diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-08-23 09:35:04 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-08-23 09:35:04 +0000 |
| commit | 16c693f0a4a97bc956ab72f21e3bce00cf3a55d0 (patch) | |
| tree | e463ba3a45ac84f6877e1ffddc42335de83ac1d9 /net-analyzer/flow-tools/files | |
| parent | Version bump (diff) | |
| download | historical-16c693f0a4a97bc956ab72f21e3bce00cf3a55d0.tar.gz historical-16c693f0a4a97bc956ab72f21e3bce00cf3a55d0.tar.bz2 historical-16c693f0a4a97bc956ab72f21e3bce00cf3a55d0.zip | |
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
Diffstat (limited to 'net-analyzer/flow-tools/files')
| -rw-r--r-- | net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch | 22 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch | 47 |
2 files changed, 69 insertions, 0 deletions
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 */ |