summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/bind-9.11.0-P2.local.patch484
-rw-r--r--patches/gdk-pixbuf-2.36.10.local.patch12
-rw-r--r--patches/glib-2.46.2.local.patch33
-rw-r--r--patches/libressl-2.6.1.local.patch (renamed from patches/libressl-2.2.6.local.patch)261
-rw-r--r--patches/openlitespeed-1.4.27.local.patch (renamed from patches/openlitespeed-1.4.24.local.patch)356
5 files changed, 357 insertions, 789 deletions
diff --git a/patches/bind-9.11.0-P2.local.patch b/patches/bind-9.11.0-P2.local.patch
deleted file mode 100644
index 88314f8a..00000000
--- a/patches/bind-9.11.0-P2.local.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-diff -ru bind-9.11.0-P2.orig/bin/check/Makefile.in bind-9.11.0-P2/bin/check/Makefile.in
---- bind-9.11.0-P2.orig/bin/check/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/check/Makefile.in 2017-01-25 17:07:39.385668783 +0100
-@@ -20,7 +20,7 @@
- CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
- CWARNINGS =
-
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
-@@ -31,8 +31,8 @@
- ISCDEPLIBS = ../../lib/isc/libisc.@A@
- BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
-
--LIBS = ${ISCLIBS} @LIBS@
--NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
-+LIBS = ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-+NOSYMLIBS = ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- SUBDIRS =
-
-diff -ru bind-9.11.0-P2.orig/bin/confgen/Makefile.in bind-9.11.0-P2/bin/confgen/Makefile.in
---- bind-9.11.0-P2.orig/bin/confgen/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/confgen/Makefile.in 2017-01-25 17:09:02.925668783 +0100
-@@ -24,7 +24,7 @@
- ISCCCLIBS = ../../lib/isccc/libisccc.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- BIND9LIBS = ../../lib/bind9/libbind9.@A@
-
- ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
-@@ -36,9 +36,9 @@
- RNDCLIBS = ${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
- RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
--NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
-+NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- CONFDEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
-diff -ru bind-9.11.0-P2.orig/bin/delv/Makefile.in bind-9.11.0-P2/bin/delv/Makefile.in
---- bind-9.11.0-P2.orig/bin/delv/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/delv/Makefile.in 2017-01-25 17:09:20.553668783 +0100
-@@ -19,7 +19,7 @@
- CWARNINGS =
-
- ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- IRSLIBS = ../../lib/irs/libirs.@A@
-@@ -31,8 +31,8 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
--NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-+NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- SUBDIRS =
-
-diff -ru bind-9.11.0-P2.orig/bin/dig/Makefile.in bind-9.11.0-P2/bin/dig/Makefile.in
---- bind-9.11.0-P2.orig/bin/dig/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/dig/Makefile.in 2017-01-25 17:06:52.125668783 +0100
-@@ -21,7 +21,7 @@
- CWARNINGS =
-
- ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- BIND9LIBS = ../../lib/bind9/libbind9.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
-@@ -37,10 +37,10 @@
- ${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
-
- LIBS = ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-- ${ISCLIBS} @IDNLIBS@ @LIBS@
-+ ${ISCLIBS} @DNS_CRYPTO_LIBS@ @IDNLIBS@ @LIBS@
-
- NOSYMLIBS = ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-- ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
-+ ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @IDNLIBS@ @LIBS@
-
- SUBDIRS =
-
-diff -ru bind-9.11.0-P2.orig/bin/dnssec/Makefile.in bind-9.11.0-P2/bin/dnssec/Makefile.in
---- bind-9.11.0-P2.orig/bin/dnssec/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/dnssec/Makefile.in 2017-01-25 17:09:52.013668783 +0100
-@@ -20,7 +20,7 @@
- @CRYPTO@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
- CWARNINGS =
-
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
-
-@@ -29,9 +29,9 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
--NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
-+NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- # Alphabetically
- TARGETS = dnssec-keygen@EXEEXT@ dnssec-signzone@EXEEXT@ \
-diff -ru bind-9.11.0-P2.orig/bin/Makefile.in bind-9.11.0-P2/bin/Makefile.in
---- bind-9.11.0-P2.orig/bin/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/Makefile.in 2017-02-03 23:57:28.674733352 +0100
-@@ -10,7 +10,7 @@
- VPATH = @srcdir@
- top_srcdir = @top_srcdir@
-
--SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \
-+SUBDIRS = named rndc dig delv dnssec tools nsupdate \
- check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
-
-diff -ru bind-9.11.0-P2.orig/bin/named/Makefile.in bind-9.11.0-P2/bin/named/Makefile.in
---- bind-9.11.0-P2.orig/bin/named/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/named/Makefile.in 2017-01-25 17:10:18.269668783 +0100
-@@ -44,7 +44,7 @@
-
- CWARNINGS =
-
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
- ISCCCLIBS = ../../lib/isccc/libisccc.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
-@@ -64,11 +64,11 @@
-
- LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
-- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+ ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
-- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+ ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- SUBDIRS = unix
-
-diff -ru bind-9.11.0-P2.orig/bin/nsupdate/Makefile.in bind-9.11.0-P2/bin/nsupdate/Makefile.in
---- bind-9.11.0-P2.orig/bin/nsupdate/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/nsupdate/Makefile.in 2017-01-25 17:10:44.321668783 +0100
-@@ -25,7 +25,7 @@
- CWARNINGS =
-
- LWRESLIBS = ../../lib/lwres/liblwres.@A@
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- BIND9LIBS = ../../lib/bind9/libbind9.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
-@@ -39,9 +39,9 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
-
--LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
--NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
-+NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- SUBDIRS =
-
-diff -ru bind-9.11.0-P2.orig/bin/rndc/Makefile.in bind-9.11.0-P2/bin/rndc/Makefile.in
---- bind-9.11.0-P2.orig/bin/rndc/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/rndc/Makefile.in 2017-01-25 17:11:14.893668783 +0100
-@@ -24,7 +24,7 @@
- ISCCCLIBS = ../../lib/isccc/libisccc.@A@
- ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- BIND9LIBS = ../../lib/bind9/libbind9.@A@
-
- ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
-@@ -33,8 +33,8 @@
- DNSDEPLIBS = ../../lib/dns/libdns.@A@
- BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
-
--LIBS = ${ISCLIBS} @LIBS@
--NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
-+LIBS = ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-+NOSYMLIBS = ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
-
-diff -ru bind-9.11.0-P2.orig/bin/tests/db/Makefile.in bind-9.11.0-P2/bin/tests/db/Makefile.in
---- bind-9.11.0-P2.orig/bin/tests/db/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tests/db/Makefile.in 2017-01-25 17:12:06.949668783 +0100
-@@ -17,7 +17,7 @@
- CDEFINES =
- CWARNINGS =
-
--DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../../lib/dns/libdns.@A@
- ISCLIBS = ../../../lib/isc/libisc.@A@
- ISCCFGLIBS = ../../../lib/isccfg/libisccfg.@A@
-
-@@ -27,7 +27,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCCFGLIBS} @DNS_CRYPTO_LIBS@ ${ISCLIBS} @LIBS@
-
- TLIB = ../../../lib/tests/libt_api.@A@
-
-diff -ru bind-9.11.0-P2.orig/bin/tests/dst/Makefile.in bind-9.11.0-P2/bin/tests/dst/Makefile.in
---- bind-9.11.0-P2.orig/bin/tests/dst/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tests/dst/Makefile.in 2017-01-25 17:12:23.009668783 +0100
-@@ -18,7 +18,7 @@
- CDEFINES = @USE_GSSAPI@
- CWARNINGS =
-
--DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../../lib/dns/libdns.@A@
- ISCLIBS = ../../../lib/isc/libisc.@A@
-
- DNSDEPLIBS = ../../../lib/dns/libdns.@A@
-@@ -26,7 +26,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- TLIB = ../../../lib/tests/libt_api.@A@
-
-diff -ru bind-9.11.0-P2.orig/bin/tests/master/Makefile.in bind-9.11.0-P2/bin/tests/master/Makefile.in
---- bind-9.11.0-P2.orig/bin/tests/master/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tests/master/Makefile.in 2017-01-25 17:12:52.229668783 +0100
-@@ -18,7 +18,7 @@
- CWARNINGS =
-
- # Note that we do not want to use libtool for libt_api
--DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../../lib/dns/libdns.@A@
- ISCLIBS = ../../../lib/isc/libisc.@A@
-
- DNSDEPLIBS = ../../../lib/dns/libdns.@A@
-@@ -26,7 +26,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- TLIB = ../../../lib/tests/libt_api.@A@
-
-diff -ru bind-9.11.0-P2.orig/bin/tests/names/Makefile.in bind-9.11.0-P2/bin/tests/names/Makefile.in
---- bind-9.11.0-P2.orig/bin/tests/names/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tests/names/Makefile.in 2017-01-25 17:13:14.697668783 +0100
-@@ -18,7 +18,7 @@
- CWARNINGS =
-
- # Note that we do not want to use libtool for libt_api
--DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../../lib/dns/libdns.@A@
- ISCLIBS = ../../../lib/isc/libisc.@A@
-
- DNSDEPLIBS = ../../../lib/dns/libdns.@A@
-@@ -26,7 +26,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- TLIB = ../../../lib/tests/libt_api.@A@
-
-diff -ru bind-9.11.0-P2.orig/bin/tests/rbt/Makefile.in bind-9.11.0-P2/bin/tests/rbt/Makefile.in
---- bind-9.11.0-P2.orig/bin/tests/rbt/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tests/rbt/Makefile.in 2017-01-25 17:13:30.497668783 +0100
-@@ -18,7 +18,7 @@
- CWARNINGS =
-
- # Note that we do not want to use libtool for libt_api
--DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../../lib/dns/libdns.@A@
- ISCLIBS = ../../../lib/isc/libisc.@A@
-
- DNSDEPLIBS = ../../../lib/dns/libdns.@A@
-@@ -26,7 +26,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- TLIB = ../../../lib/tests/libt_api.@A@
-
-diff -ru bind-9.11.0-P2.orig/bin/tests/resolver/Makefile.in bind-9.11.0-P2/bin/tests/resolver/Makefile.in
---- bind-9.11.0-P2.orig/bin/tests/resolver/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tests/resolver/Makefile.in 2017-01-25 17:13:43.301668783 +0100
-@@ -18,7 +18,7 @@
- CWARNINGS =
-
- # Note that we do not want to use libtool for libt_api
--DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../../lib/dns/libdns.@A@
- ISCLIBS = ../../../lib/isc/libisc.@A@
-
- DNSDEPLIBS = ../../../lib/dns/libdns.@A@
-@@ -26,7 +26,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- TLIB = ../../../lib/tests/libt_api.@A@
-
-diff -ru bind-9.11.0-P2.orig/bin/tools/Makefile.in bind-9.11.0-P2/bin/tools/Makefile.in
---- bind-9.11.0-P2.orig/bin/tools/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/bin/tools/Makefile.in 2017-01-25 17:11:46.241668783 +0100
-@@ -18,9 +18,9 @@
- CDEFINES = -DVERSION=\"${VERSION}\"
- CWARNINGS =
-
--DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../../lib/dns/libdns.@A@
- BIND9LIBS = ../../lib/bind9/libbind9.@A@
--ISCLIBS = ../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
-+ISCLIBS = ../../lib/isc/libisc.@A@
- ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
- ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
- LWRESLIBS = ../../lib/lwres/liblwres.@A@
-@@ -31,8 +31,8 @@
- ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
- LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@
-
--LIBS = ${ISCLIBS} @LIBS@
--NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
-+LIBS = ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-+NOSYMLIBS = ${ISCNOSYMLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- SUBDIRS =
-
-diff -ru bind-9.11.0-P2.orig/configure bind-9.11.0-P2/configure
---- bind-9.11.0-P2.orig/configure 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/configure 2017-01-25 15:56:50.481668000 +0100
-@@ -15756,28 +15756,6 @@
- with_aes="no"
- fi
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL library" >&5
--$as_echo_n "checking for OpenSSL library... " >&6; }
--OPENSSL_WARNING=
--openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
--if test "$want_native_pkcs11" = "yes"
--then
-- use_openssl="native_pkcs11"
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: use of native PKCS11 instead" >&5
--$as_echo "use of native PKCS11 instead" >&6; }
--fi
--
--if test "$use_openssl" = "auto"
--then
-- for d in $openssldirs
-- do
-- if test -f $d/include/openssl/opensslv.h
-- then
-- use_openssl=$d
-- break
-- fi
-- done
--fi
- OPENSSL_ECDSA=""
- OPENSSL_GOST=""
- gosttype="raw"
-diff -ru bind-9.11.0-P2.orig/lib/irs/Makefile.in bind-9.11.0-P2/lib/irs/Makefile.in
---- bind-9.11.0-P2.orig/lib/irs/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/lib/irs/Makefile.in 2017-02-02 18:28:58.588540351 +0100
-@@ -34,7 +34,7 @@
- gai_strerror.c getaddrinfo.c getnameinfo.c \
- resconf.c
-
--LIBS = @LIBS@
-+LIBS = @LIBS@ -L../isc -lisc -L../dns -ldns -L../isccfg -lisccfg
-
- SUBDIRS = include
- TARGETS = timestamp
-diff -ru bind-9.11.0-P2.orig/lib/isc/Makefile.in bind-9.11.0-P2/lib/isc/Makefile.in
---- bind-9.11.0-P2.orig/lib/isc/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/lib/isc/Makefile.in 2017-02-02 18:16:09.144540351 +0100
-@@ -108,9 +108,9 @@
- ${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
- ${RANLIB} $@
-
--libisc-nosymtbl.@SA@: ${OBJS}
-- ${AR} ${ARFLAGS} $@ ${OBJS}
-- ${RANLIB} $@
-+#libisc-nosymtbl.@SA@: ${OBJS}
-+# ${AR} ${ARFLAGS} $@ ${OBJS}
-+# ${RANLIB} $@
-
- libisc.la: ${OBJS} ${SYMTBLOBJS}
- ${LIBTOOL_MODE_LINK} \
-@@ -118,13 +118,13 @@
- -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
- ${OBJS} ${SYMTBLOBJS} ${LIBS}
-
--libisc-nosymtbl.la: ${OBJS}
-- ${LIBTOOL_MODE_LINK} \
-- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
-- -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-- ${OBJS} ${LIBS}
-+#libisc-nosymtbl.la: ${OBJS}
-+# ${LIBTOOL_MODE_LINK} \
-+# ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
-+# -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-+# ${OBJS} ${LIBS}
-
--timestamp: libisc.@A@ libisc-nosymtbl.@A@
-+timestamp: libisc.@A@
- touch timestamp
-
- installdirs:
-diff -ru bind-9.11.0-P2.orig/lib/Makefile.in bind-9.11.0-P2/lib/Makefile.in
---- bind-9.11.0-P2.orig/lib/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/lib/Makefile.in 2017-02-03 23:57:45.310733352 +0100
-@@ -14,7 +14,7 @@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS = isc isccc dns isccfg bind9 lwres irs tests samples
-+SUBDIRS = isc isccc dns isccfg bind9 lwres irs samples
- TARGETS =
-
- @BIND9_MAKE_RULES@
-diff -ru bind-9.11.0-P2.orig/lib/samples/Makefile.in bind-9.11.0-P2/lib/samples/Makefile.in
---- bind-9.11.0-P2.orig/lib/samples/Makefile.in 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/lib/samples/Makefile.in 2017-01-25 17:34:04.613668783 +0100
-@@ -21,7 +21,7 @@
- CWARNINGS =
-
- ISCLIBS = ../isc/libisc.@A@
--DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS = ../dns/libdns.@A@
- ISCCFGLIBS = ../isccfg/libisccfg.@A@
- IRSLIBS = ../irs/libirs.@A@
-
-@@ -32,7 +32,7 @@
-
- DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-
--LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-+LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@
-
- SUBDIRS =
-
---- bind-9.11.0-P2/configure.in.orig 2016-12-11 23:05:44.000000000 +0100
-+++ bind-9.11.0-P2/configure.in 2017-02-04 18:47:10.437368600 +0100
-@@ -2277,9 +2277,9 @@
- esac
- ;;
- *)
-- if test -f "$use_libxml2/bin/xml2-config" ; then
-- libxml2_libs=`$use_libxml2/bin/xml2-config --libs`
-- libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags`
-+ if test -f "$use_libxml2" ; then
-+ libxml2_libs=`$use_libxml2 --libs`
-+ libxml2_cflags=`$use_libxml2 --cflags`
- fi
- ;;
- esac
diff --git a/patches/gdk-pixbuf-2.36.10.local.patch b/patches/gdk-pixbuf-2.36.10.local.patch
new file mode 100644
index 00000000..3c19f614
--- /dev/null
+++ b/patches/gdk-pixbuf-2.36.10.local.patch
@@ -0,0 +1,12 @@
+diff -ru gdk-pixbuf-2.36.10.orig/thumbnailer/Makefile.in gdk-pixbuf-2.36.10/thumbnailer/Makefile.in
+--- gdk-pixbuf-2.36.10.orig/thumbnailer/Makefile.in 2017-09-11 13:00:44.000000000 +0200
++++ gdk-pixbuf-2.36.10/thumbnailer/Makefile.in 2017-09-15 20:57:24.196896220 +0200
+@@ -453,7 +453,7 @@
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
+
+ thumbnailerdir = $(datadir)/thumbnailers/
+-thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer
++thumbnailer_DATA =
+ EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in
+ CLEANFILES = $(thumbnailer_DATA)
+ all: all-am
diff --git a/patches/glib-2.46.2.local.patch b/patches/glib-2.46.2.local.patch
deleted file mode 100644
index d30cf5b8..00000000
--- a/patches/glib-2.46.2.local.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- glib-2.46.2/gio/inotify/Makefile.in.orig 2015-11-06 23:28:59.000000000 +0100
-+++ glib-2.46.2/gio/inotify/Makefile.in 2016-09-07 05:20:16.670049836 +0200
-@@ -180,7 +180,7 @@
- "$(DESTDIR)$(installed_test_metadir)" \
- "$(DESTDIR)$(installed_testdir)"
- LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_LTLIBRARIES)
--libinotify_la_LIBADD =
-+libinotify_la_LIBADD = -L../../glib -lglib-2.0
- am__objects_1 =
- am_libinotify_la_OBJECTS = libinotify_la-inotify-kernel.lo \
- libinotify_la-inotify-sub.lo libinotify_la-inotify-path.lo \
---- glib-2.46.2/glib-2.0.pc.in.orig 2015-03-23 04:22:18.000000000 +0100
-+++ glib-2.46.2/glib-2.0.pc.in 2017-08-25 22:20:03.833998381 +0200
-@@ -5,7 +5,7 @@
-
- glib_genmarshal=glib-genmarshal
- gobject_query=gobject-query
--glib_mkenums=glib-mkenums
-+glib_mkenums=@exec_prefix@/bin/glib-mkenums
-
- Name: GLib
- Description: C Utility Library
---- glib-2.46.2/configure.orig 2015-11-06 22:28:54.000000000 +0000
-+++ glib-2.46.2/configure 2017-09-06 17:48:13.444000000 +0000
-@@ -28873,7 +28873,7 @@
- -Wall -Wstrict-prototypes -Werror=declaration-after-statement \
- -Werror=missing-prototypes -Werror=implicit-function-declaration \
- -Werror=pointer-arith -Werror=init-self -Werror=format-security \
-- -Werror=format=2 -Werror=missing-include-dirs; do
-+ -Werror=missing-include-dirs; do
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5
- $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; }
diff --git a/patches/libressl-2.2.6.local.patch b/patches/libressl-2.6.1.local.patch
index 759cfecd..01068bc1 100644
--- a/patches/libressl-2.2.6.local.patch
+++ b/patches/libressl-2.6.1.local.patch
@@ -1,22 +1,83 @@
---- 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
+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 @@
+ HOST_LINUX_TRUE
+ HOST_HPUX_FALSE
+ HOST_HPUX_TRUE
++HOST_MIDIPIX_FALSE
++HOST_MIDIPIX_TRUE
+ HOST_FREEBSD_FALSE
+ HOST_FREEBSD_TRUE
+ HOST_DARWIN_FALSE
+@@ -11045,7 +11047,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 @@
+ 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
+ HOST_ABI=elf
+@@ -12316,6 +12323,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='#'
+@@ -14214,6 +14229,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.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
@@ -12,7 +12,7 @@
#elif defined(__hpux)
#include "arc4random_hpux.h"
-#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__MIDIPIX)
++#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
+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
@@ -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)
++#if defined(SYS__sysctl) && !defined(__midipix__)
#include <linux/sysctl.h>
#endif
#include <sys/statvfs.h>
@@ -24,36 +85,59 @@
#include <time.h>
#include <openssl/sha.h>
-+#ifndef __MIDIPIX
++#ifndef __midipix__
#include <linux/types.h>
#include <linux/random.h>
+#endif
#ifdef HAVE_GETAUXVAL
#include <sys/auxv.h>
#endif
-@@ -78,7 +80,7 @@
+@@ -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__)
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)
++#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 @@
+@@ -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 @@
if (ret != -1)
return (ret);
-#ifdef SYS__sysctl
-+#if defined(SYS__sysctl) && !defined(__MIDIPIX)
++#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 @@
+@@ -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 @@
close(fd);
goto nodevrandom;
}
-+#ifndef __MIDIPIX
++#ifndef __midipix__
if (ioctl(fd, RNDGETENTCNT, &cnt) == -1) {
close(fd);
goto nodevrandom;
@@ -62,132 +146,77 @@
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;
+@@ -270,7 +274,7 @@
+ return (-1);
}
-#ifdef SYS__sysctl
-+#if defined(SYS__sysctl) && !defined(__MIDIPIX)
++#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 \
+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 \
@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
+@@ -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
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) \
+@@ -251,7 +253,7 @@
$(am__objects_15) $(am__objects_16) $(am__objects_17) \
-- $(am__objects_18) $(am__objects_19)
-+ $(am__objects_18) $(am__objects_19) $(am__objects_20)
+ $(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)
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)
+@@ -1020,7 +1022,7 @@
+ $(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)
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
+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
@@ -21,7 +21,7 @@
#define BYTE_ORDER BIG_ENDIAN
#endif
-#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__MIDIPIX)
++#elif defined(__linux__) || defined(__midipix__)
#include <endian.h>
#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
diff --git a/patches/openlitespeed-1.4.24.local.patch b/patches/openlitespeed-1.4.27.local.patch
index bab2d49e..279d53d1 100644
--- a/patches/openlitespeed-1.4.24.local.patch
+++ b/patches/openlitespeed-1.4.27.local.patch
@@ -1,49 +1,7 @@
---- openlitespeed-1.4.24/src/util/gsendfile.h.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/src/util/gsendfile.h 2017-02-11 15:37:19.976655229 +0000
-@@ -83,7 +83,7 @@
- #endif
-
- #if defined(linux) || defined(__linux) || defined(__linux__) || \
-- defined(__gnu_linux__)
-+ defined(__gnu_linux__) || defined(__midipix__)
- #include <sys/sendfile.h>
- #define gsendfile ::sendfile
- #endif
---- openlitespeed-1.4.24/src/util/pcutil.h.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/src/util/pcutil.h 2017-02-11 15:39:02.736901419 +0000
-@@ -18,7 +18,7 @@
- #ifndef PCUTIL_H
- #define PCUTIL_H
-
--#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
-+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
- #include <sched.h>
- # define SET_AFFINITY(pid, size, mask) sched_setaffinity(0, size, mask)
- # define GET_AFFINITY(pid, size, mask) sched_getaffinity(0, size, mask)
---- openlitespeed-1.4.24/src/main/lshttpdmain.cpp.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/src/main/lshttpdmain.cpp 2017-02-11 15:50:52.882605886 +0000
-@@ -45,7 +45,9 @@
- #include <util/stringlist.h>
- #include <util/signalutil.h>
- #include <util/vmembuf.h>
-+#ifndef __midipix__
- #include <sys/sysctl.h>
-+#endif
-
- #include <extensions/cgi/cgidworker.h>
- #include <extensions/registry/extappregistry.h>
-@@ -1428,7 +1430,7 @@
- #ifdef LSWS_NO_SET_AFFINITY
- return 2;
- #else
--#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
-+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
- return sysconf(_SC_NPROCESSORS_ONLN);
- #else
- int nm[2];
---- openlitespeed-1.4.24/configure.orig 2016-12-02 19:52:25.745807731 +0000
-+++ openlitespeed-1.4.24/configure 2017-02-11 21:11:39.234979798 +0000
-@@ -11292,7 +11292,7 @@
+diff -ru openlitespeed-1.4.27.orig/configure openlitespeed-1.4.27/configure
+--- openlitespeed-1.4.27.orig/configure 2017-08-15 23:10:20.876017915 +0200
++++ openlitespeed-1.4.27/configure 2017-09-19 23:24:41.430943590 +0200
+@@ -11323,7 +11323,7 @@
;;
# This must be glibc/ELF.
@@ -52,7 +10,7 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
-@@ -15863,16 +15863,8 @@
+@@ -15907,16 +15907,8 @@
if test "$OPENLSWS_BSSL" = no ; then
@@ -71,7 +29,7 @@
echo "Openssl: use_dyn_ossl = $usedynossl"
else
#### Not provide location, use default location, will not copy files
-@@ -15982,12 +15974,6 @@
+@@ -16243,12 +16235,6 @@
fi
@@ -84,7 +42,7 @@
#
# Locate zlib, if wanted
#
-@@ -16131,7 +16117,6 @@
+@@ -16392,7 +16378,6 @@
@@ -92,7 +50,7 @@
# Check whether --with-openssl was given.
-@@ -16259,8 +16244,6 @@
+@@ -16520,8 +16505,6 @@
@@ -101,101 +59,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lib pcre" >&5
$as_echo_n "checking lib pcre... " >&6; }
PCRE_LDFLAGS=
---- openlitespeed-1.4.24/src/util/pcutil.cpp.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/src/util/pcutil.cpp 2017-02-12 20:09:45.817635783 +0000
-@@ -21,6 +21,8 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <string.h>
-+#include <pthread.h>
+diff -ru openlitespeed-1.4.27.orig/dist/install.sh openlitespeed-1.4.27/dist/install.sh
+--- openlitespeed-1.4.27.orig/dist/install.sh 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/dist/install.sh 2017-09-19 23:35:08.535232855 +0200
+@@ -7,92 +7,6 @@
+ MARIADBCPUARCH=
- #ifdef __linux
- #include <sched.h>
-@@ -72,7 +74,7 @@
-
- if (s_nCpu > 0)
- return s_nCpu;
--#if defined(linux) || defined(__linux) || defined(__linux__)
-+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__midipix__)
- s_nCpu = sysconf(_SC_NPROCESSORS_ONLN);
- #else
- int mib[2];
-@@ -116,7 +118,7 @@
- #ifdef __FreeBSD__
- return cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1,
- sizeof(cpu_set_t), mask);
--#elif defined(linux) || defined(__linux) || defined(__linux__)
-+#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__midipix__)
- return pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), mask);
- //return sched_setaffinity(0, sizeof(cpu_set_t), mask);
- #endif
---- openlitespeed-1.4.24/src/util/sysinfo/partitioninfo.cpp.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/src/util/sysinfo/partitioninfo.cpp 2017-02-12 20:11:21.637846476 +0000
-@@ -17,6 +17,9 @@
- *****************************************************************************/
- #include "partitioninfo.h"
- #include <lsdef.h>
-+#ifdef __midipix__
-+#include <sys/statfs.h>
-+#endif
-
- PartitionInfo::PartitionInfo()
- {
-@@ -33,7 +36,7 @@
- int PartitionInfo::getPartitionInfo(const char *path, uint64_t *outTotal,
- uint64_t *outFree)
- {
--#if defined(__linux) || defined(sun)
-+#if defined(__linux) || defined(sun) || defined(__midipix__)
- struct statvfs st;
- if (statvfs(path, &st) != 0)
- {
---- openlitespeed-1.4.24/src/util/sysinfo/siocglif_nicdetect.cpp.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/src/util/sysinfo/siocglif_nicdetect.cpp 2017-02-12 20:14:43.894291205 +0000
-@@ -18,6 +18,9 @@
- struct ifi_info *
- NICDetect::get_ifi_info(int family, int doaliases)
- {
-+#ifdef __midipix__
-+ return NULL;
-+#else
- struct ifi_info *ifi, *ifihead, **ifipnext;
- int sockfd, len, lastlen, flags, myflags;
- char *buf, lastname[IFNAMSIZ], *cptr;
-@@ -163,5 +166,6 @@
- close(sockfd);
- free(buf);
- return (ifihead); /* pointer to first structure in linked list */
-+#endif
- }
-
---- openlitespeed-1.4.24/src/modules/Makefile.in.orig 2016-12-02 19:52:23.711814564 +0000
-+++ openlitespeed-1.4.24/src/modules/Makefile.in 2017-02-12 20:16:36.002537713 +0000
-@@ -185,7 +185,7 @@
- done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = cache uploadprogress modinspector lua
-+DIST_SUBDIRS = lua
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- am__relativize = \
- dir0=`pwd`; \
-@@ -361,8 +361,8 @@
- AM_CPPFLAGS = -I$(top_srcdir)/openssl/include/ -I$(top_srcdir)/include -I$(top_srcdir)/src
- libmodules_a_METASOURCES = AUTO
- libmodules_a_SOURCES = modgzip/modgzip.cpp
--@HAVE_LIBLUA_FALSE@SUBDIRS = cache uploadprogress modinspector
--@HAVE_LIBLUA_TRUE@SUBDIRS = cache uploadprogress lua modinspector
-+@HAVE_LIBLUA_FALSE@SUBDIRS =
-+@HAVE_LIBLUA_TRUE@SUBDIRS = lua
- all: all-recursive
-
- .SUFFIXES:
---- openlitespeed-1.4.24/dist/install.sh.orig 2016-12-02 19:51:11.000000000 +0000
-+++ openlitespeed-1.4.24/dist/install.sh 2017-02-12 20:39:56.309734680 +0000
-@@ -1,84 +1,5 @@
- #!/bin/sh
-inst_admin_php()
-{
@@ -203,18 +72,26 @@
- OS=`uname -s`
- OSTYPE=`uname -m`
-
-- DLCMD="wget -nv -O"
-- if [ "x$OS" = "xFreeBSD" ] ; then
-- DL=`which fetch`
-- DLCMD="$DL -o"
-- fi
-- if [ "x$DLCMD" = "x" ] ; then
-- DL=`which wget`
-- DLCMD="$DL -nv -O"
+- DLCMD=
+- DL=`which wget`
+- if [ $? -eq 0 ] ; then
+- DLCMD="wget -nv -O "
+- else
+- DL=`which curl`
+- if [ $? -eq 0 ] ; then
+- DLCMD="curl -L -o "
+- else
+- if [ "x$OS" = "xFreeBSD" ] ; then
+- DL=`which fetch`
+- if [ $? -eq 0 ] ; then
+- DLCMD="fetch -o "
+- fi
+- fi
+- fi
- fi
+-
- if [ "x$DLCMD" = "x" ] ; then
-- DL=`which curl`
-- DLCMD="$DL -L -o"
+- echo "ERROR: cannot find proper download method curl/wget/fetch."
- fi
-
- echo "DLCMD is $DLCMD"
@@ -275,11 +152,28 @@
-}
-
-
+ install_lsphp7_centos()
+ {
+ action=install
+@@ -230,17 +144,6 @@
+ }
+
+
+-inst_lsphp7()
+-{
+- check_os
+- if [ "x$OSNAME" = "xcentos" ] ; then
+- install_lsphp7_centos
+- else
+- install_lsphp7_debian
+- fi
+-}
+-
-
#script start here
cd `dirname "$0"`
source ./functions.sh 2>/dev/null
-@@ -169,7 +90,6 @@
+@@ -332,7 +235,6 @@
echo
echo -e "\033[38;5;148m$LSWS_HOME/conf/httpd_config.xml exists, will be converted to $LSWS_HOME/conf/httpd_config.conf!\033[39m"
@@ -287,7 +181,7 @@
PHP_INSTALLED=y
if [ -e "$LSWS_HOME/conf/httpd_config.conf" ] ; then
-@@ -238,9 +158,6 @@
+@@ -401,9 +303,6 @@
buildConfigFiles
installation
@@ -297,3 +191,153 @@
rm $LSWS_HOME/bin/lshttpd
ln -sf ./openlitespeed $LSWS_HOME/bin/lshttpd
+@@ -424,7 +323,6 @@
+ ln -sf "$LSWS_HOME/fcgi-bin/lsphp5" "$LSWS_HOME/fcgi-bin/lsphp"
+
+ if [ "x$USE_LSPHP7" = "xyes" ] ; then
+- inst_lsphp7
+ if [ -f "$LSWS_HOME/fcgi-bin/lsphp7" ]; then
+ rm "$LSWS_HOME/fcgi-bin/lsphp"
+ ln -sf "$LSWS_HOME/fcgi-bin/lsphp7" "$LSWS_HOME/fcgi-bin/lsphp"
+diff -ru openlitespeed-1.4.27.orig/src/main/lshttpdmain.cpp openlitespeed-1.4.27/src/main/lshttpdmain.cpp
+--- openlitespeed-1.4.27.orig/src/main/lshttpdmain.cpp 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/src/main/lshttpdmain.cpp 2017-09-19 23:17:37.734034146 +0200
+@@ -46,7 +46,9 @@
+ #include <util/stringlist.h>
+ #include <util/signalutil.h>
+ #include <util/vmembuf.h>
++#ifndef __midipix__
+ #include <sys/sysctl.h>
++#endif
+
+ #include <extensions/cgi/cgidworker.h>
+ #include <extensions/registry/extappregistry.h>
+@@ -1441,7 +1443,7 @@
+ #ifdef LSWS_NO_SET_AFFINITY
+ return 2;
+ #else
+-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
+ return sysconf(_SC_NPROCESSORS_ONLN);
+ #else
+ int nm[2];
+diff -ru openlitespeed-1.4.27.orig/src/modules/Makefile.in openlitespeed-1.4.27/src/modules/Makefile.in
+--- openlitespeed-1.4.27.orig/src/modules/Makefile.in 2017-08-15 23:10:18.868017963 +0200
++++ openlitespeed-1.4.27/src/modules/Makefile.in 2017-09-19 23:30:25.052836970 +0200
+@@ -188,7 +188,7 @@
+ done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = cache uploadprogress modinspector modreqparser lua
++DIST_SUBDIRS = lua
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+ dir0=`pwd`; \
+@@ -375,8 +375,8 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/openssl/include/ -I$(top_srcdir)/include -I$(top_srcdir)/src
+ libmodules_a_METASOURCES = AUTO
+ libmodules_a_SOURCES = modgzip/modgzip.cpp
+-@HAVE_LIBLUA_FALSE@SUBDIRS = cache uploadprogress modinspector modreqparser
+-@HAVE_LIBLUA_TRUE@SUBDIRS = cache uploadprogress lua modinspector modreqparser
++@HAVE_LIBLUA_FALSE@SUBDIRS =
++@HAVE_LIBLUA_TRUE@SUBDIRS = lua
+ all: all-recursive
+
+ .SUFFIXES:
+diff -ru openlitespeed-1.4.27.orig/src/util/gsendfile.h openlitespeed-1.4.27/src/util/gsendfile.h
+--- openlitespeed-1.4.27.orig/src/util/gsendfile.h 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/src/util/gsendfile.h 2017-09-19 23:16:05.818827428 +0200
+@@ -83,7 +83,7 @@
+ #endif
+
+ #if defined(linux) || defined(__linux) || defined(__linux__) || \
+- defined(__gnu_linux__)
++ defined(__gnu_linux__) || defined(__midipix__)
+ #include <sys/sendfile.h>
+ #define gsendfile ::sendfile
+ #endif
+diff -ru openlitespeed-1.4.27.orig/src/util/pcutil.cpp openlitespeed-1.4.27/src/util/pcutil.cpp
+--- openlitespeed-1.4.27.orig/src/util/pcutil.cpp 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/src/util/pcutil.cpp 2017-09-19 23:26:15.822340402 +0200
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <pthread.h>
+
+ #ifdef __linux
+ #include <sched.h>
+@@ -73,7 +74,7 @@
+
+ if (s_nCpu > 0)
+ return s_nCpu;
+-#if defined(linux) || defined(__linux) || defined(__linux__)
++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__midipix__)
+ s_nCpu = sysconf(_SC_NPROCESSORS_ONLN);
+ #else
+ int mib[2];
+@@ -117,7 +118,7 @@
+ #ifdef __FreeBSD__
+ return cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1,
+ sizeof(cpu_set_t), mask);
+-#elif defined(linux) || defined(__linux) || defined(__linux__)
++#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__midipix__)
+ return pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), mask);
+ //return sched_setaffinity(0, sizeof(cpu_set_t), mask);
+ #endif
+diff -ru openlitespeed-1.4.27.orig/src/util/pcutil.h openlitespeed-1.4.27/src/util/pcutil.h
+--- openlitespeed-1.4.27.orig/src/util/pcutil.h 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/src/util/pcutil.h 2017-09-19 23:16:40.650519918 +0200
+@@ -18,7 +18,7 @@
+ #ifndef PCUTIL_H
+ #define PCUTIL_H
+
+-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
+ #include <sched.h>
+ # define SET_AFFINITY(pid, size, mask) sched_setaffinity(0, size, mask)
+ # define GET_AFFINITY(pid, size, mask) sched_getaffinity(0, size, mask)
+diff -ru openlitespeed-1.4.27.orig/src/util/sysinfo/partitioninfo.cpp openlitespeed-1.4.27/src/util/sysinfo/partitioninfo.cpp
+--- openlitespeed-1.4.27.orig/src/util/sysinfo/partitioninfo.cpp 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/src/util/sysinfo/partitioninfo.cpp 2017-09-19 23:27:38.773827268 +0200
+@@ -16,7 +16,11 @@
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
+ *****************************************************************************/
+ #include "partitioninfo.h"
++
+ #include <lsdef.h>
++#ifdef __midipix__
++#include <sys/statfs.h>
++#endif
+
+ PartitionInfo::PartitionInfo()
+ {
+@@ -33,7 +37,7 @@
+ int PartitionInfo::getPartitionInfo(const char *path, uint64_t *outTotal,
+ uint64_t *outFree)
+ {
+-#if defined(__linux) || defined(sun)
++#if defined(__linux) || defined(sun) || defined(__midipix__)
+ struct statvfs st;
+ if (statvfs(path, &st) != 0)
+ {
+diff -ru openlitespeed-1.4.27.orig/src/util/sysinfo/siocglif_nicdetect.cpp openlitespeed-1.4.27/src/util/sysinfo/siocglif_nicdetect.cpp
+--- openlitespeed-1.4.27.orig/src/util/sysinfo/siocglif_nicdetect.cpp 2017-08-15 22:41:26.000000000 +0200
++++ openlitespeed-1.4.27/src/util/sysinfo/siocglif_nicdetect.cpp 2017-09-19 23:29:06.497299135 +0200
+@@ -18,6 +18,9 @@
+ struct ifi_info *
+ NICDetect::get_ifi_info(int family, int doaliases)
+ {
++#ifdef __midipix__
++ return NULL;
++#else
+ struct ifi_info *ifi, *ifihead, **ifipnext;
+ int sockfd, len, lastlen, flags, myflags;
+ char *buf, lastname[IFNAMSIZ], *cptr;
+@@ -163,5 +166,6 @@
+ close(sockfd);
+ free(buf);
+ return (ifihead); /* pointer to first structure in linked list */
++#endif
+ }
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 06:13:28 +0000