diff options
| author | jschauma <jschauma> | 2003-06-10 17:58:34 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-06-10 17:58:34 +0000 |
| commit | d9699e4cc16f0a9c18239b5563d987bc7b66d0ad (patch) | |
| tree | 5764be934a661e2939e5f30a46d1de436bb2ffb7 /security/tcp_wrappers | |
| parent | 64becfe6f60a3844dd9d2c318abdc6e31fe08844 (diff) | |
| download | pkgsrc-d9699e4cc16f0a9c18239b5563d987bc7b66d0ad.tar.gz | |
Make this find the right target in IRIX 6.5, and disable IPv6 under Linux
for the time being.
Diffstat (limited to 'security/tcp_wrappers')
| -rw-r--r-- | security/tcp_wrappers/Makefile | 8 | ||||
| -rw-r--r-- | security/tcp_wrappers/distinfo | 4 | ||||
| -rw-r--r-- | security/tcp_wrappers/patches/patch-aa | 21 |
3 files changed, 20 insertions, 13 deletions
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile index ff5b4596c1e..5ccf19b60a6 100644 --- a/security/tcp_wrappers/Makefile +++ b/security/tcp_wrappers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/12/24 04:23:09 jschauma Exp $ +# $NetBSD: Makefile,v 1.11 2003/06/10 17:58:34 jschauma Exp $ DISTNAME= tcp_wrappers_7.6-ipv6.1 PKGNAME= tcp_wrappers-7.6.1 @@ -21,15 +21,13 @@ USE_LIBTOOL= # defined ALL_TARGET= netbsd .elif ${OPSYS} == "SunOS" ALL_TARGET= sunos5 -.elif ${OPSYS} == "Linux" -ALL_TARGET= linux -.elif ${OPSYS} == "IRIX" +.elif ${OPSYS} == "IRIX" || ${OPSYS} == "Linux" ALL_TARGET= ${LOWER_OPSYS} .else ALL_TARGET= generic # good luck! .endif -.if defined(USE_INET6) && ${USE_INET6} == "YES" +.if defined(USE_INET6) && ${USE_INET6} == "YES" && ${OPSYS} != "Linux" MAKE_ENV+= IPV6=-DHAVE_IPV6 .endif diff --git a/security/tcp_wrappers/distinfo b/security/tcp_wrappers/distinfo index e43b21d5ed9..40b28f546fc 100644 --- a/security/tcp_wrappers/distinfo +++ b/security/tcp_wrappers/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/10/07 22:09:41 jschauma Exp $ +$NetBSD: distinfo,v 1.4 2003/06/10 17:58:34 jschauma Exp $ SHA1 (tcp_wrappers_7.6-ipv6.1.tar.gz) = d0b70d4f0c0ac0375d8283a18ec2b6d602f82fde Size (tcp_wrappers_7.6-ipv6.1.tar.gz) = 144708 bytes -SHA1 (patch-aa) = af0ec390df43dbd621df8d15877f5cde6851ebf7 +SHA1 (patch-aa) = 4158e67803e39d9cf0469bc1961ea2a1e6d672e2 diff --git a/security/tcp_wrappers/patches/patch-aa b/security/tcp_wrappers/patches/patch-aa index 42681b1a761..cb5a3cc37f0 100644 --- a/security/tcp_wrappers/patches/patch-aa +++ b/security/tcp_wrappers/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2002/11/26 21:51:55 cjep Exp $ ---- Makefile.orig Mon Aug 21 13:59:52 2000 -+++ Makefile Mon Oct 7 17:50:50 2002 +$NetBSD: patch-aa,v 1.5 2003/06/10 17:58:34 jschauma Exp $ + +--- Makefile.orig Mon Aug 21 10:59:52 2000 ++++ Makefile Tue Jun 10 10:29:53 2003 @@ -44,7 +44,7 @@ #REAL_DAEMON_DIR=/usr/etc # @@ -19,7 +20,15 @@ $NetBSD: patch-aa,v 1.4 2002/11/26 21:51:55 cjep Exp $ # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. hpux hpux8 hpux9 hpux10: -@@ -669,7 +669,7 @@ +@@ -185,6 +185,7 @@ + + # IRIX 6.2 (tucker@math.unc.edu). Must find a better value than 200000. + irix6: ++irix6.5: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ + LIBS= RANLIB=echo ARFLAGS=rv VSYSLOG= \ + NETGROUP=-DNETGROUP EXTRA_CFLAGS="-DBSD=200000" TLI= all +@@ -669,7 +670,7 @@ # Protection against weird shells or weird make programs. SHELL = /bin/sh @@ -28,7 +37,7 @@ $NetBSD: patch-aa,v 1.4 2002/11/26 21:51:55 cjep Exp $ CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ -@@ -696,7 +696,7 @@ +@@ -696,7 +697,7 @@ refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ scaffold.h tcpdmatch.8 README.NIS @@ -37,7 +46,7 @@ $NetBSD: patch-aa,v 1.4 2002/11/26 21:51:55 cjep Exp $ all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk -@@ -713,31 +713,29 @@ +@@ -713,31 +714,29 @@ cflags: config-check $(LIB): $(LIB_OBJ) |