vars/build.vars:libressl{,_host}: updated to v2.9.1 (via Redfoxmoon.)

vars/build.vars:openlitespeed:${PKG_DISABLED}: disabled (via Redfoxmoon.)
vars/build.vars:ruby:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-out-ext=fiddle,openssl (via Redfoxmoon.)
patches/bdwgc.local.patch: updated (via Redfoxmoon.)
patches/libressl-2.9.1.local.patch: added (via Redfoxmoon.)

3 files changed, 131 insertions, 48 deletions

diff --git a/patches/bdwgc.local.patch b/patches/bdwgc.local.patch
index 228f3b28..62b52c87 100644
--- a/patches/bdwgc.local.patch
+++ b/patches/bdwgc.local.patch
@@ -1,18 +1,7 @@
-diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
---- bdwgc.orig/os_dep.c	2017-01-13 01:05:27.201020300 +0100
-+++ bdwgc/os_dep.c	2017-01-12 22:54:52.681020300 +0100
-@@ -32,7 +32,7 @@
- #endif
- 
- #if defined(UNIX_LIKE) || defined(CYGWIN32) || defined(NACL) \
--    || defined(SYMBIAN)
-+    || defined(SYMBIAN) || defined(MIDIPIX)
- # include <fcntl.h>
- #endif
-
---- bdwgc/include/private/gcconfig.h.orig	2018-11-14 15:26:02.756000000 +0000
-+++ bdwgc/include/private/gcconfig.h	2018-11-14 16:42:13.244000000 +0000
-@@ -108,6 +108,10 @@
+diff -ru bdwgc.orig/include/private/gcconfig.h bdwgc/include/private/gcconfig.h
+--- bdwgc.orig/include/private/gcconfig.h	2019-04-25 16:08:37.996677359 +0200
++++ bdwgc/include/private/gcconfig.h	2019-04-25 16:22:53.456682549 +0200
+@@ -109,6 +109,10 @@
  #   define LINUX
  # endif
  
@@ -20,51 +9,53 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
 +#    define MIDIPIX
 +# endif
 +
- /* And one for QNX: */
- # if defined(__QNX__)
- #    define I386
-@@ -362,6 +366,14 @@
+ /* And one for NetBSD: */
+ # if defined(__NetBSD__)
+ #    define NETBSD
+@@ -345,6 +349,16 @@
  #    define X86_64
  #    define mach_type_known
  # endif
-+# if defined(MIDIPIX) && defined(__x86_64__)
-+#    define X86_64
-+#    define mach_type_known
-+# endif
-+# if defined(MIDIPIX) && defined(__i386__)
-+#    define I386
-+#    define mach_type_known
++# if defined(MIDIPIX)
++#    if defined(__i386__)
++#      define I386
++#      define mach_type_known
++#    endif
++#    if defined(__x86_64__)
++#      define X86_64
++#      define mach_type_known
++#    endif
 +# endif
- # if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
- #    define IA64
+ # if defined(LINUX) && (defined(i386) || defined(__i386__))
+ #    define I386
  #    define mach_type_known
-@@ -1542,6 +1554,12 @@
+@@ -1538,6 +1552,12 @@
            EXTERN_C_BEGIN
  #       endif
  #   endif
 +#   ifdef MIDIPIX
 +#      define OS_TYPE "MIDIPIX"
-+#	define DATASTART (ptr_t)NULL /* Wrong */
-+#	define DATAEND (ptr_t)NULL /* Wrong */
-+#	define STACKBOTTOM (ptr_t)0x000000 /* Not sure if we should be using STACKBOTTOM or LINUX_STACKBOTTOM & /proc/self/stat */
++#      define DATASTART (ptr_t)NULL /* Wrong */
++#      define DATAEND (ptr_t)NULL /* Wrong */
++#      define STACKBOTTOM (ptr_t)0x000000 /* Not sure if we should be using STACKBOTTOM or LINUX_STACK... */
 +#   endif
  #   ifdef CYGWIN32
  #       define OS_TYPE "CYGWIN32"
  #       define DATASTART ((ptr_t)GC_DATASTART)  /* From gc.h */
-@@ -2656,6 +2674,12 @@
+@@ -2656,6 +2676,12 @@
            EXTERN_C_BEGIN
  #       endif
  #   endif
 +#   ifdef MIDIPIX
 +#      define OS_TYPE "MIDIPIX"
-+#	define DATASTART (ptr_t)NULL /* Wrong */
-+#	define DATAEND (ptr_t)NULL /* Wrong */
-+#	define STACKBOTTOM (ptr_t)0x000000 /* Not sure if we should be using STACKBOTTOM or LINUX_STACKBOTTOM & /proc/self/stat */
++#      define DATASTART (ptr_t)NULL /* Wrong */
++#      define DATAEND (ptr_t)NULL /* Wrong */
++#      define STACKBOTTOM (ptr_t)0x000000 /* Not sure if we should be using STACKBOTTOM or LINUX_STACK... */
 +#   endif
  #   ifdef DARWIN
  #     define OS_TYPE "DARWIN"
- #     define DARWIN_DONT_PARSE_STACK
-@@ -3242,7 +3266,7 @@
+ #     define DARWIN_DONT_PARSE_STACK 1
+@@ -3259,7 +3285,7 @@
  # if defined(GC_IRIX_THREADS) && !defined(IRIX5)
  #   error Inconsistent configuration
  # endif
@@ -73,11 +64,24 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
  #   error Inconsistent configuration
  # endif
  # if defined(GC_NETBSD_THREADS) && !defined(NETBSD)
---- bdwgc/pthread_stop_world.c.orig	2017-01-23 18:47:24.683963226 +0000
-+++ bdwgc/pthread_stop_world.c	2017-01-23 18:59:56.449597256 +0000
-@@ -20,6 +20,10 @@
- #if defined(GC_PTHREADS) && !defined(GC_WIN32_THREADS) && \
-     !defined(GC_DARWIN_THREADS)
+diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
+--- bdwgc.orig/os_dep.c	2019-04-25 16:08:38.000677359 +0200
++++ bdwgc/os_dep.c	2019-04-25 16:11:21.272678349 +0200
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #if defined(UNIX_LIKE) || defined(CYGWIN32) || defined(NACL) \
+-    || defined(SYMBIAN)
++    || defined(SYMBIAN) || defined(MIDIPIX)
+ # include <fcntl.h>
+ #endif
+ 
+diff -ru bdwgc.orig/pthread_stop_world.c bdwgc/pthread_stop_world.c
+--- bdwgc.orig/pthread_stop_world.c	2019-04-25 16:08:38.000677359 +0200
++++ bdwgc/pthread_stop_world.c	2019-04-25 16:23:19.820682709 +0200
+@@ -21,6 +21,10 @@
+     !defined(GC_DARWIN_THREADS) && !defined(SN_TARGET_ORBIS) \
+     && !defined(SN_TARGET_PSP2)
  
 +#ifdef MIDIPIX
 +# include <sys/select.h>
diff --git a/patches/libressl-2.9.1.local.patch b/patches/libressl-2.9.1.local.patch
new file mode 100644
index 00000000..35fd0eb8
--- /dev/null
+++ b/patches/libressl-2.9.1.local.patch
@@ -0,0 +1,78 @@
+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"])
+ 
+ # 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
+@@ -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.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
+ 
+ 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
+@@ -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.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])
+ ])
diff --git a/vars/build.vars b/vars/build.vars
index 235d6890..aede3d07 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -77,8 +77,8 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}";
 : ${PKG_LIBARCHIVE_HOST_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e};
 : ${PKG_LIBARCHIVE_HOST_VERSION:=3.3.3};
 : ${PKG_LIBARCHIVE_HOST_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_HOST_VERSION}.tar.gz};
-: ${PKG_LIBRESSL_HOST_SHA256SUM:=917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995};
-: ${PKG_LIBRESSL_HOST_VERSION:=2.7.2};
+: ${PKG_LIBRESSL_HOST_SHA256SUM:=39e4dd856694dc10d564201e4549c46d2431601a2b10f3422507e24ccc8f62f8};
+: ${PKG_LIBRESSL_HOST_VERSION:=2.9.1};
 : ${PKG_LIBRESSL_HOST_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_HOST_VERSION}.tar.gz};
 : ${PKG_LMDB_HOST_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};
 : ${PKG_LMDB_HOST_IN_TREE:=1};
@@ -518,8 +518,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBDMTX_SHA256SUM:=686bcfb44e50b96345aa53f41e285f2118a2cf87a333b69b74165a2e7ddca492};
 : ${PKG_LIBDMTX_VERSION:=0.7.4};
 : ${PKG_LIBDMTX_URL:=https://midipix.org/mirror/libdmtx/libdmtx-${PKG_LIBDMTX_VERSION}.tar.gz};
-: ${PKG_LIBRESSL_SHA256SUM:=917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995};
-: ${PKG_LIBRESSL_VERSION:=2.7.2};
+: ${PKG_LIBRESSL_SHA256SUM:=39e4dd856694dc10d564201e4549c46d2431601a2b10f3422507e24ccc8f62f8};
+: ${PKG_LIBRESSL_VERSION:=2.9.1};
 : ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz};
 : ${PKG_LIBRESSL_CFLAGS_CONFIGURE_EXTRA:=-D__MIDIPIX};
 : ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc};
@@ -1224,7 +1224,7 @@ bdwgc bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patch
 : ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
 : ${PKG_RUBY_VERSION:=2.3.0};
 : ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz};
-: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle"};
+: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle,openssl"};
 : ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
 : ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
@@ -1517,6 +1517,7 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht
 : ${PKG_OPENLITESPEED_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"};
 : ${PKG_OPENLITESPEED_DESTDIR:=destdir/lsws};
 : ${PKG_OPENLITESPEED_IN_TREE:=1};
+: ${PKG_OPENLITESPEED_DISABLED:=1};
 : ${PKG_OPENLITESPEED_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_OPENLITESPEED_PREFIX:=${PREFIX_NATIVE}/lsws};
 : ${PKG_OPENSSH_SHA256SUM:=6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad};