Convert sed script to patch. Fix syslog calls without format (bug #520520).

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

5 files changed, 87 insertions, 12 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index f34b547024a7..5a5ea6b5d867 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/flow-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.70 2014/07/11 12:24:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.71 2014/08/23 09:35:02 jer Exp $
+
+*flow-tools-0.68.5.1-r4 (23 Aug 2014)
+
+  23 Aug 2014; Jeroen Roovers <jer@gentoo.org> -flow-tools-0.68.5.1-r3.ebuild,
+  +flow-tools-0.68.5.1-r4.ebuild, +files/flow-tools-0.68.5.1-run.patch,
+  +files/flow-tools-0.68.5.1-syslog.patch:
+  Convert sed script to patch. Fix syslog calls without format (bug #520520).
 
 *flow-tools-0.68.5.1-r3 (11 Jul 2014)
 
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 24402a9eabf2..13c81874c53d 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX flow-tools-0.68.5.1-run.patch 493 SHA256 8879df3fb76ed6459a7932a471a7360adb195d26fa88f3797b1a25ccdc4a81e5 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d WHIRLPOOL d58315e44f7886fcc3b944c2c6595d94b15ba7bb46a09ff1608d9876e3db46ce99c3a063b06ad80b470fc01e6caedd8e71137ca1000c11c2e032abbeed5c0417
+AUX flow-tools-0.68.5.1-syslog.patch 979 SHA256 15eab977271205917b303f79b2caf69e48f5a1a575be704ffbdbdf07e812d525 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537 WHIRLPOOL 31d185f356f842103c3e7f10652c1438132f3f49fbcb9c2ee37ab76adaf60386d74865292d11b22708cbb59bdca903096ace198d864c20e04397dddf80be75b0
 AUX flowcapture.confd 1677 SHA256 b9398472e08fc93f4bffb542312bd494a90047177be29c8082fbdf2297c0c4bc SHA512 60285943879e48416b00e176de0ab2054623ecf83d49feb5bd88b5e68afea187013cbf889e7be3f26e8d2bdd96a2f19c482dab2815d14f4ab0e9d454aa27e3c1 WHIRLPOOL 2c3668088fc1d18c4ff7ba5229d2beb5bc3fbd20a4ffc6aae8cde5d193aff6fb3747844e426900ad8a23ad82c17b868dcf935f983e058dd22f00fe5f306578e4
 AUX flowcapture.initd 558 SHA256 02ab64ec16194df5e5ee36f87a939a20d155f6c2a8924b96bf2239c3d5836959 SHA512 7b7977a47cd8b9a0f20c7eff4bbdd667f581ec35f0ba619723540afbdc7e922981bec54999a83347b5a587fe236662bebe3a919de25997842a5e43e20d2eeeb6 WHIRLPOOL 78fcb69421049a97bed6ea084cd70a7a840e7a8dc609904ef365ad2c1f19f1454b612333e68dad93dc4a1d46eb23f08b4fc4a68f4abb24b97a0c1d285199f13e
 AUX linkme 283 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359 WHIRLPOOL 94af50de39a8350d194917c129fdd5cdb542e07834340db0453a897185ccd4f4da6fd6584ecf144b79c5f8981c3dbfdd7e87894fa66bc230c530d2985828dba7
 DIST flow-tools-0.68.5.1.tar.bz2 914062 SHA256 80bbd3791b59198f0d20184761d96ba500386b0a71ea613c214a50aa017a1f67 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 WHIRLPOOL 2e7b98abab82ec07639356c07c89bb480276fec945c48ef86188a70a28ff54ab5dd1f1c7b69945d7b4e2687aafee06bef81dceea655b15aa735c50455723be83
 EBUILD flow-tools-0.68.5.1-r2.ebuild 1815 SHA256 e06df59c7da884d6f86cadb58d14f0469cd5fbb6bca45e97f28af02fd58f8e6b SHA512 2f5693534b8e6ad29277b95f0281aa37e56b33078a31215d0f521a7271e5b2c296b14d3ef2bdb214a65daf8ca472f6fe26526e27632ab161b290aad89e360401 WHIRLPOOL 24c680f92a8e4b13606acb2499cb206ef5cf7a4268049a8acf2a93d75cef53989738ee1123419084871b88f7e292d3c4b490cb051c07c03fd5bffec0261b1cab
-EBUILD flow-tools-0.68.5.1-r3.ebuild 1722 SHA256 72b09a5a4422894f6058763eb5cbdeccc492e5fb8a6bfeceb65ad1033e23ee84 SHA512 7a1deab014182f0860d051d763cabb7e9e8cd1a4b8812b6d6a14b8d4e685857ae2dcbec29af32918588a717e8f8ee71dfa5a45005f9395ace2ad6b3b5f3ec70b WHIRLPOOL e714b42ffeb39c2264ad4f1de5f3b6eae259e904a40ba4bc52e9cfa74e79ae68065442a3cfd00fe8bebe75a798b0e21397d031861797afef16f6f2166528a012
-MISC ChangeLog 12704 SHA256 bad8e3fa67073898b509a1a4bf1d3b7e6be510b183b96986b1a875b2b7f79fb7 SHA512 2e4a9664dbd9471cefe4f26ca85e35b6d08d122958de6be191c2a7b0024ad02cbb6a0ee1242f32404c2639fcca70477a19da693d81c325798bc058853047bb87 WHIRLPOOL 1348807e1635195a4708766ba2fa39c66dc3eaeb94ca5d14467309780d6691acd917de46ddeb35701cd6b33697b7247b61acc289e7fc3f8581966b8a29d1482a
+EBUILD flow-tools-0.68.5.1-r4.ebuild 1706 SHA256 1e2c7377dd0086d9a5e294899d1e5cc9bca25b91cc8aedb140a9ab0c301bbb67 SHA512 287c6eb6a15e752e1cde6c55e152e913d44cb3b46af3bacf8ea695f011dac5616add1868b9deba6b8e49e27f4c067406cc5e13f7c4acdc5ca64782847d290313 WHIRLPOOL 2b25a489db80f2ef55834a879bed443a87373ab3302219bd9116da7ae0ce3e8e8a6766ba2627388cfea4565411d3fbe0295b6738eb299b6a833872bd2e3c8943
+MISC ChangeLog 13016 SHA256 6dd449a10ea0d5a0ec63efc8f9a9ac7f525379bf9e1d65585d2cf89c52b0eddd SHA512 e02ac5b810f8a87a9dcf2e214848147906ecdcabc5e135c41f31072a8d0f0983a7313a983b361a0654f0786edb27882c6cec59c014c1064aef5cc14439c34374 WHIRLPOOL b9470eb5c0fc64d5d243e4a09ea08ce21d3fd8d6aec61ff9a7addd64b1c5e72704f7859e8fe583976d99d4a86d77be85ff3eff1fe8ecfc216271d9241e2d24d9
 MISC metadata.xml 782 SHA256 96523568d0fc94af99564596f973f8207ca051a02fc4f2c248b4f416002aa50b SHA512 957f1c76b9439f5c72542691886eb728febe2fdd8bc0c524654987e84a3a007d9918d9d50aededd26f98ea00380947f8e6dd0b1da339c5235fa30d13ebd6163a WHIRLPOOL a52ba37b3f7f69a39ac39bc00ff8cba08b8bb67a533d567b441ebc647ae7acffadcbcb41e8ab271c477ddc59b3253096459e133b95309c1989e333e5251e14ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlO/15MACgkQVWmRsqeSphPQDwCcDz+zbpWceiAINelM7ktIqM/o
-2QIAn1Il3KE8m7kHi+mR/TU4CbWY8gaU
-=dEmf
+iEYEAREIAAYFAlP4YEgACgkQVWmRsqeSphNcuACdHBrspPBL3E9UeXdiRZ7Awkkv
+WM0An3e30l2FoRnRGHCCfUFpLyfCsTks
+=tm8s
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch
new file mode 100644
index 000000000000..e1b06eee7e00
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch
@@ -0,0 +1,22 @@
+--- a/src/flow-fanout.c
++++ b/src/flow-fanout.c
+@@ -57,7 +57,7 @@
+ #endif
+ 
+ 
+-#define FANOUT_PIDFILE    "/var/run/flow-fanout.pid"
++#define FANOUT_PIDFILE    "/run/flow-fanout.pid"
+ 
+ #define SELECT_TIMEOUT 5   /* 5 seconds */
+ 
+--- a/src/flow-capture.c
++++ b/src/flow-capture.c
+@@ -61,7 +61,7 @@
+ 
+ void fterr_exit_handler(int code);
+ 
+-#define CAPTURE_PIDFILE    "/var/run/flow-capture.pid"
++#define CAPTURE_PIDFILE    "/run/flow-capture.pid"
+ 
+ #define SELECT_TIMEOUT 1   /* 1 second */
+ 
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
new file mode 100644
index 000000000000..cb17471072bc
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
@@ -0,0 +1,47 @@
+--- a/lib/fterr.c
++++ b/lib/fterr.c
+@@ -112,7 +112,7 @@
+     fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_info */
+ 
+@@ -134,7 +134,7 @@
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+   if (fterr_exit)
+@@ -159,7 +159,7 @@
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+   if (fterr_exit)
+     fterr_exit(code);
+@@ -183,7 +183,7 @@
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_warnx */
+ 
+@@ -205,7 +205,7 @@
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+ } /* fterr_warn */
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r3.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild
index 8d61d64f58d7..3a6de28f5df3 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r3.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r3.ebuild,v 1.1 2014/07/11 12:24:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild,v 1.1 2014/08/23 09:35:02 jer Exp $
 
 EAPI=5
 inherit eutils user
@@ -32,11 +32,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i \
-		-e 's|/var/run/|/run/|g' \
-		src/flow-capture.c \
-		src/flow-fanout.c \
-		|| die
+	epatch "${FILESDIR}"/${P}-run.patch
+	epatch "${FILESDIR}"/${P}-syslog.patch
 }
 
 src_configure() {