patches/libressl-2.9.1.local.patch: don't patch auto{conf,make} input files directly (fixes libressl build.)

patches/libressl-2.7.2.local.patch: removes obsolete patch.

2 files changed, 452 insertions, 323 deletions

diff --git a/patches/libressl-2.7.2.local.patch b/patches/libressl-2.7.2.local.patch
deleted file mode 100644
index 143313e0..00000000
--- a/patches/libressl-2.7.2.local.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-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
-+HOST_MIDIPIX_FALSE
-+HOST_MIDIPIX_TRUE
- HOST_FREEBSD_FALSE
- HOST_FREEBSD_TRUE
- HOST_DARWIN_FALSE
-@@ -11043,7 +11045,7 @@
-   ;;
- 
- # This must be glibc/ELF.
--linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu | midipix*)
-   version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-@@ -12190,6 +12192,11 @@
- 		PLATFORM_LDADD='-lpthread'
- 
- 		;;
-+	*midipix*)
-+		HOST_OS=midipix
-+		HOST_ABI=pe
-+		CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
-+		;;
- 	*netbsd*)
- 		HOST_OS=netbsd
- 		HOST_ABI=elf
-@@ -12315,6 +12322,14 @@
-   HOST_LINUX_FALSE=
- fi
- 
-+ if test x$HOST_OS = xmidipix; then
-+  HOST_MIDIPIX_TRUE=
-+  HOST_MIDIPIX_FALSE='#'
-+else
-+  HOST_MIDIPIX_TRUE='#'
-+  HOST_MIDIPIX_FALSE=
-+fi
-+
-  if test x$HOST_OS = xnetbsd; then
-   HOST_NETBSD_TRUE=
-   HOST_NETBSD_FALSE='#'
-@@ -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
-+if test -z "${HOST_MIDIPIX_TRUE}" && test -z "${HOST_MIDIPIX_FALSE}"; then
-+  as_fn_error $? "conditional \"HOST_MIDIPIX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- 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.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"
- 
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__midipix__)
- #include "arc4random_linux.h"
- 
- #elif defined(__NetBSD__)
-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>
- #include <sys/syscall.h>
--#ifdef SYS__sysctl
-+#if defined(SYS__sysctl) && !defined(__midipix__)
- #include <linux/sysctl.h>
- #endif
- #include <sys/statvfs.h>
-@@ -49,8 +49,11 @@
- #include <time.h>
- #include <openssl/sha.h>
- 
-+#ifndef __midipix__
- #include <linux/types.h>
- #include <linux/random.h>
-+#endif
-+
- #ifdef HAVE_GETAUXVAL
- #include <sys/auxv.h>
- #endif
-@@ -78,7 +81,7 @@
- static int getentropy_getrandom(void *buf, size_t len);
- #endif
- static int getentropy_urandom(void *buf, size_t len);
--#ifdef SYS__sysctl
-+#if defined(SYS__sysctl) && !defined(__midipix__)
- static int getentropy_sysctl(void *buf, size_t len);
- #endif
- static int getentropy_fallback(void *buf, size_t len);
-@@ -118,7 +121,7 @@
- 	if (ret != -1)
- 		return (ret);
- 
--#ifdef SYS__sysctl
-+#if defined(SYS__sysctl) && !defined(__midipix__)
- 	/*
- 	 * Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID.
- 	 * sysctl is a failsafe API, so it guarantees a result.  This
-@@ -244,10 +247,12 @@
- 		close(fd);
- 		goto nodevrandom;
- 	}
-+#ifndef __midipix__
- 	if (ioctl(fd, RNDGETENTCNT, &cnt) == -1) {
- 		close(fd);
- 		goto nodevrandom;
- 	}
-+#endif
- 	for (i = 0; i < len; ) {
- 		size_t wanted = len - i;
- 		ssize_t ret = read(fd, (char *)buf + i, wanted);
-@@ -270,7 +275,7 @@
- 	return (-1);
- }
- 
--#ifdef SYS__sysctl
-+#if defined(SYS__sysctl) && !defined(__midipix__)
- static int
- getentropy_sysctl(void *buf, size_t len)
- {
-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 \
-@@ -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) \
-@@ -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_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@)
-@@ -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_29) $(am__append_30) $(am__append_31) $(am__append_32)
- libcompat_la_LIBADD = $(PLATFORM_LDADD)
- 
- # rc4
-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
- 
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__midipix__)
- #include <endian.h>
- 
- #elif defined(__sun) || defined(_AIX) || defined(__hpux)
-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"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_delete.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_doall.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_doall_arg.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_error.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_free.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_insert.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_new.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_retrieve.3"
- 	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"
-@@ -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"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_delete.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_doall.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_doall_arg.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_error.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_free.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_insert.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_new.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_retrieve.3"
- 	-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.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"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_delete.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_doall.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_doall_arg.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_error.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_free.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_insert.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_new.3"
--	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_<type>_retrieve.3"
- 	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"
-@@ -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"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_delete.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_doall.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_doall_arg.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_error.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_free.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_insert.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_new.3"
--	-rm -f "$(DESTDIR)$(mandir)/man3/lh_<type>_retrieve.3"
- 	-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 --git a/patches/libressl-2.9.1.local.patch b/patches/libressl-2.9.1.local.patch
index 35fd0eb8..33a66bc6 100644
--- a/patches/libressl-2.9.1.local.patch
+++ b/patches/libressl-2.9.1.local.patch
@@ -1,18 +1,82 @@
-diff -ru libressl-2.9.1.orig/configure.ac libressl-2.9.1/configure.ac
---- libressl-2.9.1.orig/configure.ac	2019-04-11 13:20:57.000000000 +0200
-+++ libressl-2.9.1/configure.ac	2019-04-25 11:35:00.232577751 +0200
-@@ -115,6 +115,8 @@
-     [test "x$HOST_ABI" = "xmasm" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
- AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64],
-     [test "x$HOST_ABI" = "xmingw64" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
-+AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64],
-+    [test "x$HOST_ABI" = "xmingw64" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
+diff -Nru libressl-2.9.1/configure ../libressl-2.9.1/configure
+--- libressl-2.9.1/configure	2019-04-13 17:22:35.000000000 +0000
++++ libressl-2.9.1/configure	2019-05-06 15:54:43.112000000 +0000
+@@ -722,6 +722,8 @@
+ CCASDEPMODE
+ CCASFLAGS
+ CCAS
++HOST_MIDIPIX_FALSE
++HOST_MIDIPIX_TRUE
+ HOST_WIN_FALSE
+ HOST_WIN_TRUE
+ HOST_SOLARIS_FALSE
+@@ -12055,6 +12057,11 @@
+ 		PLATFORM_LDADD='-lws2_32'
+ 
+ 		;;
++	*midipix*)
++		HOST_OS=midipix
++		HOST_ABI=mingw64
++		CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
++		;;
+ 	*solaris*)
+ 		HOST_OS=solaris
+ 		HOST_ABI=elf
+@@ -12167,6 +12174,14 @@
+   HOST_WIN_FALSE=
+ fi
+ 
++ if test x$HOST_OS = xmidipix; then
++  HOST_MIDIPIX_TRUE=
++  HOST_MIDIPIX_FALSE='#'
++else
++  HOST_MIDIPIX_TRUE='#'
++  HOST_MIDIPIX_FALSE=
++fi
++
+ 
+ 
+ 
+@@ -13990,6 +14005,14 @@
+   HOST_ASM_MINGW64_X86_64_FALSE=
+ fi
+ 
++ if test "x$HOST_ABI" = "xmingw64" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"; then
++  HOST_ASM_MINGW64_X86_64_TRUE=
++  HOST_ASM_MINGW64_X86_64_FALSE='#'
++else
++  HOST_ASM_MINGW64_X86_64_TRUE='#'
++  HOST_ASM_MINGW64_X86_64_FALSE=
++fi
++
  
  # Check if time_t is sized correctly
- AC_CHECK_SIZEOF([time_t], [time.h])
-diff -ru libressl-2.9.1.orig/crypto/compat/arc4random.h libressl-2.9.1/crypto/compat/arc4random.h
---- libressl-2.9.1.orig/crypto/compat/arc4random.h	2017-11-04 21:04:56.000000000 +0100
-+++ libressl-2.9.1/crypto/compat/arc4random.h	2019-04-23 08:24:53.883460156 +0200
+ # The cast to long int works around a bug in the HP C Compiler
+@@ -14269,6 +14292,10 @@
+   as_fn_error $? "conditional \"HOST_WIN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${HOST_MIDIPIX_TRUE}" && test -z "${HOST_MIDIPIX_FALSE}"; then
++  as_fn_error $? "conditional \"HOST_MIDIPIX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -14438,6 +14465,10 @@
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HOST_ASM_MINGW64_X86_64_TRUE}" && test -z "${HOST_ASM_MINGW64_X86_64_FALSE}"; then
++  as_fn_error $? "conditional \"HOST_ASM_MINGW64_X86_64\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${HOST_ASM_MINGW64_X86_64_TRUE}" && test -z "${HOST_ASM_MINGW64_X86_64_FALSE}"; then
+   as_fn_error $? "conditional \"HOST_ASM_MINGW64_X86_64\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+diff -Nru libressl-2.9.1/crypto/compat/arc4random.h ../libressl-2.9.1/crypto/compat/arc4random.h
+--- libressl-2.9.1/crypto/compat/arc4random.h	2017-11-04 20:04:56.000000000 +0000
++++ libressl-2.9.1/crypto/compat/arc4random.h	2019-05-06 15:54:22.488000000 +0000
 @@ -12,7 +12,7 @@
  #elif defined(__hpux)
  #include "arc4random_hpux.h"
@@ -22,30 +86,382 @@ diff -ru libressl-2.9.1.orig/crypto/compat/arc4random.h libressl-2.9.1/crypto/co
  #include "arc4random_linux.h"
  
  #elif defined(__NetBSD__)
-diff -ru libressl-2.9.1.orig/crypto/Makefile.am libressl-2.9.1/crypto/Makefile.am
---- libressl-2.9.1.orig/crypto/Makefile.am	2019-04-11 13:20:57.000000000 +0200
-+++ libressl-2.9.1/crypto/Makefile.am	2019-04-25 12:00:00.092586851 +0200
-@@ -167,6 +167,9 @@
- if HOST_LINUX
- libcompat_la_SOURCES += compat/getprogname_linux.c
- else
-+if HOST_MIDIPIX
-+libcompat_la_SOURCES += compat/getprogname_linux.c
-+else
- if HOST_WIN
- libcompat_la_SOURCES += compat/getprogname_windows.c
- else
-@@ -174,6 +177,7 @@
- endif
- endif
- endif
-+endif
+diff -Nru libressl-2.9.1/crypto/Makefile.in ../libressl-2.9.1/crypto/Makefile.in
+--- libressl-2.9.1/crypto/Makefile.in	2019-04-13 17:22:40.000000000 +0000
++++ libressl-2.9.1/crypto/Makefile.in	2019-05-06 15:54:44.404000000 +0000
+@@ -108,31 +108,32 @@
+ @HAVE_FREEZERO_FALSE@am__append_14 = compat/freezero.c
+ @HAVE_GETPAGESIZE_FALSE@am__append_15 = compat/getpagesize.c
+ @HAVE_GETPROGNAME_FALSE@@HOST_LINUX_TRUE@am__append_16 = compat/getprogname_linux.c
+-@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_WIN_TRUE@am__append_17 = compat/getprogname_windows.c
+-@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_WIN_FALSE@am__append_18 = compat/getprogname_unimpl.c
+-@HAVE_TIMEGM_FALSE@am__append_19 = compat/timegm.c
+-@HAVE_REALLOCARRAY_FALSE@am__append_20 = compat/reallocarray.c
+-@HAVE_RECALLOCARRAY_FALSE@am__append_21 = compat/recallocarray.c
+-@HAVE_SYSLOG_R_FALSE@am__append_22 = compat/syslog_r.c
+-@HAVE_TIMINGSAFE_MEMCMP_FALSE@am__append_23 = compat/timingsafe_memcmp.c
+-@HAVE_TIMINGSAFE_BCMP_FALSE@am__append_24 = compat/timingsafe_bcmp.c
+-@HOST_WIN_TRUE@am__append_25 = compat/posix_win.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@am__append_26 = compat/arc4random.c \
++@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_MIDIPIX_TRUE@am__append_17 = compat/getprogname_linux.c
++@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_MIDIPIX_FALSE@@HOST_WIN_TRUE@am__append_18 = compat/getprogname_windows.c
++@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_MIDIPIX_FALSE@@HOST_WIN_FALSE@am__append_19 = compat/getprogname_unimpl.c
++@HAVE_TIMEGM_FALSE@am__append_20 = compat/timegm.c
++@HAVE_REALLOCARRAY_FALSE@am__append_21 = compat/reallocarray.c
++@HAVE_RECALLOCARRAY_FALSE@am__append_22 = compat/recallocarray.c
++@HAVE_SYSLOG_R_FALSE@am__append_23 = compat/syslog_r.c
++@HAVE_TIMINGSAFE_MEMCMP_FALSE@am__append_24 = compat/timingsafe_memcmp.c
++@HAVE_TIMINGSAFE_BCMP_FALSE@am__append_25 = compat/timingsafe_bcmp.c
++@HOST_WIN_TRUE@am__append_26 = compat/posix_win.c
++@HAVE_ARC4RANDOM_BUF_FALSE@am__append_27 = compat/arc4random.c \
+ @HAVE_ARC4RANDOM_BUF_FALSE@	compat/arc4random_uniform.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_AIX_TRUE@am__append_27 = compat/getentropy_aix.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__append_28 = compat/getentropy_freebsd.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__append_29 = compat/getentropy_hpux.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__append_30 = compat/getentropy_linux.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_31 = compat/getentropy_netbsd.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_32 = compat/getentropy_osx.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_33 = compat/getentropy_solaris.c
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_34 = compat/getentropy_win.c
+-@HOST_ASM_ELF_ARM_TRUE@am__append_35 = -DAES_ASM -DOPENSSL_BN_ASM_MONT \
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_AIX_TRUE@am__append_28 = compat/getentropy_aix.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__append_29 = compat/getentropy_freebsd.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__append_30 = compat/getentropy_hpux.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__append_31 = compat/getentropy_linux.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_32 = compat/getentropy_netbsd.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_33 = compat/getentropy_osx.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_34 = compat/getentropy_solaris.c
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_35 = compat/getentropy_win.c
++@HOST_ASM_ELF_ARM_TRUE@am__append_36 = -DAES_ASM -DOPENSSL_BN_ASM_MONT \
+ @HOST_ASM_ELF_ARM_TRUE@	-DOPENSSL_BN_ASM_GF2m -DGHASH_ASM \
+ @HOST_ASM_ELF_ARM_TRUE@	-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM \
+ @HOST_ASM_ELF_ARM_TRUE@	-DOPENSSL_CPUID_OBJ
+-@HOST_ASM_ELF_ARM_TRUE@am__append_36 = $(ASM_ARM_ELF)
+-@HOST_ASM_ELF_X86_64_TRUE@am__append_37 = -DAES_ASM -DBSAES_ASM \
++@HOST_ASM_ELF_ARM_TRUE@am__append_37 = $(ASM_ARM_ELF)
++@HOST_ASM_ELF_X86_64_TRUE@am__append_38 = -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 \
+ @HOST_ASM_ELF_X86_64_TRUE@	-DOPENSSL_BN_ASM_MONT5 \
+@@ -140,8 +141,8 @@
+ @HOST_ASM_ELF_X86_64_TRUE@	-DGHASH_ASM -DRSA_ASM -DSHA1_ASM \
+ @HOST_ASM_ELF_X86_64_TRUE@	-DSHA256_ASM -DSHA512_ASM \
+ @HOST_ASM_ELF_X86_64_TRUE@	-DWHIRLPOOL_ASM -DOPENSSL_CPUID_OBJ
+-@HOST_ASM_ELF_X86_64_TRUE@am__append_38 = $(ASM_X86_64_ELF)
+-@HOST_ASM_MACOSX_X86_64_TRUE@am__append_39 = -DAES_ASM -DBSAES_ASM \
++@HOST_ASM_ELF_X86_64_TRUE@am__append_39 = $(ASM_X86_64_ELF)
++@HOST_ASM_MACOSX_X86_64_TRUE@am__append_40 = -DAES_ASM -DBSAES_ASM \
+ @HOST_ASM_MACOSX_X86_64_TRUE@	-DVPAES_ASM -DOPENSSL_IA32_SSE2 \
+ @HOST_ASM_MACOSX_X86_64_TRUE@	-DOPENSSL_BN_ASM_MONT \
+ @HOST_ASM_MACOSX_X86_64_TRUE@	-DOPENSSL_BN_ASM_MONT5 \
+@@ -150,8 +151,8 @@
+ @HOST_ASM_MACOSX_X86_64_TRUE@	-DSHA256_ASM -DSHA512_ASM \
+ @HOST_ASM_MACOSX_X86_64_TRUE@	-DWHIRLPOOL_ASM \
+ @HOST_ASM_MACOSX_X86_64_TRUE@	-DOPENSSL_CPUID_OBJ
+-@HOST_ASM_MACOSX_X86_64_TRUE@am__append_40 = $(ASM_X86_64_MACOSX)
+-@HOST_ASM_MASM_X86_64_TRUE@am__append_41 = -DAES_ASM -DBSAES_ASM \
++@HOST_ASM_MACOSX_X86_64_TRUE@am__append_41 = $(ASM_X86_64_MACOSX)
++@HOST_ASM_MASM_X86_64_TRUE@am__append_42 = -DAES_ASM -DBSAES_ASM \
+ @HOST_ASM_MASM_X86_64_TRUE@	-DVPAES_ASM -DOPENSSL_IA32_SSE2 \
+ @HOST_ASM_MASM_X86_64_TRUE@	-DOPENSSL_BN_ASM_MONT \
+ @HOST_ASM_MASM_X86_64_TRUE@	-DOPENSSL_BN_ASM_MONT5 \
+@@ -159,31 +160,31 @@
+ @HOST_ASM_MASM_X86_64_TRUE@	-DGHASH_ASM -DRSA_ASM -DSHA1_ASM \
+ @HOST_ASM_MASM_X86_64_TRUE@	-DSHA256_ASM -DSHA512_ASM \
+ @HOST_ASM_MASM_X86_64_TRUE@	-DWHIRLPOOL_ASM -DOPENSSL_CPUID_OBJ
+-@HOST_ASM_MASM_X86_64_TRUE@am__append_42 = $(ASM_X86_64_MASM)
++@HOST_ASM_MASM_X86_64_TRUE@am__append_43 = $(ASM_X86_64_MASM)
+ #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+ #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
+ #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_GF2m
+-@HOST_ASM_MINGW64_X86_64_TRUE@am__append_43 = -DAES_ASM -DBSAES_ASM \
++@HOST_ASM_MINGW64_X86_64_TRUE@am__append_44 = -DAES_ASM -DBSAES_ASM \
+ @HOST_ASM_MINGW64_X86_64_TRUE@	-DVPAES_ASM -DOPENSSL_IA32_SSE2 \
+ @HOST_ASM_MINGW64_X86_64_TRUE@	-DMD5_ASM -DGHASH_ASM -DRSA_ASM \
+ @HOST_ASM_MINGW64_X86_64_TRUE@	-DSHA1_ASM -DSHA256_ASM \
+ @HOST_ASM_MINGW64_X86_64_TRUE@	-DSHA512_ASM -DWHIRLPOOL_ASM \
+ @HOST_ASM_MINGW64_X86_64_TRUE@	-DOPENSSL_CPUID_OBJ
+-@HOST_ASM_MINGW64_X86_64_TRUE@am__append_44 = $(ASM_X86_64_MINGW64)
+-@HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@am__append_45 = aes/aes_cbc.c \
++@HOST_ASM_MINGW64_X86_64_TRUE@am__append_45 = $(ASM_X86_64_MINGW64)
++@HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@am__append_46 = aes/aes_cbc.c \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	aes/aes_core.c \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	camellia/camellia.c \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	camellia/cmll_cbc.c \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	rc4/rc4_enc.c \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	rc4/rc4_skey.c \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	whrlpool/wp_block.c
+-@HOST_WIN_FALSE@am__append_46 = crypto_lock.c
+-@HOST_WIN_TRUE@am__append_47 = compat/crypto_lock_win.c
+-@HOST_WIN_FALSE@am__append_48 = bio/b_posix.c
+-@HOST_WIN_TRUE@am__append_49 = bio/b_win.c
+-@HOST_WIN_FALSE@am__append_50 = bio/bss_log.c
+-@HOST_WIN_FALSE@am__append_51 = ui/ui_openssl.c
+-@HOST_WIN_TRUE@am__append_52 = ui/ui_openssl_win.c
++@HOST_WIN_FALSE@am__append_47 = crypto_lock.c
++@HOST_WIN_TRUE@am__append_48 = compat/crypto_lock_win.c
++@HOST_WIN_FALSE@am__append_49 = bio/b_posix.c
++@HOST_WIN_TRUE@am__append_50 = bio/b_win.c
++@HOST_WIN_FALSE@am__append_51 = bio/bss_log.c
++@HOST_WIN_FALSE@am__append_52 = ui/ui_openssl.c
++@HOST_WIN_TRUE@am__append_53 = ui/ui_openssl_win.c
+ subdir = crypto
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/check-hardening-options.m4 \
+@@ -255,27 +256,28 @@
+ @HAVE_FREEZERO_FALSE@am__objects_7 = compat/freezero.lo
+ @HAVE_GETPAGESIZE_FALSE@am__objects_8 = compat/getpagesize.lo
+ @HAVE_GETPROGNAME_FALSE@@HOST_LINUX_TRUE@am__objects_9 = compat/getprogname_linux.lo
+-@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_WIN_TRUE@am__objects_10 = compat/getprogname_windows.lo
+-@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_WIN_FALSE@am__objects_11 = compat/getprogname_unimpl.lo
+-@HAVE_TIMEGM_FALSE@am__objects_12 = compat/timegm.lo
+-@HAVE_REALLOCARRAY_FALSE@am__objects_13 = compat/reallocarray.lo
+-@HAVE_RECALLOCARRAY_FALSE@am__objects_14 = compat/recallocarray.lo
+-@HAVE_SYSLOG_R_FALSE@am__objects_15 = compat/syslog_r.lo
+-@HAVE_TIMINGSAFE_MEMCMP_FALSE@am__objects_16 =  \
++@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_MIDIPIX_TRUE@am__objects_10 = compat/getprogname_linux.lo
++@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_MIDIPIX_FALSE@@HOST_WIN_TRUE@am__objects_11 = compat/getprogname_windows.lo
++@HAVE_GETPROGNAME_FALSE@@HOST_LINUX_FALSE@@HOST_MIDIPIX_FALSE@@HOST_WIN_FALSE@am__objects_12 = compat/getprogname_unimpl.lo
++@HAVE_TIMEGM_FALSE@am__objects_13 = compat/timegm.lo
++@HAVE_REALLOCARRAY_FALSE@am__objects_14 = compat/reallocarray.lo
++@HAVE_RECALLOCARRAY_FALSE@am__objects_15 = compat/recallocarray.lo
++@HAVE_SYSLOG_R_FALSE@am__objects_16 = compat/syslog_r.lo
++@HAVE_TIMINGSAFE_MEMCMP_FALSE@am__objects_17 =  \
+ @HAVE_TIMINGSAFE_MEMCMP_FALSE@	compat/timingsafe_memcmp.lo
+-@HAVE_TIMINGSAFE_BCMP_FALSE@am__objects_17 =  \
++@HAVE_TIMINGSAFE_BCMP_FALSE@am__objects_18 =  \
+ @HAVE_TIMINGSAFE_BCMP_FALSE@	compat/timingsafe_bcmp.lo
+-@HOST_WIN_TRUE@am__objects_18 = compat/posix_win.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@am__objects_19 = compat/arc4random.lo \
++@HOST_WIN_TRUE@am__objects_19 = compat/posix_win.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@am__objects_20 = compat/arc4random.lo \
+ @HAVE_ARC4RANDOM_BUF_FALSE@	compat/arc4random_uniform.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_AIX_TRUE@am__objects_20 = compat/getentropy_aix.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__objects_21 = compat/getentropy_freebsd.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__objects_22 = compat/getentropy_hpux.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__objects_23 = compat/getentropy_linux.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_24 = compat/getentropy_netbsd.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_25 = compat/getentropy_osx.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_26 = compat/getentropy_solaris.lo
+-@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_27 = compat/getentropy_win.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_AIX_TRUE@am__objects_21 = compat/getentropy_aix.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__objects_22 = compat/getentropy_freebsd.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__objects_23 = compat/getentropy_hpux.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__objects_24 = compat/getentropy_linux.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_25 = compat/getentropy_netbsd.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_26 = compat/getentropy_osx.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_27 = compat/getentropy_solaris.lo
++@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_28 = 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) \
+@@ -285,7 +287,7 @@
+ 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+ 	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
+ 	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
+-	$(am__objects_27)
++	$(am__objects_27) $(am__objects_28)
+ libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -294,10 +296,10 @@
+ libcompatnoopt_la_LIBADD =
+ am__libcompatnoopt_la_SOURCES_DIST = compat/explicit_bzero_win.c \
+ 	compat/explicit_bzero.c
+-@HAVE_EXPLICIT_BZERO_FALSE@@HOST_WIN_TRUE@am__objects_28 = compat/libcompatnoopt_la-explicit_bzero_win.lo
+-@HAVE_EXPLICIT_BZERO_FALSE@@HOST_WIN_FALSE@am__objects_29 = compat/libcompatnoopt_la-explicit_bzero.lo
++@HAVE_EXPLICIT_BZERO_FALSE@@HOST_WIN_TRUE@am__objects_29 = compat/libcompatnoopt_la-explicit_bzero_win.lo
++@HAVE_EXPLICIT_BZERO_FALSE@@HOST_WIN_FALSE@am__objects_30 = compat/libcompatnoopt_la-explicit_bzero.lo
+ @HAVE_EXPLICIT_BZERO_FALSE@am_libcompatnoopt_la_OBJECTS =  \
+-@HAVE_EXPLICIT_BZERO_FALSE@	$(am__objects_28) $(am__objects_29)
++@HAVE_EXPLICIT_BZERO_FALSE@	$(am__objects_29) $(am__objects_30)
+ libcompatnoopt_la_OBJECTS = $(am_libcompatnoopt_la_OBJECTS)
+ libcompatnoopt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+@@ -496,7 +498,7 @@
+ 	x509v3/v3_pcons.c x509v3/v3_pku.c x509v3/v3_pmaps.c \
+ 	x509v3/v3_prn.c x509v3/v3_purp.c x509v3/v3_skey.c \
+ 	x509v3/v3_sxnet.c x509v3/v3_utl.c x509v3/v3err.c
+-am__objects_30 = aes/libcrypto_la-aes-elf-armv4.lo \
++am__objects_31 = aes/libcrypto_la-aes-elf-armv4.lo \
+ 	bn/libcrypto_la-gf2m-elf-armv4.lo \
+ 	bn/libcrypto_la-mont-elf-armv4.lo \
+ 	sha/libcrypto_la-sha1-elf-armv4.lo \
+@@ -507,8 +509,8 @@
+ 	aes/libcrypto_la-aes_cbc.lo camellia/libcrypto_la-camellia.lo \
+ 	camellia/libcrypto_la-cmll_cbc.lo rc4/libcrypto_la-rc4_enc.lo \
+ 	rc4/libcrypto_la-rc4_skey.lo whrlpool/libcrypto_la-wp_block.lo
+-@HOST_ASM_ELF_ARM_TRUE@am__objects_31 = $(am__objects_30)
+-am__objects_32 = aes/libcrypto_la-aes-elf-x86_64.lo \
++@HOST_ASM_ELF_ARM_TRUE@am__objects_32 = $(am__objects_31)
++am__objects_33 = aes/libcrypto_la-aes-elf-x86_64.lo \
+ 	aes/libcrypto_la-bsaes-elf-x86_64.lo \
+ 	aes/libcrypto_la-vpaes-elf-x86_64.lo \
+ 	aes/libcrypto_la-aesni-elf-x86_64.lo \
+@@ -527,8 +529,8 @@
+ 	sha/libcrypto_la-sha512-elf-x86_64.lo \
+ 	whrlpool/libcrypto_la-wp-elf-x86_64.lo \
+ 	libcrypto_la-cpuid-elf-x86_64.lo
+-@HOST_ASM_ELF_X86_64_TRUE@am__objects_33 = $(am__objects_32)
+-am__objects_34 = aes/libcrypto_la-aes-macosx-x86_64.lo \
++@HOST_ASM_ELF_X86_64_TRUE@am__objects_34 = $(am__objects_33)
++am__objects_35 = aes/libcrypto_la-aes-macosx-x86_64.lo \
+ 	aes/libcrypto_la-bsaes-macosx-x86_64.lo \
+ 	aes/libcrypto_la-vpaes-macosx-x86_64.lo \
+ 	aes/libcrypto_la-aesni-macosx-x86_64.lo \
+@@ -547,8 +549,8 @@
+ 	sha/libcrypto_la-sha512-macosx-x86_64.lo \
+ 	whrlpool/libcrypto_la-wp-macosx-x86_64.lo \
+ 	libcrypto_la-cpuid-macosx-x86_64.lo
+-@HOST_ASM_MACOSX_X86_64_TRUE@am__objects_35 = $(am__objects_34)
+-am__objects_36 = aes/libcrypto_la-aes-masm-x86_64.lo \
++@HOST_ASM_MACOSX_X86_64_TRUE@am__objects_36 = $(am__objects_35)
++am__objects_37 = aes/libcrypto_la-aes-masm-x86_64.lo \
+ 	aes/libcrypto_la-bsaes-masm-x86_64.lo \
+ 	aes/libcrypto_la-vpaes-masm-x86_64.lo \
+ 	aes/libcrypto_la-aesni-masm-x86_64.lo \
+@@ -567,8 +569,8 @@
+ 	sha/libcrypto_la-sha512-masm-x86_64.lo \
+ 	whrlpool/libcrypto_la-wp-masm-x86_64.lo \
+ 	libcrypto_la-cpuid-masm-x86_64.lo
+-@HOST_ASM_MASM_X86_64_TRUE@am__objects_37 = $(am__objects_36)
+-am__objects_38 = aes/libcrypto_la-aes-mingw64-x86_64.lo \
++@HOST_ASM_MASM_X86_64_TRUE@am__objects_38 = $(am__objects_37)
++am__objects_39 = aes/libcrypto_la-aes-mingw64-x86_64.lo \
+ 	aes/libcrypto_la-bsaes-mingw64-x86_64.lo \
+ 	aes/libcrypto_la-vpaes-mingw64-x86_64.lo \
+ 	aes/libcrypto_la-aesni-mingw64-x86_64.lo \
+@@ -583,27 +585,27 @@
+ 	sha/libcrypto_la-sha512-mingw64-x86_64.lo \
+ 	whrlpool/libcrypto_la-wp-mingw64-x86_64.lo \
+ 	libcrypto_la-cpuid-mingw64-x86_64.lo
+-@HOST_ASM_MINGW64_X86_64_TRUE@am__objects_39 = $(am__objects_38)
+-@HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@am__objects_40 = aes/libcrypto_la-aes_cbc.lo \
++@HOST_ASM_MINGW64_X86_64_TRUE@am__objects_40 = $(am__objects_39)
++@HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@am__objects_41 = aes/libcrypto_la-aes_cbc.lo \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	aes/libcrypto_la-aes_core.lo \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	camellia/libcrypto_la-camellia.lo \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	camellia/libcrypto_la-cmll_cbc.lo \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	rc4/libcrypto_la-rc4_enc.lo \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	rc4/libcrypto_la-rc4_skey.lo \
+ @HOST_ASM_ELF_ARM_FALSE@@HOST_ASM_ELF_X86_64_FALSE@@HOST_ASM_MACOSX_X86_64_FALSE@@HOST_ASM_MASM_X86_64_FALSE@@HOST_ASM_MINGW64_X86_64_FALSE@	whrlpool/libcrypto_la-wp_block.lo
+-@HOST_WIN_FALSE@am__objects_41 = libcrypto_la-crypto_lock.lo
+-@HOST_WIN_TRUE@am__objects_42 =  \
++@HOST_WIN_FALSE@am__objects_42 = libcrypto_la-crypto_lock.lo
++@HOST_WIN_TRUE@am__objects_43 =  \
+ @HOST_WIN_TRUE@	compat/libcrypto_la-crypto_lock_win.lo
+-@HOST_WIN_FALSE@am__objects_43 = bio/libcrypto_la-b_posix.lo
+-@HOST_WIN_TRUE@am__objects_44 = bio/libcrypto_la-b_win.lo
+-@HOST_WIN_FALSE@am__objects_45 = bio/libcrypto_la-bss_log.lo
+-@HOST_WIN_FALSE@am__objects_46 = ui/libcrypto_la-ui_openssl.lo
+-@HOST_WIN_TRUE@am__objects_47 = ui/libcrypto_la-ui_openssl_win.lo
+-am_libcrypto_la_OBJECTS = $(am__objects_31) $(am__objects_33) \
+-	$(am__objects_35) $(am__objects_37) $(am__objects_39) \
+-	$(am__objects_40) libcrypto_la-cpt_err.lo \
++@HOST_WIN_FALSE@am__objects_44 = bio/libcrypto_la-b_posix.lo
++@HOST_WIN_TRUE@am__objects_45 = bio/libcrypto_la-b_win.lo
++@HOST_WIN_FALSE@am__objects_46 = bio/libcrypto_la-bss_log.lo
++@HOST_WIN_FALSE@am__objects_47 = ui/libcrypto_la-ui_openssl.lo
++@HOST_WIN_TRUE@am__objects_48 = ui/libcrypto_la-ui_openssl_win.lo
++am_libcrypto_la_OBJECTS = $(am__objects_32) $(am__objects_34) \
++	$(am__objects_36) $(am__objects_38) $(am__objects_40) \
++	$(am__objects_41) libcrypto_la-cpt_err.lo \
+ 	libcrypto_la-cryptlib.lo libcrypto_la-crypto_init.lo \
+-	$(am__objects_41) $(am__objects_42) libcrypto_la-cversion.lo \
++	$(am__objects_42) $(am__objects_43) libcrypto_la-cversion.lo \
+ 	libcrypto_la-ex_data.lo libcrypto_la-malloc-wrapper.lo \
+ 	libcrypto_la-mem_clr.lo libcrypto_la-mem_dbg.lo \
+ 	libcrypto_la-o_init.lo libcrypto_la-o_str.lo \
+@@ -651,15 +653,15 @@
+ 	bf/libcrypto_la-bf_cfb64.lo bf/libcrypto_la-bf_ecb.lo \
+ 	bf/libcrypto_la-bf_enc.lo bf/libcrypto_la-bf_ofb64.lo \
+ 	bf/libcrypto_la-bf_skey.lo bio/libcrypto_la-b_dump.lo \
+-	$(am__objects_43) bio/libcrypto_la-b_print.lo \
+-	bio/libcrypto_la-b_sock.lo $(am__objects_44) \
++	$(am__objects_44) bio/libcrypto_la-b_print.lo \
++	bio/libcrypto_la-b_sock.lo $(am__objects_45) \
+ 	bio/libcrypto_la-bf_buff.lo bio/libcrypto_la-bf_nbio.lo \
+ 	bio/libcrypto_la-bf_null.lo bio/libcrypto_la-bio_cb.lo \
+ 	bio/libcrypto_la-bio_err.lo bio/libcrypto_la-bio_lib.lo \
+ 	bio/libcrypto_la-bio_meth.lo bio/libcrypto_la-bss_acpt.lo \
+ 	bio/libcrypto_la-bss_bio.lo bio/libcrypto_la-bss_conn.lo \
+ 	bio/libcrypto_la-bss_dgram.lo bio/libcrypto_la-bss_fd.lo \
+-	bio/libcrypto_la-bss_file.lo $(am__objects_45) \
++	bio/libcrypto_la-bss_file.lo $(am__objects_46) \
+ 	bio/libcrypto_la-bss_mem.lo bio/libcrypto_la-bss_null.lo \
+ 	bio/libcrypto_la-bss_sock.lo bn/libcrypto_la-bn_add.lo \
+ 	bn/libcrypto_la-bn_asm.lo bn/libcrypto_la-bn_blind.lo \
+@@ -862,7 +864,7 @@
+ 	ts/libcrypto_la-ts_rsp_verify.lo \
+ 	ts/libcrypto_la-ts_verify_ctx.lo txt_db/libcrypto_la-txt_db.lo \
+ 	ui/libcrypto_la-ui_err.lo ui/libcrypto_la-ui_lib.lo \
+-	$(am__objects_46) $(am__objects_47) ui/libcrypto_la-ui_util.lo \
++	$(am__objects_47) $(am__objects_48) ui/libcrypto_la-ui_util.lo \
+ 	whrlpool/libcrypto_la-wp_dgst.lo x509/libcrypto_la-by_dir.lo \
+ 	x509/libcrypto_la-by_file.lo x509/libcrypto_la-by_mem.lo \
+ 	x509/libcrypto_la-x509_att.lo x509/libcrypto_la-x509_cmp.lo \
+@@ -1784,8 +1786,8 @@
+ libcrypto_la_LIBADD = libcompat.la $(am__append_1)
+ libcrypto_la_CPPFLAGS = $(AM_CPPFLAGS) -DLIBRESSL_INTERNAL \
+ 	-DOPENSSL_NO_HW_PADLOCK $(am__append_2) $(am__append_3) \
+-	$(am__append_4) $(am__append_35) $(am__append_37) \
+-	$(am__append_39) $(am__append_41) $(am__append_43)
++	$(am__append_4) $(am__append_36) $(am__append_38) \
++	$(am__append_40) $(am__append_42) $(am__append_44)
+ noinst_LTLIBRARIES = libcompat.la $(am__append_5)
+ @HAVE_EXPLICIT_BZERO_FALSE@libcompatnoopt_la_CFLAGS = -O0
+ @HAVE_EXPLICIT_BZERO_FALSE@libcompatnoopt_la_SOURCES =  \
+@@ -1801,7 +1803,7 @@
+ 	$(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_33) \
+-	$(am__append_34)
++	$(am__append_34) $(am__append_35)
+ libcompat_la_LIBADD = $(PLATFORM_LDADD)
  
- if !HAVE_TIMEGM
- libcompat_la_SOURCES += compat/timegm.c
-diff -ru libressl-2.9.1.orig/include/compat/machine/endian.h libressl-2.9.1/include/compat/machine/endian.h
---- libressl-2.9.1.orig/include/compat/machine/endian.h	2017-11-04 21:04:56.000000000 +0100
-+++ libressl-2.9.1/include/compat/machine/endian.h	2019-04-23 08:20:38.971458609 +0200
+ # rc4
+@@ -1922,10 +1924,10 @@
+ # x509
+ 
+ # x509v3
+-libcrypto_la_SOURCES = $(am__append_36) $(am__append_38) \
+-	$(am__append_40) $(am__append_42) $(am__append_44) \
+-	$(am__append_45) cpt_err.c cryptlib.c crypto_init.c \
+-	$(am__append_46) $(am__append_47) cversion.c ex_data.c \
++libcrypto_la_SOURCES = $(am__append_37) $(am__append_39) \
++	$(am__append_41) $(am__append_43) $(am__append_45) \
++	$(am__append_46) cpt_err.c cryptlib.c crypto_init.c \
++	$(am__append_47) $(am__append_48) cversion.c ex_data.c \
+ 	malloc-wrapper.c mem_clr.c mem_dbg.c o_init.c o_str.c o_time.c \
+ 	aes/aes_cfb.c aes/aes_ctr.c aes/aes_ecb.c aes/aes_ige.c \
+ 	aes/aes_misc.c aes/aes_ofb.c aes/aes_wrap.c asn1/a_bitstr.c \
+@@ -1949,11 +1951,11 @@
+ 	asn1/x_pkey.c asn1/x_pubkey.c asn1/x_req.c asn1/x_sig.c \
+ 	asn1/x_spki.c asn1/x_val.c asn1/x_x509.c asn1/x_x509a.c \
+ 	bf/bf_cfb64.c bf/bf_ecb.c bf/bf_enc.c bf/bf_ofb64.c \
+-	bf/bf_skey.c bio/b_dump.c $(am__append_48) bio/b_print.c \
+-	bio/b_sock.c $(am__append_49) bio/bf_buff.c bio/bf_nbio.c \
++	bf/bf_skey.c bio/b_dump.c $(am__append_49) bio/b_print.c \
++	bio/b_sock.c $(am__append_50) bio/bf_buff.c bio/bf_nbio.c \
+ 	bio/bf_null.c bio/bio_cb.c bio/bio_err.c bio/bio_lib.c \
+ 	bio/bio_meth.c bio/bss_acpt.c bio/bss_bio.c bio/bss_conn.c \
+-	bio/bss_dgram.c bio/bss_fd.c bio/bss_file.c $(am__append_50) \
++	bio/bss_dgram.c bio/bss_fd.c bio/bss_file.c $(am__append_51) \
+ 	bio/bss_mem.c bio/bss_null.c bio/bss_sock.c bn/bn_add.c \
+ 	bn/bn_asm.c bn/bn_blind.c bn/bn_const.c bn/bn_ctx.c \
+ 	bn/bn_depr.c bn/bn_div.c bn/bn_err.c bn/bn_exp.c bn/bn_exp2.c \
+@@ -2054,7 +2056,7 @@
+ 	ts/ts_err.c ts/ts_lib.c ts/ts_req_print.c ts/ts_req_utils.c \
+ 	ts/ts_rsp_print.c ts/ts_rsp_sign.c ts/ts_rsp_utils.c \
+ 	ts/ts_rsp_verify.c ts/ts_verify_ctx.c txt_db/txt_db.c \
+-	ui/ui_err.c ui/ui_lib.c $(am__append_51) $(am__append_52) \
++	ui/ui_err.c ui/ui_lib.c $(am__append_52) $(am__append_53) \
+ 	ui/ui_util.c whrlpool/wp_dgst.c x509/by_dir.c x509/by_file.c \
+ 	x509/by_mem.c x509/x509_att.c x509/x509_cmp.c x509/x509_d2.c \
+ 	x509/x509_def.c x509/x509_err.c x509/x509_ext.c x509/x509_lu.c \
+diff -Nru libressl-2.9.1/include/compat/machine/endian.h ../libressl-2.9.1/include/compat/machine/endian.h
+--- libressl-2.9.1/include/compat/machine/endian.h	2017-11-04 20:04:56.000000000 +0000
++++ libressl-2.9.1/include/compat/machine/endian.h	2019-05-06 15:54:22.488000000 +0000
 @@ -21,7 +21,7 @@
  #define BYTE_ORDER BIG_ENDIAN
  #endif
@@ -55,24 +471,3 @@ diff -ru libressl-2.9.1.orig/include/compat/machine/endian.h libressl-2.9.1/incl
  #include <endian.h>
  
  #elif defined(__sun) || defined(_AIX) || defined(__hpux)
-diff -ru libressl-2.9.1.orig/m4/check-os-options.m4 libressl-2.9.1/m4/check-os-options.m4
---- libressl-2.9.1.orig/m4/check-os-options.m4	2019-04-11 13:20:57.000000000 +0200
-+++ libressl-2.9.1/m4/check-os-options.m4	2019-04-25 11:33:31.580577213 +0200
-@@ -110,6 +110,11 @@
- 		CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SPEED"
- 		AC_SUBST([PLATFORM_LDADD], ['-lws2_32'])
- 		;;
-+	*midipix*)
-+		HOST_OS=midipix
-+		HOST_ABI=mingw64
-+		CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
-+		;;
- 	*solaris*)
- 		HOST_OS=solaris
- 		HOST_ABI=elf
-@@ -134,4 +139,5 @@
- AM_CONDITIONAL([HOST_OPENBSD], [test x$HOST_OS = xopenbsd])
- AM_CONDITIONAL([HOST_SOLARIS], [test x$HOST_OS = xsolaris])
- AM_CONDITIONAL([HOST_WIN],     [test x$HOST_OS = xwin])
-+AM_CONDITIONAL([HOST_MIDIPIX], [test x$HOST_OS = xmidipix])
- ])