[nc] 1.106 bump

[Petr Šabata]

commit 148e86d8db865a92fc467542512459b335162c4f
Author: Petr Šabata <contyk at redhat.com>
Date:   Fri Mar 23 14:54:18 2012 +0100

    1.106 bump

 .gitignore                   |    1 +
 nc-1.100-format-size_t.patch |   19 ----------------
 nc-1.101-linux-ify.patch     |   50 +-----------------------------------------
 nc.spec                      |   21 ++++++++++-------
 sources                      |    2 +-
 5 files changed, 15 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 567b279..3dcfdb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nc-1.84.tar.bz2
 /nc-1.101.tar.bz2
 /nc-1.103.tar.bz2
 /nc-1.105.tar.bz2
+/nc-1.106.tar.bz2
diff --git a/nc-1.101-linux-ify.patch b/nc-1.101-linux-ify.patch
index ebde130..950788c 100644
--- a/nc-1.101-linux-ify.patch
+++ b/nc-1.101-linux-ify.patch
@@ -1,13 +1,5 @@
 --- a/netcat.c	2011-01-09 23:16:46.000000000 +0100
 +++ b/netcat.c	2011-03-08 09:21:31.599560952 +0100
-@@ -67,7 +67,6 @@
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- unsigned int iflag;				/* Interval Flag */
--int	jflag;					/* use jumbo frames if we can */
- int	kflag;					/* More than one connect */
- int	lflag;					/* Bind to local port */
- int	nflag;					/* Don't do name look up */
 @@ -85,7 +84,6 @@
  int	Oflag;					/* TCP send buffer size */
  int	Sflag;					/* TCP MD5 signature option */
@@ -20,21 +12,11 @@
  	sv = NULL;
  
  	while ((ch = getopt(argc, argv,
--	    "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
+-	    "46DdhI:i:klnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
 +	    "46DdhI:i:klnO:P:p:rSs:tT:Uuvw:X:x:z")) != -1) {
  		switch (ch) {
  		case '4':
  			family = AF_INET;
-@@ -162,9 +160,6 @@
- 			if (errstr)
- 				errx(1, "interval %s: %s", errstr, optarg);
- 			break;
--		case 'j':
--			jflag = 1;
--			break;
- 		case 'k':
- 			kflag = 1;
- 			break;
 @@ -192,12 +187,6 @@
  		case 'u':
  			uflag = 1;
@@ -59,15 +41,6 @@
  			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
  		}
  	}
-@@ -346,7 +335,7 @@
- 				struct sockaddr_storage z;
- 
- 				len = sizeof(z);
--				plen = jflag ? 16384 : 2048;
-+				plen = 2048;
- 				rv = recvfrom(s, buf, plen, MSG_PEEK,
- 				    (struct sockaddr *)&z, &len);
- 				if (rv < 0)
 @@ -551,18 +540,10 @@
  		    res0->ai_protocol)) < 0)
  			continue;
@@ -102,27 +75,6 @@
  		if (ret == -1)
  			err(1, NULL);
  
-@@ -668,7 +643,7 @@
- 	int lfd = fileno(stdout);
- 	int plen;
- 
--	plen = jflag ? 16384 : 2048;
-+	plen = 2048;
- 
- 	/* Setup Network FD */
- 	pfd[0].fd = nfd;
-@@ -851,11 +826,6 @@
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
--	if (jflag) {
--		if (setsockopt(s, SOL_SOCKET, SO_JUMBO,
--			&x, sizeof(x)) == -1)
--			err(1, NULL);
--	}
- 	if (Tflag != -1) {
- 		if (setsockopt(s, IPPROTO_IP, IP_TOS,
- 		    &Tflag, sizeof(Tflag)) == -1)
 --- a/socks.c	2011-02-12 16:54:18.000000000 +0100
 +++ b/socks.c	2011-03-07 16:24:37.198561350 +0100
 @@ -38,7 +38,7 @@
diff --git a/nc.spec b/nc.spec
index 6b94a70..b827644 100644
--- a/nc.spec
+++ b/nc.spec
@@ -1,6 +1,6 @@
 Summary:    Reads and writes data across network connections using TCP or UDP
 Name:       nc
-Version:    1.105
+Version:    1.106
 Release:    1%{?dist}
 URL:        http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/%{name}/
 License:    BSD and ISC
@@ -16,10 +16,9 @@ Patch3:     nc-1.100-udp-portscan.patch
 Patch4:     nc-1.103-crlf.patch
 Patch5:     nc-1.105-comma.patch
 Patch6:     nc-1.100-libbsd.patch
-Patch7:     nc-1.100-format-size_t.patch
-Patch8:     nc-1.100-initialize-range.patch
-Patch9:     nc-1.100-check-accept.patch
-Patch10:    nc-1.103-iptos-class.patch
+Patch7:     nc-1.100-initialize-range.patch
+Patch8:     nc-1.100-check-accept.patch
+Patch9:    nc-1.103-iptos-class.patch
 
 BuildRequires: libbsd-devel
 
@@ -45,10 +44,9 @@ capabilities.
 %patch4 -p1 -b .crlf
 %patch5 -p1 -b .comma
 %patch6 -p1 -b .libbsd
-%patch7 -p1 -b .format-size_t
-%patch8 -p1 -b .initialize-range
-%patch9 -p1 -b .check-accept
-%patch10 -p1 -b .iptos-class
+%patch7 -p1 -b .initialize-range
+%patch8 -p1 -b .check-accept
+%patch9 -p1 -b .iptos-class
 cp -p %{SOURCE1} .
 
 %build
@@ -65,6 +63,11 @@ install -m644 -p nc.1 %{buildroot}%{_mandir}/man1
 %{_mandir}/man1/nc.1*
 
 %changelog
+* Fri Mar 23 2012 Petr Šabata <contyk at redhat.com> - 1.106-1
+- 1.106 bump
+- BSD jumbo support removed upstream
+- size_t format patch included upstream
+
 * Thu Feb 09 2012 Petr Šabata <contyk at redhat.com> - 1.105-1
 - 1.105 bump
 
diff --git a/sources b/sources
index 41cf468..6c1c5ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-557bc8d4a75c11e472e7b4263be00aba  nc-1.105.tar.bz2
+f639aac0f487242512d1b3907bf46259  nc-1.106.tar.bz2