Changes 7.6.4:

Bug fixes

8 files changed, 57 insertions, 119 deletions

diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index df2293a3551..ce926efc74c 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2012/06/12 15:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2012/07/20 09:58:36 adam Exp $
 
-DISTNAME=	tcp_wrappers_7.6-ipv6.1
-PKGNAME=	tcp_wrappers-7.6.1
-PKGREVISION=	4
+DISTNAME=	tcp_wrappers_7.6-ipv6.4
+PKGNAME=	${DISTNAME:S/_7.6-ipv6/-7.6/}
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.porcupine.org/pub/security/
 
@@ -45,12 +44,12 @@ MAKE_ENV+=	IPV6=-DHAVE_IPV6
 # PKG_SYSCONFDIR.tcp_wrappers to a different value in /etc/mk.conf.
 #
 PKG_SYSCONFDIR.tcp_wrappers?=	/etc
-MAKE_ENV+=	PKGSYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_ENV+=	PKGSYSCONFDIR=${PKG_SYSCONFDIR}
 
 INSTALLATION_DIRS=	bin include lib libexec ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 post-build:
-	cd ${WRKSRC}; for file in *.[0-9]; do				\
+	set -e; cd ${WRKSRC}; for file in *.[0-9]; do			\
 		${MV} -f $$file $$file.BAK;				\
 		${SED}	-e "s|/etc/hosts\.|${PKG_SYSCONFDIR}/hosts.|g"	\
 			$$file.BAK > $$file;				\
@@ -60,18 +59,18 @@ DOCDIR=			${PREFIX}/share/doc/tcp_wrappers
 INSTALLATION_DIRS+=	${DOCDIR}
 
 do-install:
-	cd ${WRKSRC}; ${LIBTOOL} --mode=install \
-		${INSTALL_LIB} libwrap.la ${DESTDIR}${PREFIX}/lib
-	cd ${WRKSRC}; ${LIBTOOL} --mode=install \
-		${INSTALL_PROGRAM} \
-		tcpdmatch try-from safe_finger tcpdchk ${DESTDIR}${PREFIX}/bin
-	cd ${WRKSRC}; ${INSTALL_DATA} tcpd.h ${DESTDIR}${PREFIX}/include
-	cd ${WRKSRC}; ${LIBTOOL} --mode=install \
-		${INSTALL_PROGRAM} tcpd ${DESTDIR}${PREFIX}/libexec
-	cd ${WRKSRC}; ${INSTALL_DATA} *.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-	cd ${WRKSRC}; ${INSTALL_DATA} *.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-	cd ${WRKSRC}; ${INSTALL_DATA} *.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-	cd ${WRKSRC}; ${INSTALL_DATA} README README.NIS README.ipv6 \
-		${DESTDIR}${DOCDIR}
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/libwrap.la ${DESTDIR}${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+		${WRKSRC}/tcpdchk ${WRKSRC}/tcpdmatch ${WRKSRC}/try-from \
+		${WRKSRC}/safe_finger ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tcpd.h ${DESTDIR}${PREFIX}/include
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+		${WRKSRC}/tcpd ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_DATA} ${WRKSRC}/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_DATA} ${WRKSRC}/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_DATA} ${WRKSRC}/*.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.NIS \
+		${WRKSRC}/README.ipv6 ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tcp_wrappers/distinfo b/security/tcp_wrappers/distinfo
index ab61cc15837..9590d12ba02 100644
--- a/security/tcp_wrappers/distinfo
+++ b/security/tcp_wrappers/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.16 2007/02/03 18:48:49 schwarz Exp $
+$NetBSD: distinfo,v 1.17 2012/07/20 09:58:36 adam Exp $
 
-SHA1 (tcp_wrappers_7.6-ipv6.1.tar.gz) = d0b70d4f0c0ac0375d8283a18ec2b6d602f82fde
-RMD160 (tcp_wrappers_7.6-ipv6.1.tar.gz) = 948f5ac4ede3999273399b641474ca26fd967b70
-Size (tcp_wrappers_7.6-ipv6.1.tar.gz) = 144708 bytes
-SHA1 (patch-aa) = 4de36854d13cb9b007ac92164becaa59848f1202
-SHA1 (patch-ab) = e6b485b21623395a6ca6b1ce0054d3dc5c9b2232
+SHA1 (tcp_wrappers_7.6-ipv6.4.tar.gz) = e82e269337223a001118e5084b05c6c53fe53dc5
+RMD160 (tcp_wrappers_7.6-ipv6.4.tar.gz) = 7bc5617c0e2833dd60c2fdc681f4890df5a9ac4b
+Size (tcp_wrappers_7.6-ipv6.4.tar.gz) = 138700 bytes
+SHA1 (patch-aa) = 6bc6f0523b4e8c31a4b02af948f285e800d5c59b
+SHA1 (patch-ab) = b05733e5e615bd3009045ecef4d4e988c8df6236
 SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0
-SHA1 (patch-ad) = 45eff3bffb787ccdfee00df34d947aac32f07262
-SHA1 (patch-ae) = feddad07e9661c220a5be279fcf2cec87eb1b6b2
 SHA1 (patch-af) = 1bf946174b027880014e64aa9b84dcfa5ca951a0
-SHA1 (patch-ag) = a7aba77230e870ff2695fb681c0b3c5bfc80fa1a
+SHA1 (patch-ag) = a2c88d1db9b3ec127f7a0889dcb4329ea3eb06a3
 SHA1 (patch-ah) = fa829052d466a4597c1cec528ab02c9d2ea98a60
 SHA1 (patch-ai) = f5a675f8fd1cc7e4e735dc8a9804f1dcf8d276bc
 SHA1 (patch-aj) = 6332edd3e464d0f68bfa10dc6724346d0bc05f1f
+SHA1 (patch-fix_options.c) = ce49ff5b4b1e26eb7634e61fa33ad4697917fbcb
diff --git a/security/tcp_wrappers/patches/patch-aa b/security/tcp_wrappers/patches/patch-aa
index 864f729d29a..de3803de8a5 100644
--- a/security/tcp_wrappers/patches/patch-aa
+++ b/security/tcp_wrappers/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2007/02/03 18:48:50 schwarz Exp $
+$NetBSD: patch-aa,v 1.11 2012/07/20 09:58:36 adam Exp $
 
---- Makefile.orig	2000-08-21 19:59:52.000000000 +0200
-+++ Makefile	2006-01-22 22:46:17.000000000 +0100
-@@ -44,7 +44,7 @@
+--- Makefile.orig	2003-04-16 14:25:03.000000000 +0000
++++ Makefile
+@@ -44,7 +44,7 @@ what:
  #REAL_DAEMON_DIR=/usr/etc
  #
  # SysV.4 Solaris 2.x OSF AIX
@@ -11,16 +11,7 @@ $NetBSD: patch-aa,v 1.10 2007/02/03 18:48:50 schwarz Exp $
  #
  # BSD 4.4
  #REAL_DAEMON_DIR=/usr/libexec
-@@ -144,7 +144,7 @@
- linux:
- 	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
- 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
--	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
-+	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER -DSYS_ERRLIST_DEFINED" all
- 
- # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
- hpux hpux8 hpux9 hpux10:
-@@ -602,7 +602,7 @@
+@@ -603,7 +603,7 @@ ACCESS	= -DHOSTS_ACCESS
  # look for access control information. Watch out for the quotes and
  # backslashes when you make changes.
  
@@ -29,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2007/02/03 18:48:50 schwarz Exp $
  
  ####################################################
  # Optional: dealing with host name/address conflicts
-@@ -669,9 +669,9 @@
+@@ -670,9 +670,9 @@ HOSTNAME= -DALWAYS_HOSTNAME
  # Protection against weird shells or weird make programs.
  
  SHELL	= /bin/sh
@@ -41,7 +32,7 @@ $NetBSD: patch-aa,v 1.10 2007/02/03 18:48:50 schwarz Exp $
  	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
  	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
  	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
-@@ -696,7 +696,7 @@
+@@ -697,7 +697,7 @@ KIT	= README miscd.c tcpd.c fromhost.c h
  	refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
  	scaffold.h tcpdmatch.8 README.NIS
  
@@ -50,7 +41,7 @@ $NetBSD: patch-aa,v 1.10 2007/02/03 18:48:50 schwarz Exp $
  
  all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
  
-@@ -713,31 +713,29 @@
+@@ -714,31 +714,29 @@ config-check:
  cflags: config-check
  
  $(LIB):	$(LIB_OBJ)
diff --git a/security/tcp_wrappers/patches/patch-ab b/security/tcp_wrappers/patches/patch-ab
index d27d31201c6..0231f399ca5 100644
--- a/security/tcp_wrappers/patches/patch-ab
+++ b/security/tcp_wrappers/patches/patch-ab
@@ -1,16 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/05/26 02:25:22 markd Exp $
+$NetBSD: patch-ab,v 1.3 2012/07/20 09:58:36 adam Exp $
 
---- tcpd.h.orig	2000-08-22 05:59:52.000000000 +1200
+--- tcpd.h.orig	2003-04-16 14:27:11.000000000 +0000
 +++ tcpd.h
-@@ -8,6 +8,7 @@
- 
- #define STRING_LENGTH	128		/* hosts, users, processes */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- 
-@@ -136,7 +137,11 @@ extern void fromhost();			/* get/validat
+@@ -137,7 +137,11 @@ extern void fromhost();			/* get/validat
  #define fromhost sock_host		/* no TLI support needed */
  #endif
  
@@ -22,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2005/05/26 02:25:22 markd Exp $
  extern void shell_cmd();		/* execute shell command */
  extern char *percent_x();		/* do %<char> expansion */
  extern void rfc931();			/* client name from RFC 931 daemon */
-@@ -195,20 +200,35 @@ extern struct request_info *request_set(
+@@ -196,20 +200,35 @@ extern struct request_info *request_set(
    * host_info structures serve as caches for the lookup results.
    */
  
diff --git a/security/tcp_wrappers/patches/patch-ad b/security/tcp_wrappers/patches/patch-ad
deleted file mode 100644
index 30245e0682f..00000000000
--- a/security/tcp_wrappers/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/01/27 17:33:55 joerg Exp $
-
---- percent_m.c.orig	1994-12-28 16:42:37.000000000 +0000
-+++ percent_m.c
-@@ -12,12 +12,6 @@ static char sccsid[] = "@(#) percent_m.c
- #include <errno.h>
- #include <string.h>
- 
--extern int errno;
--#ifndef SYS_ERRLIST_DEFINED
--extern char *sys_errlist[];
--extern int sys_nerr;
--#endif
--
- #include "mystdarg.h"
- 
- char   *percent_m(obuf, ibuf)
-@@ -29,11 +23,7 @@ char   *ibuf;
- 
-     while (*bp = *cp)
- 	if (*cp == '%' && cp[1] == 'm') {
--	    if (errno < sys_nerr && errno > 0) {
--		strcpy(bp, sys_errlist[errno]);
--	    } else {
--		sprintf(bp, "Unknown error %d", errno);
--	    }
-+	    strcpy(bp, strerror(errno));
- 	    bp += strlen(bp);
- 	    cp += 2;
- 	} else {
diff --git a/security/tcp_wrappers/patches/patch-ae b/security/tcp_wrappers/patches/patch-ae
deleted file mode 100644
index 3b0e3a2a3aa..00000000000
--- a/security/tcp_wrappers/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/03/21 19:49:05 bouyer Exp $
-
---- tli.c.orig	Thu Feb  5 11:40:42 2004
-+++ tli.c	Thu Feb  5 11:42:25 2004
-@@ -40,8 +40,6 @@
- 
- extern char *nc_sperror();
- extern int errno;
--extern char *sys_errlist[];
--extern int sys_nerr;
- extern int t_errno;
- extern char *t_errlist[];
- extern int t_nerr;
-@@ -317,12 +315,8 @@
- 	    return (t_errlist[t_errno]);
- 	}
-     } else {
--	if (errno < 0 || errno >= sys_nerr) {
--	    sprintf(buf, "Unknown UNIX error %d", errno);
--	    return (buf);
--	} else {
--	    return (sys_errlist[errno]);
--	}
-+	strcpy(buf, strerror(errno));
-+	return (buf);
-     }
- }
- 
diff --git a/security/tcp_wrappers/patches/patch-ag b/security/tcp_wrappers/patches/patch-ag
index 265df270002..d15260f147c 100644
--- a/security/tcp_wrappers/patches/patch-ag
+++ b/security/tcp_wrappers/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2006/01/27 17:33:55 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2012/07/20 09:58:36 adam Exp $
 
---- hosts_access.c.orig	2006-01-27 17:22:24.000000000 +0000
+--- hosts_access.c.orig	2003-12-25 00:49:56.000000000 +0000
 +++ hosts_access.c
 @@ -34,9 +34,6 @@ static char sccsid[] = "@(#) hosts_acces
  #include <setjmp.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-ag,v 1.1 2006/01/27 17:33:55 joerg Exp $
  #ifndef	INADDR_NONE
  #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
  #endif
-@@ -389,7 +386,7 @@ static void ipv6_mask(in6p, maskbits)
+@@ -405,7 +402,7 @@ static void ipv6_mask(in6p, maskbits)
  struct in6_addr *in6p;
  int maskbits;
  {
@@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.1 2006/01/27 17:33:55 joerg Exp $
  
      if (maskbits < 0 || maskbits >= IPV6_ABITS)
  	return;
-@@ -400,7 +397,7 @@ int maskbits;
+@@ -416,7 +413,7 @@ int maskbits;
      if (maskbits != 0)
  	*p++ &= 0xff << (8 - maskbits);
  
diff --git a/security/tcp_wrappers/patches/patch-fix_options.c b/security/tcp_wrappers/patches/patch-fix_options.c
new file mode 100644
index 00000000000..1331804a4d8
--- /dev/null
+++ b/security/tcp_wrappers/patches/patch-fix_options.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-fix_options.c,v 1.1 2012/07/20 09:58:36 adam Exp $
+
+Fix C error
+
+--- fix_options.c.orig	2012-07-20 09:41:10.000000000 +0000
++++ fix_options.c
+@@ -29,7 +29,7 @@ static char sccsid[] = "@(#) fix_options
+ 
+ /* fix_options - get rid of IP-level socket options */
+ 
+-fix_options(request)
++void fix_options(request)
+ struct request_info *request;
+ {
+ #ifdef IP_OPTIONS