Just remove the offending lines instead.

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

3 files changed, 43 insertions, 88 deletions

diff --git a/net-analyzer/pktstat/ChangeLog b/net-analyzer/pktstat/ChangeLog
index c0f5fbd35ffd..dfa1f44b6d69 100644
--- a/net-analyzer/pktstat/ChangeLog
+++ b/net-analyzer/pktstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/pktstat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/ChangeLog,v 1.28 2014/08/20 08:02:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/ChangeLog,v 1.29 2014/08/20 08:07:57 jer Exp $
+
+  20 Aug 2014; Jeroen Roovers <jer@gentoo.org> pktstat-1.8.5-r1.ebuild,
+  files/pktstat-1.8.5-smtp_line.patch:
+  Just remove the offending lines instead.
 
 *pktstat-1.8.5-r1 (20 Aug 2014)
 
diff --git a/net-analyzer/pktstat/Manifest b/net-analyzer/pktstat/Manifest
index e157e6aecfc0..1cfdf1f168c4 100644
--- a/net-analyzer/pktstat/Manifest
+++ b/net-analyzer/pktstat/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pktstat-1.8.5-smtp_line.patch 2648 SHA256 becf490c9aea4665fc917b5821c6953a1b6cd87db0169912cb43eb8054de926f SHA512 ac045ae8528c6c672f61daab7ff4a933ff03ff4711831b37f18e06ce167ae0bee0f39f93499d86d96ae3806b56a515e45395e5570d6bcde5056cc62560966ab5 WHIRLPOOL 9a1c4719ba69edad40f71f2daf908188fb91b38b5dbd39cb834e69a66013e7d7f70eff53d41da20a06ea254dd0baa434e7d0e37276d5d8425e63f98a9d817762
+AUX pktstat-1.8.5-smtp_line.patch 1265 SHA256 d8a41477a7db795935d848777c37514ab67eb70a122f22128198e1d86708e529 SHA512 8c72da90f29e29cd138537e25fe1cfbd104b4944161b2a05a9bbf9c12b04c0ac5c322c355a8e93c2ef9f92fd2c6fb173a794a6f1dce3ac6fe3bd572cbaf10142 WHIRLPOOL 3b8b03131c7e98311cff5ff0ad3199655643b41cb997034f34d45f0b367e41e806c9a4b8ae6845f6f44e566ccf36b07f0eeed2ba64d24241d00d79d633775c4d
 AUX pktstat-1.8.5-tinfo.patch 426 SHA256 a76a6ce6bc3b8f6da783c154702178204b2dcdba1ecd46c03838b021eec55385 SHA512 7d537d540fce9d19bcfd7b223b17dce63295d76d16234d2b078afcd72cc3a10be133f6ae36411618c6ca90534a8a3ce619cc76e15985524e5fd01dfc31cf4ece WHIRLPOOL c7ace1a9effd6e5760bc9a180204401d3b7e344a844faa0d61a01d19e9947dcdb089ab2b75f88ccc12401ad4e07cf445174aac8a5245c14f677bc2696da3663c
 DIST pktstat-1.8.5.tar.gz 133404 SHA256 140b07120eb48f139d588f0d8db792a91227fc7d6e690f0fcad1328dfcafd2c9 SHA512 0401b34646b3e6238a9fe032fa4c2afb70a3a009850bc85c043ff4bba7da6fab0dcf20b963c62ba4db5ba15a7508241dba4f4789ea59b12193928b4c4ec7f0c7 WHIRLPOOL 2e9d4a4c603080999afa0fa3b50b70d09586212c1e69305fb05974756d779e033822c87d8f809ef72582b4078893ca10fe126c84929c183e3289a31a614645e8
 EBUILD pktstat-1.8.5-r1.ebuild 835 SHA256 c9bfe59faffe02d10ee423122fd5c73bdc69dbbe77d6a6f6ee67c99cef8724d2 SHA512 119d7eee19092b4eb677db94ca60700529db2df915eeaf3f2305411743bd083d7d15f0fce0c912d345e8202ad51c6c3b4067457e6a9955c22c9f82875536e50b WHIRLPOOL fdcfec33a47c620e5be56511f3bfbf9290dd5751062402ed1d3082333fc6631514ee16c8b8d0d8dda9270b69fb6b78c3e2eb43657614525e1bf5671202434536
 EBUILD pktstat-1.8.5.ebuild 787 SHA256 3a9b2b2a6b8b99c0641dc8679c9def91afe7a568e4ad7e1b604b63ee201bdfbf SHA512 96198daa7c79759e04e85adff0d4c6ede3af7fb3af3d72b8af129fef4343eba5487c4c8b7b63240cf361dfcd2a27b8cbbf271d15db1c46593d8e120d755bbae0 WHIRLPOOL 2334bbf970a571384d67ef4f388b371a127bae32b012574d60c38f35babbbd25410ab047338093a80469e89b6e9921f892de7df1ce7661375dd28a5aa6a20d8e
-MISC ChangeLog 3376 SHA256 8bda01a499262679c07d0b629630dc62a0af5be6e21111b8fd2a3a20f5072427 SHA512 7cd8c96c0c62df8f95797873cc18beb7f6f708b0e4182830e39ff38b6410f7a03a8d256df081f4a5f52a50e252d4ee83f6fb1a5a6921e39439bd865aeda83256 WHIRLPOOL 4e8b946ec67e109e7693afdf076c67a3e5827232b29a6a042da5b25710dc5ea79da739bd165bdca510aeee0715846e1be52ba136e60ff2afe4ec43b32b9cf8be
+MISC ChangeLog 3531 SHA256 45bc824e7a2b52dc819f8297e5b30aaeeaacd267e9354b28b0c1c5618275e876 SHA512 1537e5fc1354c1838a837c5104bcee9c580b964f7300787f15923e7e0180ce30a8b5b6885f256860a4867473ecacf4dd43635dea9feab414ca45c128b1ea3670 WHIRLPOOL 3a8397952bdfd8051aa7f43f8639a1a8844aa4c34548de76f4802e79ec48395e79693a4a82e188e7ef31acf2dfa3e603011fef922c25026f3bb4e2d9de91f3ed
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP0VgIACgkQVWmRsqeSphNVhgCfTQFvHIoYWeOu8TNouB1y1I+1
-9SEAn2CWF2A8FoigDbVe+hU/V/hxhYkl
-=jLue
+iEYEAREIAAYFAlP0V14ACgkQVWmRsqeSphOJlQCeKrHliJcxO8ENO7a/awG56ehE
+Ho0An3DkJ3BjaxmPkMj3KgcLR8vs7rQs
+=ZkU+
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch b/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch
index fd7f61d7bb08..67ea9e9181e8 100644
--- a/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch
+++ b/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch
@@ -1,95 +1,46 @@
 --- a/tcp_smtp.c
 +++ b/tcp_smtp.c
-@@ -141,84 +141,6 @@
- 	*t = 0;
- }
- 
--static void
--smtp_line(f, line)
--	struct flow *f;
--	const char *line;
--{
--	struct smtp_state *state;
--	const char *s;
--	int addr_changed = 0;
+@@ -149,13 +149,9 @@
+ 	struct smtp_state *state;
+ 	const char *s;
+ 	int addr_changed = 0;
 -FILE*log;
--
--	state = (struct smtp_state *)f->udata;
--
+ 
+ 	state = (struct smtp_state *)f->udata;
+ 
 -if ((log = fopen("/tmp/smtp.log", "a")))
 -   fprintf(log, "smpt_line [%s]\n", line);
 -
--	if (state->in_data) {
--	    if (strcmp(line, ".") == 0) {
--		state->in_data = 0;
--		state->from_addr[0] = 0;
--		state->to_addr[0] = 0;
--	    } else if (state->in_header) {
--		if (!*line)
--		    state->in_header = 0;
--#if 0
--		/* Tag the Subject: line inside DATA */
--		else if ((line[0] == 'S' || line[0] == 's') &&
--		         (line[1] == 'U' || line[1] == 'u') &&
--		         (line[2] == 'B' || line[2] == 'b') &&
--		         (line[3] == 'J' || line[3] == 'j') &&
--		         (line[4] == 'E' || line[4] == 'e') &&
--		         (line[5] == 'C' || line[5] == 'c') &&
--		         (line[6] == 'T' || line[6] == 't') &&
--		         line[7] == ':')
--		    snprintf(f->desc, sizeof f->desc, "%s", line);
--#endif
--	    }
--	} else {
--	    /* Normalize the command line */
--	    normalize_line(line);
+ 	if (state->in_data) {
+ 	    if (strcmp(line, ".") == 0) {
+ 		state->in_data = 0;
+@@ -180,18 +176,15 @@
+ 	} else {
+ 	    /* Normalize the command line */
+ 	    normalize_line(line);
 -if (log)fprintf(log, "normalized to [%s]\n", line);
--	    if ((s = strip_prefix(line, "MAIL FROM:"))) {
--		snprintf(state->from_addr, sizeof state->from_addr, "%s", s);
--		normalize_addr(state->from_addr);
--		addr_changed = 1;
+ 	    if ((s = strip_prefix(line, "MAIL FROM:"))) {
+ 		snprintf(state->from_addr, sizeof state->from_addr, "%s", s);
+ 		normalize_addr(state->from_addr);
+ 		addr_changed = 1;
 -if (log)fprintf(log, "from_addr = [%s]\n", state->from_addr);
--	    }
--	    else if ((s = strip_prefix(line, "RCPT TO:"))) {
--		snprintf(state->to_addr, sizeof state->to_addr, "%s", s);
--		normalize_addr(state->to_addr);
--		addr_changed = 1;
+ 	    }
+ 	    else if ((s = strip_prefix(line, "RCPT TO:"))) {
+ 		snprintf(state->to_addr, sizeof state->to_addr, "%s", s);
+ 		normalize_addr(state->to_addr);
+ 		addr_changed = 1;
 -if (log)fprintf(log, "to_addr = [%s]\n", state->to_addr);
--	    }
--	    else if (strcmp(line, "DATA") == 0) {
--		state->in_data = 1;
--		state->in_header = 1;
--	    }
--	    else if (strcmp(line, "STARTTLS") == 0) {
--		state->state = sENCRYPTED;
--		snprintf(f->desc, sizeof f->desc, "STARTTLS");
--	    }
--
--	    if ((addr_changed || 
--	         strcmp(line, "QUIT") == 0 ||
--		 strcmp(line, "DATA") == 0) && 
--		(*state->from_addr && *state->to_addr)) 
--	    {
--		snprintf(f->desc, sizeof f->desc, "%s -> %s", 
--		    state->from_addr, state->to_addr);
--	    } else {
--		if (strcmp(line, "QUIT") != 0)
--		    snprintf(f->desc, sizeof f->desc, "%s", line);
--	    }
+ 	    }
+ 	    else if (strcmp(line, "DATA") == 0) {
+ 		state->in_data = 1;
+@@ -213,10 +206,7 @@
+ 		if (strcmp(line, "QUIT") != 0)
+ 		    snprintf(f->desc, sizeof f->desc, "%s", line);
+ 	    }
 -if (log)fprintf(log, "set desc to: [%s]\n", f->desc);
--	}
+ 	}
 -
 -if (log)fclose(log);
--}
--
+ }
+ 
  /*
-  * Look for simple SMTP (RFC 2822) commands.
-  */
-@@ -270,7 +192,6 @@
- 	    case sEXPECT_LF:
- 		if (*d == LF) {
- 		    state->line[state->line_len] = 0;
--		    smtp_line(f, state->line);
- 		    state->line_len = 0;
- 		    state->state = sLINE;
- 		} else if (*d == CR) {