diff -bdruN tcp_wrappers_old/11_inet6_fixes.patch tcp_wrappers/11_inet6_fixes.patch --- tcp_wrappers_old/11_inet6_fixes.patch 1970-01-01 01:00:00.000000000 +0100 +++ tcp_wrappers/11_inet6_fixes.patch 2009-10-28 10:56:15.619326476 +0100 @@ -0,0 +1,41 @@ +--- Makefile.old 2009-10-28 10:37:40.138328073 +0100 ++++ Makefile 2009-10-28 10:37:57.014326831 +0100 +@@ -154,7 +154,7 @@ + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ + LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ + NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \ +- EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT" ++ EXTRA_CFLAGS="-DINET6 -DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT" + + gnu: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +--- tcpd.h.old 2009-10-28 10:48:19.285326834 +0100 ++++ tcpd.h 2009-10-28 10:47:32.951325793 +0100 +@@ -91,7 +91,11 @@ + + extern void shell_cmd __P((char *)); /* execute shell command */ + extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do % expansion */ ++#ifdef INET6 ++extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */ ++#else + extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ ++#endif + extern void clean_exit __P((struct request_info *)); /* clean up and exit */ + extern void refuse __P((struct request_info *)); /* clean up and exit */ + extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ +--- scaffold.c.old 2009-10-28 10:50:13.584449353 +0100 ++++ scaffold.c 2009-10-28 10:52:53.765443023 +0100 +@@ -182,8 +237,13 @@ + /* ARGSUSED */ + + void rfc931(rmt_sin, our_sin, dest) ++#ifdef INET6 ++struct sockaddr *rmt_sin; ++struct sockaddr *our_sin; ++#else + struct sockaddr_in *rmt_sin; + struct sockaddr_in *our_sin; ++#endif + char *dest; + { + strcpy(dest, unknown); diff -bdruN tcp_wrappers_old/PKGBUILD tcp_wrappers/PKGBUILD --- tcp_wrappers_old/PKGBUILD 2009-10-28 05:05:57.000000000 +0100 +++ tcp_wrappers/PKGBUILD 2009-10-28 10:58:02.787324822 +0100 @@ -2,7 +2,7 @@ # Maintainer: judd pkgname=tcp_wrappers pkgver=7.6 -pkgrel=10 +pkgrel=11 pkgdesc="Monitors and Controls incoming TCP connections" arch=(i686 x86_64) url="ftp://ftp.porcupine.org/pub/security/index.html" @@ -24,6 +24,7 @@ 08_all_strerror.patch 09_all_gcc-3.4.patch 10_all_more-headers.patch + 11_inet6_fixes.patch tcp-wrappers-7.6-ipv6-1.14.patch) md5sums=('e6fa25f71226d090f34de3f6b122fb5a' '32cfeeed797161034f62bb45f3167baa' @@ -39,6 +40,7 @@ '801292cacf14a92e2784b925e72a1db1' '0978932f49aae33834a46e189ace7d77' '68b1c7f82fed60b446b00f6de27c3b9f' + '530201d32b8b22c6a3db02c9779f1546' '9154c38e3fb69d12b5bfb2fc5284314f') build() { @@ -52,6 +54,7 @@ patch -Np1 -i ../07_all_sig.patch || return 1 patch -Np1 -i ../09_all_gcc-3.4.patch || return 1 patch -Np1 -i ../10_all_more-headers.patch || return 1 + patch -Np0 -i ../11_inet6_fixes.patch || return 1 patch -Np2 -i ../tcp-wrappers-7.6-ipv6-1.14.patch || return 1 make REAL_DAEMON_DIR=/usr/sbin STYLE=-DSYS_ERRLIST_DEFINED linux || return 1