[gentoo-commits] gentoo-x86 commit in net-analyzer/flow-tools/files: flow-tools-0.68.5.1-run.patch flow-tools-0.68.5.1-syslog.patch

[Jeroen Roovers (jer)]

jer         14/08/23 09:35:03

  Added:                flow-tools-0.68.5.1-run.patch
                        flow-tools-0.68.5.1-syslog.patch
  Log:
  Convert sed script to patch. Fix syslog calls without format (bug #520520).
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.1                  net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch?rev=1.1&content-type=text/plain

Index: flow-tools-0.68.5.1-run.patch
===================================================================
--- 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 */
 



1.1                  
net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch?rev=1.1&content-type=text/plain

Index: flow-tools-0.68.5.1-syslog.patch
===================================================================
--- 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 */