From 7e214346433c9f37a0b4c99ee4cc9fb9204e91df Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Sep 13 2017 15:04:32 +0000 Subject: vars/build.vars: updates {bind,irssi,less,mc,nano,util-linux,whois} to v9.11.2, v1.0.4, v487, v4.8.19, v2.8.7, v2.30.1, and v5.2.18, resp. (via Redfoxmoon.) patches/{bind-9.11.2,irssi-1.0.4,mc-4.8.19}.local.patch: via Redfoxmoon. --- diff --git a/patches/bind-9.11.2.local.patch b/patches/bind-9.11.2.local.patch new file mode 100644 index 0000000..73697b6 --- /dev/null +++ b/patches/bind-9.11.2.local.patch @@ -0,0 +1,330 @@ +diff -ru bind-9.11.2.orig/bin/check/Makefile.in bind-9.11.2/bin/check/Makefile.in +--- bind-9.11.2.orig/bin/check/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/check/Makefile.in 2017-09-13 16:09:24.589543862 +0200 +@@ -20,7 +20,7 @@ + CDEFINES = @CRYPTO@ -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.2.orig/bin/confgen/Makefile.in bind-9.11.2/bin/confgen/Makefile.in +--- bind-9.11.2.orig/bin/confgen/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/confgen/Makefile.in 2017-09-13 16:10:26.857177684 +0200 +@@ -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.2.orig/bin/delv/Makefile.in bind-9.11.2/bin/delv/Makefile.in +--- bind-9.11.2.orig/bin/delv/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/delv/Makefile.in 2017-09-13 16:11:30.200805972 +0200 +@@ -20,7 +20,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@ +@@ -32,8 +32,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.2.orig/bin/dig/Makefile.in bind-9.11.2/bin/dig/Makefile.in +--- bind-9.11.2.orig/bin/dig/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/dig/Makefile.in 2017-09-13 16:12:11.496564031 +0200 +@@ -22,7 +22,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@ +@@ -38,10 +38,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.2.orig/bin/dnssec/Makefile.in bind-9.11.2/bin/dnssec/Makefile.in +--- bind-9.11.2.orig/bin/dnssec/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/dnssec/Makefile.in 2017-09-13 16:12:31.476447075 +0200 +@@ -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.2.orig/bin/Makefile.in bind-9.11.2/bin/Makefile.in +--- bind-9.11.2.orig/bin/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/Makefile.in 2017-09-13 16:13:03.324260771 +0200 +@@ -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.2.orig/bin/named/Makefile.in bind-9.11.2/bin/named/Makefile.in +--- bind-9.11.2.orig/bin/named/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/named/Makefile.in 2017-09-13 16:13:34.788076866 +0200 +@@ -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.2.orig/bin/nsupdate/Makefile.in bind-9.11.2/bin/nsupdate/Makefile.in +--- bind-9.11.2.orig/bin/nsupdate/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/nsupdate/Makefile.in 2017-09-13 16:14:07.755884315 +0200 +@@ -26,7 +26,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@ +@@ -40,9 +40,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.2.orig/bin/rndc/Makefile.in bind-9.11.2/bin/rndc/Makefile.in +--- bind-9.11.2.orig/bin/rndc/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/rndc/Makefile.in 2017-09-13 16:14:38.291706093 +0200 +@@ -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.2.orig/bin/tools/Makefile.in bind-9.11.2/bin/tools/Makefile.in +--- bind-9.11.2.orig/bin/tools/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/bin/tools/Makefile.in 2017-09-13 16:15:59.075235122 +0200 +@@ -19,9 +19,9 @@ + CDEFINES = @CRYPTO@ -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@ +@@ -32,8 +32,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.2.orig/configure.in bind-9.11.2/configure.in +--- bind-9.11.2.orig/configure.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/configure.in 2017-09-13 16:21:26.765330737 +0200 +@@ -2335,9 +2335,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 -ru bind-9.11.2.orig/lib/irs/Makefile.in bind-9.11.2/lib/irs/Makefile.in +--- bind-9.11.2.orig/lib/irs/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/lib/irs/Makefile.in 2017-09-13 16:17:32.502691292 +0200 +@@ -35,7 +35,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 + TESTDIRS = @UNITTESTS@ +diff -ru bind-9.11.2.orig/lib/isc/Makefile.in bind-9.11.2/lib/isc/Makefile.in +--- bind-9.11.2.orig/lib/isc/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/lib/isc/Makefile.in 2017-09-13 16:25:11.723950416 +0200 +@@ -108,26 +108,16 @@ + ${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS} + ${RANLIB} $@ + +-libisc-nosymtbl.@SA@: ${OBJS} +- ${AR} ${ARFLAGS} $@ ${OBJS} +- ${RANLIB} $@ +- + libisc.la: ${OBJS} ${SYMTBLOBJS} + ${LIBTOOL_MODE_LINK} \ + ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \ + -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} +- +-timestamp: libisc.@A@ libisc-nosymtbl.@A@ ++timestamp: libisc.@A@ + touch timestamp + +-testdirs: libisc.@A@ libisc-nosymtbl.@A@ ++testdirs: libisc.@A@ + + installdirs: + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} +@@ -139,5 +129,4 @@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc.@A@ + + clean distclean:: +- rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \ +- libisc-nosymtbl.la timestamp ++ rm -f libisc.@A@ libisc.la timestamp +diff -ru bind-9.11.2.orig/lib/Makefile.in bind-9.11.2/lib/Makefile.in +--- bind-9.11.2.orig/lib/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/lib/Makefile.in 2017-09-13 16:19:00.166181699 +0200 +@@ -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.2.orig/lib/samples/Makefile.in bind-9.11.2/lib/samples/Makefile.in +--- bind-9.11.2.orig/lib/samples/Makefile.in 2017-07-24 07:36:50.000000000 +0200 ++++ bind-9.11.2/lib/samples/Makefile.in 2017-09-13 16:19:36.149972702 +0200 +@@ -22,7 +22,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@ + +@@ -33,7 +33,7 @@ + + DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS} + +-LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ ++LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ @LIBS@ + + SUBDIRS = + diff --git a/patches/irssi-0.8.20.local.patch b/patches/irssi-0.8.20.local.patch deleted file mode 100644 index 0dfa06d..0000000 --- a/patches/irssi-0.8.20.local.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- irssi-0.8.20/src/core/pidwait.c.orig 2016-08-11 14:59:21.000000000 +0200 -+++ irssi-0.8.20/src/core/pidwait.c 2016-12-18 01:14:30.017866300 +0100 -@@ -39,8 +39,10 @@ - void pidwait_add(int pid) - { - if (g_hash_table_lookup(child_pids, GINT_TO_POINTER(pid)) == NULL) { -+#ifndef __midipix__ - int id = g_child_watch_add_full(10, pid, sig_child, NULL, NULL); - g_hash_table_insert(child_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(id)); -+#endif - pids = g_slist_append(pids, GINT_TO_POINTER(pid)); - } - } ---- irssi-0.8.20/src/core/servers.c.orig 2016-09-14 13:46:13.000000000 +0200 -+++ irssi-0.8.20/src/core/servers.c 2016-12-18 01:17:03.451031500 +0100 -@@ -407,6 +407,36 @@ - /* connect with unix socket */ - server_real_connect(server, NULL, server->connrec->address); - } else { -+ #ifdef __midipix__ -+ IPADDR ip4, ip6, *ip; -+ -+ connect_address = server->connrec->proxy != NULL ? -+ server->connrec->proxy : server->connrec->address; -+ if (net_gethostbyname(connect_address, &ip4, &ip6) == -1) { -+ g_warning("net_gethostbyname(): -1"); -+ g_free(server->tag); -+ g_free(server->nick); -+ return FALSE; -+ } else if (server->connrec->family == 0) { -+ /* prefer IPv4 addresses */ -+ ip = ip4.family != 0 ? &ip4 : &ip6; -+ } else if (server->connrec->family == AF_INET6) { -+ /* IPv6 address, use if possible */ -+ if (ip6.family != 0) { -+ ip = &ip6; -+ } else { -+ ip = &ip4; -+ } -+ } else { -+ /* IPv4 address, use if possible */ -+ if (ip4.family != 0) { -+ ip = &ip4; -+ } else { -+ ip = &ip6; -+ } -+ } -+ server_real_connect(server, ip, NULL); -+ #else - /* resolve host name */ - if (pipe(fd) != 0) { - g_warning("server_connect(): pipe() failed."); -@@ -433,6 +463,7 @@ - lookup_servers = g_slist_append(lookup_servers, server); - - signal_emit("server looking", 1, server); -+ #endif - } - return TRUE; - } ---- irssi-0.8.20/src/fe-common/core/fe-exec.c.orig 2016-09-14 13:46:13.000000000 +0200 -+++ irssi-0.8.20/src/fe-common/core/fe-exec.c 2016-12-18 01:14:30.018866300 +0100 -@@ -288,6 +288,9 @@ - } - } - -+#ifdef __midipix__ -+static void sig_pidwait(void *pid, void *statusp); -+#endif - static void process_exec(PROCESS_REC *rec, const char *cmd) - { - const char *shell_args[4] = { "/bin/sh", "-c", NULL, NULL }; -@@ -535,6 +538,14 @@ - (GInputFunction) sig_exec_input_reader, - rec); - processes = g_slist_append(processes, rec); -+#ifdef __midipix__ -+ int status; -+ waitpid(rec->pid, &status, 0); -+ while (rec->read_tag != -1) { -+ sig_exec_input_reader(rec); -+ } -+ sig_pidwait((void *)rec->pid, &status); -+#endif - - if (rec->target == NULL && interactive) - rec->target_item = exec_wi_create(active_win, rec); diff --git a/patches/irssi-1.0.4.local.patch b/patches/irssi-1.0.4.local.patch new file mode 100644 index 0000000..0dfa06d --- /dev/null +++ b/patches/irssi-1.0.4.local.patch @@ -0,0 +1,87 @@ +--- irssi-0.8.20/src/core/pidwait.c.orig 2016-08-11 14:59:21.000000000 +0200 ++++ irssi-0.8.20/src/core/pidwait.c 2016-12-18 01:14:30.017866300 +0100 +@@ -39,8 +39,10 @@ + void pidwait_add(int pid) + { + if (g_hash_table_lookup(child_pids, GINT_TO_POINTER(pid)) == NULL) { ++#ifndef __midipix__ + int id = g_child_watch_add_full(10, pid, sig_child, NULL, NULL); + g_hash_table_insert(child_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(id)); ++#endif + pids = g_slist_append(pids, GINT_TO_POINTER(pid)); + } + } +--- irssi-0.8.20/src/core/servers.c.orig 2016-09-14 13:46:13.000000000 +0200 ++++ irssi-0.8.20/src/core/servers.c 2016-12-18 01:17:03.451031500 +0100 +@@ -407,6 +407,36 @@ + /* connect with unix socket */ + server_real_connect(server, NULL, server->connrec->address); + } else { ++ #ifdef __midipix__ ++ IPADDR ip4, ip6, *ip; ++ ++ connect_address = server->connrec->proxy != NULL ? ++ server->connrec->proxy : server->connrec->address; ++ if (net_gethostbyname(connect_address, &ip4, &ip6) == -1) { ++ g_warning("net_gethostbyname(): -1"); ++ g_free(server->tag); ++ g_free(server->nick); ++ return FALSE; ++ } else if (server->connrec->family == 0) { ++ /* prefer IPv4 addresses */ ++ ip = ip4.family != 0 ? &ip4 : &ip6; ++ } else if (server->connrec->family == AF_INET6) { ++ /* IPv6 address, use if possible */ ++ if (ip6.family != 0) { ++ ip = &ip6; ++ } else { ++ ip = &ip4; ++ } ++ } else { ++ /* IPv4 address, use if possible */ ++ if (ip4.family != 0) { ++ ip = &ip4; ++ } else { ++ ip = &ip6; ++ } ++ } ++ server_real_connect(server, ip, NULL); ++ #else + /* resolve host name */ + if (pipe(fd) != 0) { + g_warning("server_connect(): pipe() failed."); +@@ -433,6 +463,7 @@ + lookup_servers = g_slist_append(lookup_servers, server); + + signal_emit("server looking", 1, server); ++ #endif + } + return TRUE; + } +--- irssi-0.8.20/src/fe-common/core/fe-exec.c.orig 2016-09-14 13:46:13.000000000 +0200 ++++ irssi-0.8.20/src/fe-common/core/fe-exec.c 2016-12-18 01:14:30.018866300 +0100 +@@ -288,6 +288,9 @@ + } + } + ++#ifdef __midipix__ ++static void sig_pidwait(void *pid, void *statusp); ++#endif + static void process_exec(PROCESS_REC *rec, const char *cmd) + { + const char *shell_args[4] = { "/bin/sh", "-c", NULL, NULL }; +@@ -535,6 +538,14 @@ + (GInputFunction) sig_exec_input_reader, + rec); + processes = g_slist_append(processes, rec); ++#ifdef __midipix__ ++ int status; ++ waitpid(rec->pid, &status, 0); ++ while (rec->read_tag != -1) { ++ sig_exec_input_reader(rec); ++ } ++ sig_pidwait((void *)rec->pid, &status); ++#endif + + if (rec->target == NULL && interactive) + rec->target_item = exec_wi_create(active_win, rec); diff --git a/patches/mc-4.8.18.local.patch b/patches/mc-4.8.18.local.patch deleted file mode 100644 index 534e0cd..0000000 --- a/patches/mc-4.8.18.local.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mc-4.8.18/configure.orig 2016-10-02 19:47:28.000000000 +0200 -+++ mc-4.8.18/configure 2016-12-18 01:54:29.486734700 +0100 -@@ -19922,7 +19922,7 @@ - - - # Determine how to get the list of mounted file systems. --ac_list_mounted_fs= -+#ac_list_mounted_fs= - - # If the getmntent function is available but not in the standard library, - # make sure LIBS contains the appropriate -l option. -@@ -20634,7 +20634,7 @@ - - - # Determine how to get the list of mounted file systems. --ac_list_mounted_fs= -+#ac_list_mounted_fs= - - # If the getmntent function is available but not in the standard library, - # make sure LIBS contains the appropriate -l option. diff --git a/patches/mc-4.8.19.local.patch b/patches/mc-4.8.19.local.patch new file mode 100644 index 0000000..a683a52 --- /dev/null +++ b/patches/mc-4.8.19.local.patch @@ -0,0 +1,20 @@ +--- mc-4.8.19/configure.orig 2016-10-02 19:47:28.000000000 +0200 ++++ mc-4.8.19/configure 2016-12-18 01:54:29.486734700 +0100 +@@ -19974,7 +19974,7 @@ + + + # Determine how to get the list of mounted file systems. +-ac_list_mounted_fs= ++#ac_list_mounted_fs= + + # If the getmntent function is available but not in the standard library, + # make sure LIBS contains the appropriate -l option. +@@ -20686,7 +20686,7 @@ + + + # Determine how to get the list of mounted file systems. +-ac_list_mounted_fs= ++#ac_list_mounted_fs= + + # If the getmntent function is available but not in the standard library, + # make sure LIBS contains the appropriate -l option. diff --git a/vars/build.vars b/vars/build.vars index 516f0c5..50ed4da 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -602,11 +602,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BC_URL:=http://alpha.gnu.org/gnu/bc/bc-${PKG_BC_VERSION}.tar.bz2}; : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"}; : ${PKG_BDWGC_SUBDIR:=bdwgc}; -: ${PKG_BIND_SHA256SUM:=d651f83ce1c08c83d6ac8201685c4f2b5fdb79794f3a4f93c3948e0ef439c1e5}; -: ${PKG_BIND_VERSION:=9.11.0-P2}; -: ${PKG_BIND_URL:=https://www.isc.org/downloads/file/bind-9-11-0-p2/}; -: ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-ecdsa=yes --with-gost=yes --with-gssapi=no --with-libtool --with-libxml2=${PREFIX}/bin/${TARGET}-xml2-config --with-libjson=no --with-openssl=${PREFIX_NATIVE} --with-randomdev=/dev/urandom BUILD_CC=gcc"}; -: ${PKG_BIND_FNAME:=bind-${PKG_BIND_VERSION}.tar.gz}; +: ${PKG_BIND_SHA256SUM:=7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a}; +: ${PKG_BIND_VERSION:=9.11.2}; +: ${PKG_BIND_URL:=https://ftp.isc.org/isc/bind9/cur/${PKG_BIND_VERSION%.*}/bind-${PKG_BIND_VERSION}.tar.gz}; +: ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-ecdsa=yes --with-gost=no --with-gssapi=no --with-libtool --with-libxml2=${PREFIX}/bin/${TARGET}-xml2-config --with-libjson=no --with-openssl=${PREFIX_NATIVE} --with-randomdev=/dev/urandom BUILD_CC=gcc"}; : ${PKG_BISON_SHA256SUM:=a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1}; : ${PKG_BISON_VERSION:=3.0.4}; : ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.xz}; @@ -726,8 +725,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_INFOZIP_MAKEFLAGS_BUILD_EXTRA:="-f unix/Makefile midipix"}; : ${PKG_INFOZIP_NO_MAKE_INSTALL:=1}; : ${PKG_INFOZIP_SUBDIR:=${PKG_INFOZIP_BUILD_DIR}}; -: ${PKG_IRSSI_SHA256SUM:=f5e20f76aa8237303c463e08adb3a3e3a400a24ba95acf73e9b068d634173f66}; -: ${PKG_IRSSI_VERSION:=0.8.20}; +: ${PKG_IRSSI_SHA256SUM:=48ff359f8abb706e729cbb8bc7bd93863e4e785f9a05d993a398310ac74beea8}; +: ${PKG_IRSSI_VERSION:=1.0.4}; : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz}; : ${PKG_IRSSI_CONFIGURE_ARGS_EXTRA:=--with-ncurses=${PREFIX_NATIVE}}; : ${PKG_JOHN_SHA256SUM:=952cf68369fb5b27f2d112ce7ca1eb16b975c85cbce8c658abb8bc5a20e1b266}; @@ -747,8 +746,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"}; : ${PKG_LDNS_MAKEFLAGS_BUILD_EXTRA:=libtool=slibtool}; : ${PKG_LDNS_MAKEFLAGS_INSTALL_EXTRA:=libtool=slibtool}; -: ${PKG_LESS_SHA256SUM:=3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5}; -: ${PKG_LESS_VERSION:=481}; +: ${PKG_LESS_SHA256SUM:=f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706}; +: ${PKG_LESS_VERSION:=487}; : ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz}; : ${PKG_LIGHTTPD_SHA256SUM:=1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f}; : ${PKG_LIGHTTPD_VERSION:=1.4.45}; @@ -768,8 +767,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MAN_DB_URL:=http://download.savannah.gnu.org/releases/man-db/man-db-${PKG_MAN_DB_VERSION}.tar.xz}; : ${PKG_MAN_DB_CFLAGS_BUILD_EXTRA:="-Dprogram_name=program_invocation_name -I${PREFIX_NATIVE}/include"}; : ${PKG_MAN_DB_MAKEFLAGS_BUILD_EXTRA:=V=99}; -: ${PKG_MC_SHA256SUM:=f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece}; -: ${PKG_MC_VERSION:=4.8.18}; +: ${PKG_MC_SHA256SUM:=eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df}; +: ${PKG_MC_VERSION:=4.8.19}; : ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz}; : ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"}; : ${PKG_MC_CONFIGURE_ARGS_EXTRA:="--with-screen=ncurses --x-includes=${PREFIX_NATIVE}/include/X11 --x-libraries=${PREFIX_NATIVE}/lib"}; @@ -792,8 +791,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_M4_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07}; : ${PKG_M4_VERSION:=1.4.18}; : ${PKG_M4_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_VERSION}.tar.xz}; -: ${PKG_NANO_SHA256SUM:=3725aa145880223b2c4d0b3fa08220e1633f2d341917f49d028e067fc12cce49}; -: ${PKG_NANO_VERSION:=2.8.6}; +: ${PKG_NANO_SHA256SUM:=a49a888c20f09a17c7f1049d1fda619472c92eedcb25fd4be5f088a51cc392a5}; +: ${PKG_NANO_VERSION:=2.8.7}; : ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz}; : ${PKG_NETCAT_SHA256SUM:=5b3fda14e972d908896a605293f4634a72e2968278117410e12d8b3faf9a3976}; : ${PKG_NETCAT_VERSION:=110}; @@ -915,10 +914,10 @@ fi; : ${PKG_TOILET_SUBDIR:=toilet}; : ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}:CACA_LIBS=-L${PREFIX_NATIVE}/lib -lcaca"}; : ${PKG_TOILET_CONFIGURE_ARGS_EXTRA:=--program-prefix=""}; -: ${PKG_UTIL_LINUX_SHA256SUM:=21ede7eb6c3a2a9c7b13eeee241e82428be4f6d5030ff488f638817f419af093}; -: ${PKG_UTIL_LINUX_VERSION:=2.27}; -: ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; -: ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-wall --disable-write}; +: ${PKG_UTIL_LINUX_SHA256SUM:=88bb1d08f0d67fb1b548c3e2160f7f40fb552cdf6b771a5dd1b94e1e04fc1d9a}; +: ${PKG_UTIL_LINUX_VERSION:=2.30.1}; +: ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION%.*}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; +: ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-lslogins --disable-agetty --disable-wall --disable-write}; : ${PKG_UTIL_LINUX_ENV_VARS_EXTRA:=PKG_CONFIG=${PREFIX}/bin/${TARGET}-pkg-config}; : ${PKG_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67}; : ${PKG_VIM_VERSION:=7.4.1952}; @@ -943,8 +942,8 @@ fi; : ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad}; : ${PKG_WHICH_VERSION:=2.21}; : ${PKG_WHICH_URL:=https://ftp.gnu.org/gnu/which/which-${PKG_WHICH_VERSION}.tar.gz}; -: ${PKG_WHOIS_SHA256SUM:=d7af1e89e7b3c63835e78bcea6c8aeb14640a3f1027f18b7b619a47100a6f2dc}; -: ${PKG_WHOIS_VERSION:=5.2.13}; +: ${PKG_WHOIS_SHA256SUM:=048c3b0fd731e5c777c9cf1e01e0ed7aca387891743a97c5b57b3daa8df524a4}; +: ${PKG_WHOIS_VERSION:=5.2.18}; : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz}; : ${PKG_WHOIS_BUILD_DIR:=whois-${PKG_WHOIS_VERSION}}; : ${PKG_WHOIS_MAKEFLAGS_INSTALL:=BASEDIR=${PREFIX_NATIVE}};