Merge lp:~gandelman-a/ubuntu/quantal/netcat-openbsd/merge into lp:ubuntu/quantal/netcat-openbsd

[Adam Gandelman]

netcat-openbsd (1.105-6ubuntu1) quantal; urgency=low

  * Merge from Debian unstable (LP: #1006631).
  * debian/patches/verbose-message-to-stderr.patch: Dropped,
    applied upstream.
  * debian/patches/dccp.patch: Dropped, applied in Debian.
  * debian/control: Update XSBC-Original-Maintainer.
  * debian/patches/netcat-info.patch: Refresh.
  * Remaining changes:
    - debian/patches/netcat-info.patch: Add info about netcat-traditional
      if you are looking for an option when it is not available.
      (LP: #590925)

 -- Adam Gandelman <email address hidden> Wed, 30 May 2012 14:38:36 -0700

[Oliver Grawert (ogra)]

looks fine, merged and uploaded

review: Approve

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2012-05-30 22:10:23 +0000
@@ -0,0 +1,1 @@
+2
 
=== modified file 'Makefile'
--- Makefile	2010-11-19 14:40:32 +0000
+++ Makefile	2012-05-30 22:10:23 +0000
@@ -1,21 +1,6 @@
 #	$OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
 
 PROG=	nc
-SRCS=	netcat.c atomicio.c socks.c \
-        openbsd-compat/base64.c openbsd-compat/readpassphrase.c
-
-CC = gcc
-override CFLAGS += `pkg-config --cflags glib-2.0`
-INC = -Iopenbsd-compat
-LIBS = `pkg-config --libs glib-2.0`
-OBJS = $(SRCS:.c=.o)
-
-all: nc
-nc: $(OBJS)
-	$(CC) $(OBJS) $(LIBS) -o nc
-
-$(OBJS): %.o: %.c
-	$(CC) $(CFLAGS) $(INC) -c $< -o $@
-
-clean:
-	rm -f $(OBJS) nc
+SRCS=	netcat.c atomicio.c socks.c
+
+.include <bsd.prog.mk>
 
=== modified file 'atomicio.c'
--- atomicio.c	2008-01-30 18:24:46 +0000
+++ atomicio.c	2012-05-30 22:10:23 +0000
@@ -1,7 +1,7 @@
-/* $OpenBSD: atomicio.c,v 1.8 2006/02/11 19:31:18 otto Exp $ */
-
+/* $OpenBSD: atomicio.c,v 1.10 2011/01/08 00:47:19 jeremy Exp $ */
 /*
- * Copyright (c) 2005 Anil Madhavapeddy.  All rights served.
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
+ * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
  * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
  * All rights reserved.
  *
@@ -26,32 +26,37 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/uio.h>
+#include <sys/param.h>
+
 #include <errno.h>
+#include <poll.h>
 #include <unistd.h>
+
 #include "atomicio.h"
 
 /*
  * ensure all of data on socket comes through. f==read || f==vwrite
  */
 size_t
-atomicio(f, fd, _s, n)
-	ssize_t (*f) (int, void *, size_t);
-	int fd;
-	void *_s;
-	size_t n;
+atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
 {
 	char *s = _s;
 	size_t pos = 0;
 	ssize_t res;
+	struct pollfd pfd;
 
+	pfd.fd = fd;
+	pfd.events = f == read ? POLLIN : POLLOUT;
 	while (n > pos) {
 		res = (f) (fd, s + pos, n - pos);
 		switch (res) {
 		case -1:
-			if (errno == EINTR || errno == EAGAIN)
-				continue;
+			if (errno == EINTR)
+				continue;
+			if ((errno == EAGAIN) || (errno == ENOBUFS)) {
+				(void)poll(&pfd, 1, -1);
+				continue;
+			}
 			return 0;
 		case 0:
 			errno = EPIPE;
@@ -60,5 +65,5 @@
 			pos += (size_t)res;
 		}
 	}
-	return pos;
+	return (pos);
 }
 
=== modified file 'atomicio.h'
--- atomicio.h	2008-01-30 18:24:46 +0000
+++ atomicio.h	2012-05-30 22:10:23 +0000
@@ -1,6 +1,7 @@
-/*	$OpenBSD: atomicio.h,v 1.1 2005/05/24 20:13:28 avsm Exp $	*/
+/* $OpenBSD: atomicio.h,v 1.2 2007/09/07 14:50:44 tobias Exp $ */
 
 /*
+ * Copyright (c) 2006 Damien Miller.  All rights reserved.
  * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
  * All rights reserved.
  *
@@ -25,9 +26,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _ATOMICIO_H
+#define _ATOMICIO_H
+
 /*
  * Ensure all of data on socket comes through. f==read || f==vwrite
  */
 size_t	atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
 
 #define vwrite (ssize_t (*)(int, void *, size_t))write
+
+#endif /* _ATOMICIO_H */
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-01 21:39:53 +0000
+++ debian/changelog	2012-05-30 22:10:23 +0000
@@ -1,3 +1,86 @@
+netcat-openbsd (1.105-6ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable (LP: #1006631).
+  * debian/patches/verbose-message-to-stderr.patch: Dropped,
+    applied upstream.
+  * debian/patches/dccp.patch: Dropped, applied in Debian.
+  * debian/control: Update XSBC-Original-Maintainer.
+  * debian/patches/netcat-info.patch: Refresh.
+  * Remaining changes:
+    - debian/patches/netcat-info.patch: Add info about netcat-traditional
+      if you are looking for an option when it is not available.
+      (LP: #590925)
+
+ -- Adam Gandelman <[e-mail]>  Wed, 30 May 2012 14:38:36 -0700
+
+netcat-openbsd (1.105-6) unstable; urgency=low
+
+  * Fix segfaults when using -Ulv (Closes: #668558).
+  * Do not continue to listen on port after accepting connection.
+
+ -- Aron Xu <[e-mail]>  Thu, 03 May 2012 07:38:59 +0800
+
+netcat-openbsd (1.105-5) unstable; urgency=low
+
+  * Add $LDFLAGS from environment (Closes: #665321). 
+
+ -- Aron Xu <[e-mail]>  Mon, 26 Mar 2012 01:37:16 +0800
+
+netcat-openbsd (1.105-4) unstable; urgency=high
+
+  * High urgency for fixing RC bug.
+  * Fix readwrite() behaviour (Closes: #662741).
+
+ -- Aron Xu <[e-mail]>  Tue, 06 Mar 2012 15:18:26 +0800
+
+netcat-openbsd (1.105-3) unstable; urgency=low
+
+  * Clear up symlink of man page.
+  * Use Breaks instead of Conflicts.
+  * Fix minor warnings from man.
+
+ -- Aron Xu <[e-mail]>  Sun, 19 Feb 2012 14:28:46 +0800
+
+netcat-openbsd (1.105-2) unstable; urgency=low
+
+  * Add missing Build-Depends: pkg-config.
+
+ -- Aron Xu <[e-mail]>  Sun, 19 Feb 2012 03:59:37 +0800
+
+netcat-openbsd (1.105-1) unstable; urgency=low
+
+  * New upstream CVS snapshot, new maintainer.
+    - Verbose message to strerr (Closes: #570765).
+    - Can use packet's content > 1024 (Closes: #607003).
+    - Replace non-portable echo with printf (Closes: #510372).
+  * debian/patches:
+    - Rearrange existing patches, fix new porting issues.
+    - Option -l and -p are now compatible (Closes: #540073).
+    - Use libbsd instead of glib for strlcpy (Closes: #550611).
+    - Fix build with -Wl,--as-needed (Closes: #604781).
+    - Handling multiple clients subsquently when -k (Closes: #514792).
+    - Replace inet_ntoa with inet_ntop to support IPv6
+      (Closes: #512992).
+    - Modify -q behavior to be compatible with nc.traditional
+      (Closes: #508722, #594614, #606925, #611964).
+    - DCCP and broadcast support.
+    - Arbitrary port list to scan.
+    - Fix misc connection failures
+      (Closes: #579485, #579486, #579487, #579488, #633948).
+    - Improve verbose information and documentations.
+  * debian/rules:
+    - Link nc.openbsd.1 from nc.1 (Closes: #535951).
+    - Enable optional hardening build flags.
+  * debian/control:
+    - Replace glib with libbsd.
+    - Update to use debhelper 8, std-ver 3.9.2.
+    - Priority: important, to make it into base system.
+    - Add Vcs-*.
+  * debian/compat:
+    - Update to 8 from 4.
+
+ -- Aron Xu <[e-mail]>  Wed, 15 Feb 2012 01:39:04 +0800
+
 netcat-openbsd (1.89-4ubuntu1) oneiric; urgency=low
 
   * Merge from Debian unstable (LP: #803856).  Remaining changes:
 
=== modified file 'debian/compat'
--- debian/compat	2008-01-30 18:24:46 +0000
+++ debian/compat	2012-05-30 22:10:23 +0000
@@ -1,1 +1,1 @@
-4
+8
 
=== modified file 'debian/control'
--- debian/control	2010-02-09 10:42:03 +0000
+++ debian/control	2012-05-30 22:10:23 +0000
@@ -2,15 +2,17 @@
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Decklin Foster <[e-mail]>
-Standards-Version: 3.7.3
-Build-Depends: quilt, debhelper (>= 4.0.0), libglib2.0-dev
+XSBC-Original-Maintainer: Aron Xu <[e-mail]>
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8), quilt, libbsd-dev, pkg-config
+Vcs-Browser: http://git.debian.org/?p=collab-maint/netcat-openbsd.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/netcat-openbsd.git
 
 Package: netcat-openbsd
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: netcat
-Conflicts: netcat (<< 1.10-35)
+Breaks: netcat (<< 1.10-35)
 Replaces: netcat (<< 1.10-35)
 Description: TCP/IP swiss army knife
  A simple Unix utility which reads and writes data across network
 
=== modified file 'debian/copyright'
--- debian/copyright	2008-01-30 18:24:46 +0000
+++ debian/copyright	2012-05-30 22:10:23 +0000
@@ -1,130 +1,46 @@
-The netcat-openbsd Debian package was created by Soren Hansen
-<[e-mail]> and by Decklin Foster <[e-mail]>, based
-loosely on the original netcat package. The code itself was rewritten
-by the OpenBSD project, from the original implementation by Hobbit
-<[e-mail]>.
-
-Sources can be found at:
-
-    http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
-
-Copyright and license of netcat.c:
-
-    Copyright (c) 2001 Eric Jackson <[e-mail]>
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. The name of the author may not be used to endorse or promote products
-       derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright and license of atomicio.c:
-
-    Copyright (c) 2005 Anil Madhavapeddy.  All rights served.
-    Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    Copyright (c) 2005 Anil Madhavapeddy.  All rights served.
-    Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
-
-Copyright of socks.c (license is identical to that of atomicio.c):
-
-    Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
-    Copyright (c) 2004, 2005 Damien Miller.  All rights reserved.
-
-Copyright and license of readpassphrase.c:
-
-    Copyright (c) 2000-2002, 2007 Todd C. Miller <[e-mail]>
-
-    Permission to use, copy, modify, and distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-    Sponsored in part by the Defense Advanced Research Projects
-    Agency (DARPA) and Air Force Research Laboratory, Air Force
-    Materiel Command, USAF, under agreement number F39502-99-1-0512.
-
-Copyright and license of base64.c:
-
-    Copyright (c) 1996 by Internet Software Consortium.
-
-    Permission to use, copy, modify, and distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-    ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-    CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-    DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-    PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-    ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-    SOFTWARE.
-
-    Portions Copyright (c) 1995 by International Business Machines, Inc.
-
-    International Business Machines, Inc. (hereinafter called IBM) grants
-    permission under its copyrights to use, copy, modify, and distribute this
-    Software with or without fee, provided that the above copyright notice and
-    all paragraphs of this notice appear in all copies, and that the name of IBM
-    not be used in connection with the marketing of any product incorporating
-    the Software or modifications thereof, without specific, written prior
-    permission.
-
-    To the extent it has a right to do so, IBM grants an immunity from suit
-    under its patents, if any, for the use, sale or manufacture of products to
-    the extent that such products are used for performing Domain Name System
-    dynamic updates in TCP/IP networks by means of the Software.  No immunity is
-    granted for any product per se or for any other function of any product.
-
-    THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-    INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-    PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-    DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
-    OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
-    IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+Format: http://dep.debian.net/deps/dep5/
+Source: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
+
+Files: netcat.c
+Copyright: 2001 Eric Jackson <[e-mail]>
+License: BSD-3-Clause
+
+Files: atomicio.*
+Copyright: 2005 Anil Madhavapeddy
+           1995,1999 Theo de Raadt
+License: BSD-3-Clause
+
+Files: socks.c
+Copyright: 1999 Niklas Hallqvist
+           2004, 2005 Damien Miller
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2008, 2009, 2010 Decklin Foster <[e-mail]>
+           2008, 2009, 2010 Soren Hansen <[e-mail]>
+           2012 Aron Xu <[e-mail]>
+License: BSD-3-Clause
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== modified file 'debian/netcat-openbsd.README.Debian'
--- debian/netcat-openbsd.README.Debian	2008-01-30 18:24:46 +0000
+++ debian/netcat-openbsd.README.Debian	2012-05-30 22:10:23 +0000
@@ -1,6 +1,19 @@
 OpenBSD netcat for Debian
 -------------------------
 
+Merge with upstream again, now it links against -lresov and -lbsd. The
+former one is from libc, and the latter provides a good strlcpy(). Now
+the package has a much saner dependency to make its way into base system.
+A lot of bug fixes and some new features are also applied.
+
+For record, the reason of not implementing features like -c or -e in this
+cat is about security. These options enable anyone on the system to open
+port and execute arbitrary command on local host from remote very easily,
+which is not desired for ordinary multi-user systems. If you do need such
+function, please try nc.traditional or nc6.
+
+ -- Aron Xu <[e-mail]>  Wed, 15 Feb 2012 01:39:04 +0800
+
 This package has been rebased on OpenBSD's implementation of netcat. The
 code has been massively cleaned up, and important functionality has been
 added.
 
=== removed file 'debian/netcat-openbsd.dirs'
--- debian/netcat-openbsd.dirs	2008-01-30 18:24:46 +0000
+++ debian/netcat-openbsd.dirs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bin
-usr/share/man/man1
 
=== added file 'debian/netcat-openbsd.examples'
--- debian/netcat-openbsd.examples	1970-01-01 00:00:00 +0000
+++ debian/netcat-openbsd.examples	2012-05-30 22:10:23 +0000
@@ -0,0 +1,1 @@
+debian/examples/*
 
=== added file 'debian/netcat-openbsd.install'
--- debian/netcat-openbsd.install	1970-01-01 00:00:00 +0000
+++ debian/netcat-openbsd.install	2012-05-30 22:10:23 +0000
@@ -0,0 +1,2 @@
+nc.openbsd bin/
+nc_openbsd.1 usr/share/man/man1/
 
=== added file 'debian/netcat-openbsd.links'
--- debian/netcat-openbsd.links	1970-01-01 00:00:00 +0000
+++ debian/netcat-openbsd.links	2012-05-30 22:10:23 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/nc_openbsd.1 usr/share/man/man1/nc.openbsd.1
 
=== added file 'debian/patches/0001-port-to-linux-with-libsd.patch'
--- debian/patches/0001-port-to-linux-with-libsd.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-port-to-linux-with-libsd.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,466 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 15:59:31 +0800
+Subject: [PATCH] port to linux with libsd
+
+---
+ Makefile |   17 +++++++++-
+ nc.1     |    2 +-
+ netcat.c |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ socks.c  |   46 +++++++++++++-------------
+ 4 files changed, 130 insertions(+), 40 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,19 @@
+-#	$OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
++#       $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
+ 
+ PROG=	nc
+ SRCS=	netcat.c atomicio.c socks.c
+ 
+-.include <bsd.prog.mk>
++LIBS=  `pkg-config --libs libbsd` -lresolv
++OBJS=  $(SRCS:.c=.o)
++CFLAGS=  -g -O2
++LDFLAGS=  -Wl,--no-add-needed
++
++all: nc
++nc: $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o nc
++
++$(OBJS): %.o: %.c
++	$(CC) $(CFLAGS) -c $< -o $@
++
++clean:
++	rm -f $(OBJS) nc
+--- a/nc.1
++++ b/nc.1
+@@ -146,9 +146,6 @@
+ Specifies the source port
+ .Nm
+ should use, subject to privilege restrictions and availability.
+-It is an error to use this option in conjunction with the
+-.Fl l
+-option.
+ .It Fl r
+ Specifies that source and/or destination ports should be chosen randomly
+ instead of sequentially within a range or in the order that the system
+@@ -170,6 +167,7 @@
+ may be one of
+ .Ar critical ,
+ .Ar inetcontrol ,
++.Ar lowcost ,
+ .Ar lowdelay ,
+ .Ar netcontrol ,
+ .Ar throughput ,
+--- a/netcat.c
++++ b/netcat.c
+@@ -42,6 +42,46 @@
+ #include <netinet/ip.h>
+ #include <arpa/telnet.h>
+ 
++#ifndef IPTOS_LOWDELAY
++# define IPTOS_LOWDELAY 0x10
++# define IPTOS_THROUGHPUT 0x08
++# define IPTOS_RELIABILITY 0x04
++# define IPTOS_LOWCOST 0x02
++# define IPTOS_MINCOST IPTOS_LOWCOST
++#endif /* IPTOS_LOWDELAY */
++
++# ifndef IPTOS_DSCP_AF11
++# define	IPTOS_DSCP_AF11		0x28
++# define	IPTOS_DSCP_AF12		0x30
++# define	IPTOS_DSCP_AF13		0x38
++# define	IPTOS_DSCP_AF21		0x48
++# define	IPTOS_DSCP_AF22		0x50
++# define	IPTOS_DSCP_AF23		0x58
++# define	IPTOS_DSCP_AF31		0x68
++# define	IPTOS_DSCP_AF32		0x70
++# define	IPTOS_DSCP_AF33		0x78
++# define	IPTOS_DSCP_AF41		0x88
++# define	IPTOS_DSCP_AF42		0x90
++# define	IPTOS_DSCP_AF43		0x98
++# define	IPTOS_DSCP_EF		0xb8
++#endif /* IPTOS_DSCP_AF11 */
++
++#ifndef IPTOS_DSCP_CS0
++# define	IPTOS_DSCP_CS0		0x00
++# define	IPTOS_DSCP_CS1		0x20
++# define	IPTOS_DSCP_CS2		0x40
++# define	IPTOS_DSCP_CS3		0x60
++# define	IPTOS_DSCP_CS4		0x80
++# define	IPTOS_DSCP_CS5		0xa0
++# define	IPTOS_DSCP_CS6		0xc0
++# define	IPTOS_DSCP_CS7		0xe0
++#endif /* IPTOS_DSCP_CS0 */
++
++#ifndef IPTOS_DSCP_EF
++# define	IPTOS_DSCP_EF		0xb8
++#endif /* IPTOS_DSCP_EF */
++
++
+ #include <err.h>
+ #include <errno.h>
+ #include <netdb.h>
+@@ -53,6 +93,8 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <bsd/stdlib.h>
++#include <bsd/string.h>
+ #include "atomicio.h"
+ 
+ #ifndef SUN_LEN
+@@ -118,7 +160,7 @@
+ 	struct servent *sv;
+ 	socklen_t len;
+ 	struct sockaddr_storage cliaddr;
+-	char *proxy;
++	char *proxy = NULL;
+ 	const char *errstr, *proxyhost = "", *proxyport = NULL;
+ 	struct addrinfo proxyhints;
+ 	char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
+@@ -164,7 +206,11 @@
+ 				errx(1, "interval %s: %s", errstr, optarg);
+ 			break;
+ 		case 'j':
++# if defined(SO_JUMBO)
+ 			jflag = 1;
++# else
++			errx(1, "no jumbo frame support available");
++# endif
+ 			break;
+ 		case 'k':
+ 			kflag = 1;
+@@ -194,10 +240,14 @@
+ 			uflag = 1;
+ 			break;
+ 		case 'V':
++# if defined(RT_TABLEID_MAX)
+ 			rtableid = (unsigned int)strtonum(optarg, 0,
+ 			    RT_TABLEID_MAX, &errstr);
+ 			if (errstr)
+ 				errx(1, "rtable %s: %s", errstr, optarg);
++# else
++			errx(1, "no alternate routing table support available");
++# endif
+ 			break;
+ 		case 'v':
+ 			vflag = 1;
+@@ -232,7 +282,11 @@
+ 				    errstr, optarg);
+ 			break;
+ 		case 'S':
++# if defined(TCP_MD5SIG)
+ 			Sflag = 1;
++# else
++			errx(1, "no TCP MD5 signature support available");
++# endif
+ 			break;
+ 		case 'T':
+ 			errstr = NULL;
+@@ -259,6 +313,15 @@
+ 	if (argv[0] && !argv[1] && family == AF_UNIX) {
+ 		host = argv[0];
+ 		uport = NULL;
++	} else if (!argv[0] && lflag) {
++		if (sflag)
++			errx(1, "cannot use -s and -l");
++		if (zflag)
++			errx(1, "cannot use -z and -l");
++		if (pflag)
++			uport=pflag;
++	} else if (!lflag && kflag) {
++		errx(1, "cannot use -k without -l");
+ 	} else if (argv[0] && !argv[1]) {
+ 		if  (!lflag)
+ 			usage(1);
+@@ -270,14 +333,7 @@
+ 	} else
+ 		usage(1);
+ 
+-	if (lflag && sflag)
+-		errx(1, "cannot use -s and -l");
+-	if (lflag && pflag)
+-		errx(1, "cannot use -p and -l");
+-	if (lflag && zflag)
+-		errx(1, "cannot use -z and -l");
+-	if (!lflag && kflag)
+-		errx(1, "must use -l with -k");
++
+ 
+ 	/* Get name of temporary socket for unix datagram client */
+ 	if ((family == AF_UNIX) && uflag && !lflag) {
+@@ -286,8 +342,8 @@
+ 		} else {
+ 			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
+ 				UNIX_DG_TMP_SOCKET_SIZE);
+-			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
+-				err(1, "mktemp");
++			if (mkstemp(unix_dg_tmp_socket_buf) == -1)
++				err(1, "mkstemp");
+ 			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
+ 		}
+ 	}
+@@ -563,18 +619,22 @@
+ 		    res0->ai_protocol)) < 0)
+ 			continue;
+ 
++# if defined(RT_TABLEID_MAX)
+ 		if (rtableid) {
+ 			if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
+ 			    sizeof(rtableid)) == -1)
+ 				err(1, "setsockopt SO_RTABLE");
+ 		}
++# endif
+ 
+ 		/* Bind to a local port or source address if specified. */
+ 		if (sflag || pflag) {
+ 			struct addrinfo ahints, *ares;
+ 
++# if defined (SO_BINDANY)
+ 			/* try SO_BINDANY, but don't insist */
+ 			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
++# endif
+ 			memset(&ahints, 0, sizeof(struct addrinfo));
+ 			ahints.ai_family = res0->ai_family;
+ 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
+@@ -674,15 +734,23 @@
+ 		    res0->ai_protocol)) < 0)
+ 			continue;
+ 
++# if defined(RT_TABLEID_MAX)
+ 		if (rtableid) {
+ 			if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
+ 			    sizeof(rtableid)) == -1)
+ 				err(1, "setsockopt SO_RTABLE");
+ 		}
++# endif
++
++		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
++		if (ret == -1)
++			err(1, NULL);
+ 
++# if defined(SO_REUSEPORT)
+ 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
+ 		if (ret == -1)
+ 			err(1, NULL);
++# endif
+ 
+ 		set_common_sockopts(s);
+ 
+@@ -886,21 +954,25 @@
+ {
+ 	int x = 1;
+ 
++# if defined(TCP_MD5SIG)
+ 	if (Sflag) {
+ 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
+ 			&x, sizeof(x)) == -1)
+ 			err(1, NULL);
+ 	}
++# endif
+ 	if (Dflag) {
+ 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
+ 			&x, sizeof(x)) == -1)
+ 			err(1, NULL);
+ 	}
++# if defined(SO_JUMBO)
+ 	if (jflag) {
+ 		if (setsockopt(s, SOL_SOCKET, SO_JUMBO,
+ 			&x, sizeof(x)) == -1)
+ 			err(1, NULL);
+ 	}
++# endif
+ 	if (Tflag != -1) {
+ 		if (setsockopt(s, IPPROTO_IP, IP_TOS,
+ 		    &Tflag, sizeof(Tflag)) == -1)
+@@ -949,6 +1021,7 @@
+ 		{ "cs7",		IPTOS_DSCP_CS7 },
+ 		{ "ef",			IPTOS_DSCP_EF },
+ 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
++		{ "lowcost",		IPTOS_LOWCOST },
+ 		{ "lowdelay",		IPTOS_LOWDELAY },
+ 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
+ 		{ "reliability",	IPTOS_RELIABILITY },
+@@ -969,6 +1042,9 @@
+ void
+ help(void)
+ {
++# if defined(DEBIAN_VERSION)
++        fprintf(stderr, "OpenBSD netcat (Debian patchlevel " DEBIAN_VERSION ")\n");
++# endif
+ 	usage(0);
+ 	fprintf(stderr, "\tCommand Summary:\n\
+ 	\t-4		Use IPv4\n\
+@@ -978,6 +1054,7 @@
+ 	\t-h		This help text\n\
+ 	\t-I length	TCP receive buffer length\n\
+ 	\t-i secs\t	Delay interval for lines sent, ports scanned\n\
++	\t-j		Use jumbo frame\n\
+ 	\t-k		Keep inbound sockets open for multiple connects\n\
+ 	\t-l		Listen mode, for inbound connects\n\
+ 	\t-n		Suppress name/port resolutions\n\
+@@ -998,15 +1075,15 @@
+ 	\t-x addr[:port]\tSpecify 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");
+-	exit(1);
++	exit(0);
+ }
+ 
+ void
+ usage(int ret)
+ {
+ 	fprintf(stderr,
+-	    "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\n"
+-	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n"
++	    "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
++	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
+ 	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+ 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
+ 	if (ret)
+--- a/socks.c
++++ b/socks.c
+@@ -38,7 +38,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <resolv.h>
+-#include <readpassphrase.h>
++#include <bsd/readpassphrase.h>
+ #include "atomicio.h"
+ 
+ #define SOCKS_PORT	"1080"
+@@ -167,11 +167,11 @@
+ 		buf[2] = SOCKS_NOAUTH;
+ 		cnt = atomicio(vwrite, proxyfd, buf, 3);
+ 		if (cnt != 3)
+-			err(1, "write failed (%zu/3)", cnt);
++			err(1, "write failed (%zu/3)", (size_t)cnt);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 2);
+ 		if (cnt != 2)
+-			err(1, "read failed (%zu/3)", cnt);
++			err(1, "read failed (%zu/3)", (size_t)cnt);
+ 
+ 		if (buf[1] == SOCKS_NOMETHOD)
+ 			errx(1, "authentication method negotiation failed");
+@@ -220,23 +220,23 @@
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
+ 		if (cnt != wlen)
+-			err(1, "write failed (%zu/%zu)", cnt, wlen);
++			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 4);
+ 		if (cnt != 4)
+-			err(1, "read failed (%zu/4)", cnt);
++			err(1, "read failed (%zu/4)", (size_t)cnt);
+ 		if (buf[1] != 0)
+ 			errx(1, "connection failed, SOCKS error %d", buf[1]);
+ 		switch (buf[3]) {
+ 		case SOCKS_IPV4:
+ 			cnt = atomicio(read, proxyfd, buf + 4, 6);
+ 			if (cnt != 6)
+-				err(1, "read failed (%d/6)", cnt);
++				err(1, "read failed (%lu/6)", (unsigned long)cnt);
+ 			break;
+ 		case SOCKS_IPV6:
+ 			cnt = atomicio(read, proxyfd, buf + 4, 18);
+ 			if (cnt != 18)
+-				err(1, "read failed (%d/18)", cnt);
++				err(1, "read failed (%lu/18)", (unsigned long)cnt);
+ 			break;
+ 		default:
+ 			errx(1, "connection failed, unsupported address type");
+@@ -256,11 +256,11 @@
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
+ 		if (cnt != wlen)
+-			err(1, "write failed (%zu/%zu)", cnt, wlen);
++			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 8);
+ 		if (cnt != 8)
+-			err(1, "read failed (%zu/8)", cnt);
++			err(1, "read failed (%zu/8)", (size_t)cnt);
+ 		if (buf[1] != 90)
+ 			errx(1, "connection failed, SOCKS error %d", buf[1]);
+ 	} else if (socksv == -1) {
+@@ -272,39 +272,39 @@
+ 
+ 		/* Try to be sane about numeric IPv6 addresses */
+ 		if (strchr(host, ':') != NULL) {
+-			r = snprintf(buf, sizeof(buf),
++			r = snprintf((char*)buf, sizeof(buf),
+ 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
+ 			    host, ntohs(serverport));
+ 		} else {
+-			r = snprintf(buf, sizeof(buf),
++			r = snprintf((char*)buf, sizeof(buf),
+ 			    "CONNECT %s:%d HTTP/1.0\r\n",
+ 			    host, ntohs(serverport));
+ 		}
+ 		if (r == -1 || (size_t)r >= sizeof(buf))
+ 			errx(1, "hostname too long");
+-		r = strlen(buf);
++		r = strlen((char*)buf);
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, r);
+ 		if (cnt != r)
+-			err(1, "write failed (%zu/%d)", cnt, r);
++			err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
+ 
+ 		if (authretry > 1) {
+ 			char resp[1024];
+ 
+ 			proxypass = getproxypass(proxyuser, proxyhost);
+-			r = snprintf(buf, sizeof(buf), "%s:%s",
++			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
+ 			    proxyuser, proxypass);
+ 			if (r == -1 || (size_t)r >= sizeof(buf) ||
+-			    b64_ntop(buf, strlen(buf), resp,
++			    b64_ntop(buf, strlen((char*)buf), resp,
+ 			    sizeof(resp)) == -1)
+ 				errx(1, "Proxy username/password too long");
+-			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
++			r = snprintf((char*)buf, sizeof((char*)buf), "Proxy-Authorization: "
+ 			    "Basic %s\r\n", resp);
+ 			if (r == -1 || (size_t)r >= sizeof(buf))
+ 				errx(1, "Proxy auth response too long");
+-			r = strlen(buf);
++			r = strlen((char*)buf);
+ 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
+-				err(1, "write failed (%zu/%d)", cnt, r);
++				err(1, "write failed (%zu/%d)", (size_t)cnt, r);
+ 		}
+ 
+ 		/* Terminate headers */
+@@ -312,22 +312,22 @@
+ 			err(1, "write failed (2/%d)", r);
+ 
+ 		/* Read status reply */
+-		proxy_read_line(proxyfd, buf, sizeof(buf));
++		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
+ 		if (proxyuser != NULL &&
+-		    strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
++		    strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
+ 			if (authretry > 1) {
+ 				fprintf(stderr, "Proxy authentication "
+ 				    "failed\n");
+ 			}
+ 			close(proxyfd);
+ 			goto again;
+-		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
+-		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
++		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
++		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
+ 			errx(1, "Proxy error: \"%s\"", buf);
+ 
+ 		/* Headers continue until we hit an empty line */
+ 		for (r = 0; r < HTTP_MAXHDRS; r++) {
+-			proxy_read_line(proxyfd, buf, sizeof(buf));
++			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
+ 			if (*buf == '\0')
+ 				break;
+ 		}
 
=== added file 'debian/patches/0002-connect-timeout.patch'
--- debian/patches/0002-connect-timeout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-connect-timeout.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,118 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 14:43:56 +0800
+Subject: [PATCH] connect timeout
+
+---
+ netcat.c |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 75 insertions(+), 2 deletions(-)
+
+--- a/netcat.c
++++ b/netcat.c
+@@ -106,6 +106,10 @@
+ #define PORT_MAX_LEN	6
+ #define UNIX_DG_TMP_SOCKET_SIZE	19
+ 
++#define CONNECTION_SUCCESS 0
++#define CONNECTION_FAILED 1
++#define CONNECTION_TIMEOUT 2
++
+ /* Command Line Options */
+ int	dflag;					/* detached, no stdin */
+ unsigned int iflag;				/* Interval Flag */
+@@ -151,6 +155,9 @@
+ int	map_tos(char *, int *);
+ void	usage(int);
+ 
++static int connect_with_timeout(int fd, const struct sockaddr *sa,
++        socklen_t salen, int ctimeout);
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -651,11 +658,14 @@
+ 
+ 		set_common_sockopts(s);
+ 
+-		if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
++                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
+ 			break;
+-		else if (vflag)
++		else if (vflag && error == CONNECTION_FAILED)
+ 			warn("connect to %s port %s (%s) failed", host, port,
+ 			    uflag ? "udp" : "tcp");
++                else if (vflag && error == CONNECTION_TIMEOUT)
++                    warn("connect to %s port %s (%s) timed out", host, port,
++                            uflag ? "udp" : "tcp");
+ 
+ 		close(s);
+ 		s = -1;
+@@ -703,6 +713,69 @@
+ 	return (ret);
+ }
+ 
++static int connect_with_timeout(int fd, const struct sockaddr *sa,
++		                socklen_t salen, int ctimeout)
++{
++	int err;
++	struct timeval tv, *tvp = NULL;
++	fd_set connect_fdset;
++	socklen_t len;
++	int orig_flags;
++
++	orig_flags = fcntl(fd, F_GETFL, 0);
++	if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) {
++		warn("can't set O_NONBLOCK - timeout not available");
++		if (connect(fd, sa, salen) == 0)
++			return CONNECTION_SUCCESS;
++		else
++			return CONNECTION_FAILED;
++	}
++
++	/* set connect timeout */
++	if (ctimeout > 0) {
++		tv.tv_sec = (time_t)ctimeout/1000;
++		tv.tv_usec = 0;
++		tvp = &tv;
++	}
++
++	/* attempt the connection */
++	err = connect(fd, sa, salen);
++	if (err != 0 && errno == EINPROGRESS) {
++		/* connection is proceeding
++		 * it is complete (or failed) when select returns */
++
++		/* initialize connect_fdset */
++		FD_ZERO(&connect_fdset);
++		FD_SET(fd, &connect_fdset);
++
++		/* call select */
++		do {
++			err = select(fd + 1, NULL, &connect_fdset,
++				     NULL, tvp);
++		} while (err < 0 && errno == EINTR);
++
++		/* select error */
++		if (err < 0)
++			errx(1,"select error: %s", strerror(errno));
++		/* we have reached a timeout */
++		if (err == 0)
++			return CONNECTION_TIMEOUT;
++		/* select returned successfully, but we must test socket
++		 * error for result */
++		len = sizeof(err);
++		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0)
++			errx(1, "getsockopt error: %s", strerror(errno));
++		/* setup errno according to the result returned by
++		 * getsockopt */
++		if (err != 0)
++			errno = err;
++	}
++
++	/* return aborted if an error occured, and valid otherwise */
++	fcntl(fd, F_SETFL, orig_flags);
++	return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS;
++}
++
+ /*
+  * local_listen()
+  * Returns a socket listening on a local port, binds to specified source
 
=== added file 'debian/patches/0003-get-sev-by-name.patch'
--- debian/patches/0003-get-sev-by-name.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-get-sev-by-name.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,34 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 14:45:08 +0800
+Subject: [PATCH] get sev by name
+
+---
+ netcat.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/netcat.c b/netcat.c
+index 51a5729..28e871e 100644
+--- a/netcat.c
++++ b/netcat.c
+@@ -949,12 +949,19 @@ atelnet(int nfd, unsigned char *buf, unsigned int size)
+ void
+ build_ports(char *p)
+ {
++        struct servent *sv;
+ 	const char *errstr;
+ 	char *n;
+ 	int hi, lo, cp;
+ 	int x = 0;
+ 
+-	if ((n = strchr(p, '-')) != NULL) {
++        sv = getservbyname(p, uflag ? "udp" : "tcp");
++        if (sv) {
++                portlist[0] = calloc(1, PORT_MAX_LEN);
++                if (portlist[0] == NULL)
++                        err(1, NULL);
++                snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
++        } else if ((n = strchr(p, '-')) != NULL) {
+ 		*n = '\0';
+ 		n++;
+ 
+-- 
 
=== added file 'debian/patches/0004-poll-hup.patch'
--- debian/patches/0004-poll-hup.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0004-poll-hup.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,59 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 15:08:33 +0800
+Subject: [PATCH] poll hup
+
+---
+ netcat.c |   24 +++++++++++++++++-------
+ 1 files changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/netcat.c b/netcat.c
+index 28e871e..b36583f 100644
+--- a/netcat.c
++++ b/netcat.c
+@@ -884,9 +884,7 @@ readwrite(int nfd)
+ 			if ((n = read(nfd, buf, plen)) < 0)
+ 				return;
+ 			else if (n == 0) {
+-				shutdown(nfd, SHUT_RD);
+-				pfd[0].fd = -1;
+-				pfd[0].events = 0;
++				goto shutdown_rd;
+ 			} else {
+ 				if (tflag)
+ 					atelnet(nfd, buf, n);
+@@ -894,18 +892,30 @@ readwrite(int nfd)
+ 					return;
+ 			}
+ 		}
++		else if (pfd[0].revents & POLLHUP) {
++		shutdown_rd:
++			shutdown(nfd, SHUT_RD);
++			pfd[0].fd = -1;
++			pfd[0].events = 0;
++		}
+ 
+-		if (!dflag && pfd[1].revents & POLLIN) {
++		if (!dflag) {
++		    if(pfd[1].revents & POLLIN) {
+ 			if ((n = read(wfd, buf, plen)) < 0)
+ 				return;
+ 			else if (n == 0) {
+-				shutdown(nfd, SHUT_WR);
+-				pfd[1].fd = -1;
+-				pfd[1].events = 0;
++				goto shutdown_wr;
+ 			} else {
+ 				if (atomicio(vwrite, nfd, buf, n) != n)
+ 					return;
+ 			}
++			}
++			else if (pfd[1].revents & POLLHUP) {
++			shutdown_wr:
++				shutdown(nfd, SHUT_WR);
++				pfd[1].fd = -1;
++				pfd[1].events = 0;
++			}
+ 		}
+ 	}
+ }
+-- 
 
=== added file 'debian/patches/0005-send-crlf.patch'
--- debian/patches/0005-send-crlf.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0005-send-crlf.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,103 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 14:57:45 +0800
+Subject: [PATCH] send crlf
+
+---
+ nc.1     |    6 ++++--
+ netcat.c |   21 +++++++++++++++++----
+ 2 files changed, 21 insertions(+), 6 deletions(-)
+
+--- a/nc.1
++++ b/nc.1
+@@ -34,7 +34,7 @@
+ .Sh SYNOPSIS
+ .Nm nc
+ .Bk -words
+-.Op Fl 46DdhklnrStUuvz
++.Op Fl 46CDdhklnrStUuvz
+ .Op Fl I Ar length
+ .Op Fl i Ar interval
+ .Op Fl O Ar length
+@@ -98,6 +98,8 @@
+ Forces
+ .Nm
+ to use IPv6 addresses only.
++.It Fl C
++Send CRLF as line-ending.
+ .It Fl D
+ Enable debugging on the socket.
+ .It Fl d
+@@ -355,7 +357,7 @@
+ of requests required by the server.
+ As another example, an email may be submitted to an SMTP server using:
+ .Bd -literal -offset indent
+-$ nc localhost 25 \*(Lt\*(Lt EOF
++$ nc [\-C] localhost 25 \*(Lt\*(Lt EOF
+ HELO host.example.com
+ MAIL FROM:\*([e-mail]\*(Gt
+ RCPT TO:\*([e-mail]\*(Gt
+--- a/netcat.c
++++ b/netcat.c
+@@ -111,6 +111,7 @@
+ #define CONNECTION_TIMEOUT 2
+ 
+ /* Command Line Options */
++int     Cflag = 0;                              /* CRLF line-ending */
+ int	dflag;					/* detached, no stdin */
+ unsigned int iflag;				/* Interval Flag */
+ int	jflag;					/* use jumbo frames if we can */
+@@ -180,7 +181,7 @@
+ 	sv = NULL;
+ 
+ 	while ((ch = getopt(argc, argv,
+-	    "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
++	    "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
+ 		switch (ch) {
+ 		case '4':
+ 			family = AF_INET;
+@@ -309,6 +310,9 @@
+ 			if (Tflag < 0 || Tflag > 255 || errstr || errno)
+ 				errx(1, "illegal tos value %s", optarg);
+ 			break;
++                case 'C':
++                        Cflag = 1;
++                        break;
+ 		default:
+ 			usage(1);
+ 		}
+@@ -906,8 +910,16 @@
+ 			else if (n == 0) {
+ 				goto shutdown_wr;
+ 			} else {
+-				if (atomicio(vwrite, nfd, buf, n) != n)
+-					return;
++				if ((Cflag) && (buf[n-1]=='\n')) {
++					if (atomicio(vwrite, nfd, buf, n-1) != (n-1))
++						return;
++					if (atomicio(vwrite, nfd, "\r\n", 2) != 2)
++						return;
++				}
++				else {
++					if (atomicio(vwrite, nfd, buf, n) != n)
++						return;
++				}
+ 			}
+ 			}
+ 			else if (pfd[1].revents & POLLHUP) {
+@@ -1139,6 +1151,7 @@
+ 	fprintf(stderr, "\tCommand Summary:\n\
+ 	\t-4		Use IPv4\n\
+ 	\t-6		Use IPv6\n\
++	\t-C		Send CRLF as line-ending\n\
+ 	\t-D		Enable the debug socket option\n\
+ 	\t-d		Detach from stdin\n\
+ 	\t-h		This help text\n\
+@@ -1172,7 +1185,7 @@
+ usage(int ret)
+ {
+ 	fprintf(stderr,
+-	    "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
++	    "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
+ 	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
+ 	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+ 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
 
=== added file 'debian/patches/0006-quit-timer.patch'
--- debian/patches/0006-quit-timer.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0006-quit-timer.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,128 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 15:16:04 +0800
+Subject: [PATCH] quit timer
+
+---
+ nc.1     |    5 +++++
+ netcat.c |   39 ++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 39 insertions(+), 5 deletions(-)
+
+--- a/nc.1
++++ b/nc.1
+@@ -40,6 +40,7 @@
+ .Op Fl O Ar length
+ .Op Fl P Ar proxy_username
+ .Op Fl p Ar source_port
++.Op Fl q Ar seconds
+ .Op Fl s Ar source
+ .Op Fl T Ar toskeyword
+ .Op Fl V Ar rtable
+@@ -148,6 +149,10 @@
+ Specifies the source port
+ .Nm
+ should use, subject to privilege restrictions and availability.
++.It Fl q Ar seconds
++after EOF on stdin, wait the specified number of seconds and then quit. If
++.Ar seconds
++is negative, wait forever.
+ .It Fl r
+ Specifies that source and/or destination ports should be chosen randomly
+ instead of sequentially within a range or in the order that the system
+--- a/netcat.c
++++ b/netcat.c
+@@ -86,6 +86,7 @@
+ #include <errno.h>
+ #include <netdb.h>
+ #include <poll.h>
++#include <signal.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -120,6 +121,7 @@
+ int	nflag;					/* Don't do name look up */
+ char   *Pflag;					/* Proxy username */
+ char   *pflag;					/* Localport flag */
++int     qflag = 0;                             /* Quit after some secs */
+ int	rflag;					/* Random ports flag */
+ char   *sflag;					/* Source Address */
+ int	tflag;					/* Telnet Emulation */
+@@ -158,6 +160,7 @@
+ 
+ static int connect_with_timeout(int fd, const struct sockaddr *sa,
+         socklen_t salen, int ctimeout);
++static void quit();
+ 
+ int
+ main(int argc, char *argv[])
+@@ -181,7 +184,7 @@
+ 	sv = NULL;
+ 
+ 	while ((ch = getopt(argc, argv,
+-	    "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
++	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
+ 		switch (ch) {
+ 		case '4':
+ 			family = AF_INET;
+@@ -235,6 +238,11 @@
+ 		case 'p':
+ 			pflag = optarg;
+ 			break;
++                case 'q':
++			qflag = strtonum(optarg, INT_MIN, INT_MAX, &errstr);
++			if (errstr)
++				errx(1, "quit timer %s: %s", errstr, optarg);
++			break;
+ 		case 'r':
+ 			rflag = 1;
+ 			break;
+@@ -924,9 +932,18 @@
+ 			}
+ 			else if (pfd[1].revents & POLLHUP) {
+ 			shutdown_wr:
++			/* if the user asked to exit on EOF, do it */
++			if (qflag == 0) {
+ 				shutdown(nfd, SHUT_WR);
+-				pfd[1].fd = -1;
+-				pfd[1].events = 0;
++				close(wfd);
++			}
++			/* if user asked to die after a while, arrange for it */
++			if (qflag > 0) {
++				signal(SIGALRM, quit);
++				alarm(qflag);
++			}
++			pfd[1].fd = -1;
++			pfd[1].events = 0;
+ 			}
+ 		}
+ 	}
+@@ -1164,6 +1181,7 @@
+ 	\t-O length	TCP send buffer length\n\
+ 	\t-P proxyuser\tUsername for proxy authentication\n\
+ 	\t-p port\t	Specify local port for remote connects\n\
++        \t-q secs\t	quit after EOF on stdin and delay of secs\n\
+ 	\t-r		Randomize remote ports\n\
+ 	\t-S		Enable the TCP MD5 signature option\n\
+ 	\t-s addr\t	Local source address\n\
+@@ -1186,9 +1204,19 @@
+ {
+ 	fprintf(stderr,
+ 	    "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
+-	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
+-	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
++	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
++	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+ 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
+ 	if (ret)
+ 		exit(1);
+ }
++
++/*
++ * quit()
++ * handler for a "-q" timeout (exit 0 instead of 1)
++ */
++static void quit()
++{
++        /* XXX: should explicitly close fds here */
++        exit(0);
++}
 
=== added file 'debian/patches/0007-udp-scan-timeout.patch'
--- debian/patches/0007-udp-scan-timeout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0007-udp-scan-timeout.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,56 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 15:29:37 +0800
+Subject: [PATCH] udp scan timeout
+
+---
+ netcat.c |   25 ++++++++++++++++---------
+ 1 files changed, 16 insertions(+), 9 deletions(-)
+
+--- a/netcat.c
++++ b/netcat.c
+@@ -111,6 +111,8 @@
+ #define CONNECTION_FAILED 1
+ #define CONNECTION_TIMEOUT 2
+ 
++#define UDP_SCAN_TIMEOUT 3			/* Seconds */
++
+ /* Command Line Options */
+ int     Cflag = 0;                              /* CRLF line-ending */
+ int	dflag;					/* detached, no stdin */
+@@ -497,7 +499,7 @@
+ 				continue;
+ 
+ 			ret = 0;
+-			if (vflag || zflag) {
++			if (vflag) {
+ 				/* For UDP, make sure we are connected. */
+ 				if (uflag) {
+ 					if (udptest(s) == -1) {
+@@ -1057,15 +1059,20 @@
+ int
+ udptest(int s)
+ {
+-	int i, ret;
++	int i, t;
+ 
+-	for (i = 0; i <= 3; i++) {
+-		if (write(s, "X", 1) == 1)
+-			ret = 1;
+-		else
+-			ret = -1;
++	if ((write(s, "X", 1) != 1) ||
++	    ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
++		return -1;
++
++	/* Give the remote host some time to reply. */
++	for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000);
++	     i < t; i++) {
++		sleep(1);
++		if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
++			return -1;
+ 	}
+-	return (ret);
++	return 1;
+ }
+ 
+ void
 
=== added file 'debian/patches/0008-verbose-numeric-port.patch'
--- debian/patches/0008-verbose-numeric-port.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0008-verbose-numeric-port.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,103 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 15:38:15 +0800
+Subject: [PATCH] verbose numeric port
+
+---
+ netcat.c |   44 ++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 40 insertions(+), 4 deletions(-)
+
+--- a/netcat.c
++++ b/netcat.c
+@@ -41,6 +41,7 @@
+ #include <netinet/tcp.h>
+ #include <netinet/ip.h>
+ #include <arpa/telnet.h>
++#include <arpa/inet.h>
+ 
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+@@ -424,6 +425,18 @@
+ 				s = local_listen(host, uport, hints);
+ 			if (s < 0)
+ 				err(1, NULL);
++
++			char* local;
++			if (family == AF_INET6
++				local = "0.0.0.0";
++			else if (family == AF_INET)
++				local = ":::";
++			else
++				local = "unknown"
++			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
++				host ?: local,
++				family,
++				*uport);
+ 			/*
+ 			 * For UDP, we will use recvfrom() initially
+ 			 * to wait for a caller, then use the regular
+@@ -432,16 +445,15 @@
+ 			if (uflag) {
+ 				int rv, plen;
+ 				char buf[16384];
+-				struct sockaddr_storage z;
+ 
+-				len = sizeof(z);
++				len = sizeof(cliaddr);
+ 				plen = jflag ? 16384 : 2048;
+ 				rv = recvfrom(s, buf, plen, MSG_PEEK,
+-				    (struct sockaddr *)&z, &len);
++				    (struct sockaddr *)&cliaddr, &len);
+ 				if (rv < 0)
+ 					err(1, "recvfrom");
+ 
+-				rv = connect(s, (struct sockaddr *)&z, len);
++				rv = connect(s, (struct sockaddr *)&cliaddr, len);
+ 				if (rv < 0)
+ 					err(1, "connect");
+ 
+@@ -450,6 +462,45 @@
+ 				len = sizeof(cliaddr);
+ 				connfd = accept(s, (struct sockaddr *)&cliaddr,
+ 				    &len);
++				if(vflag) {
++				/* Don't look up port if -n. */
++					if (nflag)
++						sv = NULL;
++					else
++						sv = getservbyport(ntohs(atoi(uport)),
++							uflag ? "udp" : "tcp");
++
++					if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) {
++						char dst[INET_ADDRSTRLEN];
++						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN);
++						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
++							dst,
++							uport,
++							uflag ? "udp" : "tcp",
++							sv ? sv->s_name : "*",
++							((struct sockaddr *)(&cliaddr))->sa_family,
++							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
++					}
++					else if(((struct sockaddr *)&cliaddr)->sa_family == AF_INET6) {
++						char dst[INET6_ADDRSTRLEN];
++						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN);
++						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
++							dst,
++							uport,
++							uflag ? "udp" : "tcp",
++							sv ? sv->s_name : "*",
++							((struct sockaddr *)&cliaddr)->sa_family,
++							ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port));
++					}
++					else {
++						fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n",
++							uport,
++							uflag ? "udp" : "tcp",
++							sv ? sv->s_name : "*",
++							((struct sockaddr *)(&cliaddr))->sa_family,
++							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
++					}
++				}
+ 				readwrite(connfd);
+ 				close(connfd);
+ 			}
 
=== added file 'debian/patches/0009-dccp-support.patch'
--- debian/patches/0009-dccp-support.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0009-dccp-support.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,299 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 15:56:51 +0800
+Subject: [PATCH] dccp support
+
+---
+ nc.1     |    4 ++-
+ netcat.c |  102 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
+ 2 files changed, 88 insertions(+), 18 deletions(-)
+
+--- a/nc.1
++++ b/nc.1
+@@ -34,7 +34,7 @@
+ .Sh SYNOPSIS
+ .Nm nc
+ .Bk -words
+-.Op Fl 46CDdhklnrStUuvz
++.Op Fl 46CDdhklnrStUuvZz
+ .Op Fl I Ar length
+ .Op Fl i Ar interval
+ .Op Fl O Ar length
+@@ -257,6 +257,8 @@
+ .Ar port
+ is not specified, the well-known port for the proxy protocol is used (1080
+ for SOCKS, 3128 for HTTPS).
++.It Fl Z
++DCCP mode.
+ .It Fl z
+ Specifies that
+ .Nm
+--- a/netcat.c
++++ b/netcat.c
+@@ -129,6 +129,7 @@
+ char   *sflag;					/* Source Address */
+ int	tflag;					/* Telnet Emulation */
+ int	uflag;					/* UDP - Default to TCP */
++int	dccpflag;				/* DCCP - Default to TCP */
+ int	vflag;					/* Verbosity */
+ int	xflag;					/* Socks proxy */
+ int	zflag;					/* Port Scan Flag */
+@@ -160,6 +161,7 @@
+ void	set_common_sockopts(int);
+ int	map_tos(char *, int *);
+ void	usage(int);
++char    *proto_name(int uflag, int dccpflag);
+ 
+ static int connect_with_timeout(int fd, const struct sockaddr *sa,
+         socklen_t salen, int ctimeout);
+@@ -187,7 +189,7 @@
+ 	sv = NULL;
+ 
+ 	while ((ch = getopt(argc, argv,
+-	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
++	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
+ 		switch (ch) {
+ 		case '4':
+ 			family = AF_INET;
+@@ -258,6 +260,13 @@
+ 		case 'u':
+ 			uflag = 1;
+ 			break;
++		case 'Z':
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++			dccpflag = 1;
++# else
++			errx(1, "no DCCP support available");
++# endif
++			break;
+ 		case 'V':
+ # if defined(RT_TABLEID_MAX)
+ 			rtableid = (unsigned int)strtonum(optarg, 0,
+@@ -333,6 +342,12 @@
+ 
+ 	/* Cruft to make sure options are clean, and used properly. */
+ 	if (argv[0] && !argv[1] && family == AF_UNIX) {
++ 		if (uflag)
++ 			errx(1, "cannot use -u and -U");
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++		if (dccpflag)
++			errx(1, "cannot use -Z and -U");
++# endif
+ 		host = argv[0];
+ 		uport = NULL;
+ 	} else if (!argv[0] && lflag) {
+@@ -374,8 +389,20 @@
+ 	if (family != AF_UNIX) {
+ 		memset(&hints, 0, sizeof(struct addrinfo));
+ 		hints.ai_family = family;
+-		hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
+-		hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
++		if (uflag) {
++		    hints.ai_socktype = SOCK_DGRAM;
++		    hints.ai_protocol = IPPROTO_UDP;
++		}
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++		else if (dccpflag) {
++		    hints.ai_socktype = SOCK_DCCP;
++		    hints.ai_protocol = IPPROTO_DCCP;
++		}
++# endif
++		else {
++		    hints.ai_socktype = SOCK_STREAM;
++		    hints.ai_protocol = IPPROTO_TCP;
++		}
+ 		if (nflag)
+ 			hints.ai_flags |= AI_NUMERICHOST;
+ 	}
+@@ -383,7 +410,10 @@
+ 	if (xflag) {
+ 		if (uflag)
+ 			errx(1, "no proxy support for UDP mode");
+-
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++		if (dccpflag)
++			errx(1, "no proxy support for DCCP mode");
++# endif
+ 		if (lflag)
+ 			errx(1, "no proxy support for listen");
+ 
+@@ -427,12 +457,12 @@
+ 				err(1, NULL);
+ 
+ 			char* local;
+-			if (family == AF_INET6
++			if (family == AF_INET6 )
+ 				local = "0.0.0.0";
+ 			else if (family == AF_INET)
+ 				local = ":::";
+ 			else
+-				local = "unknown"
++				local = "unknown";
+ 			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
+ 				host ?: local,
+ 				family,
+@@ -463,12 +493,13 @@
+ 				connfd = accept(s, (struct sockaddr *)&cliaddr,
+ 				    &len);
+ 				if(vflag) {
++					char *proto = proto_name(uflag, dccpflag);
+ 				/* Don't look up port if -n. */
+ 					if (nflag)
+ 						sv = NULL;
+ 					else
+ 						sv = getservbyport(ntohs(atoi(uport)),
+-							uflag ? "udp" : "tcp");
++							proto);
+ 
+ 					if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) {
+ 						char dst[INET_ADDRSTRLEN];
+@@ -476,7 +507,7 @@
+ 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
+ 							dst,
+ 							uport,
+-							uflag ? "udp" : "tcp",
++							proto,
+ 							sv ? sv->s_name : "*",
+ 							((struct sockaddr *)(&cliaddr))->sa_family,
+ 							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
+@@ -487,7 +518,7 @@
+ 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
+ 							dst,
+ 							uport,
+-							uflag ? "udp" : "tcp",
++							proto,
+ 							sv ? sv->s_name : "*",
+ 							((struct sockaddr *)&cliaddr)->sa_family,
+ 							ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port));
+@@ -495,7 +526,7 @@
+ 					else {
+ 						fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n",
+ 							uport,
+-							uflag ? "udp" : "tcp",
++							proto,
+ 							sv ? sv->s_name : "*",
+ 							((struct sockaddr *)(&cliaddr))->sa_family,
+ 							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
+@@ -559,19 +590,20 @@
+ 					}
+ 				}
+ 
++				char *proto = proto_name(uflag, dccpflag);
+ 				/* Don't look up port if -n. */
+ 				if (nflag)
+ 					sv = NULL;
+ 				else {
+ 					sv = getservbyport(
+ 					    ntohs(atoi(portlist[i])),
+-					    uflag ? "udp" : "tcp");
++					    proto);
+ 				}
+ 
+ 				fprintf(stderr,
+ 				    "Connection to %s %s port [%s/%s] "
+ 				    "succeeded!\n", host, portlist[i],
+-				    uflag ? "udp" : "tcp",
++				    proto,
+ 				    sv ? sv->s_name : "*");
+ 			}
+ 			if (!zflag)
+@@ -671,6 +703,24 @@
+ 	return (s);
+ }
+ 
++char *proto_name(uflag, dccpflag) {
++
++    char *proto = NULL;
++    if (uflag) {
++	proto = "udp";
++    }
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++    else if (dccpflag) {
++	proto = "dccp";
++    }
++# endif
++    else {
++	proto = "tcp";
++    }
++
++    return proto;
++}
++
+ /*
+  * remote_connect()
+  * Returns a socket connected to a remote host. Properly binds to a local
+@@ -709,8 +759,21 @@
+ # endif
+ 			memset(&ahints, 0, sizeof(struct addrinfo));
+ 			ahints.ai_family = res0->ai_family;
+-			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
+-			ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
++			if (uflag) {
++			    ahints.ai_socktype = SOCK_DGRAM;
++			    ahints.ai_protocol = IPPROTO_UDP;
++
++			}
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++			else if (dccpflag) {
++			    hints.ai_socktype = SOCK_DCCP;
++			    hints.ai_protocol = IPPROTO_DCCP;
++			}
++# endif
++			else {
++		    	    ahints.ai_socktype = SOCK_STREAM;
++			    ahints.ai_protocol = IPPROTO_TCP;
++			}
+ 			ahints.ai_flags = AI_PASSIVE;
+ 			if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
+ 				errx(1, "getaddrinfo: %s", gai_strerror(error));
+@@ -722,15 +785,19 @@
+ 		}
+ 
+ 		set_common_sockopts(s);
++		char *proto = proto_name(uflag, dccpflag);
+ 
+-                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
++                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) {
+ 			break;
+-		else if (vflag && error == CONNECTION_FAILED)
++		}
++		else if (vflag && error == CONNECTION_FAILED) {
+ 			warn("connect to %s port %s (%s) failed", host, port,
+-			    uflag ? "udp" : "tcp");
+-                else if (vflag && error == CONNECTION_TIMEOUT)
++			     proto);
++		}
++                else if (vflag && error == CONNECTION_TIMEOUT) {
+                     warn("connect to %s port %s (%s) timed out", host, port,
+-                            uflag ? "udp" : "tcp");
++                             proto);
++		}
+ 
+ 		close(s);
+ 		s = -1;
+@@ -1047,7 +1114,8 @@
+ 	int hi, lo, cp;
+ 	int x = 0;
+ 
+-        sv = getservbyname(p, uflag ? "udp" : "tcp");
++	char *proto = proto_name(uflag, dccpflag);
++	sv = getservbyname(p, proto);
+         if (sv) {
+                 portlist[0] = calloc(1, PORT_MAX_LEN);
+                 if (portlist[0] == NULL)
+@@ -1252,6 +1320,7 @@
+ 	\t-w secs\t	Timeout for connects and final net reads\n\
+ 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
+ 	\t-x addr[:port]\tSpecify proxy address and port\n\
++	\t-Z		DCCP mode\n\
+ 	\t-z		Zero-I/O mode [used for scanning]\n\
+ 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
+ 	exit(0);
+@@ -1261,7 +1330,7 @@
+ usage(int ret)
+ {
+ 	fprintf(stderr,
+-	    "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
++	    "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
+ 	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
+ 	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+ 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
 
=== added file 'debian/patches/0010-serialized-handling-multiple-clients.patch'
--- debian/patches/0010-serialized-handling-multiple-clients.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0010-serialized-handling-multiple-clients.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,73 @@
+From: Aron Xu <[e-mail]>
+Date: Tue, 14 Feb 2012 23:02:00 +0800
+Subject: [PATCH] serialized handling multiple clients
+
+---
+ netcat.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/netcat.c
++++ b/netcat.c
+@@ -447,26 +447,24 @@
+ 				s = unix_bind(host);
+ 			else
+ 				s = unix_listen(host);
+-		}
++		} else
++			s = local_listen(host, uport, hints);
++		if (s < 0)
++			err(1, NULL);
++
++		char* local;
++		if (family == AF_INET6)
++			local = ":::";
++		else
++			local = "0.0.0.0";
++		fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
++			host ?: local,
++			family,
++			*uport);
+ 
+ 		/* Allow only one connection at a time, but stay alive. */
+ 		for (;;) {
+-			if (family != AF_UNIX)
+-				s = local_listen(host, uport, hints);
+-			if (s < 0)
+-				err(1, NULL);
+-
+-			char* local;
+-			if (family == AF_INET6 )
+-				local = "0.0.0.0";
+-			else if (family == AF_INET)
+-				local = ":::";
+-			else
+-				local = "unknown";
+-			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
+-				host ?: local,
+-				family,
+-				*uport);
++
+ 			/*
+ 			 * For UDP, we will use recvfrom() initially
+ 			 * to wait for a caller, then use the regular
+@@ -536,15 +534,16 @@
+ 				close(connfd);
+ 			}
+ 
+-			if (family != AF_UNIX)
++			if (kflag)
++				continue;
++			if (family != AF_UNIX) {
+ 				close(s);
++			}
+ 			else if (uflag) {
+ 				if (connect(s, NULL, 0) < 0)
+ 					err(1, "connect");
+ 			}
+-
+-			if (!kflag)
+-				break;
++			break;
+ 		}
+ 	} else if (family == AF_UNIX) {
+ 		ret = 0;
 
=== added file 'debian/patches/0011-misc-failures-and-features.patch'
--- debian/patches/0011-misc-failures-and-features.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0011-misc-failures-and-features.patch	2012-05-30 22:10:23 +0000
@@ -0,0 +1,443 @@
+From: Aron Xu <[e-mail]>
+Date: Mon, 13 Feb 2012 19:06:52 +0800
+Subject: [PATCH] misc connection failures
+
+---
+ netcat.c |   22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+--- a/netcat.c
++++ b/netcat.c
+@@ -88,6 +88,7 @@
+ #include <netdb.h>
+ #include <poll.h>
+ #include <signal.h>
++#include <stddef.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -115,6 +116,7 @@
+ #define UDP_SCAN_TIMEOUT 3			/* Seconds */
+ 
+ /* Command Line Options */
++int	bflag;					/* Allow Broadcast */
+ int     Cflag = 0;                              /* CRLF line-ending */
+ int	dflag;					/* detached, no stdin */
+ unsigned int iflag;				/* Interval Flag */
+@@ -146,7 +148,7 @@
+ char *unix_dg_tmp_socket;
+ 
+ void	atelnet(int, unsigned char *, unsigned int);
+-void	build_ports(char *);
++void	build_ports(char **);
+ void	help(void);
+ int	local_listen(char *, char *, struct addrinfo);
+ void	readwrite(int);
+@@ -171,11 +173,14 @@
+ main(int argc, char *argv[])
+ {
+ 	int ch, s, ret, socksv;
+-	char *host, *uport;
++	char *host, **uport;
+ 	struct addrinfo hints;
+ 	struct servent *sv;
+ 	socklen_t len;
+-	struct sockaddr_storage cliaddr;
++	union {
++        	struct sockaddr_storage storage;
++		struct sockaddr_un forunix;
++	} cliaddr;
+ 	char *proxy = NULL;
+ 	const char *errstr, *proxyhost = "", *proxyport = NULL;
+ 	struct addrinfo proxyhints;
+@@ -189,7 +194,7 @@
+ 	sv = NULL;
+ 
+ 	while ((ch = getopt(argc, argv,
+-	    "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
++	    "46bCDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
+ 		switch (ch) {
+ 		case '4':
+ 			family = AF_INET;
+@@ -197,6 +202,13 @@
+ 		case '6':
+ 			family = AF_INET6;
+ 			break;
++		case 'b':
++# if defined(SO_BROADCAST)
++			bflag = 1;
++# else
++			errx(1, "no broadcast frame support available");
++# endif
++			break;
+ 		case 'U':
+ 			family = AF_UNIX;
+ 			break;
+@@ -350,27 +362,34 @@
+ # endif
+ 		host = argv[0];
+ 		uport = NULL;
+-	} else if (!argv[0] && lflag) {
+-		if (sflag)
+-			errx(1, "cannot use -s and -l");
+-		if (zflag)
+-			errx(1, "cannot use -z and -l");
+-		if (pflag)
+-			uport=pflag;
+-	} else if (!lflag && kflag) {
+-		errx(1, "cannot use -k without -l");
+-	} else if (argv[0] && !argv[1]) {
+-		if  (!lflag)
+-			usage(1);
+-		uport = argv[0];
++	} else if (argv[0] && !argv[1] && lflag) {
++		if (pflag) {
++			uport = &pflag;
++			host = argv[0];
++		} else {
++			uport = argv;
++			host = NULL;
++		}
++	} else if (!argv[0] && lflag && pflag) {
++		uport = &pflag;
+ 		host = NULL;
+ 	} else if (argv[0] && argv[1]) {
+ 		host = argv[0];
+-		uport = argv[1];
++		uport = &argv[1];
+ 	} else
+ 		usage(1);
+ 
+-
++	if (lflag) {
++		if (sflag)
++			errx(1, "cannot use -s and -l");
++		if (zflag)
++			errx(1, "cannot use -z and -l");
++		if (pflag)
++			/* This still does not work well because of getopt mess
++			errx(1, "cannot use -p and -l"); */
++			uport = &pflag;
++	} else if (!lflag && kflag)
++		errx(1, "cannot use -k without -l");
+ 
+ 	/* Get name of temporary socket for unix datagram client */
+ 	if ((family == AF_UNIX) && uflag && !lflag) {
+@@ -448,7 +467,7 @@
+ 			else
+ 				s = unix_listen(host);
+ 		} else
+-			s = local_listen(host, uport, hints);
++			s = local_listen(host, *uport, hints);
+ 		if (s < 0)
+ 			err(1, NULL);
+ 
+@@ -457,7 +476,8 @@
+ 			local = ":::";
+ 		else
+ 			local = "0.0.0.0";
+-		fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
++		if (vflag && (family != AF_UNIX))
++		fprintf(stderr, "Listening on [%s] (family %d, port %s)\n",
+ 			host ?: local,
+ 			family,
+ 			*uport);
+@@ -490,13 +510,17 @@
+ 				len = sizeof(cliaddr);
+ 				connfd = accept(s, (struct sockaddr *)&cliaddr,
+ 				    &len);
+-				if(vflag) {
++				if(vflag && family == AF_UNIX) {
++					fprintf(stderr, "Connection from \"%.*s\" accepted\n",
++						(len - (int)offsetof(struct sockaddr_un, sun_path)),
++						((struct sockaddr_un*)&cliaddr)->sun_path);
++				} else if(vflag) {
+ 					char *proto = proto_name(uflag, dccpflag);
+ 				/* Don't look up port if -n. */
+ 					if (nflag)
+ 						sv = NULL;
+ 					else
+-						sv = getservbyport(ntohs(atoi(uport)),
++						sv = getservbyport(ntohs(atoi(*uport)),
+ 							proto);
+ 
+ 					if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) {
+@@ -504,7 +528,7 @@
+ 						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN);
+ 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
+ 							dst,
+-							uport,
++							*uport,
+ 							proto,
+ 							sv ? sv->s_name : "*",
+ 							((struct sockaddr *)(&cliaddr))->sa_family,
+@@ -515,7 +539,7 @@
+ 						inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN);
+ 						fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n",
+ 							dst,
+-							uport,
++							*uport,
+ 							proto,
+ 							sv ? sv->s_name : "*",
+ 							((struct sockaddr *)&cliaddr)->sa_family,
+@@ -523,17 +547,21 @@
+ 					}
+ 					else {
+ 						fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n",
+-							uport,
++							*uport,
+ 							proto,
+ 							sv ? sv->s_name : "*",
+ 							((struct sockaddr *)(&cliaddr))->sa_family,
+ 							ntohs(((struct sockaddr_in *)&cliaddr)->sin_port));
+ 					}
+ 				}
++                                if(!kflag)
++                                        close(s);
+ 				readwrite(connfd);
+ 				close(connfd);
+ 			}
+ 
++			if (vflag && kflag)
++                                fprintf(stderr, "Connection closed, listening again.\n");
+ 			if (kflag)
+ 				continue;
+ 			if (family != AF_UNIX) {
+@@ -641,6 +669,8 @@
+ 		return (-1);
+ 	}
+ 
++        unlink(path);
++
+ 	if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
+ 		close(s);
+ 		return (-1);
+@@ -662,8 +692,10 @@
+ 		if ((s = unix_bind(unix_dg_tmp_socket)) < 0)
+ 			return (-1);
+ 	} else {
+-		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
++		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
++                        errx(1,"create unix socket failed");
+ 			return (-1);
++                }
+ 	}
+ 	(void)fcntl(s, F_SETFD, 1);
+ 
+@@ -674,9 +706,11 @@
+ 	    sizeof(sun.sun_path)) {
+ 		close(s);
+ 		errno = ENAMETOOLONG;
++                warn("unix connect abandoned");
+ 		return (-1);
+ 	}
+ 	if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
++                warn("unix connect failed");
+ 		close(s);
+ 		return (-1);
+ 	}
+@@ -1105,22 +1139,23 @@
+  * that we should try to connect to.
+  */
+ void
+-build_ports(char *p)
++build_ports(char **p)
+ {
+         struct servent *sv;
+ 	const char *errstr;
+ 	char *n;
+ 	int hi, lo, cp;
+ 	int x = 0;
++	int i;
+ 
+ 	char *proto = proto_name(uflag, dccpflag);
+-	sv = getservbyname(p, proto);
++	sv = getservbyname(*p, proto);
+         if (sv) {
+                 portlist[0] = calloc(1, PORT_MAX_LEN);
+                 if (portlist[0] == NULL)
+                         err(1, NULL);
+                 snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
+-        } else if ((n = strchr(p, '-')) != NULL) {
++        } else if ((n = strchr(*p, '-')) != NULL) {
+ 		*n = '\0';
+ 		n++;
+ 
+@@ -1128,9 +1163,9 @@
+ 		hi = strtonum(n, 1, PORT_MAX, &errstr);
+ 		if (errstr)
+ 			errx(1, "port number %s: %s", errstr, n);
+-		lo = strtonum(p, 1, PORT_MAX, &errstr);
++		lo = strtonum(*p, 1, PORT_MAX, &errstr);
+ 		if (errstr)
+-			errx(1, "port number %s: %s", errstr, p);
++			errx(1, "port number %s: %s", errstr, *p);
+ 
+ 		if (lo > hi) {
+ 			cp = hi;
+@@ -1160,10 +1195,12 @@
+ 			}
+ 		}
+ 	} else {
+-		hi = strtonum(p, 1, PORT_MAX, &errstr);
++		hi = strtonum(*p, 1, PORT_MAX, &errstr);
+ 		if (errstr)
+-			errx(1, "port number %s: %s", errstr, p);
+-		portlist[0] = strdup(p);
++			errx(1, "port number %s: %s", errstr, *p);
++		for (i=0;p[i];i++) {
++			portlist[i] = strdup(p[i]);
++		}
+ 		if (portlist[0] == NULL)
+ 			err(1, NULL);
+ 	}
+@@ -1198,6 +1235,13 @@
+ {
+ 	int x = 1;
+ 
++# if defined(SO_BROADCAST)
++	if (bflag) {
++		if (setsockopt(s, IPPROTO_TCP, SO_BROADCAST,
++			&x, sizeof(x)) == -1)
++			err(1, NULL);
++	}
++# endif
+ # if defined(TCP_MD5SIG)
+ 	if (Sflag) {
+ 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
+@@ -1293,6 +1337,7 @@
+ 	fprintf(stderr, "\tCommand Summary:\n\
+ 	\t-4		Use IPv4\n\
+ 	\t-6		Use IPv6\n\
++	\t-b		Allow broadcast\n\
+ 	\t-C		Send CRLF as line-ending\n\
+ 	\t-D		Enable the debug socket option\n\
+ 	\t-d		Detach from stdin\n\
+@@ -1329,7 +1374,7 @@
+ usage(int ret)
+ {
+ 	fprintf(stderr,
+-	    "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
++	    "usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
+ 	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
+ 	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+ 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
+--- a/nc.1
++++ b/nc.1
+@@ -34,7 +34,7 @@
+ .Sh SYNOPSIS
+ .Nm nc
+ .Bk -words
+-.Op Fl 46CDdhklnrStUuvZz
++.Op Fl 46bCDdhklnrStUuvZz
+ .Op Fl I Ar length
+ .Op Fl i Ar interval
+ .Op Fl O Ar length
+@@ -99,6 +99,8 @@
+ Forces
+ .Nm
+ to use IPv6 addresses only.
++.It Fl b
++Allow broadcast.
+ .It Fl C
+ Send CRLF as line-ending.
+ .It Fl D
+@@ -323,6 +325,54 @@
+ The connection may be terminated using an
+ .Dv EOF
+ .Pq Sq ^D .
++.Pp
++There is no
++.Fl c
++or
++.Fl e
++option in this netcat, but you still can execute a command after connection
++being established by redirecting file descriptors. Be cautious here because
++opening a port and let anyone connected execute arbitrary command on your
++site is DANGEROUS. If you really need to do this, here is an example:
++.Pp
++On
++.Sq server
++side:
++.Pp
++.Dl $ rm -f /tmp/f; mkfifo /tmp/f
++.Dl $ cat /tmp/f | /bin/sh -i 2>&1 | nc -l 127.0.0.1 1234 > /tmp/f
++.Pp
++On
++.Sq client
++side:
++.Pp
++.Dl $ nc host.example.com 1234
++.Dl $ (shell prompt from host.example.com)
++.Pp
++By doing this, you create a fifo at /tmp/f and make nc listen at port 1234
++of address 127.0.0.1 on
++.Sq server
++side, when a
++.Sq client
++establishes a connection successfully to that port, /bin/sh gets executed
++on
++.Sq server
++side and the shell prompt is given to
++.Sq client
++side.
++.Pp
++When connection is terminated,
++.Nm
++quits as well. Use
++.Fl k
++if you want it keep listening, but if the command quits this option won't
++restart it or keep
++.Nm
++running. Also don't forget to remove the file descriptor once you don't need
++it anymore:
++.Pp
++.Dl $ rm -f /tmp/f
++.Pp
+ .Sh DATA TRANSFER
+ The example in the previous section can be expanded to build a
+ basic data transfer model.
+@@ -382,15 +432,30 @@
+ flag can be used to tell
+ .Nm
+ to report open ports,
+-rather than initiate a connection.
++rather than initiate a connection. Usually it's useful to turn on verbose
++output to stderr by use this option in conjunction with
++.Fl v
++option.
++.Pp
+ For example:
+ .Bd -literal -offset indent
+-$ nc -z host.example.com 20-30
++$ nc \-zv host.example.com 20-30
+ Connection to host.example.com 22 port [tcp/ssh] succeeded!
+ Connection to host.example.com 25 port [tcp/smtp] succeeded!
+ .Ed
+ .Pp
+-The port range was specified to limit the search to ports 20 \- 30.
++The port range was specified to limit the search to ports 20 \- 30, and is
++scanned by increasing order.
++.Pp
++You can also specify a list of ports to scan, for example:
++.Bd -literal -offset indent
++$ nc \-zv host.example.com 80 20 22
++nc: connect to host.example.com 80 (tcp) failed: Connection refused
++nc: connect to host.example.com 20 (tcp) failed: Connection refused
++Connection to host.example.com port [tcp/ssh] succeeded!
++.Ed
++.Pp
++The ports are scanned by the order you given.
+ .Pp
+ Alternatively, it might be useful to know which server software
+ is running, and which versions.
+@@ -455,6 +520,9 @@
+ .br
+ Rewritten with IPv6 support by
+ .An Eric Jackson Aq [e-mail] .
++.br
++Modified for Debian port by Aron Xu
++.Aq [e-mail] .
+ .Sh CAVEATS
+ UDP port scans using the
+ .Fl uz
 
=== removed file 'debian/patches/connect-timeout.patch'
--- debian/patches/connect-timeout.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/connect-timeout.patch	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 16:17:27.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 16:17:30.000000000 -0500
-@@ -65,6 +65,10 @@
- #define PORT_MAX	65535
- #define PORT_MAX_LEN	6
- 
-+#define CONNECTION_SUCCESS 0
-+#define CONNECTION_FAILED 1
-+#define CONNECTION_TIMEOUT 2
-+
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- int	iflag;					/* Interval Flag */
-@@ -104,6 +108,9 @@
- int	parse_iptos(char *);
- void	usage(int);
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa, 
-+		                socklen_t salen, int ctimeout);
-+
- int
- main(int argc, char *argv[])
- {
-@@ -508,13 +515,15 @@
- 		}
- 
- 		set_common_sockopts(s);
--
--		if (connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
-+		if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
- 			break;
--		else if (vflag)
-+		else if (vflag && error == CONNECTION_FAILED)
- 			warn("connect to %s port %s (%s) failed", host, port,
- 			    uflag ? "udp" : "tcp");
--
-+		else if (vflag && error == CONNECTION_TIMEOUT)
-+			warn("connect to %s port %s (%s) timed out", host, port,
-+			    uflag ? "udp" : "tcp");
-+		
- 		close(s);
- 		s = -1;
- 	} while ((res0 = res0->ai_next) != NULL);
-@@ -524,6 +533,74 @@
- 	return (s);
- }
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa, 
-+		                socklen_t salen, int ctimeout)
-+{
-+	int err;
-+	struct timeval tv, *tvp = NULL;
-+	fd_set connect_fdset;
-+	socklen_t len;
-+	int orig_flags;	
-+
-+	orig_flags = fcntl(fd, F_GETFL, 0);
-+	if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) {
-+		warn("can't set O_NONBLOCK - timeout not avaliable");
-+		if (connect(fd, sa, salen) == 0)
-+			return CONNECTION_SUCCESS;
-+		else
-+			return CONNECTION_FAILED;
-+	}
-+
-+	/* set connect timeout */
-+	if (ctimeout > 0) {
-+		tv.tv_sec = (time_t)ctimeout/1000;
-+		tv.tv_usec = 0;
-+		tvp = &tv;
-+	}
-+
-+	/* attempt the connection */
-+	err = connect(fd, sa, salen);
-+	
-+	if (err != 0 && errno == EINPROGRESS) {
-+		/* connection is proceeding
-+		 * it is complete (or failed) when select returns */
-+
-+		/* initialize connect_fdset */
-+		FD_ZERO(&connect_fdset);
-+		FD_SET(fd, &connect_fdset);
-+
-+		/* call select */
-+		do {
-+			err = select(fd + 1, NULL, &connect_fdset, 
-+				     NULL, tvp);
-+		} while (err < 0 && errno == EINTR);
-+
-+		/* select error */
-+		if (err < 0)
-+			errx(1,"select error: %s", strerror(errno));
-+	
-+		/* we have reached a timeout */
-+		if (err == 0) 
-+			return CONNECTION_TIMEOUT;
-+		
-+		/* select returned successfully, but we must test socket 
-+		 * error for result */
-+		len = sizeof(err);
-+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0)
-+			errx(1, "getsockopt error: %s", strerror(errno));
-+		
-+		/* setup errno according to the result returned by 
-+		 * getsockopt */
-+		if (err != 0)
-+			errno = err;
-+	}
-+
-+	/* return aborted if an error occured, and valid otherwise */
-+	fcntl(fd, F_SETFL, orig_flags);
-+	return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS;
-+}
-+						    				
-+
- /*
-  * local_listen()
-  * Returns a socket listening on a local port, binds to specified source
 
=== removed file 'debian/patches/dccp.patch'
--- debian/patches/dccp.patch	2011-06-11 14:31:06 +0000
+++ debian/patches/dccp.patch	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-Index: netcat-openbsd-oneiric/netcat.c
-===================================================================
---- netcat-openbsd-oneiric.orig/netcat.c	2011-06-10 22:29:16.371916860 +0300
-+++ netcat-openbsd-oneiric/netcat.c	2011-06-10 22:29:16.371916860 +0300
-@@ -88,6 +88,7 @@
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
- int	uflag;					/* UDP - Default to TCP */
-+int	dccpflag;				/* DCCP - Default to TCP */
- int	vflag;					/* Verbosity */
- int	xflag;					/* Socks proxy */
- int	zflag;					/* Port Scan Flag */
-@@ -113,6 +114,7 @@
- void	set_common_sockopts(int);
- int	parse_iptos(char *);
- void	usage(int);
-+char    *proto_name(int uflag, int dccpflag);
- 
- static int connect_with_timeout(int fd, const struct sockaddr *sa, 
- 		                socklen_t salen, int ctimeout);
-@@ -140,7 +142,7 @@
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46Ddhi:jklnP:p:q:rSs:tT:Uuvw:X:x:zC")) != -1) {
-+	    "46Ddhi:jklnP:p:q:rSs:tT:UuZvw:X:x:zC")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -205,6 +207,9 @@
- 		case 'u':
- 			uflag = 1;
- 			break;
-+		case 'Z':
-+			dccpflag = 1;
-+			break;
- 		case 'v':
- 			vflag = 1;
- 			break;
-@@ -247,6 +252,9 @@
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
- 		if (uflag)
- 			errx(1, "cannot use -u and -U");
-+		if (dccpflag)
-+			errx(1, "cannot use -C and -U");
-+
- 		host = argv[0];
- 		uport = NULL;
- 	} else if (argv[0] && !argv[1]) {
-@@ -273,8 +281,18 @@
- 	if (family != AF_UNIX) {
- 		memset(&hints, 0, sizeof(struct addrinfo));
- 		hints.ai_family = family;
--		hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--		hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+		if (uflag) {
-+		    hints.ai_socktype = SOCK_DGRAM;
-+		    hints.ai_protocol = IPPROTO_UDP;
-+		}
-+		else if (dccpflag) {
-+		    hints.ai_socktype = SOCK_DCCP;
-+		    hints.ai_protocol = IPPROTO_DCCP;
-+		}
-+		else {
-+		    hints.ai_socktype = SOCK_STREAM;
-+		    hints.ai_protocol = IPPROTO_TCP;
-+		}
- 		if (nflag)
- 			hints.ai_flags |= AI_NUMERICHOST;
- 	}
-@@ -283,6 +301,9 @@
- 		if (uflag)
- 			errx(1, "no proxy support for UDP mode");
- 
-+		if (dccpflag)
-+			errx(1, "no proxy support for DCCP mode");
-+
- 		if (lflag)
- 			errx(1, "no proxy support for listen");
- 
-@@ -348,17 +369,19 @@
- 			}
- 
- 			if(vflag) {
-+				char *proto = proto_name(uflag, dccpflag);
-+
- 				/* Don't look up port if -n. */
- 				if (nflag)
- 					sv = NULL;
- 				else 
- 					sv = getservbyport(ntohs(atoi(uport)),
--						uflag ? "udp" : "tcp");
-+						proto);
- 
- 				fprintf(stderr, "Connection from %s port %s [%s/%s] accepted\n", 
- 					inet_ntoa(((struct sockaddr_in *)(&cliaddr))->sin_addr),
- 					uport,
--					uflag ? "udp" : "tcp", 
-+					proto,
- 					sv ? sv->s_name : "*");
- 			}
- 
-@@ -503,6 +526,22 @@
- 	return (s);
- }
- 
-+char *proto_name(uflag, dccpflag) {
-+
-+    char *proto = NULL;
-+    if (uflag) {
-+	proto = "udp";
-+    }
-+    else if (dccpflag) {
-+	proto = "dccp";
-+    }
-+    else {
-+	proto = "tcp";
-+    }
-+
-+    return proto;
-+}
-+
- /*
-  * remote_connect()
-  * Returns a socket connected to a remote host. Properly binds to a local
-@@ -529,8 +568,19 @@
- 
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res0->ai_family;
--			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--			ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+			if (uflag) {
-+			    ahints.ai_socktype = SOCK_DGRAM;
-+			    ahints.ai_protocol = IPPROTO_UDP;
-+
-+			}
-+			else if (dccpflag) {
-+			    ahints.ai_socktype = SOCK_DCCP;
-+			    ahints.ai_protocol = IPPROTO_DCCP;
-+			}
-+			else {
-+		    	    ahints.ai_socktype = SOCK_STREAM;
-+			    ahints.ai_protocol = IPPROTO_TCP;
-+			}
- 			ahints.ai_flags = AI_PASSIVE;
- 			if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
- 				errx(1, "getaddrinfo: %s", gai_strerror(error));
-@@ -542,14 +592,19 @@
- 		}
- 
- 		set_common_sockopts(s);
--		if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
-+		char *proto = proto_name(uflag, dccpflag);
-+
-+		if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout)) == CONNECTION_SUCCESS) {
- 			break;
--		else if (vflag && error == CONNECTION_FAILED)
-+		}
-+		else if (vflag && error == CONNECTION_FAILED) {
- 			warn("connect to %s port %s (%s) failed", host, port,
--			    uflag ? "udp" : "tcp");
--		else if (vflag && error == CONNECTION_TIMEOUT)
-+			    proto);
-+		}
-+		else if (vflag && error == CONNECTION_TIMEOUT) {
- 			warn("connect to %s port %s (%s) timed out", host, port,
--			    uflag ? "udp" : "tcp");
-+			    proto);
-+		}
- 		
- 		close(s);
- 		s = -1;
-@@ -817,8 +872,8 @@
- 	char *n, *endp;
- 	int hi, lo, cp;
- 	int x = 0;
--
--	sv = getservbyname(p, uflag ? "udp" : "tcp");
-+	char *proto = proto_name(uflag, dccpflag);
-+	sv = getservbyname(p, proto);
- 	if (sv) {
- 		portlist[0] = calloc(1, PORT_MAX_LEN);
- 		if (portlist[0] == NULL)
-@@ -979,6 +1034,7 @@
- 	\t-t		Answer TELNET negotiation\n\
- 	\t-U		Use UNIX domain socket\n\
- 	\t-u		UDP mode\n\
-+	\t-Z		DCCP mode\n\
- 	\t-v		Verbose\n\
- 	\t-w secs\t	Timeout for connects and final net reads\n\
- 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
 
=== removed file 'debian/patches/gcc-warnings.patch'
--- debian/patches/gcc-warnings.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/gcc-warnings.patch	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 20:39:46.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 20:42:35.000000000 -0500
-@@ -127,7 +127,7 @@
- 	struct servent *sv;
- 	socklen_t len;
- 	struct sockaddr_storage cliaddr;
--	char *proxy;
-+	char *proxy = NULL;
- 	const char *proxyhost = "", *proxyport = NULL;
- 	struct addrinfo proxyhints;
- 
-@@ -800,14 +800,12 @@
- 			obuf[1] = DONT;
- 		if ((*p == DO) || (*p == DONT))
- 			obuf[1] = WONT;
--		if (obuf) {
--			p++;
--			obuf[2] = *p;
--			obuf[3] = '\0';
--			if (atomicio(vwrite, nfd, obuf, 3) != 3)
--				warn("Write Error!");
--			obuf[0] = '\0';
--		}
-+		p++;
-+		obuf[2] = *p;
-+		obuf[3] = '\0';
-+		if (atomicio(vwrite, nfd, obuf, 3) != 3)
-+			warn("Write Error!");
-+		obuf[0] = '\0';
- 	}
- }
- 
-Index: netcat-openbsd-1.89/socks.c
-===================================================================
---- netcat-openbsd-1.89.orig/socks.c	2008-01-22 20:36:26.000000000 -0500
-+++ netcat-openbsd-1.89/socks.c	2008-01-22 20:39:46.000000000 -0500
-@@ -169,11 +169,11 @@
- 		buf[2] = SOCKS_NOAUTH;
- 		cnt = atomicio(vwrite, proxyfd, buf, 3);
- 		if (cnt != 3)
--			err(1, "write failed (%d/3)", cnt);
-+			err(1, "write failed (%d/3)", (int)cnt);
- 
- 		cnt = atomicio(read, proxyfd, buf, 2);
- 		if (cnt != 2)
--			err(1, "read failed (%d/3)", cnt);
-+			err(1, "read failed (%d/3)", (int)cnt);
- 
- 		if (buf[1] == SOCKS_NOMETHOD)
- 			errx(1, "authentication method negotiation failed");
-@@ -222,11 +222,11 @@
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%d/%d)", cnt, wlen);
-+			err(1, "write failed (%d/%d)", (int)cnt, (int)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 10);
- 		if (cnt != 10)
--			err(1, "read failed (%d/10)", cnt);
-+			err(1, "read failed (%d/10)", (int)cnt);
- 		if (buf[1] != 0)
- 			errx(1, "connection failed, SOCKS error %d", buf[1]);
- 	} else if (socksv == 4) {
-@@ -244,11 +244,11 @@
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%d/%d)", cnt, wlen);
-+			err(1, "write failed (%d/%d)", (int)cnt, (int)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 8);
- 		if (cnt != 8)
--			err(1, "read failed (%d/8)", cnt);
-+			err(1, "read failed (%d/8)", (int)cnt);
- 		if (buf[1] != 90)
- 			errx(1, "connection failed, SOCKS error %d", buf[1]);
- 	} else if (socksv == -1) {
-@@ -260,39 +260,39 @@
- 
- 		/* Try to be sane about numeric IPv6 addresses */
- 		if (strchr(host, ':') != NULL) {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		} else {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT %s:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		}
- 		if (r == -1 || (size_t)r >= sizeof(buf))
- 			errx(1, "hostname too long");
--		r = strlen(buf);
-+		r = strlen((char*)buf);
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, r);
- 		if (cnt != r)
--			err(1, "write failed (%d/%d)", cnt, r);
-+			err(1, "write failed (%d/%d)", (int)cnt, (int)r);
- 
- 		if (authretry > 1) {
- 			char resp[1024];
- 
- 			proxypass = getproxypass(proxyuser, proxyhost);
--			r = snprintf(buf, sizeof(buf), "%s:%s",
-+			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
- 			    proxyuser, proxypass);
- 			if (r == -1 || (size_t)r >= sizeof(buf) ||
--			    b64_ntop(buf, strlen(buf), resp,
-+			    b64_ntop(buf, strlen((char*)buf), resp,
- 			    sizeof(resp)) == -1)
- 				errx(1, "Proxy username/password too long");
--			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
-+			r = snprintf((char*)buf, sizeof((char*)buf), "Proxy-Authorization: "
- 			    "Basic %s\r\n", resp);
- 			if (r == -1 || (size_t)r >= sizeof(buf))
- 				errx(1, "Proxy auth response too long");
--			r = strlen(buf);
-+			r = strlen((char*)buf);
- 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
--				err(1, "write failed (%d/%d)", cnt, r);
-+				err(1, "write failed (%d/%d)", (int)cnt, r);
- 		}
- 
- 		/* Terminate headers */
-@@ -300,22 +300,22 @@
- 			err(1, "write failed (2/%d)", r);
- 
- 		/* Read status reply */
--		proxy_read_line(proxyfd, buf, sizeof(buf));
-+		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 		if (proxyuser != NULL &&
--		    strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
-+		    strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
- 			if (authretry > 1) {
- 				fprintf(stderr, "Proxy authentication "
- 				    "failed\n");
- 			}
- 			close(proxyfd);
- 			goto again;
--		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
--		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
-+		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
-+		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
- 			errx(1, "Proxy error: \"%s\"", buf);
- 
- 		/* Headers continue until we hit an empty line */
- 		for (r = 0; r < HTTP_MAXHDRS; r++) {
--			proxy_read_line(proxyfd, buf, sizeof(buf));
-+			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 			if (*buf == '\0')
- 				break;
- 		}
 
=== removed file 'debian/patches/getservbyname.patch'
--- debian/patches/getservbyname.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/getservbyname.patch	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 20:39:46.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 20:43:36.000000000 -0500
-@@ -819,11 +819,18 @@
- void
- build_ports(char *p)
- {
-+	struct servent *sv;
- 	char *n, *endp;
- 	int hi, lo, cp;
- 	int x = 0;
- 
--	if ((n = strchr(p, '-')) != NULL) {
-+	sv = getservbyname(p, uflag ? "udp" : "tcp");
-+	if (sv) {
-+		portlist[0] = calloc(1, PORT_MAX_LEN);
-+		if (portlist[0] == NULL)
-+			err(1, NULL);
-+		snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
-+	} else if ((n = strchr(p, '-')) != NULL) {
- 		if (lflag)
- 			errx(1, "Cannot use -l with multiple ports!");
- 
 
=== removed file 'debian/patches/glib-strlcpy.patch'
--- debian/patches/glib-strlcpy.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/glib-strlcpy.patch	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2007-02-20 09:11:17.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-21 18:48:23.000000000 -0500
-@@ -55,6 +55,8 @@
- #include <limits.h>
- #include "atomicio.h"
- 
-+#include <glib.h>
-+
- #ifndef SUN_LEN
- #define SUN_LEN(su) \
- 	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-@@ -414,7 +416,7 @@
- 	memset(&sun, 0, sizeof(struct sockaddr_un));
- 	sun.sun_family = AF_UNIX;
- 
--	if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
-+	if (g_strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
- 	    sizeof(sun.sun_path)) {
- 		close(s);
- 		errno = ENAMETOOLONG;
-@@ -445,7 +447,7 @@
- 	memset(&sun, 0, sizeof(struct sockaddr_un));
- 	sun.sun_family = AF_UNIX;
- 
--	if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
-+	if (g_strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
- 	    sizeof(sun.sun_path)) {
- 		close(s);
- 		errno = ENAMETOOLONG;
-@@ -549,11 +551,11 @@
- 		if ((s = socket(res0->ai_family, res0->ai_socktype,
- 		    res0->ai_protocol)) < 0)
- 			continue;
--
-+		#ifdef SO_REUSEPORT
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
- 			err(1, NULL);
--
-+		#endif
- 		set_common_sockopts(s);
- 
- 		if (bind(s, (struct sockaddr *)res0->ai_addr,
-@@ -719,7 +721,8 @@
- 			char *c;
- 
- 			for (x = 0; x <= (hi - lo); x++) {
--				y = (arc4random() & 0xFFFF) % (hi - lo);
-+				/* use random instead of arc4random */
-+				y = (random() & 0xFFFF) % (hi - lo);
- 				c = portlist[x];
- 				portlist[x] = portlist[y];
- 				portlist[y] = c;
-@@ -761,21 +764,25 @@
- {
- 	int x = 1;
- 
-+#ifdef TCP_MD5SIG
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+#endif
- 	if (Dflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+#ifdef SO_JUMBO
- 	if (jflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_JUMBO,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+#endif
- 	if (Tflag != -1) {
- 		if (setsockopt(s, IPPROTO_IP, IP_TOS,
- 		    &Tflag, sizeof(Tflag)) == -1)
-@@ -816,9 +823,11 @@
- 	\t-n		Suppress name/port resolutions\n\
- 	\t-P proxyuser\tUsername for proxy authentication\n\
- 	\t-p port\t	Specify local port for remote connects\n\
--	\t-r		Randomize remote ports\n\
--	\t-S		Enable the TCP MD5 signature option\n\
--	\t-s addr\t	Local source address\n\
-+	\t-r		Randomize remote ports\n "
-+#ifdef TCP_MD5SIG
-+"	\t-S		Enable the TCP MD5 signature option\n"
-+#endif
-+"	\t-s addr\t	Local source address\n\
- 	\t-T ToS\t	Set IP Type of Service\n\
- 	\t-t		Answer TELNET negotiation\n\
- 	\t-U		Use UNIX domain socket\n\
 
=== removed file 'debian/patches/help-version-exit.patch'
--- debian/patches/help-version-exit.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/help-version-exit.patch	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-25 13:14:34.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-25 13:15:49.000000000 -0500
-@@ -937,6 +937,7 @@
- void
- help(void)
- {
-+	fprintf(stderr, "OpenBSD netcat (Debian patchlevel " DEBIAN_VERSION ")\n");
- 	usage(0);
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
-@@ -966,7 +967,7 @@
- 	\t-x addr[:port]\tSpecify 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");
--	exit(1);
-+	exit(0);
- }
- 
- void
 
=== removed file 'debian/patches/nc-1.84-udp_stop.patch'
--- debian/patches/nc-1.84-udp_stop.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/nc-1.84-udp_stop.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Index: netcat-1.84/netcat.c
-===================================================================
---- netcat-1.84.orig/netcat.c	2008-01-15 10:10:22.373351813 +0100
-+++ netcat-1.84/netcat.c	2008-01-15 10:10:24.840730278 +0100
-@@ -799,6 +799,9 @@
- 			hi = lo;
- 			lo = cp;
- 		}
-+		else if (pfd[0].revents & POLLERR)
-+			if (write(nfd, "", 1) == -1)
-+			    warn("Write error");
- 
- 		/* Load ports sequentially. */
- 		for (cp = lo; cp <= hi; cp++) {
 
=== modified file 'debian/patches/netcat-info.patch'
--- debian/patches/netcat-info.patch	2011-01-04 14:31:12 +0000
+++ debian/patches/netcat-info.patch	2012-05-30 22:10:23 +0000
@@ -1,12 +1,13 @@
-diff -Naurp netcat-openbsd-1.89.orig//netcat.c netcat-openbsd-1.89/netcat.c
---- netcat-openbsd-1.89.orig//netcat.c	2011-01-04 13:54:23.707910134 -0500
-+++ netcat-openbsd-1.89/netcat.c	2011-01-04 14:12:50.499950473 -0500
-@@ -995,6 +995,8 @@ help(void)
+Index: netcat-openbsd/netcat.c
+===================================================================
+--- netcat-openbsd.orig/netcat.c	2012-05-30 14:44:13.000000000 -0700
++++ netcat-openbsd/netcat.c	2012-05-30 14:46:35.810792514 -0700
+@@ -1373,6 +1373,8 @@
  void
  usage(int ret)
  {
 +	fprintf(stderr, "This is nc from the netcat-openbsd package. An alternative nc is available\n");
 +	fprintf(stderr, "in the netcat-traditional package.\n");
- 	fprintf(stderr, "usage: nc [-46DdhklnrStUuvzC] [-i interval] [-P proxy_username] [-p source_port]\n");
- 	fprintf(stderr, "\t  [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
- 	fprintf(stderr, "\t  [-x proxy_address[:port]] [hostname] [port[s]]\n");
+ 	fprintf(stderr,
+ 	    "usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n"
+ 	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
 
=== removed file 'debian/patches/no-strtonum.patch'
--- debian/patches/no-strtonum.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/no-strtonum.patch	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 16:17:17.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 16:17:18.000000000 -0500
-@@ -67,7 +67,7 @@
- 
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
--unsigned int iflag;				/* Interval Flag */
-+int	iflag;					/* Interval Flag */
- int	jflag;					/* use jumbo frames if we can */
- int	kflag;					/* More than one connect */
- int	lflag;					/* Bind to local port */
-@@ -108,13 +108,13 @@
- main(int argc, char *argv[])
- {
- 	int ch, s, ret, socksv;
--	char *host, *uport;
-+	char *host, *uport, *endp;
- 	struct addrinfo hints;
- 	struct servent *sv;
- 	socklen_t len;
- 	struct sockaddr_storage cliaddr;
- 	char *proxy;
--	const char *errstr, *proxyhost = "", *proxyport = NULL;
-+	const char *proxyhost = "", *proxyport = NULL;
- 	struct addrinfo proxyhints;
- 
- 	ret = 1;
-@@ -122,6 +122,7 @@
- 	socksv = 5;
- 	host = NULL;
- 	uport = NULL;
-+	endp = NULL;
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
-@@ -153,9 +154,9 @@
- 			help();
- 			break;
- 		case 'i':
--			iflag = strtonum(optarg, 0, UINT_MAX, &errstr);
--			if (errstr)
--				errx(1, "interval %s: %s", errstr, optarg);
-+			iflag = (int)strtoul(optarg, &endp, 10);
-+			if (iflag < 0 || *endp != '\0')
-+				errx(1, "interval cannot be negative");
- 			break;
- 		case 'j':
- 			jflag = 1;
-@@ -191,9 +192,11 @@
- 			vflag = 1;
- 			break;
- 		case 'w':
--			timeout = strtonum(optarg, 0, INT_MAX / 1000, &errstr);
--			if (errstr)
--				errx(1, "timeout %s: %s", errstr, optarg);
-+			timeout = (int)strtoul(optarg, &endp, 10);
-+			if (timeout < 0 || *endp != '\0')
-+				errx(1, "timeout cannot be negative");
-+			if (timeout >= (INT_MAX / 1000))
-+				errx(1, "timeout too large");
- 			timeout *= 1000;
- 			break;
- 		case 'x':
-@@ -680,8 +683,7 @@
- void
- build_ports(char *p)
- {
--	const char *errstr;
--	char *n;
-+	char *n, *endp;
- 	int hi, lo, cp;
- 	int x = 0;
- 
-@@ -693,12 +695,12 @@
- 		n++;
- 
- 		/* Make sure the ports are in order: lowest->highest. */
--		hi = strtonum(n, 1, PORT_MAX, &errstr);
--		if (errstr)
--			errx(1, "port number %s: %s", errstr, n);
--		lo = strtonum(p, 1, PORT_MAX, &errstr);
--		if (errstr)
--			errx(1, "port number %s: %s", errstr, p);
-+		hi = (int)strtoul(n, &endp, 10);
-+		if (hi <= 0 || hi > PORT_MAX || *endp != '\0')
-+			errx(1, "port range not valid");
-+		lo = (int)strtoul(p, &endp, 10);
-+		if (lo <= 0 || lo > PORT_MAX || *endp != '\0')
-+			errx(1, "port range not valid");
- 
- 		if (lo > hi) {
- 			cp = hi;
-@@ -729,9 +731,9 @@
- 			}
- 		}
- 	} else {
--		hi = strtonum(p, 1, PORT_MAX, &errstr);
--		if (errstr)
--			errx(1, "port number %s: %s", errstr, p);
-+		hi = (int)strtoul(p, &endp, 10);
-+		if (hi <= 0 || hi > PORT_MAX || *endp != '\0')
-+			errx(1, "port range not valid");
- 		portlist[0] = calloc(1, PORT_MAX_LEN);
- 		if (portlist[0] == NULL)
- 			err(1, NULL);
 
=== removed file 'debian/patches/openbsd-compat.patch'
--- debian/patches/openbsd-compat.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/openbsd-compat.patch	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-Index: netcat-openbsd-1.89/openbsd-compat/readpassphrase.c
-===================================================================
---- netcat-openbsd-1.89.orig/openbsd-compat/readpassphrase.c	2008-01-22 18:21:56.000000000 -0500
-+++ netcat-openbsd-1.89/openbsd-compat/readpassphrase.c	2008-01-22 18:22:58.000000000 -0500
-@@ -31,6 +31,12 @@
- #include <unistd.h>
- #include <readpassphrase.h>
- 
-+#ifdef TCSASOFT
-+# define _T_FLUSH      (TCSAFLUSH|TCSASOFT)
-+#else
-+# define _T_FLUSH      (TCSAFLUSH)
-+#endif
-+
- static volatile sig_atomic_t signo;
- 
- static void handler(int);
-@@ -92,9 +98,11 @@
- 		memcpy(&term, &oterm, sizeof(term));
- 		if (!(flags & RPP_ECHO_ON))
- 			term.c_lflag &= ~(ECHO | ECHONL);
-+#ifdef VSTATUS
- 		if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
- 			term.c_cc[VSTATUS] = _POSIX_VDISABLE;
--		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
-+#endif
-+		(void)tcsetattr(input, _T_FLUSH, &term);
- 	} else {
- 		memset(&term, 0, sizeof(term));
- 		term.c_lflag |= ECHO;
-@@ -129,7 +137,7 @@
- 
- 	/* Restore old terminal settings and signals. */
- 	if (memcmp(&term, &oterm, sizeof(term)) != 0) {
--		while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
-+		while (tcsetattr(input, _T_FLUSH, &oterm) == -1 &&
- 		    errno == EINTR)
- 			continue;
- 	}
-@@ -164,14 +172,6 @@
- 	return(nr == -1 ? NULL : buf);
- }
- 
--char *
--getpass(const char *prompt)
--{
--	static char buf[_PASSWORD_LEN + 1];
--
--	return(readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF));
--}
--
- static void handler(int s)
- {
- 
 
=== removed file 'debian/patches/pollhup.patch'
--- debian/patches/pollhup.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/pollhup.patch	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 16:17:18.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 16:17:25.000000000 -0500
-@@ -618,9 +618,7 @@
- 			if ((n = read(nfd, buf, plen)) < 0)
- 				return;
- 			else if (n == 0) {
--				shutdown(nfd, SHUT_RD);
--				pfd[0].fd = -1;
--				pfd[0].events = 0;
-+				goto shutdown_rd;
- 			} else {
- 				if (tflag)
- 					atelnet(nfd, buf, n);
-@@ -628,18 +626,30 @@
- 					return;
- 			}
- 		}
-+		else if (pfd[0].revents & POLLHUP) {
-+		shutdown_rd:
-+			shutdown(nfd, SHUT_RD);
-+			pfd[0].fd = -1;
-+			pfd[0].events = 0;
-+		}
- 
--		if (!dflag && pfd[1].revents & POLLIN) {
-+		if (!dflag) {
-+		    if(pfd[1].revents & POLLIN) {
- 			if ((n = read(wfd, buf, plen)) < 0)
- 				return;
- 			else if (n == 0) {
--				shutdown(nfd, SHUT_WR);
--				pfd[1].fd = -1;
--				pfd[1].events = 0;
-+				goto shutdown_wr;
- 			} else {
- 				if (atomicio(vwrite, nfd, buf, n) != n)
- 					return;
- 			}
-+		    }
-+		    else if (pfd[1].revents & POLLHUP) {
-+		    shutdown_wr:
-+			shutdown(nfd, SHUT_WR);
-+			pfd[1].fd = -1;
-+			pfd[1].events = 0;
-+		    }
- 		}
- 	}
- }
 
=== removed file 'debian/patches/quit-timer.patch'
--- debian/patches/quit-timer.patch	2011-06-30 11:55:43 +0000
+++ debian/patches/quit-timer.patch	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2010-04-18 20:02:55.240980186 -0400
-+++ netcat-openbsd-1.89/netcat.c	2010-04-18 20:04:41.987984568 -0400
-@@ -47,6 +47,7 @@
- #include <errno.h>
- #include <netdb.h>
- #include <poll.h>
-+#include <signal.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -82,6 +83,7 @@
- int	nflag;					/* Don't do name look up */
- char   *Pflag;					/* Proxy username */
- char   *pflag;					/* Localport flag */
-+int	qflag = -1;				/* Quit after some secs */
- int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
-@@ -114,6 +116,7 @@
- 
- static int connect_with_timeout(int fd, const struct sockaddr *sa, 
- 		                socklen_t salen, int ctimeout);
-+static void quit();
- 
- int
- main(int argc, char *argv[])
-@@ -137,7 +140,7 @@
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46Ddhi:jklnP:p:rSs:tT:Uuvw:X:x:zC")) != -1) {
-+	    "46Ddhi:jklnP:p:q:rSs:tT:Uuvw:X:x:zC")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -187,6 +190,9 @@
- 		case 'p':
- 			pflag = optarg;
- 			break;
-+		case 'q':
-+			qflag = (int)strtoul(optarg, &endp, 10);
-+			break;
- 		case 'r':
- 			rflag = 1;
- 			break;
-@@ -756,7 +762,13 @@
- 		    }
- 		    else if (pfd[1].revents & POLLHUP) {
- 		    shutdown_wr:
--			shutdown(nfd, SHUT_WR);
-+			/* if user asked to die after a while, arrange for it */
-+			if (qflag > 0) {
-+				 signal(SIGALRM, quit);
-+				 alarm(qflag);
-+			} else {
-+				 shutdown(nfd, SHUT_WR);
-+                        }
- 			pfd[1].fd = -1;
- 			pfd[1].events = 0;
- 		    }
-@@ -951,6 +963,7 @@
- 	\t-n		Suppress name/port resolutions\n\
- 	\t-P proxyuser\tUsername for proxy authentication\n\
- 	\t-p port\t	Specify local port for remote connects\n\
-+	\t-q secs\t	quit after EOF on stdin and delay of secs\n\
- 	\t-r		Randomize remote ports\n "
- #ifdef TCP_MD5SIG
- "	\t-S		Enable the TCP MD5 signature option\n"
-@@ -979,3 +992,13 @@
- 	if (ret)
- 		exit(1);
- }
-+
-+/*
-+ * quit()
-+ * handler for a "-q" timeout (exit 0 instead of 1)
-+ */
-+static void quit()
-+{
-+	/* XXX: should explicitly close fds here */
-+	exit(0);
-+}
 
=== removed file 'debian/patches/reuseaddr.patch'
--- debian/patches/reuseaddr.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/reuseaddr.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 16:17:25.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 16:17:27.000000000 -0500
-@@ -554,6 +554,10 @@
- 		if ((s = socket(res0->ai_family, res0->ai_socktype,
- 		    res0->ai_protocol)) < 0)
- 			continue;
-+
-+		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
-+		if (ret == -1)
-+			err(1, NULL);
- 		#ifdef SO_REUSEPORT
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
 
=== removed file 'debian/patches/send-crlf.patch'
--- debian/patches/send-crlf.patch	2008-06-19 16:20:01 +0000
+++ debian/patches/send-crlf.patch	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-06-19 16:49:57.000000000 -0400
-+++ netcat-openbsd-1.89/netcat.c	2008-06-19 17:04:22.000000000 -0400
-@@ -73,6 +73,7 @@
- #define UDP_SCAN_TIMEOUT 3			/* Seconds */
- 
- /* Command Line Options */
-+int	Cflag = 0;				/* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
- int	iflag;					/* Interval Flag */
- int	jflag;					/* use jumbo frames if we can */
-@@ -136,7 +137,7 @@
- 	sv = NULL;
- 
- 	while ((ch = getopt(argc, argv,
--	    "46Ddhi:jklnP:p:rSs:tT:Uuvw:X:x:z")) != -1) {
-+	    "46Ddhi:jklnP:p:rSs:tT:Uuvw:X:x:zC")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -226,6 +227,9 @@
- 		case 'T':
- 			Tflag = parse_iptos(optarg);
- 			break;
-+		case 'C':
-+			Cflag = 1;
-+			break;
- 		default:
- 			usage(1);
- 		}
-@@ -738,8 +742,16 @@
- 			else if (n == 0) {
- 				goto shutdown_wr;
- 			} else {
--				if (atomicio(vwrite, nfd, buf, n) != n)
--					return;
-+				if ((Cflag) && (buf[n-1]=='\n')) {
-+					if (atomicio(vwrite, nfd, buf, n-1) != (n-1))
-+						return;
-+					if (atomicio(vwrite, nfd, "\r\n", 2) != 2)
-+						return;
-+				}
-+				else {
-+					if (atomicio(vwrite, nfd, buf, n) != n)
-+						return;
-+				}
- 			}
- 		    }
- 		    else if (pfd[1].revents & POLLHUP) {
-@@ -944,6 +956,7 @@
- #endif
- "	\t-s addr\t	Local source address\n\
- 	\t-T ToS\t	Set IP Type of Service\n\
-+	\t-C		Send CRLF as line-ending\n\
- 	\t-t		Answer TELNET negotiation\n\
- 	\t-U		Use UNIX domain socket\n\
- 	\t-u		UDP mode\n\
-@@ -959,7 +972,7 @@
- void
- usage(int ret)
- {
--	fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
-+	fprintf(stderr, "usage: nc [-46DdhklnrStUuvzC] [-i interval] [-P proxy_username] [-p source_port]\n");
- 	fprintf(stderr, "\t  [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
- 	fprintf(stderr, "\t  [-x proxy_address[:port]] [hostname] [port[s]]\n");
- 	if (ret)
-Index: netcat-openbsd-1.89/nc.1
-===================================================================
---- netcat-openbsd-1.89.orig/nc.1	2008-06-19 16:49:39.000000000 -0400
-+++ netcat-openbsd-1.89/nc.1	2008-06-19 16:54:36.000000000 -0400
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46DdhklnrStUuvz
-+.Op Fl 46DdhklnrStUuvzC
- .Op Fl i Ar interval
- .Op Fl P Ar proxy_username
- .Op Fl p Ar source_port
-@@ -140,6 +140,10 @@
- It is an error to use this option in conjunction with the
- .Fl l
- option.
-+.It Fl q
-+after EOF on stdin, wait the specified number of seconds and then quit. If
-+.Ar seconds
-+is negative, wait forever.
- .It Fl r
- Specifies that source and/or destination ports should be chosen randomly
- instead of sequentially within a range or in the order that the system
-@@ -159,6 +163,8 @@
- .Dq reliability ,
- or an 8-bit hexadecimal value preceded by
- .Dq 0x .
-+.It Fl C 
-+Send CRLF as line-ending
- .It Fl t
- Causes
- .Nm
-@@ -317,7 +323,7 @@
- of requests required by the server.
- As another example, an email may be submitted to an SMTP server using:
- .Bd -literal -offset indent
--$ nc localhost 25 \*(Lt\*(Lt EOF
-+$ nc [-C] localhost 25 \*(Lt\*(Lt EOF
- HELO host.example.com
- MAIL FROM:\*([e-mail]\*(Gt
- RCPT TO:\*([e-mail]\*(Gt
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-11 14:31:06 +0000
+++ debian/patches/series	2012-05-30 22:10:23 +0000
@@ -1,18 +1,12 @@
-openbsd-compat.patch
-socks-b64-prototype.patch
-silence-z.patch
-glib-strlcpy.patch
-no-strtonum.patch
-pollhup.patch
-reuseaddr.patch
-connect-timeout.patch
-udp-scan-timeout.patch
-verbose-numeric-port.patch
-send-crlf.patch
-help-version-exit.patch
-quit-timer.patch
-getservbyname.patch
-gcc-warnings.patch
-verbose-message-to-stderr.patch
+0001-port-to-linux-with-libsd.patch
+0002-connect-timeout.patch
+0003-get-sev-by-name.patch
+0004-poll-hup.patch
+0005-send-crlf.patch
+0006-quit-timer.patch
+0007-udp-scan-timeout.patch
+0008-verbose-numeric-port.patch
+0009-dccp-support.patch
+0010-serialized-handling-multiple-clients.patch
+0011-misc-failures-and-features.patch
 netcat-info.patch
-dccp.patch
 
=== removed file 'debian/patches/silence-z.patch'
--- debian/patches/silence-z.patch	2008-06-19 16:20:01 +0000
+++ debian/patches/silence-z.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-06-19 16:33:52.000000000 -0400
-+++ netcat-openbsd-1.89/netcat.c	2008-06-19 16:34:58.000000000 -0400
-@@ -364,7 +364,7 @@
- 				continue;
- 
- 			ret = 0;
--			if (vflag || zflag) {
-+			if (vflag) {
- 				/* For UDP, make sure we are connected. */
- 				if (uflag) {
- 					if (udptest(s) == -1) {
 
=== removed file 'debian/patches/socks-b64-prototype.patch'
--- debian/patches/socks-b64-prototype.patch	2008-06-19 16:20:01 +0000
+++ debian/patches/socks-b64-prototype.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: netcat-openbsd-1.89/socks.c
-===================================================================
---- netcat-openbsd-1.89.orig/socks.c	2008-06-19 16:30:45.000000000 -0400
-+++ netcat-openbsd-1.89/socks.c	2008-06-19 16:30:36.000000000 -0400
-@@ -53,6 +53,8 @@
- #define SOCKS_DOMAIN	3
- #define SOCKS_IPV6	4
- 
-+extern int b64_ntop(unsigned char const *, size_t, char *, size_t);
-+
- int	remote_connect(const char *, const char *, struct addrinfo);
- int	socks_connect(const char *, const char *, struct addrinfo,
- 	    const char *, const char *, struct addrinfo, int,
 
=== removed file 'debian/patches/udp-scan-timeout.patch'
--- debian/patches/udp-scan-timeout.patch	2008-06-19 16:20:01 +0000
+++ debian/patches/udp-scan-timeout.patch	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 16:17:30.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 16:17:34.000000000 -0500
-@@ -69,6 +69,8 @@
- #define CONNECTION_FAILED 1
- #define CONNECTION_TIMEOUT 2
- 
-+#define UDP_SCAN_TIMEOUT 3			/* Seconds */
-+
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- int	iflag;					/* Interval Flag */
-@@ -376,7 +378,7 @@
- 				continue;
- 
- 			ret = 0;
--			if (vflag) {
-+			if (vflag && !uflag) {
- 				/* For UDP, make sure we are connected. */
- 				if (uflag) {
- 					if (udptest(s) == -1) {
-@@ -841,15 +843,20 @@
- int
- udptest(int s)
- {
--	int i, ret;
-+	int i, t;
- 
--	for (i = 0; i <= 3; i++) {
--		if (write(s, "X", 1) == 1)
--			ret = 1;
--		else
--			ret = -1;
-+	if ((write(s, "X", 1) != 1) ||
-+	    ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
-+		return -1;
-+
-+	/* Give the remote host some time to reply. */
-+	for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000);
-+	     i < t; i++) {
-+		sleep(1);
-+		if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
-+			return -1;
- 	}
--	return (ret);
-+	return 1;
- }
- 
- void
 
=== removed file 'debian/patches/verbose-message-to-stderr.patch'
--- debian/patches/verbose-message-to-stderr.patch	2010-02-09 10:42:03 +0000
+++ debian/patches/verbose-message-to-stderr.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2010-02-09 10:29:21.000000000 +0100
-+++ netcat-openbsd-1.89/netcat.c	2010-02-09 10:29:45.000000000 +0100
-@@ -421,9 +421,9 @@ main(int argc, char *argv[])
- 					    uflag ? "udp" : "tcp");
- 				}
- 
--				printf("Connection to %s %s port [%s/%s] succeeded!\n",
--				    host, portlist[i], uflag ? "udp" : "tcp",
--				    sv ? sv->s_name : "*");
-+				fprintf(stderr, "Connection to %s %s port [%s/%s] "
-+				        "succeeded!\n", host, portlist[i],
-+				        uflag ? "udp" : "tcp", sv ? sv->s_name : "*");
- 			}
- 			if (!zflag)
- 				readwrite(s);
 
=== removed file 'debian/patches/verbose-numeric-port.patch'
--- debian/patches/verbose-numeric-port.patch	2008-01-30 18:24:46 +0000
+++ debian/patches/verbose-numeric-port.patch	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-Index: netcat-openbsd-1.89/netcat.c
-===================================================================
---- netcat-openbsd-1.89.orig/netcat.c	2008-01-22 16:17:34.000000000 -0500
-+++ netcat-openbsd-1.89/netcat.c	2008-01-22 16:17:44.000000000 -0500
-@@ -41,6 +41,7 @@
- #include <netinet/tcp.h>
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
-+#include <arpa/inet.h>
- 
- #include <err.h>
- #include <errno.h>
-@@ -317,16 +318,15 @@
- 			if (uflag) {
- 				int rv, plen;
- 				char buf[8192];
--				struct sockaddr_storage z;
- 
--				len = sizeof(z);
-+				len = sizeof(cliaddr);
- 				plen = jflag ? 8192 : 1024;
- 				rv = recvfrom(s, buf, plen, MSG_PEEK,
--				    (struct sockaddr *)&z, &len);
-+				    (struct sockaddr *)&cliaddr, &len);
- 				if (rv < 0)
- 					err(1, "recvfrom");
- 
--				rv = connect(s, (struct sockaddr *)&z, len);
-+				rv = connect(s, (struct sockaddr *)&cliaddr, len);
- 				if (rv < 0)
- 					err(1, "connect");
- 
-@@ -337,6 +337,21 @@
- 				    &len);
- 			}
- 
-+			if(vflag) {
-+				/* Don't look up port if -n. */
-+				if (nflag)
-+					sv = NULL;
-+				else 
-+					sv = getservbyport(ntohs(atoi(uport)),
-+						uflag ? "udp" : "tcp");
-+
-+				fprintf(stderr, "Connection from %s port %s [%s/%s] accepted\n", 
-+					inet_ntoa(((struct sockaddr_in *)(&cliaddr))->sin_addr),
-+					uport,
-+					uflag ? "udp" : "tcp", 
-+					sv ? sv->s_name : "*");
-+			}
-+
- 			readwrite(connfd);
- 			close(connfd);
- 			if (family != AF_UNIX)
 
=== modified file 'debian/rules'
--- debian/rules	2008-01-30 18:24:46 +0000
+++ debian/rules	2012-05-30 22:10:23 +0000
@@ -1,64 +1,16 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
 
-DEB_CFLAGS = -g -Wall
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-DEB_CFLAGS += -O0
-else
-DEB_CFLAGS += -O2
-endif
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROG = install -m 0755
-else
-INSTALL_PROG = install -s -m 0755
-endif
+DEB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+DEB_LDFLAGS = $(LDFLAGS) -Wl,--no-add-needed,--as-needed
 DEB_VER = $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 
-patch: patch-stamp
-patch-stamp:
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
-
-unpatch:
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc patch-stamp
-
-build: build-stamp
-build-stamp: patch-stamp
-
-	$(MAKE) CFLAGS='$(DEB_CFLAGS) -DDEBIAN_VERSION=\"$(DEB_VER)\"'
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_clean patch-stamp build-stamp
-	$(MAKE) clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(INSTALL_PROG) nc $(CURDIR)/debian/netcat-openbsd/bin/nc.openbsd
-	cp nc.1 $(CURDIR)/debian/netcat-openbsd/usr/share/man/man1/nc_openbsd.1
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples debian/examples/*
-	dh_link
-	dh_strip
-	dh_compress -Xexamples
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
+%:
+	dh $@
+override_dh_auto_build:
+	$(MAKE) CFLAGS='$(DEB_CFLAGS) -DDEBIAN_VERSION=\"$(DEB_VER)\"' LDFLAGS="$(DEB_LDFLAGS)"
+override_dh_auto_install:
+	mv nc nc.openbsd
+	mv nc.1 nc_openbsd.1
+	dh_auto_install
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-05-30 22:10:23 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== modified file 'nc.1'
--- nc.1	2008-01-30 18:24:46 +0000
+++ nc.1	2012-05-30 22:10:23 +0000
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
+.\"     $OpenBSD: nc.1,v 1.60 2012/02/07 12:11:43 lum Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: February 7 2012 $
 .Dt NC 1
 .Os
 .Sh NAME
@@ -35,27 +35,32 @@
 .Nm nc
 .Bk -words
 .Op Fl 46DdhklnrStUuvz
+.Op Fl I Ar length
 .Op Fl i Ar interval
+.Op Fl O Ar length
 .Op Fl P Ar proxy_username
 .Op Fl p Ar source_port
-.Op Fl s Ar source_ip_address
-.Op Fl T Ar ToS
+.Op Fl s Ar source
+.Op Fl T Ar toskeyword
+.Op Fl V Ar rtable
 .Op Fl w Ar timeout
 .Op Fl X Ar proxy_protocol
 .Oo Xo
 .Fl x Ar proxy_address Ns Oo : Ns
-.Ar port Oc Oc
-.Xc
-.Op Ar hostname
-.Op Ar port Ns Bq Ar s
+.Ar port Oc
+.Xc Oc
+.Op Ar destination
+.Op Ar port
 .Ek
 .Sh DESCRIPTION
 The
 .Nm
 (or
 .Nm netcat )
-utility is used for just about anything under the sun involving TCP
-or UDP.
+utility is used for just about anything under the sun involving TCP,
+UDP, or
+.Ux Ns -domain
+sockets.
 It can open TCP connections, send UDP packets, listen on arbitrary
 TCP and UDP ports, do port scanning, and deal with both IPv4 and
 IPv6.
@@ -101,6 +106,8 @@
 Prints out
 .Nm
 help.
+.It Fl I Ar length
+Specifies the size of the TCP receive buffer.
 .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.
@@ -129,6 +136,8 @@
 .It Fl n
 Do not do any DNS or service lookups on any specified addresses,
 hostnames or ports.
+.It Fl O Ar length
+Specifies the size of the TCP send buffer.
 .It Fl P Ar proxy_username
 Specifies a username to present to a proxy server that requires authentication.
 If no username is specified then authentication will not be attempted.
@@ -146,19 +155,30 @@
 assigns them.
 .It Fl S
 Enables the RFC 2385 TCP MD5 signature option.
-.It Fl s Ar source_ip_address
+.It Fl s Ar source
 Specifies the IP of the interface which is used to send the packets.
+For
+.Ux Ns -domain
+datagram sockets, specifies the local temporary socket file
+to create and use so that datagrams can be received.
 It is an error to use this option in conjunction with the
 .Fl l
 option.
-.It Fl T Ar ToS
-Specifies IP Type of Service (ToS) for the connection.
-Valid values are the tokens
-.Dq lowdelay ,
-.Dq throughput ,
-.Dq reliability ,
-or an 8-bit hexadecimal value preceded by
-.Dq 0x .
+.It Fl T Ar toskeyword
+Change IPv4 TOS value.
+.Ar toskeyword
+may be one of
+.Ar critical ,
+.Ar inetcontrol ,
+.Ar lowdelay ,
+.Ar netcontrol ,
+.Ar throughput ,
+.Ar reliability ,
+or one of the DiffServ Code Points:
+.Ar ef ,
+.Ar af11 ... af43 ,
+.Ar cs0 ... cs7 ;
+or a number in either hex or decimal.
 .It Fl t
 Causes
 .Nm
@@ -167,17 +187,32 @@
 .Nm
 to script telnet sessions.
 .It Fl U
-Specifies to use Unix Domain Sockets.
+Specifies to use
+.Ux Ns -domain
+sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
+For
+.Ux Ns -domain
+sockets, use a datagram socket instead of a stream socket.
+If a
+.Ux Ns -domain
+socket is used, a temporary receiving socket is created in
+.Pa /tmp
+unless the
+.Fl s
+flag is given.
+.It Fl V Ar rtable
+Set the routing table to be used.
+The default is 0.
 .It Fl v
 Have
 .Nm
 give more verbose output.
 .It Fl w Ar timeout
-If a connection and stdin are idle for more than
+Connections which cannot be established or are idle timeout after
 .Ar timeout
-seconds, then the connection is silently closed.
+seconds.
 The
 .Fl w
 flag has no effect on the
@@ -208,7 +243,7 @@
 Requests that
 .Nm
 should connect to
-.Ar hostname
+.Ar destination
 using a proxy at
 .Ar proxy_address
 and
@@ -226,26 +261,31 @@
 option.
 .El
 .Pp
-.Ar hostname
+.Ar destination
 can be a numerical IP address or a symbolic hostname
 (unless the
 .Fl n
 option is given).
-In general, a hostname must be specified,
+In general, a destination must be specified,
 unless the
 .Fl l
 option is given
 (in which case the local host is used).
+For
+.Ux Ns -domain
+sockets, a destination is required and is the socket path to connect to
+(or listen on if the
+.Fl l
+option is given).
 .Pp
-.Ar port Ns Op Ar s
-can be single integers or ranges.
+.Ar port
+can be a single integer or a range of ports.
 Ranges are in the form nn-mm.
 In general,
 a destination port must be specified,
 unless the
 .Fl U
-option is given
-(in which case a socket must be specified).
+option is given.
 .Sh CLIENT/SERVER MODEL
 It is quite simple to build a very basic client/server model using
 .Nm .
@@ -305,7 +345,7 @@
 in response to commands issued by the client.
 For example, to retrieve the home page of a web site:
 .Bd -literal -offset indent
-$ echo -n "GET / HTTP/1.0\er\en\er\en" | nc host.example.com 80
+$ printf "GET / HTTP/1.0\er\en\er\en" | nc host.example.com 80
 .Ed
 .Pp
 Note that this also displays the headers sent by the web server.
@@ -376,7 +416,9 @@
 .Pp
 .Dl $ nc -s 10.1.2.3 host.example.com 42
 .Pp
-Create and listen on a Unix Domain Socket:
+Create and listen on a
+.Ux Ns -domain
+stream socket:
 .Pp
 .Dl $ nc -lU /var/tmp/dsocket
 .Pp
@@ -407,8 +449,15 @@
 Rewritten with IPv6 support by
 .An Eric Jackson Aq [e-mail] .
 .Sh CAVEATS
-UDP port scans will always succeed
-(i.e. report the port as open),
-rendering the
-.Fl uz
-combination of flags relatively useless.
+UDP port scans using the
+.Fl uz
+combination of flags will always report success irrespective of
+the target machine's state.
+However,
+in conjunction with a traffic sniffer either on the target machine
+or an intermediary device,
+the
+.Fl uz
+combination could be useful for communications diagnostics.
+Note that the amount of UDP traffic generated may be limited either
+due to hardware resources and/or configuration settings.
 
=== modified file 'netcat.c'
--- netcat.c	2008-01-30 18:24:46 +0000
+++ netcat.c	2012-05-30 22:10:23 +0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.89 2007/02/20 14:11:17 jmc Exp $ */
+/* $OpenBSD: netcat.c,v 1.105 2012/02/09 06:25:35 lum Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <[e-mail]>
  *
@@ -62,6 +62,7 @@
 
 #define PORT_MAX	65535
 #define PORT_MAX_LEN	6
+#define UNIX_DG_TMP_SOCKET_SIZE	19
 
 /* Command Line Options */
 int	dflag;					/* detached, no stdin */
@@ -80,12 +81,16 @@
 int	xflag;					/* Socks proxy */
 int	zflag;					/* Port Scan Flag */
 int	Dflag;					/* sodebug */
+int	Iflag;					/* TCP receive buffer size */
+int	Oflag;					/* TCP send buffer size */
 int	Sflag;					/* TCP MD5 signature option */
 int	Tflag = -1;				/* IP Type of Service */
+u_int	rtableid;
 
 int timeout = -1;
 int family = AF_UNSPEC;
 char *portlist[PORT_MAX+1];
+char *unix_dg_tmp_socket;
 
 void	atelnet(int, unsigned char *, unsigned int);
 void	build_ports(char *);
@@ -93,13 +98,15 @@
 int	local_listen(char *, char *, struct addrinfo);
 void	readwrite(int);
 int	remote_connect(const char *, const char *, struct addrinfo);
+int	timeout_connect(int, const struct sockaddr *, socklen_t);
 int	socks_connect(const char *, const char *, struct addrinfo,
 	    const char *, const char *, struct addrinfo, int, const char *);
 int	udptest(int);
+int	unix_bind(char *);
 int	unix_connect(char *);
 int	unix_listen(char *);
 void	set_common_sockopts(int);
-int	parse_iptos(char *);
+int	map_tos(char *, int *);
 void	usage(int);
 
 int
@@ -114,6 +121,7 @@
 	char *proxy;
 	const char *errstr, *proxyhost = "", *proxyport = NULL;
 	struct addrinfo proxyhints;
+	char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
 
 	ret = 1;
 	s = 0;
@@ -123,7 +131,7 @@
 	sv = NULL;
 
 	while ((ch = getopt(argc, argv,
-	    "46Ddhi:jklnP:p:rSs:tT:Uuvw:X:x:z")) != -1) {
+	    "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
 		switch (ch) {
 		case '4':
 			family = AF_INET;
@@ -185,6 +193,12 @@
 		case 'u':
 			uflag = 1;
 			break;
+		case 'V':
+			rtableid = (unsigned int)strtonum(optarg, 0,
+			    RT_TABLEID_MAX, &errstr);
+			if (errstr)
+				errx(1, "rtable %s: %s", errstr, optarg);
+			break;
 		case 'v':
 			vflag = 1;
 			break;
@@ -205,11 +219,34 @@
 		case 'D':
 			Dflag = 1;
 			break;
+		case 'I':
+			Iflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+			if (errstr != NULL)
+				errx(1, "TCP receive window %s: %s",
+				    errstr, optarg);
+			break;
+		case 'O':
+			Oflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+			if (errstr != NULL)
+				errx(1, "TCP send window %s: %s",
+				    errstr, optarg);
+			break;
 		case 'S':
 			Sflag = 1;
 			break;
 		case 'T':
-			Tflag = parse_iptos(optarg);
+			errstr = NULL;
+			errno = 0;
+			if (map_tos(optarg, &Tflag))
+				break;
+			if (strlen(optarg) > 1 && optarg[0] == '0' &&
+			    optarg[1] == 'x')
+				Tflag = (int)strtol(optarg, NULL, 16);
+			else
+				Tflag = (int)strtonum(optarg, 0, 255,
+				    &errstr);
+			if (Tflag < 0 || Tflag > 255 || errstr || errno)
+				errx(1, "illegal tos value %s", optarg);
 			break;
 		default:
 			usage(1);
@@ -220,8 +257,6 @@
 
 	/* Cruft to make sure options are clean, and used properly. */
 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-		if (uflag)
-			errx(1, "cannot use -u and -U");
 		host = argv[0];
 		uport = NULL;
 	} else if (argv[0] && !argv[1]) {
@@ -244,6 +279,19 @@
 	if (!lflag && kflag)
 		errx(1, "must use -l with -k");
 
+	/* Get name of temporary socket for unix datagram client */
+	if ((family == AF_UNIX) && uflag && !lflag) {
+		if (sflag) {
+			unix_dg_tmp_socket = sflag;
+		} else {
+			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
+				UNIX_DG_TMP_SOCKET_SIZE);
+			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
+				err(1, "mktemp");
+			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
+		}
+	}
+
 	/* Initialize addrinfo structure. */
 	if (family != AF_UNIX) {
 		memset(&hints, 0, sizeof(struct addrinfo));
@@ -286,8 +334,12 @@
 		int connfd;
 		ret = 0;
 
-		if (family == AF_UNIX)
-			s = unix_listen(host);
+		if (family == AF_UNIX) {
+			if (uflag)
+				s = unix_bind(host);
+			else
+				s = unix_listen(host);
+		}
 
 		/* Allow only one connection at a time, but stay alive. */
 		for (;;) {
@@ -302,11 +354,11 @@
 			 */
 			if (uflag) {
 				int rv, plen;
-				char buf[8192];
+				char buf[16384];
 				struct sockaddr_storage z;
 
 				len = sizeof(z);
-				plen = jflag ? 8192 : 1024;
+				plen = jflag ? 16384 : 2048;
 				rv = recvfrom(s, buf, plen, MSG_PEEK,
 				    (struct sockaddr *)&z, &len);
 				if (rv < 0)
@@ -316,17 +368,21 @@
 				if (rv < 0)
 					err(1, "connect");
 
-				connfd = s;
+				readwrite(s);
 			} else {
 				len = sizeof(cliaddr);
 				connfd = accept(s, (struct sockaddr *)&cliaddr,
 				    &len);
+				readwrite(connfd);
+				close(connfd);
 			}
 
-			readwrite(connfd);
-			close(connfd);
 			if (family != AF_UNIX)
 				close(s);
+			else if (uflag) {
+				if (connect(s, NULL, 0) < 0)
+					err(1, "connect");
+			}
 
 			if (!kflag)
 				break;
@@ -340,6 +396,8 @@
 		} else
 			ret = 1;
 
+		if (uflag)
+			unlink(unix_dg_tmp_socket);
 		exit(ret);
 
 	} else {
@@ -382,8 +440,10 @@
 					    uflag ? "udp" : "tcp");
 				}
 
-				printf("Connection to %s %s port [%s/%s] succeeded!\n",
-				    host, portlist[i], uflag ? "udp" : "tcp",
+				fprintf(stderr,
+				    "Connection to %s %s port [%s/%s] "
+				    "succeeded!\n", host, portlist[i],
+				    uflag ? "udp" : "tcp",
 				    sv ? sv->s_name : "*");
 			}
 			if (!zflag)
@@ -398,6 +458,38 @@
 }
 
 /*
+ * unix_bind()
+ * Returns a unix socket bound to the given path
+ */
+int
+unix_bind(char *path)
+{
+	struct sockaddr_un sun;
+	int s;
+
+	/* Create unix domain socket. */
+	if ((s = socket(AF_UNIX, uflag ? SOCK_DGRAM : SOCK_STREAM,
+	     0)) < 0)
+		return (-1);
+
+	memset(&sun, 0, sizeof(struct sockaddr_un));
+	sun.sun_family = AF_UNIX;
+
+	if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
+	    sizeof(sun.sun_path)) {
+		close(s);
+		errno = ENAMETOOLONG;
+		return (-1);
+	}
+
+	if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
+		close(s);
+		return (-1);
+	}
+	return (s);
+}
+
+/*
  * unix_connect()
  * Returns a socket connected to a local unix socket. Returns -1 on failure.
  */
@@ -407,8 +499,13 @@
 	struct sockaddr_un sun;
 	int s;
 
-	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
-		return (-1);
+	if (uflag) {
+		if ((s = unix_bind(unix_dg_tmp_socket)) < 0)
+			return (-1);
+	} else {
+		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+			return (-1);
+	}
 	(void)fcntl(s, F_SETFD, 1);
 
 	memset(&sun, 0, sizeof(struct sockaddr_un));
@@ -435,27 +532,9 @@
 int
 unix_listen(char *path)
 {
-	struct sockaddr_un sun;
 	int s;
-
-	/* Create unix domain socket. */
-	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
-		return (-1);
-
-	memset(&sun, 0, sizeof(struct sockaddr_un));
-	sun.sun_family = AF_UNIX;
-
-	if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
-	    sizeof(sun.sun_path)) {
-		close(s);
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-
-	if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
-		close(s);
-		return (-1);
-	}
+	if ((s = unix_bind(path)) < 0)
+		return (-1);
 
 	if (listen(s, 5) < 0) {
 		close(s);
@@ -473,7 +552,7 @@
 remote_connect(const char *host, const char *port, struct addrinfo hints)
 {
 	struct addrinfo *res, *res0;
-	int s, error;
+	int s, error, on = 1;
 
 	if ((error = getaddrinfo(host, port, &hints, &res)))
 		errx(1, "getaddrinfo: %s", gai_strerror(error));
@@ -484,10 +563,18 @@
 		    res0->ai_protocol)) < 0)
 			continue;
 
+		if (rtableid) {
+			if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
+			    sizeof(rtableid)) == -1)
+				err(1, "setsockopt SO_RTABLE");
+		}
+
 		/* Bind to a local port or source address if specified. */
 		if (sflag || pflag) {
 			struct addrinfo ahints, *ares;
 
+			/* try SO_BINDANY, but don't insist */
+			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
 			memset(&ahints, 0, sizeof(struct addrinfo));
 			ahints.ai_family = res0->ai_family;
 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -504,7 +591,7 @@
 
 		set_common_sockopts(s);
 
-		if (connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
+		if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
 			break;
 		else if (vflag)
 			warn("connect to %s port %s (%s) failed", host, port,
@@ -519,6 +606,43 @@
 	return (s);
 }
 
+int
+timeout_connect(int s, const struct sockaddr *name, socklen_t namelen)
+{
+	struct pollfd pfd;
+	socklen_t optlen;
+	int flags, optval;
+	int ret;
+
+	if (timeout != -1) {
+		flags = fcntl(s, F_GETFL, 0);
+		if (fcntl(s, F_SETFL, flags | O_NONBLOCK) == -1)
+			err(1, "set non-blocking mode");
+	}
+
+	if ((ret = connect(s, name, namelen)) != 0 && errno == EINPROGRESS) {
+		pfd.fd = s;
+		pfd.events = POLLOUT;
+		if ((ret = poll(&pfd, 1, timeout)) == 1) {
+			optlen = sizeof(optval);
+			if ((ret = getsockopt(s, SOL_SOCKET, SO_ERROR,
+			    &optval, &optlen)) == 0) {
+				errno = optval;
+				ret = optval == 0 ? 0 : -1;
+			}
+		} else if (ret == 0) {
+			errno = ETIMEDOUT;
+			ret = -1;
+		} else
+			err(1, "poll failed");
+	}
+
+	if (timeout != -1 && fcntl(s, F_SETFL, flags) == -1)
+		err(1, "restoring flags");
+
+	return (ret);
+}
+
 /*
  * local_listen()
  * Returns a socket listening on a local port, binds to specified source
@@ -550,6 +674,12 @@
 		    res0->ai_protocol)) < 0)
 			continue;
 
+		if (rtableid) {
+			if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
+			    sizeof(rtableid)) == -1)
+				err(1, "setsockopt SO_RTABLE");
+		}
+
 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
 		if (ret == -1)
 			err(1, NULL);
@@ -582,12 +712,12 @@
 readwrite(int nfd)
 {
 	struct pollfd pfd[2];
-	unsigned char buf[8192];
+	unsigned char buf[16384];
 	int n, wfd = fileno(stdin);
 	int lfd = fileno(stdout);
 	int plen;
 
-	plen = jflag ? 8192 : 1024;
+	plen = jflag ? 16384 : 2048;
 
 	/* Setup Network FD */
 	pfd[0].fd = nfd;
@@ -646,33 +776,33 @@
 	unsigned char *p, *end;
 	unsigned char obuf[4];
 
-	end = buf + size;
-	obuf[0] = '\0';
+	if (size < 3)
+		return;
+	end = buf + size - 2;
 
 	for (p = buf; p < end; p++) {
 		if (*p != IAC)
-			break;
+			continue;
 
 		obuf[0] = IAC;
 		p++;
 		if ((*p == WILL) || (*p == WONT))
 			obuf[1] = DONT;
-		if ((*p == DO) || (*p == DONT))
+		else if ((*p == DO) || (*p == DONT))
 			obuf[1] = WONT;
-		if (obuf) {
-			p++;
-			obuf[2] = *p;
-			obuf[3] = '\0';
-			if (atomicio(vwrite, nfd, obuf, 3) != 3)
-				warn("Write Error!");
-			obuf[0] = '\0';
-		}
+		else
+			continue;
+
+		p++;
+		obuf[2] = *p;
+		if (atomicio(vwrite, nfd, obuf, 3) != 3)
+			warn("Write Error!");
 	}
 }
 
 /*
  * build_ports()
- * Build an array or ports in portlist[], listing each port
+ * Build an array of ports in portlist[], listing each port
  * that we should try to connect to.
  */
 void
@@ -684,9 +814,6 @@
 	int x = 0;
 
 	if ((n = strchr(p, '-')) != NULL) {
-		if (lflag)
-			errx(1, "Cannot use -l with multiple ports!");
-
 		*n = '\0';
 		n++;
 
@@ -729,18 +856,16 @@
 		hi = strtonum(p, 1, PORT_MAX, &errstr);
 		if (errstr)
 			errx(1, "port number %s: %s", errstr, p);
-		portlist[0] = calloc(1, PORT_MAX_LEN);
+		portlist[0] = strdup(p);
 		if (portlist[0] == NULL)
 			err(1, NULL);
-		portlist[0] = p;
 	}
 }
 
 /*
  * udptest()
  * Do a few writes to see if the UDP port is there.
- * XXX - Better way of doing this? Doesn't work for IPv6.
- * Also fails after around 100 ports checked.
+ * Fails once PF state table is full.
  */
 int
 udptest(int s)
@@ -781,23 +906,64 @@
 		    &Tflag, sizeof(Tflag)) == -1)
 			err(1, "set IP ToS");
 	}
+	if (Iflag) {
+		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+		    &Iflag, sizeof(Iflag)) == -1)
+			err(1, "set TCP receive buffer size");
+	}
+	if (Oflag) {
+		if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+		    &Oflag, sizeof(Oflag)) == -1)
+			err(1, "set TCP send buffer size");
+	}
 }
 
 int
-parse_iptos(char *s)
+map_tos(char *s, int *val)
 {
-	int tos = -1;
-
-	if (strcmp(s, "lowdelay") == 0)
-		return (IPTOS_LOWDELAY);
-	if (strcmp(s, "throughput") == 0)
-		return (IPTOS_THROUGHPUT);
-	if (strcmp(s, "reliability") == 0)
-		return (IPTOS_RELIABILITY);
-
-	if (sscanf(s, "0x%x", &tos) != 1 || tos < 0 || tos > 0xff)
-		errx(1, "invalid IP Type of Service");
-	return (tos);
+	/* DiffServ Codepoints and other TOS mappings */
+	const struct toskeywords {
+		const char	*keyword;
+		int		 val;
+	} *t, toskeywords[] = {
+		{ "af11",		IPTOS_DSCP_AF11 },
+		{ "af12",		IPTOS_DSCP_AF12 },
+		{ "af13",		IPTOS_DSCP_AF13 },
+		{ "af21",		IPTOS_DSCP_AF21 },
+		{ "af22",		IPTOS_DSCP_AF22 },
+		{ "af23",		IPTOS_DSCP_AF23 },
+		{ "af31",		IPTOS_DSCP_AF31 },
+		{ "af32",		IPTOS_DSCP_AF32 },
+		{ "af33",		IPTOS_DSCP_AF33 },
+		{ "af41",		IPTOS_DSCP_AF41 },
+		{ "af42",		IPTOS_DSCP_AF42 },
+		{ "af43",		IPTOS_DSCP_AF43 },
+		{ "critical",		IPTOS_PREC_CRITIC_ECP },
+		{ "cs0",		IPTOS_DSCP_CS0 },
+		{ "cs1",		IPTOS_DSCP_CS1 },
+		{ "cs2",		IPTOS_DSCP_CS2 },
+		{ "cs3",		IPTOS_DSCP_CS3 },
+		{ "cs4",		IPTOS_DSCP_CS4 },
+		{ "cs5",		IPTOS_DSCP_CS5 },
+		{ "cs6",		IPTOS_DSCP_CS6 },
+		{ "cs7",		IPTOS_DSCP_CS7 },
+		{ "ef",			IPTOS_DSCP_EF },
+		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
+		{ "lowdelay",		IPTOS_LOWDELAY },
+		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
+		{ "reliability",	IPTOS_RELIABILITY },
+		{ "throughput",		IPTOS_THROUGHPUT },
+		{ NULL, 		-1 },
+	};
+
+	for (t = toskeywords; t->keyword != NULL; t++) {
+		if (strcmp(s, t->keyword) == 0) {
+			*val = t->val;
+			return (1);
+		}
+	}
+
+	return (0);
 }
 
 void
@@ -810,19 +976,22 @@
 	\t-D		Enable the debug socket option\n\
 	\t-d		Detach from stdin\n\
 	\t-h		This help text\n\
+	\t-I length	TCP receive buffer length\n\
 	\t-i secs\t	Delay interval for lines sent, ports scanned\n\
 	\t-k		Keep inbound sockets open for multiple connects\n\
 	\t-l		Listen mode, for inbound connects\n\
 	\t-n		Suppress name/port resolutions\n\
+	\t-O length	TCP send buffer length\n\
 	\t-P proxyuser\tUsername for proxy authentication\n\
 	\t-p port\t	Specify local port for remote connects\n\
 	\t-r		Randomize remote ports\n\
 	\t-S		Enable the TCP MD5 signature option\n\
 	\t-s addr\t	Local source address\n\
-	\t-T ToS\t	Set IP Type of Service\n\
+	\t-T toskeyword\tSet IP Type of Service\n\
 	\t-t		Answer TELNET negotiation\n\
 	\t-U		Use UNIX domain socket\n\
 	\t-u		UDP mode\n\
+	\t-V rtable	Specify alternate routing table\n\
 	\t-v		Verbose\n\
 	\t-w secs\t	Timeout for connects and final net reads\n\
 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
@@ -835,9 +1004,11 @@
 void
 usage(int ret)
 {
-	fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
-	fprintf(stderr, "\t  [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
-	fprintf(stderr, "\t  [-x proxy_address[:port]] [hostname] [port[s]]\n");
+	fprintf(stderr,
+	    "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\n"
+	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n"
+	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
 	if (ret)
 		exit(1);
 }
 
=== removed directory 'openbsd-compat'
=== removed file 'openbsd-compat/base64.c'
--- openbsd-compat/base64.c	2008-01-30 18:24:46 +0000
+++ openbsd-compat/base64.c	1970-01-01 00:00:00 +0000
@@ -1,308 +0,0 @@
-/*	$OpenBSD: base64.c,v 1.5 2006/10/21 09:55:03 otto Exp $	*/
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(src, srclength, target, targsize)
-	u_char const *src;
-	size_t srclength;
-	char *target;
-	size_t targsize;
-{
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	int i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-	char const *src;
-	u_char *target;
-	size_t targsize;
-{
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace(ch))	/* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if (tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if (tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if (tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if (tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for (; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for (; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					return (-1);
-
-			/*