Clean up patch.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 22 insertions, 25 deletions

diff --git a/net-analyzer/tcpstat/ChangeLog b/net-analyzer/tcpstat/ChangeLog
index 8decac48bd52..c2e6cd807175 100644
--- a/net-analyzer/tcpstat/ChangeLog
+++ b/net-analyzer/tcpstat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/tcpstat
 # Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpstat/ChangeLog,v 1.22 2014/06/30 13:04:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpstat/ChangeLog,v 1.23 2014/07/17 16:57:58 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> files/tcpstat-1.5-db.patch:
+  Clean up patch.
 
 *tcpstat-1.5-r2 (30 Jun 2014)
 
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index 8fac413ae8a4..ee157b20eb07 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tcpstat-1.5-db.patch 5671 SHA256 fe9ecf790c2727ff952190cee4ceec29e4ae6089a5b88184e4c8c530c4812206 SHA512 a54aa7a9b8af747a5a6ebefe113232f24c3380d80b19726795de0f7cf7a78c288d2c03482bc1a6ffd005a478534e79b92470290057e7048412266c3016e93726 WHIRLPOOL 5941c06b6186c83b894d5666723f1b7d9311d0cf97c5af89446db92967ea35fae749be8e1f895dcaa78592c5e9a77b1b0ac5a84ca2711881020b22789848853a
+AUX tcpstat-1.5-db.patch 4691 SHA256 d77717dc7144f0be4019fbf1b695650ed4a33520cdc714e00b8fb2686e2ad291 SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d WHIRLPOOL af6b886eb6c59b3ac9c1850b4c31b959e9b88c9009eded0f3e48c8ed097caba397660df5030de874a22cb5ec98d9311b77571032b4c48d6927f2ccda0fcf6aa0
 DIST tcpstat-1.5.tar.gz 93102 SHA256 46fde9458cc5678264b0c5f2197f84ada9101951197fdeec5f04b0801fcff0ba SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab WHIRLPOOL 386e777ff42a4a61e73e22630ef4ea83e8ce23da0fd165e7d3363530033819f12da3df3891e67da29be9afba5fb43d88397c519c6c7e2fea4a6d624b61ab6522
 EBUILD tcpstat-1.5-r1.ebuild 969 SHA256 2b16a89438a4187e99df70b0424d3e1b3a7bb8c6726ea4a1bf395ef7ca448f36 SHA512 79845ff454167a49945421982ff76369c392e8a9ee3b1bcd8ee873107421a161d734338da5321740c5c3ba28b124c7e6d509bbf81ff717254afc852bebf2d855 WHIRLPOOL 6f56ea6d9300aadf392e248702bde7ab6e0494bfdd1b6483c988641c0e09e635cacf0aa92529ec1b2cc2a66f937c0da02685962954cc37c014a494a68bb74148
 EBUILD tcpstat-1.5-r2.ebuild 837 SHA256 ab9cb46901c6cb3b15d77cf2d04571a09a4bac431f3b01d19e40cdcf7d45adaf SHA512 8eae45993f2b78b902ac87854e2f43de17bc3c96fe7c43de3a188482de20e8ae161787c0dca8d681ec61d6c76894149aaed9983701ad8f510afecd8556730665 WHIRLPOOL 081ab8866bf05efbaa78627e2792acd7319663b40f0528a803b444dbc9b5131d4354540e0c3214455bb2994ab580d903c9f31844a0c6219bdba9bb109e2ed549
 EBUILD tcpstat-1.5.ebuild 665 SHA256 b5ddbbf6f8a8fa8e78ee8e8ac343c2de474f7155fcb614d28243eb84a50cec3e SHA512 c9a5cd36387f3a9bf97b77fc3134b77f58a080f9960beae89a75ede6614eb7e906f80b99a6dba5e28353b3d079b6faee9d6cc0d8eb55343a1b8cc514fc2d95e4 WHIRLPOOL 079eb450de34ba7c4dc715f21a6aadfbdaaa311c9257baf4b8ea2aa084ee627246b8d94d3ceadfc0a3dd9c8c45e161677a90765536264a89d2d98179232f84df
-MISC ChangeLog 2801 SHA256 6b2ebd8b858ed06899728452225e4fdd72b9cebff4ef4761152b70bf4ebcdec8 SHA512 d65087c0ce44fbfae12190e7e55d89173c55a46e48fd857a4b6954e6c8366c077322621303c1a87ab4f8a9ed89be7c7a2a46f6c7cc242d82f197519e52136748 WHIRLPOOL b82d3b75f0f328340effc18991fa5ff4f6a988666b022c73c2efeec490a47a4fe5be19cff99bf7b045ccd5d0f700f512f8ab5623f712c1321aa74e223eba080c
+MISC ChangeLog 2895 SHA256 e90ef50e87321d022f031076d157f436d316c417c9ae5e47cf77275cca1e608e SHA512 0c7686222a606379897fefb242c2928a82057a0db47d35c09c53672a0c0d65f24898b04b29f14dc71fa0ac5d1bafc1a671624416082edf0bac8b2ea1ee4c177e WHIRLPOOL 8b9c9fe411fa595edff1f27bc7925b3bedf8e044ac9274174ff7bfb986c036033cf38a75f9f8e6163ca3f7066e22faea434c6f1b85b8889135c16d7792ff627f
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOxYEYACgkQVWmRsqeSphMMcwCeO47IyNT0Q75wTTwAHzT4Y0wc
-6fUAn3dUD8EmGn//+ttNv1hO6rO+PTcs
-=09m8
+iEYEAREIAAYFAlPIAJgACgkQVWmRsqeSphPp4ACfQElCYXvGqXCsw7aC28bWaoJ5
+F8sAnRS9uX0h7WSeCs5/sy7RUzZ2glYr
+=XQeQ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
index 1e3d146bae4b..88e668e1a4a5 100644
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
@@ -1,6 +1,5 @@
-diff -NrU5 tcpstat-1.5.orig/configure.in tcpstat-1.5/configure.in
---- tcpstat-1.5.orig/configure.in	2002-07-27 02:50:46.000000000 +0200
-+++ tcpstat-1.5/configure.in	2008-05-12 13:01:52.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -84,15 +84,26 @@
  dnl #######################
  dnl Checks for header files
@@ -64,9 +63,8 @@ diff -NrU5 tcpstat-1.5.orig/configure.in tcpstat-1.5/configure.in
  AC_CONFIG_FILES([
  Makefile
  doc/Makefile
-diff -NrU5 tcpstat-1.5.orig/lib/process.c tcpstat-1.5/lib/process.c
---- tcpstat-1.5.orig/lib/process.c	2002-06-01 08:42:09.000000000 +0200
-+++ tcpstat-1.5/lib/process.c	2008-05-12 12:09:21.000000000 +0200
+--- a/lib/process.c
++++ b/lib/process.c
 @@ -230,12 +230,12 @@
   *   calls a user function pointing to the data
   *
@@ -82,9 +80,8 @@ diff -NrU5 tcpstat-1.5.orig/lib/process.c tcpstat-1.5/lib/process.c
  	u_char *packet;
  	int fd, len, blen, ret = 0;
  	struct snoop_file_header	fh;
-diff -NrU5 tcpstat-1.5.orig/lib/tcpseq.c tcpstat-1.5/lib/tcpseq.c
---- tcpstat-1.5.orig/lib/tcpseq.c	2002-01-02 22:05:55.000000000 +0100
-+++ tcpstat-1.5/lib/tcpseq.c	2008-05-12 12:19:40.000000000 +0200
+--- a/lib/tcpseq.c
++++ b/lib/tcpseq.c
 @@ -54,11 +54,10 @@
  	u_char	flags;
  	struct tcpseq_ha test_ha;
@@ -97,9 +94,8 @@ diff -NrU5 tcpstat-1.5.orig/lib/tcpseq.c tcpstat-1.5/lib/tcpseq.c
  	ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr;
  	if (is_ip6_packet(pd))
  		tp= &(pd->data.ip6.body.tcphdr);
-diff -NrU5 tcpstat-1.5.orig/src/catpcap.c tcpstat-1.5/src/catpcap.c
---- tcpstat-1.5.orig/src/catpcap.c	2002-09-18 23:00:29.000000000 +0200
-+++ tcpstat-1.5/src/catpcap.c	2008-05-12 12:15:33.000000000 +0200
+--- a/src/catpcap.c
++++ b/src/catpcap.c
 @@ -50,11 +50,11 @@
  	if (c == ' ') return c;
  	if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c;
@@ -126,9 +122,8 @@ diff -NrU5 tcpstat-1.5.orig/src/catpcap.c tcpstat-1.5/src/catpcap.c
  	char	ebuf[PCAP_ERRBUF_SIZE];
  	struct bpf_program	bpf_prog;
  
-diff -NrU5 tcpstat-1.5.orig/src/dump.c tcpstat-1.5/src/dump.c
---- tcpstat-1.5.orig/src/dump.c	2002-09-18 23:00:29.000000000 +0200
-+++ tcpstat-1.5/src/dump.c	2008-05-12 12:13:53.000000000 +0200
+--- a/src/dump.c
++++ b/src/dump.c
 @@ -37,21 +37,21 @@
  char filterexpr[BUF_SIZ]	= "";
  int	get_tcp_flags		= 0;
@@ -153,9 +148,8 @@ diff -NrU5 tcpstat-1.5.orig/src/dump.c tcpstat-1.5/src/dump.c
  }
  
  int parse_show_types(char *in) {
-diff -NrU5 tcpstat-1.5.orig/src/tcpstat.c tcpstat-1.5/src/tcpstat.c
---- tcpstat-1.5.orig/src/tcpstat.c	2002-07-27 02:42:05.000000000 +0200
-+++ tcpstat-1.5/src/tcpstat.c	2008-05-12 12:16:00.000000000 +0200
+--- a/src/tcpstat.c
++++ b/src/tcpstat.c
 @@ -421,11 +421,11 @@
  }