From 59765f508225998d8a73b1da8380ff06b4a6b79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 14 Nov 2016 23:02:47 +0100 Subject: 1) Replaces the SysV-style build script link mechanism w/ build {,meta-}targets, 2) splits build.{subr,sh}} into subr/{build,pkg,rtl}.subr and build.sh, 3) replaces {997.strip,998.midipix_sh,999.tarballs}.build with subr/{strip,tarball}.subr, 4) moves patches to patches/, vars files to vars/, and everything else to etc/, 5) renames `Create `Midipix mintty shell' shortcut.vbs' to midipix_shortcut.vbs, 6) fixes a Weechat configure issue, and 7) updates etc/{build.usage,README}. --- libressl-2.2.6.local.patch | 193 --------------------------------------------- 1 file changed, 193 deletions(-) delete mode 100644 libressl-2.2.6.local.patch (limited to 'libressl-2.2.6.local.patch') diff --git a/libressl-2.2.6.local.patch b/libressl-2.2.6.local.patch deleted file mode 100644 index 759cfecd..00000000 --- a/libressl-2.2.6.local.patch +++ /dev/null @@ -1,193 +0,0 @@ ---- libressl-2.2.6/crypto/compat/arc4random.h.orig 2015-10-15 23:18:44.000000000 +0200 -+++ libressl-2.2.6/crypto/compat/arc4random.h 2016-02-12 17:19:40.815245600 +0100 -@@ -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__) ---- libressl-2.2.6/crypto/compat/getentropy_linux.c.orig 2015-10-16 00:04:58.000000000 +0200 -+++ libressl-2.2.6/crypto/compat/getentropy_linux.c 2016-02-12 17:48:47.474391200 +0100 -@@ -27,7 +27,7 @@ - #include - #include - #include --#ifdef SYS__sysctl -+#if defined(SYS__sysctl) && !defined(__MIDIPIX) - #include - #endif - #include -@@ -49,8 +49,10 @@ - #include - #include - -+#ifndef __MIDIPIX - #include - #include -+#endif - #ifdef HAVE_GETAUXVAL - #include - #endif -@@ -78,7 +80,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); -@@ -115,7 +117,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 -@@ -241,10 +243,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); -@@ -267,7 +271,7 @@ - return -1; - } - --#ifdef SYS__sysctl -+#if defined(SYS__sysctl) && !defined(__MIDIPIX) - static int - getentropy_sysctl(void *buf, size_t len) - { ---- libressl-2.2.6/crypto/Makefile.in.orig 2016-01-28 19:18:08.000000000 +0100 -+++ libressl-2.2.6/crypto/Makefile.in 2016-02-12 17:19:40.823245600 +0100 -@@ -111,10 +111,11 @@ - @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__append_19 = compat/getentropy_freebsd.c - @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__append_20 = compat/getentropy_hpux.c - @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__append_21 = compat/getentropy_linux.c --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_22 = compat/getentropy_netbsd.c --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_23 = compat/getentropy_osx.c --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_24 = compat/getentropy_solaris.c --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_25 = compat/getentropy_win.c -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__append_22 = compat/getentropy_linux.c -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_23 = compat/getentropy_netbsd.c -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_24 = compat/getentropy_osx.c -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_25 = compat/getentropy_solaris.c -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_26 = compat/getentropy_win.c - @HOST_ASM_ELF_X86_64_TRUE@am__append_26 = -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 \ -@@ -220,17 +221,18 @@ - @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__objects_13 = compat/getentropy_freebsd.lo - @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__objects_14 = compat/getentropy_hpux.lo - @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__objects_15 = compat/getentropy_linux.lo --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_16 = compat/getentropy_netbsd.lo --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_17 = compat/getentropy_osx.lo --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_18 = compat/getentropy_solaris.lo --@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_19 = compat/getentropy_win.lo -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__objects_16 = compat/getentropy_linux.lo -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_17 = compat/getentropy_netbsd.lo -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_18 = compat/getentropy_osx.lo -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_19 = compat/getentropy_solaris.lo -+@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_20 = 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) \ - $(am__objects_9) $(am__objects_10) $(am__objects_11) \ - $(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_18) $(am__objects_19) $(am__objects_20) - libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -985,7 +987,7 @@ - $(am__append_16) $(am__append_17) $(am__append_18) \ - $(am__append_19) $(am__append_20) $(am__append_21) \ - $(am__append_22) $(am__append_23) $(am__append_24) \ -- $(am__append_25) -+ $(am__append_25) $(am__append_26) - libcompat_la_LIBADD = $(PLATFORM_LDADD) - - # rc4 ---- libressl-2.2.6/include/compat/machine/endian.h.orig 2015-10-15 23:18:44.000000000 +0200 -+++ libressl-2.2.6/include/compat/machine/endian.h 2016-02-12 17:19:40.827245600 +0100 -@@ -21,7 +21,7 @@ - #define BYTE_ORDER BIG_ENDIAN - #endif - --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__MIDIPIX) - #include - - #elif defined(__sun) || defined(_AIX) || defined(__hpux) ---- libressl-2.2.6/configure.orig 2016-01-28 18:18:06.000000000 +0000 -+++ libressl-2.2.6/configure 2016-02-23 13:25:30.689963257 +0000 -@@ -690,6 +690,8 @@ - HOST_NETBSD_TRUE - HOST_LINUX_FALSE - HOST_LINUX_TRUE -+HOST_MIDIPIX_FALSE -+HOST_MIDIPIX_TRUE - HOST_HPUX_FALSE - HOST_HPUX_TRUE - HOST_FREEBSD_FALSE -@@ -10824,7 +10826,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 -@@ -11902,6 +11904,11 @@ - HOST_ABI=elf - CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" - ;; -+ *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 - CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE" -@@ -11981,6 +11988,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='#' -@@ -13422,6 +13437,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 -- cgit v1.2.3