summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/bind-9.11.2.local.patch49
-rw-r--r--patches/libressl-2.7.2.local.patch (renamed from patches/libressl-2.6.1.local.patch)166
2 files changed, 121 insertions, 94 deletions
diff --git a/patches/bind-9.11.2.local.patch b/patches/bind-9.11.2.local.patch
index 73697b6b..51883611 100644
--- a/patches/bind-9.11.2.local.patch
+++ b/patches/bind-9.11.2.local.patch
@@ -328,3 +328,52 @@ diff -ru bind-9.11.2.orig/lib/samples/Makefile.in bind-9.11.2/lib/samples/Makefi
SUBDIRS =
+diff -ru bind-9.11.2.orig/lib/dns/openssldh_link.c bind-9.11.2/lib/dns/openssldh_link.c
+--- bind-9.11.2.orig/lib/dns/openssldh_link.c 2017-07-24 07:36:50.000000000 +0200
++++ bind-9.11.2/lib/dns/openssldh_link.c 2018-04-03 22:59:19.495540759 +0200
+@@ -68,7 +68,7 @@
+
+ static BIGNUM *bn2, *bn768, *bn1024, *bn1536;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ /*
+ * DH_get0_key, DH_set0_key, DH_get0_pqg and DH_set0_pqg
+ * are from OpenSSL 1.1.0.
+diff -ru bind-9.11.2.orig/lib/dns/openssldsa_link.c bind-9.11.2/lib/dns/openssldsa_link.c
+--- bind-9.11.2.orig/lib/dns/openssldsa_link.c 2017-07-24 07:36:50.000000000 +0200
++++ bind-9.11.2/lib/dns/openssldsa_link.c 2018-04-03 22:57:53.448001297 +0200
+@@ -48,7 +48,7 @@
+
+ static isc_result_t openssldsa_todns(const dst_key_t *key, isc_buffer_t *data);
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ static void
+ DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
+ const BIGNUM **g)
+diff -ru bind-9.11.2.orig/lib/dns/opensslecdsa_link.c bind-9.11.2/lib/dns/opensslecdsa_link.c
+--- bind-9.11.2.orig/lib/dns/opensslecdsa_link.c 2017-07-24 07:36:50.000000000 +0200
++++ bind-9.11.2/lib/dns/opensslecdsa_link.c 2018-04-03 23:04:46.094300264 +0200
+@@ -41,7 +41,7 @@
+
+ #define DST_RET(a) {ret = a; goto err;}
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ /* From OpenSSL 1.1 */
+ static void
+ ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) {
+diff -ru bind-9.11.2.orig/lib/dns/opensslrsa_link.c bind-9.11.2/lib/dns/opensslrsa_link.c
+--- bind-9.11.2.orig/lib/dns/opensslrsa_link.c 2017-07-24 07:36:50.000000000 +0200
++++ bind-9.11.2/lib/dns/opensslrsa_link.c 2018-04-03 22:58:49.591700657 +0200
+@@ -120,7 +120,7 @@
+ #endif
+ #define DST_RET(a) {ret = a; goto err;}
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ /* From OpenSSL 1.1.0 */
+ static int
+ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
+
diff --git a/patches/libressl-2.6.1.local.patch b/patches/libressl-2.7.2.local.patch
index a3a3ed9c..143313e0 100644
--- a/patches/libressl-2.6.1.local.patch
+++ b/patches/libressl-2.7.2.local.patch
@@ -1,7 +1,7 @@
-diff -ru libressl-2.6.1.orig/configure libressl-2.6.1/configure
---- libressl-2.6.1.orig/configure 2017-09-04 23:50:38.000000000 +0200
-+++ libressl-2.6.1/configure 2017-09-19 20:07:11.024248094 +0200
-@@ -724,6 +724,8 @@
+diff -ru libressl-2.7.2.orig/configure libressl-2.7.2/configure
+--- libressl-2.7.2.orig/configure 2018-04-01 04:14:50.000000000 +0200
++++ libressl-2.7.2/configure 2018-04-03 18:23:59.137279767 +0200
+@@ -722,6 +722,8 @@
HOST_LINUX_TRUE
HOST_HPUX_FALSE
HOST_HPUX_TRUE
@@ -10,7 +10,7 @@ diff -ru libressl-2.6.1.orig/configure libressl-2.6.1/configure
HOST_FREEBSD_FALSE
HOST_FREEBSD_TRUE
HOST_DARWIN_FALSE
-@@ -11045,7 +11047,7 @@
+@@ -11043,7 +11045,7 @@
;;
# This must be glibc/ELF.
@@ -20,8 +20,8 @@ diff -ru libressl-2.6.1.orig/configure libressl-2.6.1/configure
need_lib_prefix=no
need_version=no
@@ -12190,6 +12192,11 @@
- HOST_ABI=elf
- CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
+ PLATFORM_LDADD='-lpthread'
+
;;
+ *midipix*)
+ HOST_OS=midipix
@@ -31,7 +31,7 @@ diff -ru libressl-2.6.1.orig/configure libressl-2.6.1/configure
*netbsd*)
HOST_OS=netbsd
HOST_ABI=elf
-@@ -12316,6 +12323,14 @@
+@@ -12315,6 +12322,14 @@
HOST_LINUX_FALSE=
fi
@@ -46,7 +46,7 @@ diff -ru libressl-2.6.1.orig/configure libressl-2.6.1/configure
if test x$HOST_OS = xnetbsd; then
HOST_NETBSD_TRUE=
HOST_NETBSD_FALSE='#'
-@@ -14214,6 +14229,10 @@
+@@ -14260,6 +14275,10 @@
as_fn_error $? "conditional \"HOST_LINUX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -57,9 +57,9 @@ diff -ru libressl-2.6.1.orig/configure libressl-2.6.1/configure
if test -z "${HOST_NETBSD_TRUE}" && test -z "${HOST_NETBSD_FALSE}"; then
as_fn_error $? "conditional \"HOST_NETBSD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -ru libressl-2.6.1.orig/crypto/compat/arc4random.h libressl-2.6.1/crypto/compat/arc4random.h
---- libressl-2.6.1.orig/crypto/compat/arc4random.h 2016-04-04 00:14:45.000000000 +0200
-+++ libressl-2.6.1/crypto/compat/arc4random.h 2017-09-19 19:45:28.995745938 +0200
+diff -ru libressl-2.7.2.orig/crypto/compat/arc4random.h libressl-2.7.2/crypto/compat/arc4random.h
+--- libressl-2.7.2.orig/crypto/compat/arc4random.h 2017-11-04 21:04:56.000000000 +0100
++++ libressl-2.7.2/crypto/compat/arc4random.h 2018-04-03 18:24:22.725182637 +0200
@@ -12,7 +12,7 @@
#elif defined(__hpux)
#include "arc4random_hpux.h"
@@ -69,9 +69,9 @@ diff -ru libressl-2.6.1.orig/crypto/compat/arc4random.h libressl-2.6.1/crypto/co
#include "arc4random_linux.h"
#elif defined(__NetBSD__)
-diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/crypto/compat/getentropy_linux.c
---- libressl-2.6.1.orig/crypto/compat/getentropy_linux.c 2017-09-04 23:50:15.000000000 +0200
-+++ libressl-2.6.1/crypto/compat/getentropy_linux.c 2017-09-19 20:18:40.240411176 +0200
+diff -ru libressl-2.7.2.orig/crypto/compat/getentropy_linux.c libressl-2.7.2/crypto/compat/getentropy_linux.c
+--- libressl-2.7.2.orig/crypto/compat/getentropy_linux.c 2018-04-01 04:14:32.000000000 +0200
++++ libressl-2.7.2/crypto/compat/getentropy_linux.c 2018-04-03 19:14:31.336262932 +0200
@@ -27,7 +27,7 @@
#include <sys/ioctl.h>
#include <sys/resource.h>
@@ -81,7 +81,7 @@ diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/cry
#include <linux/sysctl.h>
#endif
#include <sys/statvfs.h>
-@@ -49,8 +49,10 @@
+@@ -49,8 +49,11 @@
#include <time.h>
#include <openssl/sha.h>
@@ -89,15 +89,11 @@ diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/cry
#include <linux/types.h>
#include <linux/random.h>
+#endif
++
#ifdef HAVE_GETAUXVAL
#include <sys/auxv.h>
#endif
-@@ -74,11 +76,11 @@
- int getentropy(void *buf, size_t len);
-
- static int gotdata(char *buf, size_t len);
--#ifdef SYS_getrandom
-+#if defined(SYS_getrandom) && !defined(__midipix__)
+@@ -78,7 +81,7 @@
static int getentropy_getrandom(void *buf, size_t len);
#endif
static int getentropy_urandom(void *buf, size_t len);
@@ -106,16 +102,7 @@ diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/cry
static int getentropy_sysctl(void *buf, size_t len);
#endif
static int getentropy_fallback(void *buf, size_t len);
-@@ -94,7 +96,7 @@
- return (-1);
- }
-
--#ifdef SYS_getrandom
-+#if defined(SYS_getrandom) && !defined(__midipix__)
- /*
- * Try descriptor-less getrandom(), in non-blocking mode.
- *
-@@ -118,7 +120,7 @@
+@@ -118,7 +121,7 @@
if (ret != -1)
return (ret);
@@ -124,16 +111,7 @@ diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/cry
/*
* Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID.
* sysctl is a failsafe API, so it guarantees a result. This
-@@ -193,7 +195,7 @@
- return (0);
- }
-
--#ifdef SYS_getrandom
-+#if defined(SYS_getrandom) && !defined(__midipix__)
- static int
- getentropy_getrandom(void *buf, size_t len)
- {
-@@ -244,10 +246,12 @@
+@@ -244,10 +247,12 @@
close(fd);
goto nodevrandom;
}
@@ -146,7 +124,7 @@ diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/cry
for (i = 0; i < len; ) {
size_t wanted = len - i;
ssize_t ret = read(fd, (char *)buf + i, wanted);
-@@ -270,7 +274,7 @@
+@@ -270,7 +275,7 @@
return (-1);
}
@@ -155,62 +133,62 @@ diff -ru libressl-2.6.1.orig/crypto/compat/getentropy_linux.c libressl-2.6.1/cry
static int
getentropy_sysctl(void *buf, size_t len)
{
-diff -ru libressl-2.6.1.orig/crypto/Makefile.in libressl-2.6.1/crypto/Makefile.in
---- libressl-2.6.1.orig/crypto/Makefile.in 2017-09-04 23:50:41.000000000 +0200
-+++ libressl-2.6.1/crypto/Makefile.in 2017-09-19 20:01:29.750162029 +0200
-@@ -121,10 +121,11 @@
- @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__append_26 = compat/getentropy_freebsd.c
- @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__append_27 = compat/getentropy_hpux.c
- @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__append_28 = compat/getentropy_linux.c
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_29 = compat/getentropy_netbsd.c
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_30 = compat/getentropy_osx.c
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_31 = compat/getentropy_solaris.c
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_32 = compat/getentropy_win.c
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__append_29 = compat/getentropy_linux.c
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_30 = compat/getentropy_netbsd.c
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_31 = compat/getentropy_osx.c
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_32 = compat/getentropy_solaris.c
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_33 = compat/getentropy_win.c
- @HOST_ASM_ELF_X86_64_TRUE@am__append_33 = -DAES_ASM -DBSAES_ASM \
+diff -ru libressl-2.7.2.orig/crypto/Makefile.in libressl-2.7.2/crypto/Makefile.in
+--- libressl-2.7.2.orig/crypto/Makefile.in 2018-04-01 04:14:53.000000000 +0200
++++ libressl-2.7.2/crypto/Makefile.in 2018-04-03 18:51:02.314411849 +0200
+@@ -120,10 +120,11 @@
+ @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__append_25 = compat/getentropy_freebsd.c
+ @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__append_26 = compat/getentropy_hpux.c
+ @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__append_27 = compat/getentropy_linux.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_28 = compat/getentropy_netbsd.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_29 = compat/getentropy_osx.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_30 = compat/getentropy_solaris.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_31 = compat/getentropy_win.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__append_28 = compat/getentropy_linux.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_29 = compat/getentropy_netbsd.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_30 = compat/getentropy_osx.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_31 = compat/getentropy_solaris.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_32 = compat/getentropy_win.c
+ @HOST_ASM_ELF_X86_64_TRUE@am__append_32 = -DAES_ASM -DBSAES_ASM \
@HOST_ASM_ELF_X86_64_TRUE@ -DVPAES_ASM -DOPENSSL_IA32_SSE2 \
@HOST_ASM_ELF_X86_64_TRUE@ -DOPENSSL_BN_ASM_MONT \
-@@ -239,10 +240,11 @@
- @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__objects_18 = compat/getentropy_freebsd.lo
- @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__objects_19 = compat/getentropy_hpux.lo
- @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__objects_20 = compat/getentropy_linux.lo
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_21 = compat/getentropy_netbsd.lo
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_22 = compat/getentropy_osx.lo
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_23 = compat/getentropy_solaris.lo
--@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_24 = compat/getentropy_win.lo
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__objects_21 = compat/getentropy_linux.lo
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_22 = compat/getentropy_netbsd.lo
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_23 = compat/getentropy_osx.lo
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_24 = compat/getentropy_solaris.lo
-+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_25 = compat/getentropy_win.lo
+@@ -237,10 +238,11 @@
+ @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__objects_17 = compat/getentropy_freebsd.lo
+ @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__objects_18 = compat/getentropy_hpux.lo
+ @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__objects_19 = compat/getentropy_linux.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_20 = compat/getentropy_netbsd.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_21 = compat/getentropy_osx.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_22 = compat/getentropy_solaris.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_23 = compat/getentropy_win.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__objects_20 = compat/getentropy_linux.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_21 = compat/getentropy_netbsd.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_22 = compat/getentropy_osx.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_23 = compat/getentropy_solaris.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_24 = compat/getentropy_win.lo
am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-@@ -251,7 +253,7 @@
+@@ -248,7 +250,7 @@
+ $(am__objects_12) $(am__objects_13) $(am__objects_14) \
$(am__objects_15) $(am__objects_16) $(am__objects_17) \
$(am__objects_18) $(am__objects_19) $(am__objects_20) \
- $(am__objects_21) $(am__objects_22) $(am__objects_23) \
-- $(am__objects_24)
-+ $(am__objects_24) $(am__objects_25)
+- $(am__objects_21) $(am__objects_22) $(am__objects_23)
++ $(am__objects_21) $(am__objects_22) $(am__objects_23) $(am__objects_24)
libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -1020,7 +1022,7 @@
+@@ -1019,7 +1021,7 @@
+ $(am__append_20) $(am__append_21) $(am__append_22) \
$(am__append_23) $(am__append_24) $(am__append_25) \
$(am__append_26) $(am__append_27) $(am__append_28) \
- $(am__append_29) $(am__append_30) $(am__append_31) \
-- $(am__append_32)
-+ $(am__append_32) $(am__append_33)
+- $(am__append_29) $(am__append_30) $(am__append_31)
++ $(am__append_29) $(am__append_30) $(am__append_31) $(am__append_32)
libcompat_la_LIBADD = $(PLATFORM_LDADD)
# rc4
-diff -ru libressl-2.6.1.orig/include/compat/machine/endian.h libressl-2.6.1/include/compat/machine/endian.h
---- libressl-2.6.1.orig/include/compat/machine/endian.h 2016-04-04 00:14:45.000000000 +0200
-+++ libressl-2.6.1/include/compat/machine/endian.h 2017-09-19 20:02:26.977839948 +0200
+diff -ru libressl-2.7.2.orig/include/compat/machine/endian.h libressl-2.7.2/include/compat/machine/endian.h
+--- libressl-2.7.2.orig/include/compat/machine/endian.h 2017-11-04 21:04:56.000000000 +0100
++++ libressl-2.7.2/include/compat/machine/endian.h 2018-04-03 18:31:43.855341237 +0200
@@ -21,7 +21,7 @@
#define BYTE_ORDER BIG_ENDIAN
#endif
@@ -220,10 +198,10 @@ diff -ru libressl-2.6.1.orig/include/compat/machine/endian.h libressl-2.6.1/incl
#include <endian.h>
#elif defined(__sun) || defined(_AIX) || defined(__hpux)
-diff -ru libressl-2.6.1.orig/man/Makefile.am libressl-2.6.1/man/Makefile.am
---- libressl-2.6.1.orig/man/Makefile.am 2017-09-04 23:50:27.000000000 +0200
-+++ libressl-2.6.1/man/Makefile.am 2017-10-17 15:08:48.948729828 +0200
-@@ -2411,14 +2411,6 @@
+diff -ru libressl-2.7.2.orig/man/Makefile.am libressl-2.7.2/man/Makefile.am
+--- libressl-2.7.2.orig/man/Makefile.am 2018-04-01 04:14:42.000000000 +0200
++++ libressl-2.7.2/man/Makefile.am 2018-04-03 19:20:55.198107774 +0200
+@@ -2668,14 +2668,6 @@
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_ARG_FN_TYPE.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_FN_TYPE.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/LHASH_HASH_FN_TYPE.3"
@@ -238,7 +216,7 @@ diff -ru libressl-2.6.1.orig/man/Makefile.am libressl-2.6.1/man/Makefile.am
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_delete.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_doall.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_doall_arg.3"
-@@ -4517,14 +4509,6 @@
+@@ -5008,14 +5000,6 @@
-rm -f "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_ARG_FN_TYPE.3"
-rm -f "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_FN_TYPE.3"
-rm -f "$(DESTDIR)$(mandir)/man3/LHASH_HASH_FN_TYPE.3"
@@ -253,10 +231,10 @@ diff -ru libressl-2.6.1.orig/man/Makefile.am libressl-2.6.1/man/Makefile.am
-rm -f "$(DESTDIR)$(mandir)/man3/lh_delete.3"
-rm -f "$(DESTDIR)$(mandir)/man3/lh_doall.3"
-rm -f "$(DESTDIR)$(mandir)/man3/lh_doall_arg.3"
-diff -ru libressl-2.6.1.orig/man/Makefile.in libressl-2.6.1/man/Makefile.in
---- libressl-2.6.1.orig/man/Makefile.in 2017-09-04 23:50:42.000000000 +0200
-+++ libressl-2.6.1/man/Makefile.in 2017-10-17 15:09:11.020656860 +0200
-@@ -2677,14 +2677,6 @@
+diff -ru libressl-2.7.2.orig/man/Makefile.in libressl-2.7.2/man/Makefile.in
+--- libressl-2.7.2.orig/man/Makefile.in 2018-04-01 04:14:53.000000000 +0200
++++ libressl-2.7.2/man/Makefile.in 2018-04-03 19:21:17.461794872 +0200
+@@ -2960,14 +2960,6 @@
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_ARG_FN_TYPE.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_FN_TYPE.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/LHASH_HASH_FN_TYPE.3"
@@ -271,7 +249,7 @@ diff -ru libressl-2.6.1.orig/man/Makefile.in libressl-2.6.1/man/Makefile.in
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_delete.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_doall.3"
ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_doall_arg.3"
-@@ -4783,14 +4775,6 @@
+@@ -5300,14 +5292,6 @@
-rm -f "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_ARG_FN_TYPE.3"
-rm -f "$(DESTDIR)$(mandir)/man3/LHASH_DOALL_FN_TYPE.3"
-rm -f "$(DESTDIR)$(mandir)/man3/LHASH_HASH_FN_TYPE.3"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 03:07:38 +0000