commit ulogd for openSUSE:Factory

Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2014-12-05 21:04:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ulogd" Changes: -------- --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2014-04-26 10:12:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2014-12-05 21:03:56.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 27 10:44:52 UTC 2014 - jengelh@inai.de + +- Add 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch + to cope with new linux-glibc-devel which lacks ipt_ULOG.h needed + for compilation. + +------------------------------------------------------------------- New: ---- 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.flQxlJ/_old 2014-12-05 21:03:57.000000000 +0100 +++ /var/tmp/diff_new_pack.flQxlJ/_new 2014-12-05 21:03:57.000000000 +0100 @@ -24,52 +24,31 @@ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/ulogd/ -#Freecode-URL: http://freecode.com/projects/ulogd/ #Git-Clone: git://git.netfilter.org/ulogd2 #DL-URL: http://netfilter.org/projects/ulogd/files/ Source: http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2 Source2: http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig Source3: etc-init.d-ulogd Source4: ulogd.service +Patch1: 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch Patch4: ulogd-conf.diff -#BuildRequires: autoconf >= 2.50 -#BuildRequires: automake >= 1.11 +BuildRequires: autoconf >= 2.50 +BuildRequires: automake >= 1.11 +BuildRequires: libmysqlclient-devel BuildRequires: libpcap-devel -#BuildRequires: libtool +BuildRequires: libtool BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.21 BuildRequires: postgresql-devel -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +BuildRequires: sqlite3-devel BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnetfilter_acct) >= 1.0.1 BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.2 BuildRequires: pkgconfig(libnetfilter_log) >= 1.0.0 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.1 -%else -BuildRequires: libmnl-devel >= 1.0.3 -BuildRequires: libnetfilter_acct-devel >= 1.0.1 -BuildRequires: libnetfilter_conntrack-devel >= 1.0.2 -BuildRequires: libnetfilter_log-devel >= 1.0.0 -BuildRequires: libnfnetlink-devel >= 1.0.1 -%endif -%if 0%{?suse_version} -BuildRequires: libmysqlclient-devel -BuildRequires: sqlite3-devel -%endif -%if 0%{?redhat_version} || 0%{?centos_version} || 0%{?fedora_version} -BuildRequires: mysql-devel -BuildRequires: sqlite-devel >= 3 -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%systemd_requires -%endif -%if 0%{?suse_version} -Requires(postun): %insserv_prereq -%endif +BuildRequires: systemd-rpm-macros Requires(pre): /usr/sbin/useradd %description @@ -112,9 +91,10 @@ %prep %setup -q -%patch -P 4 -p1 +%patch -P 1 -P 4 -p1 %build +autoreconf -fi %configure --disable-static make %{?_smp_mflags}; ++++++ 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch ++++++

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=72... 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.1.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org