summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2002-10-08 14:29:36 +0000
committerabs <abs@pkgsrc.org>2002-10-08 14:29:36 +0000
commitaedfee3c95901596a39da19c78e8c4527fa40294 (patch)
tree9e9893f469328f38cfa9d56be6324ef9842857ed
parentba7f4abc85df9c42ae2c73cd29a3eb703a8d67f0 (diff)
downloadpkgsrc-aedfee3c95901596a39da19c78e8c4527fa40294.tar.gz
Update netcat to netcat-1.10nb1
Merge two netcat.c patches into a single patch file, remove unneccessary call to res_init() and pass correct make options for Linux and (untested) Solaris.
-rw-r--r--doc/CHANGES3
-rw-r--r--net/netcat/Makefile3
-rw-r--r--net/netcat/distinfo11
-rw-r--r--net/netcat/patches/patch-aa31
-rw-r--r--net/netcat/patches/patch-ab57
-rw-r--r--net/netcat/patches/patch-ac14
-rw-r--r--net/netcat/patches/patch-ad87
-rw-r--r--net/netcat/patches/patch-ae12
8 files changed, 114 insertions, 104 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 3010178e571..a34d1606010 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.206 2002/10/08 14:18:30 martti Exp $
+$NetBSD: CHANGES,v 1.207 2002/10/08 14:30:34 abs Exp $
Changes to the packages collection and infrastructure in 2002:
@@ -3156,3 +3156,4 @@ Changes to the packages collection and infrastructure in 2002:
Updated pkgchk to 1.33 [abs 2002-10-08]
Removed koffice3 [martti 2002-10-08]
Updated koffice to 1.2 [martti 2002-10-08]
+ Updated netcat to 1.10nb1 [abs 2002-10-08]
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 40d35adedf0..3574523e466 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 18:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/08 14:29:36 abs Exp $
DISTNAME= nc110
PKGNAME= netcat-1.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= net
MASTER_SITES= ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/netcat/ \
diff --git a/net/netcat/distinfo b/net/netcat/distinfo
index e946da2b2c7..53b39c57132 100644
--- a/net/netcat/distinfo
+++ b/net/netcat/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/08/21 06:31:57 simonb Exp $
+$NetBSD: distinfo,v 1.4 2002/10/08 14:29:36 abs Exp $
SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
Size (nc110.tgz) = 75267 bytes
-SHA1 (patch-aa) = c1891404c8d520fe2c3f75b21ff3780ef08100a5
-SHA1 (patch-ab) = c967191d29c4be6bdcc37cf32455337ca1d28be3
-SHA1 (patch-ac) = b67b27baff943cc21d3c2052de22c5fb2e945ffd
-SHA1 (patch-ad) = d2eca09e83188785e57d9396acf45f8823504e4e
-SHA1 (patch-ae) = 9ee2267e4b516d21de7341a4a6279a8cb7dc9056
+SHA1 (patch-aa) = 44dc8cf9072a1c127925a4efed6bb7f1428360bc
+SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
+SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
+SHA1 (patch-ad) = ee5e1c6a8e3e2a239135d74dbf46fc25c8d2ec80
diff --git a/net/netcat/patches/patch-aa b/net/netcat/patches/patch-aa
index 9813b68ab0b..b31627f5bf8 100644
--- a/net/netcat/patches/patch-aa
+++ b/net/netcat/patches/patch-aa
@@ -1,23 +1,12 @@
-$NetBSD: patch-aa,v 1.1 1999/09/07 13:22:00 is Exp $
---- netcat.c.original Tue Sep 7 14:33:35 1999
-+++ netcat.c Tue Sep 7 14:35:50 1999
-@@ -333,6 +333,7 @@
- struct in_addr iaddr;
- register HINF * poop = NULL;
- register int x;
-+ int rc;
+$NetBSD: patch-aa,v 1.2 2002/10/08 14:29:36 abs Exp $
+
+--- data/data.c.orig Tue Feb 27 13:43:48 1996
++++ data/data.c
+@@ -16,6 +16,7 @@
+ *Hobbit*, started 951004 or so and randomly screwed around with since */
- /* I really want to strangle the twit who dreamed up all these sockaddr and
- hostent abstractions, and then forced them all to be incompatible with
-@@ -361,9 +362,9 @@
- bail ("gethostpoop fuxored");
- strcpy (poop->name, unknown); /* preload it */
- /* see wzv:workarounds.c for dg/ux return-a-struct inet_addr lossage */
-- iaddr.s_addr = inet_addr (name);
-+ rc = inet_aton(name, &iaddr);
+ #include <stdio.h>
++#include <string.h>
-- if (iaddr.s_addr == INADDR_NONE) { /* here's the great split: names... */
-+ if (rc == 0) { /* here's the great split: names... */
- if (numeric)
- bail ("Can't parse %s as an IP address", name);
- hostent = gethostbyname (name);
+ #ifdef MSDOS /* for MSC only at the moment... */
+ #include <fcntl.h>
diff --git a/net/netcat/patches/patch-ab b/net/netcat/patches/patch-ab
index b2ddce33bfd..fc815095516 100644
--- a/net/netcat/patches/patch-ab
+++ b/net/netcat/patches/patch-ab
@@ -1,49 +1,12 @@
-$NetBSD: patch-ab,v 1.2 1999/09/07 13:47:09 is Exp $
---- netcat.c.orig Tue Sep 7 15:15:59 1999
-+++ netcat.c Tue Sep 7 15:42:44 1999
-@@ -151,6 +151,7 @@
+$NetBSD: patch-ab,v 1.3 2002/10/08 14:29:36 abs Exp $
+
+--- data/rservice.c.orig Wed Jan 31 18:45:08 1996
++++ data/rservice.c
+@@ -10,6 +10,7 @@
+ ... whatever. _H*/
- /* global cmd flags: */
- USHORT o_alla = 0;
-+USHORT o_allowbroad = 0;
- unsigned int o_interval = 0;
- USHORT o_listen = 0;
- USHORT o_nflag = 0;
-@@ -621,6 +622,13 @@
- rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x));
- if (rr == -1)
- holler ("nnetfd reuseaddr failed"); /* ??? */
-+#ifdef SO_BROADCAST
-+ if (o_allowbroad) {
-+ rr = setsockopt (nnetfd, SOL_SOCKET, SO_BROADCAST, &x, sizeof (x));
-+ if (rr == -1)
-+ holler ("nnetfd reuseaddr failed"); /* ??? */
-+ }
-+#endif
- #ifdef SO_REUSEPORT /* doesnt exist everywhere... */
- rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x));
- if (rr == -1)
-@@ -1390,12 +1398,14 @@
+ #include <stdio.h>
++#include <string.h>
- /* If your shitbox doesn't have getopt, step into the nineties already. */
- /* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */
-- while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != EOF) {
-+ while ((x = getopt (argc, argv, "abe:g:G:hi:lno:p:rs:tuvw:z")) != EOF) {
- /* Debug (("in go: x now %c, optarg %x optind %d", x, optarg, optind)) */
- switch (x) {
- case 'a':
- bail ("all-A-records NIY");
- o_alla++; break;
-+ case 'b':
-+ o_allowbroad++; break;
- #ifdef GAPING_SECURITY_HOLE
- case 'e': /* prog to exec */
- pr00gie = optarg;
-@@ -1643,6 +1653,7 @@
- -e prog program to exec after connect [dangerous!!]");
- #endif
- holler ("\
-+ -b allow broadcasts\n\
- -g gateway source-routing hop point[s], up to 8\n\
- -G num source-routing pointer: 4, 8, 12, ...\n\
- -h this cruft\n\
+ /* change if you like; "id" is a good one for figuring out if you won too */
+ static char cmd[] = "pwd";
diff --git a/net/netcat/patches/patch-ac b/net/netcat/patches/patch-ac
index 0939bf11719..f6dd9da166a 100644
--- a/net/netcat/patches/patch-ac
+++ b/net/netcat/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2002/08/21 06:31:57 simonb Exp $
+$NetBSD: patch-ac,v 1.2 2002/10/08 14:29:36 abs Exp $
---- data/data.c.orig Wed Feb 28 00:43:48 1996
-+++ data/data.c
-@@ -16,6 +16,7 @@
- *Hobbit*, started 951004 or so and randomly screwed around with since */
+--- data/xor.c.orig Sun Feb 18 03:18:16 1996
++++ data/xor.c
+@@ -14,6 +14,7 @@
+ *Hobbit*, 960208 */
#include <stdio.h>
+#include <string.h>
-
- #ifdef MSDOS /* for MSC only at the moment... */
#include <fcntl.h>
+
+ char buf[8192];
diff --git a/net/netcat/patches/patch-ad b/net/netcat/patches/patch-ad
index a6072329f2a..f9cfceb8743 100644
--- a/net/netcat/patches/patch-ad
+++ b/net/netcat/patches/patch-ad
@@ -1,12 +1,81 @@
-$NetBSD: patch-ad,v 1.1 2002/08/21 06:31:57 simonb Exp $
+$NetBSD: patch-ad,v 1.2 2002/10/08 14:29:37 abs Exp $
---- data/rservice.c.orig Thu Feb 1 05:45:08 1996
-+++ data/rservice.c
-@@ -10,6 +10,7 @@
- ... whatever. _H*/
+--- netcat.c.orig Tue Oct 8 13:24:18 2002
++++ netcat.c
+@@ -151,6 +151,7 @@ unsigned char * stage = NULL; /* hexdump
- #include <stdio.h>
-+#include <string.h>
+ /* global cmd flags: */
+ USHORT o_alla = 0;
++USHORT o_allowbroad = 0;
+ unsigned int o_interval = 0;
+ USHORT o_listen = 0;
+ USHORT o_nflag = 0;
+@@ -333,6 +334,7 @@ HINF * gethostpoop (name, numeric)
+ struct in_addr iaddr;
+ register HINF * poop = NULL;
+ register int x;
++ int rc;
- /* change if you like; "id" is a good one for figuring out if you won too */
- static char cmd[] = "pwd";
+ /* I really want to strangle the twit who dreamed up all these sockaddr and
+ hostent abstractions, and then forced them all to be incompatible with
+@@ -361,9 +363,9 @@ HINF * gethostpoop (name, numeric)
+ bail ("gethostpoop fuxored");
+ strcpy (poop->name, unknown); /* preload it */
+ /* see wzv:workarounds.c for dg/ux return-a-struct inet_addr lossage */
+- iaddr.s_addr = inet_addr (name);
++ rc = inet_aton(name, &iaddr);
+
+- if (iaddr.s_addr == INADDR_NONE) { /* here's the great split: names... */
++ if (rc == 0) { /* here's the great split: names... */
+ if (numeric)
+ bail ("Can't parse %s as an IP address", name);
+ hostent = gethostbyname (name);
+@@ -620,6 +622,13 @@ newskt:
+ rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x));
+ if (rr == -1)
+ holler ("nnetfd reuseaddr failed"); /* ??? */
++#ifdef SO_BROADCAST
++ if (o_allowbroad) {
++ rr = setsockopt (nnetfd, SOL_SOCKET, SO_BROADCAST, &x, sizeof (x));
++ if (rr == -1)
++ holler ("nnetfd reuseaddr failed"); /* ??? */
++ }
++#endif
+ #ifdef SO_REUSEPORT /* doesnt exist everywhere... */
+ rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x));
+ if (rr == -1)
+@@ -1314,10 +1323,6 @@ main (argc, argv)
+ USHORT curport = 0;
+ char * randports = NULL;
+
+-#ifdef HAVE_BIND
+-/* can *you* say "cc -yaddayadda netcat.c -lresolv -l44bsd" on SunLOSs? */
+- res_init();
+-#endif
+ /* I was in this barbershop quartet in Skokie IL ... */
+ /* round up the usual suspects, i.e. malloc up all the stuff we need */
+ lclend = (SAI *) Hmalloc (sizeof (SA));
+@@ -1389,12 +1394,14 @@ main (argc, argv)
+
+ /* If your shitbox doesn't have getopt, step into the nineties already. */
+ /* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */
+- while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != EOF) {
++ while ((x = getopt (argc, argv, "abe:g:G:hi:lno:p:rs:tuvw:z")) != EOF) {
+ /* Debug (("in go: x now %c, optarg %x optind %d", x, optarg, optind)) */
+ switch (x) {
+ case 'a':
+ bail ("all-A-records NIY");
+ o_alla++; break;
++ case 'b':
++ o_allowbroad++; break;
+ #ifdef GAPING_SECURITY_HOLE
+ case 'e': /* prog to exec */
+ pr00gie = optarg;
+@@ -1642,6 +1649,7 @@ options:");
+ -e prog program to exec after connect [dangerous!!]");
+ #endif
+ holler ("\
++ -b allow broadcasts\n\
+ -g gateway source-routing hop point[s], up to 8\n\
+ -G num source-routing pointer: 4, 8, 12, ...\n\
+ -h this cruft\n\
diff --git a/net/netcat/patches/patch-ae b/net/netcat/patches/patch-ae
deleted file mode 100644
index 968bd4182bb..00000000000
--- a/net/netcat/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/08/21 06:31:57 simonb Exp $
-
---- data/xor.c.orig Sun Feb 18 14:18:16 1996
-+++ data/xor.c
-@@ -14,6 +14,7 @@
- *Hobbit*, 960208 */
-
- #include <stdio.h>
-+#include <string.h>
- #include <fcntl.h>
-
- char buf[8192];