Use dynamic linking by default. ok wiz

Also, use the default FD_SETSIZE so that syscall interceptors have
a better chance of getting lucky.

4 files changed, 37 insertions, 23 deletions

diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 47ed7715a62..95bcf2a4488 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2009/06/14 22:58:07 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2011/01/13 15:09:58 pooka Exp $
 
 DISTNAME=	nc110
 PKGNAME=	netcat-1.10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/netcat/
 EXTRACT_SUFX=	.tgz
diff --git a/net/netcat/distinfo b/net/netcat/distinfo
index 49bb989389e..3ae43e4fe4c 100644
--- a/net/netcat/distinfo
+++ b/net/netcat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 12:13:54 agc Exp $
+$NetBSD: distinfo,v 1.11 2011/01/13 15:09:58 pooka Exp $
 
 SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
 RMD160 (nc110.tgz) = 3e891fa094d921940e53035fb6721e2f0c04efdb
@@ -6,6 +6,6 @@ Size (nc110.tgz) = 75267 bytes
 SHA1 (patch-aa) = 44dc8cf9072a1c127925a4efed6bb7f1428360bc
 SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
 SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
-SHA1 (patch-ad) = e55fc7036c3dbeedca49058e99725acf61e8f55c
-SHA1 (patch-ae) = 510e4ac6c1649af4c719f3fc0ba5c65eadbe3564
+SHA1 (patch-ad) = 0e6e3234a1abbec1151705a0c21bc1b7a87044f4
+SHA1 (patch-ae) = f76fb4b4c593a7951d0c62745f599ef747360514
 SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
diff --git a/net/netcat/patches/patch-ad b/net/netcat/patches/patch-ad
index 94539a341fd..76b3515e75d 100644
--- a/net/netcat/patches/patch-ad
+++ b/net/netcat/patches/patch-ad
@@ -1,8 +1,22 @@
-$NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
+	$NetBSD: patch-ad,v 1.4 2011/01/13 15:09:58 pooka Exp $
 
---- netcat.c.orig	2004-08-05 16:17:46.000000000 +0200
-+++ netcat.c
-@@ -151,6 +151,7 @@ unsigned char * stage = NULL;	/* hexdump
+--- netcat.c.orig	1996-03-21 01:38:04.000000000 +0100
++++ netcat.c	2011-01-13 16:06:00.000000000 +0100
+@@ -44,12 +44,7 @@
+ #include <sys/select.h>
+ #endif
+ 
+-/* have to do this *before* including types.h. xxx: Linux still has it wrong */
+-#ifdef FD_SETSIZE		/* should be in types.h, butcha never know. */
+-#undef FD_SETSIZE		/* if we ever need more than 16 active */
+-#endif				/* fd's, something is horribly wrong! */
+-#define FD_SETSIZE 16		/* <-- this'll give us a long anyways, wtf */
+-#include <sys/types.h>		/* *now* do it.  Sigh, this is broken */
++#include <sys/types.h>
+ 
+ #ifdef HAVE_RANDOM		/* aficionados of ?rand48() should realize */
+ #define SRAND srandom		/* that this doesn't need *strong* random */
+@@ -151,6 +146,7 @@
  
  /* global cmd flags: */
  USHORT o_alla = 0;
@@ -10,7 +24,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  unsigned int o_interval = 0;
  USHORT o_listen = 0;
  USHORT o_nflag = 0;
-@@ -160,6 +161,7 @@ USHORT o_udpmode = 0;
+@@ -160,6 +156,7 @@
  USHORT o_verbose = 0;
  unsigned int o_wait = 0;
  USHORT o_zero = 0;
@@ -18,7 +32,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  /* o_tn in optional section */
  
  /* Debug macro: squirt whatever message and sleep a bit so we can see it go
-@@ -225,6 +227,14 @@ void catch ()
+@@ -225,6 +222,14 @@
    bail (" punt!");
  }
  
@@ -33,7 +47,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  /* timeout and other signal handling cruft */
  void tmtravel ()
  {
-@@ -333,6 +343,7 @@ HINF * gethostpoop (name, numeric)
+@@ -333,6 +338,7 @@
    struct in_addr iaddr;
    register HINF * poop = NULL;
    register int x;
@@ -41,7 +55,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  
  /* 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 +372,9 @@ HINF * gethostpoop (name, numeric)
+@@ -361,9 +367,9 @@
      bail ("gethostpoop fuxored");
    strcpy (poop->name, unknown);		/* preload it */
  /* see wzv:workarounds.c for dg/ux return-a-struct inet_addr lossage */
@@ -53,7 +67,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
      if (numeric)
        bail ("Can't parse %s as an IP address", name);
      hostent = gethostbyname (name);
-@@ -620,6 +631,13 @@ newskt:
+@@ -620,6 +626,13 @@
    rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x));
    if (rr == -1)
      holler ("nnetfd reuseaddr failed");		/* ??? */
@@ -67,7 +81,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  #ifdef SO_REUSEPORT	/* doesnt exist everywhere... */
    rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x));
    if (rr == -1)
-@@ -1216,6 +1234,18 @@ Debug (("got %d from the net, errno %d",
+@@ -1216,6 +1229,18 @@
  	if (rr <= 0) {			/* at end, or fukt, or ... */
  	  FD_CLR (0, ding1);		/* disable and close stdin */
  	  close (0);
@@ -86,7 +100,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  	} else {
  	  rzleft = rr;
  	  zp = bigbuf_in;
-@@ -1314,10 +1344,6 @@ main (argc, argv)
+@@ -1314,10 +1339,6 @@
    USHORT curport = 0;
    char * randports = NULL;
  
@@ -97,7 +111,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  /* 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));
-@@ -1354,7 +1380,8 @@ main (argc, argv)
+@@ -1354,7 +1375,8 @@
      argv[1] = cp;			/* head of new arg block */
      fprintf (stderr, "Cmd line: ");
      fflush (stderr);		/* I dont care if it's unbuffered or not! */
@@ -107,7 +121,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
      if (insaved <= 0)
        bail ("wrong");
      x = findline (cp, insaved);
-@@ -1389,12 +1416,14 @@ main (argc, argv)
+@@ -1389,12 +1411,14 @@
  
  /* If your shitbox doesn't have getopt, step into the nineties already. */
  /* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */
@@ -123,7 +137,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  #ifdef GAPING_SECURITY_HOLE
        case 'e':				/* prog to exec */
  	pr00gie = optarg;
-@@ -1443,6 +1472,8 @@ main (argc, argv)
+@@ -1443,6 +1467,8 @@
  	break;
        case 'r':				/* randomize various things */
  	o_random++; break;
@@ -132,7 +146,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
        case 's':				/* local source address */
  /* do a full lookup [since everything else goes through the same mill],
     unless -n was previously specified.  In fact, careful placement of -n can
-@@ -1642,6 +1673,7 @@ options:");
+@@ -1642,6 +1668,7 @@
  	-e prog			program to exec after connect [dangerous!!]");
  #endif
    holler ("\
@@ -140,7 +154,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/05 14:47:46 drochner Exp $
  	-g gateway		source-routing hop point[s], up to 8\n\
  	-G num			source-routing pointer: 4, 8, 12, ...\n\
  	-h			this cruft\n\
-@@ -1651,6 +1683,7 @@ options:");
+@@ -1651,6 +1678,7 @@
  	-o file			hex dump of traffic\n\
  	-p port			local port number\n\
  	-r			randomize local and remote ports\n\
diff --git a/net/netcat/patches/patch-ae b/net/netcat/patches/patch-ae
index 842be696adb..f2120ce0b4b 100644
--- a/net/netcat/patches/patch-ae
+++ b/net/netcat/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.6 2003/11/23 01:23:58 jlam Exp $
+$NetBSD: patch-ae,v 1.7 2011/01/13 15:09:58 pooka Exp $
 
 --- Makefile.orig	Tue Mar 19 19:16:06 1996
 +++ Makefile	Sat Nov 22 17:32:15 2003
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.6 2003/11/23 01:23:58 jlam Exp $
  
  nc:	netcat.c
 -	$(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
-+	$(CC) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
++	$(CC) $(CFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
  
  nc-dos:
  	@echo "DOS?!  Maybe someday, but not now"