From 3f26f5920a167b2edf2bdc8fb557a571c9dd64eb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 30 Dec 2014 22:27:16 +0000 Subject: [PATCH] Clean up documentation on a few patches. --- sys-apps/ucspi-tcp/ChangeLog | 6 +++++- sys-apps/ucspi-tcp/files/0.88-bigendian.patch | 10 +++++++--- sys-apps/ucspi-tcp/files/0.88-errno.patch | 6 ++++-- sys-apps/ucspi-tcp/files/0.88-tcprules.patch | 14 +++++++++----- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog index 5733ac67839a..be9b966628c3 100644 --- a/sys-apps/ucspi-tcp/ChangeLog +++ b/sys-apps/ucspi-tcp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/ucspi-tcp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.78 2014/12/30 22:26:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.79 2014/12/30 22:27:16 vapier Exp $ + + 30 Dec 2014; Mike Frysinger files/0.88-bigendian.patch, + files/0.88-errno.patch, files/0.88-tcprules.patch: + Clean up documentation on a few patches. 30 Dec 2014; Mike Frysinger -files/0.88-head-1.patch, -files/0.88-limits.patch: diff --git a/sys-apps/ucspi-tcp/files/0.88-bigendian.patch b/sys-apps/ucspi-tcp/files/0.88-bigendian.patch index 026fbc62d01b..c5884b883c13 100644 --- a/sys-apps/ucspi-tcp/files/0.88-bigendian.patch +++ b/sys-apps/ucspi-tcp/files/0.88-bigendian.patch @@ -1,11 +1,15 @@ ---- ucspi-tcp-0.88.orig/tcpserver.c 2005-01-06 20:51:16.590777128 +0100 -+++ ucspi-tcp-0.88/tcpserver.c 2005-01-06 20:52:34.075997584 +0100 +https://bugs.gentoo.org/18892 + +patch by Michael Hanselmann + +--- a/tcpserver.c ++++ b/tcpserver.c @@ -422,7 +422,11 @@ se = getservbyname(x,"tcp"); if (!se) strerr_die3x(111,FATAL,"unable to figure out port number for ",x); +#if __BYTE_ORDER == __BIG_ENDIAN || BYTE_ORDER == BIG_ENDIAN -+ localport = ntohs(se->s_port); ++ localport = ntohs(se->s_port); +#else uint16_unpack_big((char*)&se->s_port,&localport); +#endif diff --git a/sys-apps/ucspi-tcp/files/0.88-errno.patch b/sys-apps/ucspi-tcp/files/0.88-errno.patch index 76d53c34bf78..0d15819b9390 100644 --- a/sys-apps/ucspi-tcp/files/0.88-errno.patch +++ b/sys-apps/ucspi-tcp/files/0.88-errno.patch @@ -1,5 +1,7 @@ ---- a/error.h 2000-03-18 10:18:42.000000000 -0500 -+++ b/error.h 2003-03-05 15:36:47.000000000 -0500 +http://bugs.gentoo.org/16804 + +--- a/error.h ++++ b/error.h @@ -1,7 +1,7 @@ #ifndef ERROR_H #define ERROR_H diff --git a/sys-apps/ucspi-tcp/files/0.88-tcprules.patch b/sys-apps/ucspi-tcp/files/0.88-tcprules.patch index 4d448fdde8fe..2986fdeed0f2 100644 --- a/sys-apps/ucspi-tcp/files/0.88-tcprules.patch +++ b/sys-apps/ucspi-tcp/files/0.88-tcprules.patch @@ -1,12 +1,16 @@ ---- tcprules.c.orig 2005-09-12 00:44:11.000000000 +0200 -+++ tcprules.c 2005-09-12 00:58:11.000000000 +0200 +https://bugs.gentoo.org/90679 + +patch by Michael Hanselmann + +--- a/tcprules.c ++++ b/tcprules.c @@ -127,6 +127,9 @@ for (;;) { int tmp; tmp = byte_chr(x + colon,len - colon,':'); -+ if(colon == 0 && tmp == len) { -+ strerr_die2x(111, FATAL, "Unable to find colon on non-empty line."); -+ } ++ if (colon == 0 && tmp == len) { ++ strerr_die2x(111, FATAL, "Unable to find colon on non-empty line."); ++ } colon += tmp; if (colon == len) continue; if (byte_equal(x+colon+1,4,"deny") || byte_equal(x+colon+1,5,"allow")) break; -- 2.26.2