annotate src/libgsasl-1-fixes.patch @ 5947:09d3533acacf

* src/build-cmake.mk, src/cmake.mk: update v3.21.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 11 Nov 2021 09:49:11 -0500
parents dddd4581f8d3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2081
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
2081
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2081
diff changeset
7 From: MXE
2081
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Mon, 7 Nov 2011 18:01:56 +0100
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 Subject: [PATCH] use memxor from nettle
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/gl/memxor.c b/gl/memxor.c
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 7fec454..d9b62cd 100644
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/gl/memxor.c
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/gl/memxor.c
2562
dddd4581f8d3 upgrade package libgsasl
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
16 @@ -22,7 +22,7 @@
2081
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 #include "memxor.h"
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 void *
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -memxor (void *restrict dest, const void *restrict src, size_t n)
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 {
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 char const *s = src;
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 char *d = dest;
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 diff --git a/libgsasl.pc.in b/libgsasl.pc.in
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 index b0c477d..d8d8ccc 100644
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 --- a/libgsasl.pc.in
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 +++ b/libgsasl.pc.in
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 @@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 Version: @VERSION@
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 Libs: -L${libdir} -lgsasl
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 +Requires.private: nettle
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 Cflags: -I${includedir}
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 --
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 1.7.7
07f7a629b4da package libgsasl: use memxor from nettle to avoid conflict
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37