diff options
Diffstat (limited to 'package/ulogd/patches')
4 files changed, 17 insertions, 53 deletions
diff --git a/package/ulogd/patches/patch-configure_ac b/package/ulogd/patches/patch-configure_ac index 389b26f15..62d85d459 100644 --- a/package/ulogd/patches/patch-configure_ac +++ b/package/ulogd/patches/patch-configure_ac @@ -1,6 +1,6 @@ ---- ulogd-2.0.2.orig/configure.ac 2013-03-01 16:45:23.000000000 +0100 -+++ ulogd-2.0.2/configure.ac 2013-11-11 21:27:31.000000000 +0100 -@@ -32,7 +32,7 @@ fi +--- ulogd-2.0.4.orig/configure.ac 2014-03-23 16:30:50.000000000 +0100 ++++ ulogd-2.0.4/configure.ac 2014-04-16 06:48:35.000000000 +0200 +@@ -24,7 +24,7 @@ AC_SUBST([libdl_LIBS]) dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC diff --git a/package/ulogd/patches/patch-filter_raw2packet_ulogd_raw2packet_BASE_c b/package/ulogd/patches/patch-filter_raw2packet_ulogd_raw2packet_BASE_c index b77ea9bf4..7abc2e94f 100644 --- a/package/ulogd/patches/patch-filter_raw2packet_ulogd_raw2packet_BASE_c +++ b/package/ulogd/patches/patch-filter_raw2packet_ulogd_raw2packet_BASE_c @@ -1,6 +1,6 @@ ---- ulogd-2.0.2.orig/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-03-01 16:44:22.000000000 +0100 -+++ ulogd-2.0.2/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-11-11 21:27:31.000000000 +0100 -@@ -588,10 +588,10 @@ static int _interp_udp(struct ulogd_plug +--- ulogd-2.0.4.orig/filter/raw2packet/ulogd_raw2packet_BASE.c 2014-03-23 16:30:50.000000000 +0100 ++++ ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c 2014-04-16 06:44:33.000000000 +0200 +@@ -594,10 +594,10 @@ static int _interp_udp(struct ulogd_plug /* Section 3.1. SCTP Common Header Format */ typedef struct sctphdr { diff --git a/package/ulogd/patches/patch-output_mysql_ulogd_output_MYSQL_c b/package/ulogd/patches/patch-output_mysql_ulogd_output_MYSQL_c new file mode 100644 index 000000000..affb785c8 --- /dev/null +++ b/package/ulogd/patches/patch-output_mysql_ulogd_output_MYSQL_c @@ -0,0 +1,11 @@ +--- ulogd-2.0.4.orig/output/mysql/ulogd_output_MYSQL.c 2013-06-18 22:52:50.000000000 +0200 ++++ ulogd-2.0.4/output/mysql/ulogd_output_MYSQL.c 2014-04-16 06:49:04.000000000 +0200 +@@ -42,7 +42,7 @@ + #include <errno.h> + #include <time.h> + #include <arpa/inet.h> +-#include <mysql/mysql.h> ++#include <mysql.h> + #include <ulogd/ulogd.h> + #include <ulogd/conffile.h> + #include <ulogd/db.h> diff --git a/package/ulogd/patches/patch-src_ulogd_c b/package/ulogd/patches/patch-src_ulogd_c deleted file mode 100644 index a30a3a95a..000000000 --- a/package/ulogd/patches/patch-src_ulogd_c +++ /dev/null @@ -1,47 +0,0 @@ ---- ulogd-2.0.2.orig/src/ulogd.c 2013-03-01 16:45:23.000000000 +0100 -+++ ulogd-2.0.2/src/ulogd.c 2013-11-11 21:27:31.000000000 +0100 -@@ -78,7 +78,7 @@ - static FILE *logfile = NULL; /* logfile pointer */ - static char *ulogd_logfile = NULL; - static const char *ulogd_configfile = ULOGD_CONFIGFILE; --static FILE syslog_dummy; -+static FILE *syslog_dummy; - - static int info_mode = 0; - -@@ -420,7 +420,7 @@ void __ulogd_log(int level, char *file, - if (level < loglevel_ce.u.value) - return; - -- if (logfile == &syslog_dummy) { -+ if (logfile == syslog_dummy) { - /* FIXME: this omits the 'file' string */ - va_start(ap, format); - vsyslog(ulogd2syslog_level(level), format, ap); -@@ -941,7 +941,7 @@ static int logfile_open(const char *name - logfile = stdout; - } else if (!strcmp(name, "syslog")) { - openlog("ulogd", LOG_PID, LOG_DAEMON); -- logfile = &syslog_dummy; -+ logfile = syslog_dummy; - } else { - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { -@@ -1070,7 +1070,7 @@ static void sigterm_handler(int signal) - unload_plugins(); - #endif - -- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != NULL && logfile != stdout && logfile != syslog_dummy) { - fclose(logfile); - logfile = NULL; - } -@@ -1090,7 +1090,7 @@ static void signal_handler(int signal) - switch (signal) { - case SIGHUP: - /* reopen logfile */ -- if (logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != stdout && logfile != syslog_dummy) { - fclose(logfile); - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { |