Remove net/obnc: A new version of this port is available from base system.

7 files changed, 0 insertions, 329 deletions

diff --git a/net/Makefile b/net/Makefile
index e788b0300790..1a08394951a9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -379,7 +379,6 @@
     SUBDIR += nvnet
     SUBDIR += nxserver
     SUBDIR += nylon
-    SUBDIR += obnc
     SUBDIR += ocaml-netclient
     SUBDIR += ohphone
     SUBDIR += olsrd
diff --git a/net/obnc/Makefile b/net/obnc/Makefile
deleted file mode 100644
index b3f708401c1e..000000000000
--- a/net/obnc/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# New ports collection makefile for:	obnc
-# Date created:			3 July 2001
-# Whom:				dd
-#
-# $FreeBSD$
-#
-
-PORTNAME=	obnc
-PORTVERSION=	20020222
-CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dd
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenBSD's netcat: cleaner code, familiar interface, IPv6 support
-
-MANSECTS=	1
-MAN1=		nc.1
-MANCOMPRESSED=	maybe
-PLIST_FILES=	bin/nc
-
-CFLAGS+=	-DIPSEC
-MAKE_ENV=	LDADD="${LDADD} -lipsec"
-
-# MAN page COMPression SUFFIX
-.if !defined(NOMANCOMPRESS)
-MANCOMPSUFFIX=	.gz
-.else
-MANCOMPSUFFIX=
-.endif
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/nc ${PREFIX}/bin/nc
-.for __s in ${MANSECTS}
-.for __m in ${MAN${__s}:S/$/${MANCOMPSUFFIX}/}
-	@${INSTALL_MAN} ${WRKSRC}/${__m} ${PREFIX}/man/man${__s}/${__m}
-.endfor
-.endfor
-
-#
-# Ports build/install stuff stops here.  Tarball creation stuff begins here.
-#
-.include <bsd.port.pre.mk>
-CVS_CMD?=	cvs -z3
-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
-
-.if ${OSVERSION} > 600010 || ( ${OSVERSION} > 503102 && ${OSVERSION} < 600000 )
-IGNORE=		is now contained in the base system
-.endif
-
-DEPRECATED=	A new version of this port is available from base system.
-
-#
-# CVS checkout stuff mostly stolen from security/openssh-askpass port by
-# kris@freebsd.org
-#
-tarball:
-	@${MKDIR} ${DISTDIR}/${PKGNAME} && \
-	cd ${DISTDIR}/${PKGNAME}; \
-	for CVS_SITE in ${CVS_SITES}; do \
-		${ECHO_MSG} ">> Attempting to check out from $${CVS_SITE}."; \
-		if ${CVS_CMD} -d $${CVS_SITE} co -D "${CVS_DATE}" \
-		    ${CVS_MODULE}; then \
-			cd ${DISTDIR}; \
-			${ECHO_MSG} ">> Creating dist tarball in ${DISTDIR}"; \
-			${ECHO_MSG} ">> \"${PKGNAME}.tar.gz\"."; \
-			${MV} ${PKGNAME}/${CVS_MODULE} \
-				${PKGNAME}/${CVS_MODULE:H}/${PKGNAME}; \
-			${TAR} -cz \
-				-X ${FILESDIR}/tarignore \
-				-f ${PKGNAME}.tar.gz \
-				-C ${PKGNAME}/${CVS_MODULE:H} \
-				${PKGNAME}; \
-			exit; \
-		fi \
-	done; \
-	${RMDIR} ${DISTDIR}/${PKGNAME}; \
-	${ECHO_MSG} ">> CVS checkout failed."; \
-	exit 1;
-
-.include <bsd.port.post.mk>
diff --git a/net/obnc/distinfo b/net/obnc/distinfo
deleted file mode 100644
index 4ea98f842e80..000000000000
--- a/net/obnc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (obnc-20020222.tar.gz) = cf5b55d267cf92b79471429d761f7446
-SHA256 (obnc-20020222.tar.gz) = 851fb244494093e4573a0ed8eaeb4a165649dd83f1d150d07945de990be9c70a
-SIZE (obnc-20020222.tar.gz) = 8781
diff --git a/net/obnc/files/patch-nc.1 b/net/obnc/files/patch-nc.1
deleted file mode 100644
index d562e7d057fe..000000000000
--- a/net/obnc/files/patch-nc.1
+++ /dev/null
@@ -1,52 +0,0 @@
---- nc.1.orig	Tue Feb 19 23:45:18 2002
-+++ nc.1	Wed Jul 30 11:41:47 2003
-@@ -33,7 +33,8 @@
- .Nd "arbitrary TCP and UDP connections and listens"
- .Sh SYNOPSIS
- .Nm nc
--.Op Fl 46hklnrtuvzU
-+.Op Fl 46EhklnortuvzU
-+.Op Fl e Ar IPsec policy
- .Op Fl i Ar interval
- .Op Fl p Ar source port
- .Op Fl s Ar source ip address
-@@ -89,6 +90,12 @@
- Prints out
- .Nm
- help.
-+.It Fl E
-+Shortcut for "-e 'in ipsec esp/transport//require' -e 'out ipsec esp/transport//require'", which enables IPsec ESP transport mode in both directions.
-+.It Fl e
-+If IPsec support is available, then one can specify the IPsec policies to be used using the syntax described in
-+.Xr ipsec_set_policy 3 .
-+This flag can be specified up to two times, as typically one policy for each direction is needed.
- .It Fl i Ar interval
- Specifies a delay time interval between lines of text sent and received.
- Also causes a delay time between connections to multiple ports.
-@@ -105,6 +112,15 @@
- .It Fl n
- Do not do any DNS or service lookups on any specified addresses,
- hostnames or ports.
-+.It Fl o
-+.Dq Once-only mode .
-+By default,
-+.Nm
-+does not terminate on EOF condition on input,
-+but continues until the network side has been closed down.
-+Specifying
-+.Fl o
-+will make it terminate on EOF as well.
- .It Fl p Ar port
- Specifies the source port
- .Nm
-@@ -157,6 +173,10 @@
- .It Li "nc -s 10.1.2.3 example.host 42"
- Open a TCP connection to port 42 of example.host using 10.1.2.3 as the
- IP for the local end of the connection.
-+.It Li "nc -E example.host 42"
-+Open a TCP connection to port 42 of example.host using IPsec ESP for incoming and outgoing traffic.
-+.It Li "nc -e 'out ipsec esp/transport//require' example.host 42"
-+Open a TCP connection to port 42 of example.host using IPsec ESP for outgoing traffic only.
- .It Li "nc -v hostname 42"
- Open a TCP connection to port 42 of hostname, displaying some
- diagnostic messages on stderr.
diff --git a/net/obnc/files/patch-netcat.c b/net/obnc/files/patch-netcat.c
deleted file mode 100644
index 6807501f4a8b..000000000000
--- a/net/obnc/files/patch-netcat.c
+++ /dev/null
@@ -1,184 +0,0 @@
---- netcat.c.orig	Tue Feb 19 23:42:04 2002
-+++ netcat.c	Wed Jul 30 11:41:11 2003
-@@ -37,6 +37,9 @@
- #include <sys/un.h>
- 
- #include <netinet/in.h>
-+#ifdef IPSEC
-+#include <netinet6/ipsec.h>
-+#endif
- #include <arpa/telnet.h>
- 
- #include <err.h>
-@@ -53,10 +56,12 @@
- #define PORT_MAX 65535
- 
- /* Command Line Options */
-+int	Eflag;					/* Use IPsec ESP */
- int	iflag;					/* Interval Flag */
- int	kflag;					/* More than one connect */
- int	lflag;					/* Bind to local port */
- int	nflag;					/* Dont do name lookup */
-+int	oflag;					/* Once only: stop on EOF */
- char   *pflag;					/* Localport flag */
- int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
-@@ -84,10 +89,16 @@
- int	unix_listen(char *);
- void	usage(int);
- 
-+#ifdef IPSEC
-+void	add_ipsec_policy(int, char *);
-+
-+char	*ipsec_policy[2];
-+#endif
-+
- int
- 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;
-@@ -99,12 +110,13 @@
- 
- 	ret = 1;
- 	s = 0;
-+	ipsec_count = 0;
- 	host = NULL;
- 	uport = NULL;
- 	endp = NULL;
- 	sv = NULL;
- 
--	while ((ch = getopt(argc, argv, "46Uhi:klnp:rs:tuvw:x:z")) != -1) {
-+	while ((ch = getopt(argc, argv, "46e:EUhi:klnop:rs:tuvw:x:z")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -115,6 +127,21 @@
- 		case 'U':
- 			family = AF_UNIX;
- 			break;
-+		case 'e':
-+#ifdef IPSEC
-+			ipsec_policy[ipsec_count++ % 2] = optarg;
-+#else
-+			errx(1, "IPsec support unavailable.");
-+#endif
-+			break;
-+		case 'E':
-+#ifdef IPSEC
-+			ipsec_policy[0] = "in  ipsec esp/transport//require";
-+			ipsec_policy[1] = "out ipsec esp/transport//require";
-+#else
-+			errx(1, "IPsec support unavailable.");
-+#endif
-+			break;
- 		case 'h':
- 			help();
- 			break;
-@@ -132,6 +159,9 @@
- 		case 'n':
- 			nflag = 1;
- 			break;
-+		case 'o':
-+			oflag = 1;
-+			break;
- 		case 'p':
- 			pflag = optarg;
- 			break;
-@@ -422,6 +452,12 @@
- 		if ((s = socket(res0->ai_family, res0->ai_socktype,
- 		    res0->ai_protocol)) < 0)
- 			continue;
-+#ifdef IPSEC
-+		if (ipsec_policy[0] != NULL)
-+			add_ipsec_policy(s, ipsec_policy[0]);
-+		if (ipsec_policy[1] != NULL)
-+			add_ipsec_policy(s, ipsec_policy[1]);
-+#endif
- 
- 		/* Bind to a local port or source address if specified */
- 		if (sflag || pflag) {
-@@ -497,6 +533,12 @@
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
- 			err(1, NULL);
-+#ifdef IPSEC
-+		if (ipsec_policy[0] != NULL)
-+			add_ipsec_policy(s, ipsec_policy[0]);
-+		if (ipsec_policy[1] != NULL)
-+			add_ipsec_policy(s, ipsec_policy[1]);
-+#endif
- 
- 		if (bind(s, (struct sockaddr *)res0->ai_addr,
- 		    res0->ai_addrlen) == 0)
-@@ -561,7 +603,8 @@
- 		}
- 
- 		if (pfd[1].revents & POLLIN) {
--			if ((n = read(wfd, buf, sizeof(buf))) < 0) {
-+			if ((n = read(wfd, buf, sizeof(buf))) < 0 ||
-+			    (oflag && n == 0)) {
- 				return;
- 			} else
- 				if((ret = atomicio(write, nfd, buf, n)) != n)
-@@ -690,7 +733,13 @@
- 	usage(0);
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
--	\t-6		Use IPv6\n\
-+	\t-6		Use IPv6\n");
-+#ifdef IPSEC
-+	fprintf(stderr, "\
-+	\t-e policy	Use specified IPsec policy\n\
-+	\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\
-@@ -707,13 +756,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
-+	fprintf(stderr, "See ipsec_set_policy(3) for -e argument format\n");
-+#endif
- 	exit(1);
- }
- 
-+#ifdef IPSEC
-+void
-+add_ipsec_policy(int s, char *policy)
-+{
-+	char *raw;
-+	int e;
-+
-+	raw = ipsec_set_policy(policy, strlen(policy));
-+	if (raw == NULL)
-+		errx(1, "ipsec_set_policy `%s': %s", policy,
-+		    ipsec_strerror());
-+	e = setsockopt(s, IPPROTO_IP, IP_IPSEC_POLICY, raw,
-+	    ipsec_get_policylen(raw));
-+	if (e < 0)
-+		err(1, "ipsec policy cannot be configured");
-+	free(raw);
-+	if (vflag)
-+		fprintf(stderr, "ipsec policy configured: `%s'\n", policy);
-+	return;
-+}
-+#endif /* IPSEC */
-+
- void
- usage(int ret)
- {
-+#ifdef IPSEC
-+	fprintf(stderr, "usage: nc [-46EUhklnrtuvz] [-e policy] [-i interval] [-p source port]\n");
-+#else
- 	fprintf(stderr, "usage: nc [-46Uhklnrtuvz] [-i interval] [-p source port]\n");
-+#endif
- 	fprintf(stderr, "\t  [-s ip address] [-w timeout] [-x proxy address [:port]]\n");
- 	fprintf(stderr, "\t  [hostname] [port[s...]]\n");
- 	if (ret)
diff --git a/net/obnc/files/tarignore b/net/obnc/files/tarignore
deleted file mode 100644
index 7ac83b287f2f..000000000000
--- a/net/obnc/files/tarignore
+++ /dev/null
@@ -1 +0,0 @@
-CVS
diff --git a/net/obnc/pkg-descr b/net/obnc/pkg-descr
deleted file mode 100644
index a857cbae9ff1..000000000000
--- a/net/obnc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is OpenBSD's nc(1), featuring cleaner code, an interface
-compatible with *hobbit*'s netcat, and IPv6 support.
-
-Please note that despite the port/package name, this installs as bin/nc!