diff options
author | Dima Dorfman <dd@FreeBSD.org> | 2002-02-27 03:22:42 +0000 |
---|---|---|
committer | Dima Dorfman <dd@FreeBSD.org> | 2002-02-27 03:22:42 +0000 |
commit | f191bfbe47335427abf46029284beeabc5635eed (patch) | |
tree | 3266210f4334398b02ff847f40fecf1af17c7214 /net/obnc | |
parent | 681855d28113e62daf4608702ac61c819bf0c778 (diff) | |
download | ports-f191bfbe47335427abf46029284beeabc5635eed.tar.gz ports-f191bfbe47335427abf46029284beeabc5635eed.zip |
Notes
Diffstat (limited to 'net/obnc')
-rw-r--r-- | net/obnc/Makefile | 8 | ||||
-rw-r--r-- | net/obnc/distinfo | 2 | ||||
-rw-r--r-- | net/obnc/files/patch-nc.1 | 4 | ||||
-rw-r--r-- | net/obnc/files/patch-netcat.c | 63 |
4 files changed, 36 insertions, 41 deletions
diff --git a/net/obnc/Makefile b/net/obnc/Makefile index 5374e6269439..c73124a8ed04 100644 --- a/net/obnc/Makefile +++ b/net/obnc/Makefile @@ -6,11 +6,9 @@ # PORTNAME= obnc -PORTVERSION= 20010703 -PORTREVISION= 1 +PORTVERSION= 20020222 CATEGORIES= net ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} \ - http://www.unixfreak.org/~dima/distfiles/ +MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dd MAINTAINER= dd@FreeBSD.org @@ -42,7 +40,7 @@ do-install: # .include <bsd.port.pre.mk> CVS_CMD?= cvs -z3 -CVS_DATE= Tue Jul 3 17:56:05 PDT 2001 +CVS_DATE= Fri Feb 22 00:09:41 UTC 2002 CVS_SITES?= anoncvs@anoncvs3.usa.openbsd.org:/cvs \ anoncvs@anoncvs1.ca.openbsd.org:/cvs CVS_MODULE= src/usr.bin/nc diff --git a/net/obnc/distinfo b/net/obnc/distinfo index c44289a704f3..f0951bd11797 100644 --- a/net/obnc/distinfo +++ b/net/obnc/distinfo @@ -1 +1 @@ -MD5 (obnc-20010703.tar.gz) = 3e09393e56203f01342a55bf29afdde6 +MD5 (obnc-20020222.tar.gz) = cf5b55d267cf92b79471429d761f7446 diff --git a/net/obnc/files/patch-nc.1 b/net/obnc/files/patch-nc.1 index 9093eed76497..5dffa70aacbb 100644 --- a/net/obnc/files/patch-nc.1 +++ b/net/obnc/files/patch-nc.1 @@ -4,8 +4,8 @@ .Nd "arbitrary TCP and UDP connections and listens" .Sh SYNOPSIS .Nm nc --.Op Fl 46hklnrtuvz -+.Op Fl 46Ehklnrtuvz +-.Op Fl 46hklnrtuvzU ++.Op Fl 46EhklnrtuvzU +.Op Fl e Ar IPsec policy .Op Fl i Ar interval .Op Fl p Ar source port diff --git a/net/obnc/files/patch-netcat.c b/net/obnc/files/patch-netcat.c index 666e2aeb2809..9d75b5e652c5 100644 --- a/net/obnc/files/patch-netcat.c +++ b/net/obnc/files/patch-netcat.c @@ -1,7 +1,7 @@ ---- netcat.c.orig Wed Jun 27 02:23:58 2001 -+++ netcat.c Fri Oct 19 07:31:54 2001 -@@ -36,6 +36,9 @@ - #include <sys/time.h> +--- netcat.c.orig Tue Feb 19 22:42:04 2002 ++++ netcat.c Thu Feb 21 23:37:07 2002 +@@ -37,6 +37,9 @@ + #include <sys/un.h> #include <netinet/in.h> +#ifdef IPSEC @@ -10,7 +10,7 @@ #include <arpa/telnet.h> #include <err.h> -@@ -51,6 +54,7 @@ +@@ -53,6 +56,7 @@ #define PORT_MAX 65535 /* Command Line Options */ @@ -18,27 +18,25 @@ int iflag; /* Interval Flag */ int kflag; /* More than one connect */ int lflag; /* Bind to local port */ -@@ -77,12 +81,18 @@ - int udptest __P((int)); - void usage __P((int)); +@@ -84,10 +88,16 @@ + int unix_listen(char *); + void usage(int); +#ifdef IPSEC -+void add_ipsec_policy __P((int, const char *)); ++void add_ipsec_policy(int, char *); + +char *ipsec_policy[2]; +#endif + int - main(argc, argv) - int argc; - char *argv[]; + main(int argc, char *argv[]) { - int ch, s, ret; + int ch, s, ret, ipsec_count; char *host, *uport, *endp; struct addrinfo hints; struct servent *sv; -@@ -91,12 +101,13 @@ +@@ -99,12 +109,13 @@ ret = 1; s = 0; @@ -48,14 +46,14 @@ endp = NULL; sv = NULL; -- while ((ch = getopt(argc, argv, "46hi:klnp:rs:tuvw:z")) != -1) { -+ while ((ch = getopt(argc, argv, "46e:Ehi:klnp:rs:tuvw:z")) != -1) { +- while ((ch = getopt(argc, argv, "46Uhi:klnp:rs:tuvw:x:z")) != -1) { ++ while ((ch = getopt(argc, argv, "46e:EUhi:klnp:rs:tuvw:x:z")) != -1) { switch (ch) { case '4': family = AF_INET; -@@ -104,6 +115,21 @@ - case '6': - family = AF_INET6; +@@ -115,6 +126,21 @@ + case 'U': + family = AF_UNIX; break; + case 'e': +#ifdef IPSEC @@ -75,9 +73,9 @@ case 'h': help(); break; -@@ -295,6 +321,12 @@ +@@ -422,6 +448,12 @@ if ((s = socket(res0->ai_family, res0->ai_socktype, - res0->ai_protocol)) < 0) + res0->ai_protocol)) < 0) continue; +#ifdef IPSEC + if (ipsec_policy[0] != NULL) @@ -88,7 +86,7 @@ /* Bind to a local port or source address if specified */ if (sflag || pflag) { -@@ -372,6 +404,12 @@ +@@ -497,6 +529,12 @@ ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); if (ret == -1) err(1, NULL); @@ -100,8 +98,8 @@ +#endif if (bind(s, (struct sockaddr *)res0->ai_addr, - res0->ai_addrlen) == 0) -@@ -571,7 +609,13 @@ + res0->ai_addrlen) == 0) +@@ -690,7 +728,13 @@ usage(0); fprintf(stderr, "\tCommand Summary:\n\ \t-4 Use IPv4\n\ @@ -113,11 +111,11 @@ + \t-E Use IPsec ESP\n"); +#endif + fprintf(stderr, "\ + \t-U Use UNIX domain socket\n\ \t-h This help text\n\ \t-i secs\t Delay interval for lines sent, ports scanned\n\ - \t-k Keep inbound sockets open for multiple connects\n\ -@@ -586,14 +630,43 @@ - \t-w secs\t Timeout for connects and final net reads\n\ +@@ -707,13 +751,42 @@ + \t-x addr[:port]\tSpecify socks5 proxy address and port\n\ \t-z Zero-I/O mode [used for scanning]\n\ Port numbers can be individual or ranges: lo-hi [inclusive]\n"); +#ifdef IPSEC @@ -128,7 +126,7 @@ +#ifdef IPSEC +void -+add_ipsec_policy(int s, const char *policy) ++add_ipsec_policy(int s, char *policy) +{ + char *raw; + int e; @@ -149,14 +147,13 @@ +#endif /* IPSEC */ + void - usage(ret) - int ret; + usage(int ret) { +#ifdef IPSEC -+ fprintf(stderr, "usage: nc [-46Ehklnrtuvz] [-e policy] [-i interval] [-p source port]\n"); ++ fprintf(stderr, "usage: nc [-46EUhklnrtuvz] [-e policy] [-i interval] [-p source port]\n"); +#else - fprintf(stderr, "usage: nc [-46hklnrtuvz] [-i interval] [-p source port]\n"); + fprintf(stderr, "usage: nc [-46Uhklnrtuvz] [-i interval] [-p source port]\n"); +#endif - fprintf(stderr, "\t [-s ip address] [-w timeout] [hostname] [port[s...]]\n"); + fprintf(stderr, "\t [-s ip address] [-w timeout] [-x proxy address [:port]]\n"); + fprintf(stderr, "\t [hostname] [port[s...]]\n"); if (ret) - exit(1); |