diff options
author | joerg <joerg> | 2006-01-27 17:33:55 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-01-27 17:33:55 +0000 |
commit | 2f3463a5c34e7917cd3405d50671a5e7d754e61f (patch) | |
tree | 795d391860a251799e4b9bba0787fba5c2402c72 /security/tcp_wrappers | |
parent | a58cf12f10a3e458f0f618f80da0bc0500f594a2 (diff) | |
download | pkgsrc-2f3463a5c34e7917cd3405d50671a5e7d754e61f.tar.gz |
Fix errno. Replace uchar_t usage with unsigned char directly, the file
got patched anyway. Add DragonFly. Nuke some more prototypes in files
already touched.
Diffstat (limited to 'security/tcp_wrappers')
-rw-r--r-- | security/tcp_wrappers/Makefile | 5 | ||||
-rw-r--r-- | security/tcp_wrappers/distinfo | 8 | ||||
-rw-r--r-- | security/tcp_wrappers/patches/patch-ad | 16 | ||||
-rw-r--r-- | security/tcp_wrappers/patches/patch-ag | 32 | ||||
-rw-r--r-- | security/tcp_wrappers/patches/patch-ah | 13 | ||||
-rw-r--r-- | security/tcp_wrappers/patches/patch-ai | 18 | ||||
-rw-r--r-- | security/tcp_wrappers/patches/patch-aj | 20 |
7 files changed, 100 insertions, 12 deletions
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile index c9adf4c37f3..1241c7b9ef1 100644 --- a/security/tcp_wrappers/Makefile +++ b/security/tcp_wrappers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/27 23:44:25 reed Exp $ +# $NetBSD: Makefile,v 1.28 2006/01/27 17:33:55 joerg Exp $ DISTNAME= tcp_wrappers_7.6-ipv6.1 PKGNAME= tcp_wrappers-7.6.1 @@ -30,9 +30,8 @@ BUILD_TARGET.IRIX= ${LOWER_OPSYS:C|\..*||} BUILD_TARGET= ${BUILD_TARGET.${OPSYS}} .if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) -. if !empty(OPSYS:M*BSD) +. if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" MAKE_ENV+= IPV6="-DHAVE_IPV6 -DUSE_GETHOSTBYNAME2" -MAKE_ENV+= UCHAR="-Duchar_t=\"unsigned char\"" . elif ${OPSYS} != "Linux" MAKE_ENV+= IPV6=-DHAVE_IPV6 . endif diff --git a/security/tcp_wrappers/distinfo b/security/tcp_wrappers/distinfo index a4173c38707..73c76ce995d 100644 --- a/security/tcp_wrappers/distinfo +++ b/security/tcp_wrappers/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2006/01/22 22:01:38 schwarz Exp $ +$NetBSD: distinfo,v 1.15 2006/01/27 17:33:55 joerg Exp $ SHA1 (tcp_wrappers_7.6-ipv6.1.tar.gz) = d0b70d4f0c0ac0375d8283a18ec2b6d602f82fde RMD160 (tcp_wrappers_7.6-ipv6.1.tar.gz) = 948f5ac4ede3999273399b641474ca26fd967b70 @@ -6,6 +6,10 @@ Size (tcp_wrappers_7.6-ipv6.1.tar.gz) = 144708 bytes SHA1 (patch-aa) = 432ccfcf175ca37ff1758aa46c2970986f307fe3 SHA1 (patch-ab) = e6b485b21623395a6ca6b1ce0054d3dc5c9b2232 SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0 -SHA1 (patch-ad) = 2f2fa789599e2fca652e240f05bec8460287e79e +SHA1 (patch-ad) = 45eff3bffb787ccdfee00df34d947aac32f07262 SHA1 (patch-ae) = feddad07e9661c220a5be279fcf2cec87eb1b6b2 SHA1 (patch-af) = 1bf946174b027880014e64aa9b84dcfa5ca951a0 +SHA1 (patch-ag) = a7aba77230e870ff2695fb681c0b3c5bfc80fa1a +SHA1 (patch-ah) = fa829052d466a4597c1cec528ab02c9d2ea98a60 +SHA1 (patch-ai) = f5a675f8fd1cc7e4e735dc8a9804f1dcf8d276bc +SHA1 (patch-aj) = 6332edd3e464d0f68bfa10dc6724346d0bc05f1f diff --git a/security/tcp_wrappers/patches/patch-ad b/security/tcp_wrappers/patches/patch-ad index 6c45c18ac0a..30245e0682f 100644 --- a/security/tcp_wrappers/patches/patch-ad +++ b/security/tcp_wrappers/patches/patch-ad @@ -1,19 +1,21 @@ -$NetBSD: patch-ad,v 1.1 2004/03/21 19:49:05 bouyer Exp $ +$NetBSD: patch-ad,v 1.2 2006/01/27 17:33:55 joerg Exp $ ---- percent_m.c.orig Thu Feb 5 11:40:42 2004 -+++ percent_m.c Thu Feb 5 11:44:20 2004 -@@ -13,10 +13,6 @@ +--- 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; +-extern int errno; -#ifndef SYS_ERRLIST_DEFINED -extern char *sys_errlist[]; -extern int sys_nerr; -#endif - +- #include "mystdarg.h" -@@ -29,11 +25,7 @@ + char *percent_m(obuf, ibuf) +@@ -29,11 +23,7 @@ char *ibuf; while (*bp = *cp) if (*cp == '%' && cp[1] == 'm') { diff --git a/security/tcp_wrappers/patches/patch-ag b/security/tcp_wrappers/patches/patch-ag new file mode 100644 index 00000000000..265df270002 --- /dev/null +++ b/security/tcp_wrappers/patches/patch-ag @@ -0,0 +1,32 @@ +$NetBSD: patch-ag,v 1.1 2006/01/27 17:33:55 joerg Exp $ + +--- hosts_access.c.orig 2006-01-27 17:22:24.000000000 +0000 ++++ hosts_access.c +@@ -34,9 +34,6 @@ static char sccsid[] = "@(#) hosts_acces + #include <setjmp.h> + #include <string.h> + +-extern char *fgets(); +-extern int errno; +- + #ifndef INADDR_NONE + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ + #endif +@@ -389,7 +386,7 @@ static void ipv6_mask(in6p, maskbits) + struct in6_addr *in6p; + int maskbits; + { +- uchar_t *p = (uchar_t*) in6p; ++ unsigned char *p = (unsigned char *) in6p; + + if (maskbits < 0 || maskbits >= IPV6_ABITS) + return; +@@ -400,7 +397,7 @@ int maskbits; + if (maskbits != 0) + *p++ &= 0xff << (8 - maskbits); + +- while (p < (((uchar_t*) in6p)) + sizeof(*in6p)) ++ while (p < (((unsigned char *) in6p)) + sizeof(*in6p)) + *p++ = 0; + } + #endif diff --git a/security/tcp_wrappers/patches/patch-ah b/security/tcp_wrappers/patches/patch-ah new file mode 100644 index 00000000000..76bd3600534 --- /dev/null +++ b/security/tcp_wrappers/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2006/01/27 17:33:55 joerg Exp $ + +--- workarounds.c.orig 2006-01-27 17:25:09.000000000 +0000 ++++ workarounds.c +@@ -22,8 +22,6 @@ char sccsid[] = "@(#) workarounds.c 1 + #include <syslog.h> + #include <string.h> + +-extern int errno; +- + #include "tcpd.h" + + /* diff --git a/security/tcp_wrappers/patches/patch-ai b/security/tcp_wrappers/patches/patch-ai new file mode 100644 index 00000000000..059dc8e5120 --- /dev/null +++ b/security/tcp_wrappers/patches/patch-ai @@ -0,0 +1,18 @@ +$NetBSD: patch-ai,v 1.1 2006/01/27 17:33:55 joerg Exp $ + +--- inetcf.c.orig 2006-01-27 17:27:06.000000000 +0000 ++++ inetcf.c +@@ -12,12 +12,10 @@ static char sccsid[] = "@(#) inetcf.c 1. + #include <sys/types.h> + #include <sys/stat.h> + #include <stdio.h> ++#include <stdlib.h> + #include <errno.h> + #include <string.h> + +-extern int errno; +-extern void exit(); +- + #include "tcpd.h" + #include "inetcf.h" + diff --git a/security/tcp_wrappers/patches/patch-aj b/security/tcp_wrappers/patches/patch-aj new file mode 100644 index 00000000000..8aa8129d970 --- /dev/null +++ b/security/tcp_wrappers/patches/patch-aj @@ -0,0 +1,20 @@ +$NetBSD: patch-aj,v 1.1 2006/01/27 17:33:55 joerg Exp $ + +--- tcpdchk.c.orig 2006-01-27 17:28:34.000000000 +0000 ++++ tcpdchk.c +@@ -25,14 +25,13 @@ static char sccsid[] = "@(#) tcpdchk.c 1 + #include <netinet/in.h> + #include <arpa/inet.h> + #include <stdio.h> ++#include <stdlib.h> + #include <syslog.h> + #include <setjmp.h> + #include <errno.h> + #include <netdb.h> + #include <string.h> + +-extern int errno; +-extern void exit(); + extern int optind; + extern char *optarg; + |