tcp_wrappers: major upstream rework

diff --git a/tcp_wrappers/.footprint b/tcp_wrappers/.footprint
index 7644b9a1ed9414b2032c194935043deb3cfcbc44..2b0400223578fc063f6e2af83a23c445f8ca79a7 100644 (file)
--- a/tcp_wrappers/.footprint
+++ b/tcp_wrappers/.footprint
@@ -6,6 +6,9 @@ drwxr-xr-x      root/root       usr/include/
 -rw-r--r--     root/root       usr/include/tcpd.h
 drwxr-xr-x     root/root       usr/lib/
 -rw-r--r--     root/root       usr/lib/libwrap.a
+lrwxrwxrwx     root/root       usr/lib/libwrap.so -> libwrap.so.0.7.6
+lrwxrwxrwx     root/root       usr/lib/libwrap.so.0 -> libwrap.so.0.7.6
+-rwxr-xr-x     root/root       usr/lib/libwrap.so.0.7.6
 drwxr-xr-x     root/root       usr/man/
 drwxr-xr-x     root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/hosts_access.3.gz
@@ -13,6 +16,8 @@ lrwxrwxrwx    root/root       usr/man/man3/hosts_ctl.3.gz -> hosts_access.3.gz
 lrwxrwxrwx     root/root       usr/man/man3/request_init.3.gz -> hosts_access.3.gz
 lrwxrwxrwx     root/root       usr/man/man3/request_set.3.gz -> hosts_access.3.gz
 drwxr-xr-x     root/root       usr/man/man5/
+lrwxrwxrwx     root/root       usr/man/man5/host.allow.5.gz -> hosts_access.5.gz
+lrwxrwxrwx     root/root       usr/man/man5/host.deny.5.gz -> hosts_access.5.gz
 -rw-r--r--     root/root       usr/man/man5/hosts_access.5.gz
 -rw-r--r--     root/root       usr/man/man5/hosts_options.5.gz
 drwxr-xr-x     root/root       usr/man/man8/

diff --git a/tcp_wrappers/.md5sum b/tcp_wrappers/.md5sum
index fba4cafc7362a25ff71e32bfaafcb2ef0d1b3256..3ec72157c6687e731a60cd15a19c5c98b9d7cab4 100644 (file)
--- a/tcp_wrappers/.md5sum
+++ b/tcp_wrappers/.md5sum
@@ -1,7 +1,6 @@
 9eaab7733be201959fe72d66fc9791d9  hosts.allow
 a0ee30f6aeaca241c4d44f7c177eca6b  hosts.deny
 1a6d7b11abb1fd69ace775d02a1c72cf  safe_finger.8
-4786ec3369497eca16cec464e02ff2a2  tcp_wrappers-7.6.patch
-272835715d3cbdc8166f64872c33c0a8  tcp_wrappers_7.6-ipv6-1.14.diff.gz
+e40c4f8f90c274af23a38a698b6d1695  tcp-wrappers-7.6-patches-1.0.tar.bz2
 e6fa25f71226d090f34de3f6b122fb5a  tcp_wrappers_7.6.tar.gz
 4a8f40f9a69f0848df92b232072e8561  try-from.8

diff --git a/tcp_wrappers/Pkgfile b/tcp_wrappers/Pkgfile
index ce49b7f68859dbaa98a6fbc08e73c935e4f13b98..b34426410b1ccee2f996645af989b4dbf1bfcb18 100644 (file)
--- a/tcp_wrappers/Pkgfile
+++ b/tcp_wrappers/Pkgfile
@@ -6,26 +6,47 @@
 
 name=tcp_wrappers
 version=7.6
-release=6
-source=(ftp://ftp.porcupine.org/pub/security/tcp_wrappers_$version.tar.gz \
-        http://www.imasy.org/~ume/ipv6/tcp_wrappers_7.6-ipv6-1.14.diff.gz \
-        hosts.allow hosts.deny try-from.8 safe_finger.8 $name-$version.patch)
+release=10
+source=(ftp://ftp.porcupine.org/pub/security/${name}_${version}.tar.gz \
+        ftp://ftp.uni-frankfurt.de/pub/Mirrors/gentoo.org/distfiles/tcp-wrappers-$version-patches-1.0.tar.bz2 \
+        hosts.allow hosts.deny try-from.8 safe_finger.8)
 
 build() {
-  cd tcp_wrappers_$version
-  zcat ../tcp_wrappers_7.6-ipv6-1.14.diff.gz | patch -p2
-  patch -p1 < ../$name-$version.patch
-  make REAL_DAEMON_DIR=/usr/sbin STYLE="-DSYS_ERRLIST_DEFINED -DPROCESS_OPTIONS" linux
-  mkdir -p $PKG/usr/{sbin,lib,include} $PKG/etc $PKG/usr/man/{man3,man5,man8}
-  cp safe_finger tcpd tcpdchk tcpdmatch try-from $PKG/usr/sbin
-  cp tcpd.h $PKG/usr/include
-  cp libwrap.a $PKG/usr/lib
-  cp hosts_access.3 $PKG/usr/man/man3
-  cp hosts_access.5 hosts_options.5 $PKG/usr/man/man5
-  cp ../hosts.{deny,allow} $PKG/etc
-  cp ../try-from.8 ../safe_finger.8 tcpd.8 tcpdchk.8 tcpdmatch.8 $PKG/usr/man/man8
-  chmod -R +w $PKG
-  ln -sf hosts_access.3.gz $PKG/usr/man/man3/hosts_ctl.3.gz
-  ln -sf hosts_access.3.gz $PKG/usr/man/man3/request_init.3.gz
-  ln -sf hosts_access.3.gz $PKG/usr/man/man3/request_set.3.gz
+  cd ${name}_${version}
+
+  patch -p1 -i $SRC/$version/tcp-wrappers-$version-makefile.patch
+  patch -p1 -i $SRC/$version/generic/01_all_redhat-bug11881.patch
+  patch -p0 -i $SRC/$version/generic/02_all_redhat-bug17795.patch
+  patch -p0 -i $SRC/$version/generic/03_all_wildcard.patch
+  patch -p1 -i $SRC/$version/generic/04_all_fixgethostbyname.patch
+  patch -p1 -i $SRC/$version/generic/07_all_sig.patch
+  patch -p1 -i $SRC/$version/generic/08_all_strerror.patch
+  patch -p1 -i $SRC/$version/generic/09_all_gcc-3.4.patch
+  patch -p1 -i $SRC/$version/generic/10_all_more-headers.patch
+  patch -p1 -i $SRC/$version/tcp-wrappers-$version-shared.patch
+  patch -p2 -i $SRC/$version/tcp-wrappers-$version-ipv6-1.14.diff
+    
+  export GENTOO_OPT="-DHAVE_WEAKSYMS -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" 
+  export RANLIB=$RANLIB 
+  export MAJOR=0 MINOR=${version:0:1} REL=${version:2:3}
+  make config-check
+  make linux
+
+  install -d $PKG/{etc,usr/{sbin,lib,include,man/{man3,man5,man8}}}
+
+  install -m 0755 safe_finger tcpd tcpdchk tcpdmatch try-from $PKG/usr/sbin
+  install -m 0644 tcpd.h $PKG/usr/include
+  install -m 0644 libwrap.a $PKG/usr/lib
+  cp --no-dereference --preserve=links libwrap.so* $PKG/usr/lib
+
+  install -m 0644 *.3 $PKG/usr/man/man3
+  install -m 0644 *.5 $PKG/usr/man/man5
+  install -m 0644 $SRC/*.8 *.8 $PKG/usr/man/man8
+  ln -s hosts_access.3.gz $PKG/usr/man/man3/hosts_ctl.3.gz
+  ln -s hosts_access.3.gz $PKG/usr/man/man3/request_init.3.gz
+  ln -s hosts_access.3.gz $PKG/usr/man/man3/request_set.3.gz
+  ln -s hosts_access.5.gz $PKG/usr/man/man5/host.allow.5.gz
+  ln -s hosts_access.5.gz $PKG/usr/man/man5/host.deny.5.gz
+
+  install -m 0644 $SRC/hosts.{deny,allow} $PKG/etc
 }

diff --git a/tcp_wrappers/tcp_wrappers-7.6.patch b/tcp_wrappers/tcp_wrappers-7.6.patch
deleted file mode 100644 (file)
index 55333d9..0000000
--- a/tcp_wrappers/tcp_wrappers-7.6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru tcp_wrappers_7.6/Makefile tcp_wrappers_7.6-new/Makefile
---- tcp_wrappers_7.6/Makefile  2003-03-15 14:14:07.000000000 +0100
-+++ tcp_wrappers_7.6-new/Makefile      2003-03-15 14:13:51.000000000 +0100
-@@ -149,8 +149,8 @@
-       EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len" VSYSLOG= all
- 
- linux:
--      @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
--      LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP= TLI= \
-+      @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE="$(STYLE)" \
-+      LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
-       EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
- 
- linux-old:
-@@ -679,7 +679,7 @@
- SHELL = /bin/sh
- .c.o:;        $(CC) $(CFLAGS) -c $*.c
- 
--CFLAGS        = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
-+CFLAGS        += -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
-       $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
-       -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
-       -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \