| 1 |
jer 14/08/23 09:35:03 |
| 2 |
|
| 3 |
Added: flow-tools-0.68.5.1-run.patch |
| 4 |
flow-tools-0.68.5.1-syslog.patch |
| 5 |
Log: |
| 6 |
Convert sed script to patch. Fix syslog calls without format (bug #520520). |
| 7 |
|
| 8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: flow-tools-0.68.5.1-run.patch |
| 17 |
=================================================================== |
| 18 |
--- a/src/flow-fanout.c |
| 19 |
+++ b/src/flow-fanout.c |
| 20 |
@@ -57,7 +57,7 @@ |
| 21 |
#endif |
| 22 |
|
| 23 |
|
| 24 |
-#define FANOUT_PIDFILE "/var/run/flow-fanout.pid" |
| 25 |
+#define FANOUT_PIDFILE "/run/flow-fanout.pid" |
| 26 |
|
| 27 |
#define SELECT_TIMEOUT 5 /* 5 seconds */ |
| 28 |
|
| 29 |
--- a/src/flow-capture.c |
| 30 |
+++ b/src/flow-capture.c |
| 31 |
@@ -61,7 +61,7 @@ |
| 32 |
|
| 33 |
void fterr_exit_handler(int code); |
| 34 |
|
| 35 |
-#define CAPTURE_PIDFILE "/var/run/flow-capture.pid" |
| 36 |
+#define CAPTURE_PIDFILE "/run/flow-capture.pid" |
| 37 |
|
| 38 |
#define SELECT_TIMEOUT 1 /* 1 second */ |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch |
| 44 |
|
| 45 |
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 |
| 46 |
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 |
| 47 |
|
| 48 |
Index: flow-tools-0.68.5.1-syslog.patch |
| 49 |
=================================================================== |
| 50 |
--- a/lib/fterr.c |
| 51 |
+++ b/lib/fterr.c |
| 52 |
@@ -112,7 +112,7 @@ |
| 53 |
fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2); |
| 54 |
|
| 55 |
if (fterr_flags & FTERR_SYSLOG) |
| 56 |
- syslog(LOG_INFO, buf); |
| 57 |
+ syslog(LOG_INFO, "%s", buf); |
| 58 |
|
| 59 |
} /* fterr_info */ |
| 60 |
|
| 61 |
@@ -134,7 +134,7 @@ |
| 62 |
|
| 63 |
if (fterr_flags & FTERR_SYSLOG) { |
| 64 |
snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); |
| 65 |
- syslog(LOG_INFO, buf2); |
| 66 |
+ syslog(LOG_INFO, "%s", buf2); |
| 67 |
} |
| 68 |
|
| 69 |
if (fterr_exit) |
| 70 |
@@ -159,7 +159,7 @@ |
| 71 |
} |
| 72 |
|
| 73 |
if (fterr_flags & FTERR_SYSLOG) |
| 74 |
- syslog(LOG_INFO, buf); |
| 75 |
+ syslog(LOG_INFO, "%s", buf); |
| 76 |
|
| 77 |
if (fterr_exit) |
| 78 |
fterr_exit(code); |
| 79 |
@@ -183,7 +183,7 @@ |
| 80 |
} |
| 81 |
|
| 82 |
if (fterr_flags & FTERR_SYSLOG) |
| 83 |
- syslog(LOG_INFO, buf); |
| 84 |
+ syslog(LOG_INFO, "%s", buf); |
| 85 |
|
| 86 |
} /* fterr_warnx */ |
| 87 |
|
| 88 |
@@ -205,7 +205,7 @@ |
| 89 |
|
| 90 |
if (fterr_flags & FTERR_SYSLOG) { |
| 91 |
snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); |
| 92 |
- syslog(LOG_INFO, buf2); |
| 93 |
+ syslog(LOG_INFO, "%s", buf2); |
| 94 |
} |
| 95 |
|
| 96 |
} /* fterr_warn */ |
Archives