From 8827380c37f7150914f1662d1cc11a0233d246fd Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 4 Aug 2015 02:47:06 +0200 Subject: [PATCH] ulogd: update to 2.0.5 Signed-off-by: Nicolas Thill --- net/ulogd/Makefile | 6 +- ...ix-JSON-output-on-big-endian-systems.patch | 47 -------- ...opy-of-linux-netfilter_ipv4-ipt_ULOG.patch | 108 ------------------ 3 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 net/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch delete mode 100644 net/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile index fdf3ad9ec0..2fa9f6c780 100644 --- a/net/ulogd/Makefile +++ b/net/ulogd/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ulogd -PKG_VERSION:=2.0.4 -PKG_RELEASE:=2 +PKG_VERSION:=2.0.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \ ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \ ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \ ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/ -PKG_MD5SUM:=7c71ec460dfea5287eba27472c521ebc +PKG_MD5SUM:=f0f8fe1371fa28b5e06cb16aaa0111dd PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/net/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch b/net/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch deleted file mode 100644 index de6b0f19b2..0000000000 --- a/net/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4f267553aede76dc91133ba88c69f8b8faf00b72 Mon Sep 17 00:00:00 2001 -From: Jimmy Jones -Date: Sat, 26 Jul 2014 21:48:38 +0100 -Subject: [PATCH] Fix JSON output on big endian systems - -Signed-off-by: Jimmy Jones ---- - output/ulogd_output_JSON.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c -index e7ac642..3ad2620 100644 ---- a/output/ulogd_output_JSON.c -+++ b/output/ulogd_output_JSON.c -@@ -158,7 +158,11 @@ static int json_interp(struct ulogd_pluginstance *upi) - break; - case ULOGD_RET_BOOL: - case ULOGD_RET_INT8: -+ json_object_set_new(msg, field_name, json_integer(key->u.value.i8)); -+ break; - case ULOGD_RET_INT16: -+ json_object_set_new(msg, field_name, json_integer(key->u.value.i16)); -+ break; - case ULOGD_RET_INT32: - json_object_set_new(msg, field_name, json_integer(key->u.value.i32)); - break; -@@ -171,10 +175,17 @@ static int json_interp(struct ulogd_pluginstance *upi) - json_object_set_new(msg, "action", json_string("blocked")); - break; - } -+ json_object_set_new(msg, field_name, json_integer(key->u.value.ui8)); -+ break; - case ULOGD_RET_UINT16: -+ json_object_set_new(msg, field_name, json_integer(key->u.value.ui16)); -+ break; - case ULOGD_RET_UINT32: -+ json_object_set_new(msg, field_name, json_integer(key->u.value.ui32)); -+ break; - case ULOGD_RET_UINT64: - json_object_set_new(msg, field_name, json_integer(key->u.value.ui64)); -+ break; - default: - /* don't know how to interpret this key. */ - break; --- -2.3.0 - diff --git a/net/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch b/net/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch deleted file mode 100644 index 5b564c42d8..0000000000 --- a/net/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -Date: Fri, 7 Nov 2014 18:33:01 +0100 -Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h - -This fixes compilation if you use a Linux kernel >= 3.17. This problem -occurs since ULOG was removed from mainstream: - -http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986 -Signed-off-by: Pablo Neira Ayuso ---- - configure.ac | 2 +- - include/linux/Makefile.am | 4 +-- - include/linux/netfilter_ipv4/Makefile.am | 1 + - include/linux/netfilter_ipv4/ipt_ULOG.h | 49 ++++++++++++++++++++++++++++++++ - 4 files changed, 53 insertions(+), 3 deletions(-) - create mode 100644 include/linux/netfilter_ipv4/Makefile.am - create mode 100644 include/linux/netfilter_ipv4/ipt_ULOG.h - -diff --git a/configure.ac b/configure.ac -index 522c345..c5f573c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x) - - AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \ - include/linux/Makefile include/linux/netfilter/Makefile \ -- libipulog/Makefile \ -+ include/linux/netfilter_ipv4/Makefile libipulog/Makefile \ - input/Makefile input/packet/Makefile input/flow/Makefile \ - input/sum/Makefile \ - filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index ca80d0d..18af1c2 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -1,2 +1,2 @@ -- --SUBDIRS = netfilter -+SUBDIRS = netfilter \ -+ netfilter_ipv4 -diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am -new file mode 100644 -index 0000000..41819a3 ---- /dev/null -+++ b/include/linux/netfilter_ipv4/Makefile.am -@@ -0,0 +1 @@ -+noinst_HEADERS = ipt_ULOG.h -diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h -new file mode 100644 -index 0000000..417aad2 ---- /dev/null -+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h -@@ -0,0 +1,49 @@ -+/* Header file for IP tables userspace logging, Version 1.8 -+ * -+ * (C) 2000-2002 by Harald Welte -+ * -+ * Distributed under the terms of GNU GPL */ -+ -+#ifndef _IPT_ULOG_H -+#define _IPT_ULOG_H -+ -+#ifndef NETLINK_NFLOG -+#define NETLINK_NFLOG 5 -+#endif -+ -+#define ULOG_DEFAULT_NLGROUP 1 -+#define ULOG_DEFAULT_QTHRESHOLD 1 -+ -+#define ULOG_MAC_LEN 80 -+#define ULOG_PREFIX_LEN 32 -+ -+#define ULOG_MAX_QLEN 50 -+/* Why 50? Well... there is a limit imposed by the slab cache 131000 -+ * bytes. So the multipart netlink-message has to be < 131000 bytes. -+ * Assuming a standard ethernet-mtu of 1500, we could define this up -+ * to 80... but even 50 seems to be big enough. */ -+ -+/* private data structure for each rule with a ULOG target */ -+struct ipt_ulog_info { -+ unsigned int nl_group; -+ size_t copy_range; -+ size_t qthreshold; -+ char prefix[ULOG_PREFIX_LEN]; -+}; -+ -+/* Format of the ULOG packets passed through netlink */ -+typedef struct ulog_packet_msg { -+ unsigned long mark; -+ long timestamp_sec; -+ long timestamp_usec; -+ unsigned int hook; -+ char indev_name[IFNAMSIZ]; -+ char outdev_name[IFNAMSIZ]; -+ size_t data_len; -+ char prefix[ULOG_PREFIX_LEN]; -+ unsigned char mac_len; -+ unsigned char mac[ULOG_MAC_LEN]; -+ unsigned char payload[0]; -+} ulog_packet_msg_t; -+ -+#endif /*_IPT_ULOG_H*/ --- -2.3.0 - -- 2.30.2