[Glibc-bsd-commits] r5865 - branches/jessie/kfreebsd-10/debian/patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-01-18 02:43:55 +0000 (Mon, 18 Jan 2016)
New Revision: 5865

Modified:
   branches/jessie/kfreebsd-10/debian/patches/SA-16_05.tcp.patch
Log:
Refresh patch


Modified: branches/jessie/kfreebsd-10/debian/patches/SA-16_05.tcp.patch
===================================================================
--- branches/jessie/kfreebsd-10/debian/patches/SA-16_05.tcp.patch	2016-01-18 02:41:20 UTC (rev 5864)
+++ branches/jessie/kfreebsd-10/debian/patches/SA-16_05.tcp.patch	2016-01-18 02:43:55 UTC (rev 5865)
@@ -7,7 +7,7 @@
 
 --- a/sys/netinet/tcp_output.c
 +++ b/sys/netinet/tcp_output.c
-@@ -705,8 +705,8 @@
+@@ -698,8 +698,8 @@
  	 * segments.  Options for SYN-ACK segments are handled in TCP
  	 * syncache.
  	 */
@@ -17,7 +17,7 @@
  		/* Maximum segment size. */
  		if (flags & TH_SYN) {
  			tp->snd_nxt = tp->iss;
-@@ -1076,7 +1076,7 @@
+@@ -1069,7 +1069,7 @@
  		tp->snd_up = tp->snd_una;		/* drag it along */
  
  #ifdef TCP_SIGNATURE
@@ -26,7 +26,7 @@
  		int sigoff = to.to_signature - opt;
  		tcp_signature_compute(m, 0, len, optlen,
  		    (u_char *)(th + 1) + sigoff, IPSEC_DIR_OUTBOUND);
-@@ -1513,6 +1513,7 @@
+@@ -1506,6 +1506,7 @@
  			bcopy((u_char *)&to->to_tsecr, optp, sizeof(to->to_tsecr));
  			optp += sizeof(to->to_tsecr);
  			break;
@@ -34,7 +34,7 @@
  		case TOF_SIGNATURE:
  			{
  			int siglen = TCPOLEN_SIGNATURE - 2;
-@@ -1531,6 +1532,7 @@
+@@ -1524,6 +1525,7 @@
  				 *optp++ = 0;
  			break;
  			}