fix compile err with >=linux-headers-3.17, bug 528310

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 124 insertions, 20 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index c7ce31b3adc1..ba691d1322fd 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.92 2014/11/08 11:08:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.93 2014/11/18 02:21:24 dlan Exp $
+
+  18 Nov 2014; Yixun Lan <dlan@gentoo.org> ulogd-2.0.4.ebuild,
+  +files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch:
+  fix compile err with >=linux-headers-3.17, bug 528310
 
   08 Nov 2014; Markos Chandras <hwoarang@gentoo.org> ulogd-2.0.4.ebuild:
   Add dependency to <linux-headers-3.17. Print warnings >for kernel-3.17. Patch
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 1dd685ca891c..c2432308232b 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -2,29 +2,28 @@
 Hash: SHA256
 
 AUX ulogd-2-ng.init 1000 SHA256 72e5ef08facee693fdbd264bcc42d8277220706b2539150fef97a31b6039c44a SHA512 de80e76ef91b7913b4eb0a28f6632700c8944dd0a29a8e7a1f7365f8523ef79bd52e1e873bc94dc3958c5b4224680457b7b6d4ef0e196dc0179af50c6a9c6a92 WHIRLPOOL b2c4d7eef3ba5d2d2c9777fdafcc08137b78000a2558e894dfa737997ed236e4796abf2a9011e055237e233fd7217cad26e8607c19f6cc34226c5dd74df42e28
+AUX ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch 3187 SHA256 aa1226e726e255024862436533f3ca03673cb60b9b71ecca956f2390e5d76202 SHA512 b1dda5ff80913d104941be9bf67fa72a07729b93de297a18a754c6ee41398d603e410324ffb39932142cb6b7a58d681a3d7c4a1bcefa9fa781b452ac2ba42d42 WHIRLPOOL 2255640dc07e6b7a81f72b44b71510c341b49f4918c1b36321778d57f4bca06e74e4972cccdb8853e328d046a3dbc3f5f7be0ef82d958187cde0ef9c4d9cc64e
 AUX ulogd-2.logrotate 212 SHA256 df0f73b4dd4b0c1f6afaf3efc98c99b972e068bcbf8ea768f6522cbebd339669 SHA512 1c29316f42903a8893a110e74c171f2b8b4c9bb2d63221b65e601f077549c7447941ce6257259b4f1042076c1e4b5bfba0bf7c85289519aab6edb27edf6ffc95 WHIRLPOOL 8f2290e7de1e8958c1fc5cf1f075170a691304d1ddbf53a2f14b989925d5da6996ab409442ee9a92852a711f56a2bfe05bd97a55ab2d6be3fd1cca346cd0dd93
 DIST ulogd-2.0.3.tar.bz2 447550 SHA256 1ec965073e7f4e5605b2bd1c143b2094e495ad24a298e6fc8f6fcbd131234376 SHA512 09d61cca6cd1c8137b3a4e5ce101f54e48f30c98761602a97766554bc4130eda632b8541f5c1e3e2ac686ec718bb4d440d3bea57c811317cabb274917c996140 WHIRLPOOL f79f0300e610ee9de82aee478dec1c28ffbe10c7b4348ddc586229ac53226f238371f1e71d0b33095904d373c26359b848e18069d8da3d7e22a4819568c1ee44
 DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
 EBUILD ulogd-2.0.3.ebuild 3071 SHA256 01082b1db8ef362aa00015f0a0d56c20512589c9aebb7bb7ec08487bc9929614 SHA512 59d963b7470e9ad0436f6a2480aa815090f981b0971f28231126fd1ff95a530dd05195a2b334434fd77888d208739bde38da62518f51ae2630ea36ba0e883c9f WHIRLPOOL f869ee961c73f6c1f31618b09253ebad5006322b2bf18580fc8c71c0eaaf99ecb9dcf168b2bc7e7b18635678256e679432c0ac44d962a600cf1e1754215cebe9
-EBUILD ulogd-2.0.4.ebuild 3424 SHA256 5cd7a34d1b2733549672304fbb2aebd3b53fb18c0993a0d061b478d2475a5c3b SHA512 98d690c9dae5555182083c06172efb716b3823b910bd572443d074cae176e8213ef664ca8ffd40469605385beaae48c22fdd427f056843b7e185e389e1eccabe WHIRLPOOL a41a1fc36f8de014e9e34d6c7b53d074bdd8671cbfd7d3c923f3e415620f322a3b6087a037a7db54032859edce182228d13cc46ff8d9823429d3d5761c0f84f2
-MISC ChangeLog 15317 SHA256 ead54f8f9283d8e999b8cf1afd7c6629b87e7e2994daac4c49dd88b7fa075186 SHA512 1fc693eb4e9b85699bd0609133dcc21f07f978201cbc39f32a4d72ce7f900b2878b5c7339af29d493c07f9b78eba6ad9a030f8cd41e6e50bb7cfe2b9617c6227 WHIRLPOOL 5a0a636f18acd42cc197fab4ade999b77240313cfd9fc963ce945f0a2e148d17517b1f7d93a417523aa7fee963fc9d9979ca6a942fdda692d67a389b91c65576
+EBUILD ulogd-2.0.4.ebuild 3450 SHA256 517ab2ae5fc93e74906c9313d7a63cc3c3fe39dd2940aae3619b4a8262ae0d3e SHA512 9e751fb7d46928c018694b52631341005c2df9362476023386f6c44de5a84e481e5eeeef48bf2944948954aad8c7ad180c566f1a1a3752dde36542f01708627e WHIRLPOOL 1f79f5b744b6e7b14ea76066ce964d438205691b1fb745ec414293f094581419035b9c932b9a94dd6d5012243a45ab4ede80503c23346a8581760e9bc22f70d1
+MISC ChangeLog 15489 SHA256 a7ba8f9d126b42c92cac7ea7d20a73392f33c93600666bf047a7eb630810e482 SHA512 e7d34df66c19a298eb7c3f1fb946c9720ae7ee95d5f0442fb129ce2bdee984411a75ae9ae89e5f4b48e7b0ef9f0d2059f082c91441f6d72444c1de1c72239931 WHIRLPOOL af9efc631bb08c8d5260b344b425be55bf14d4f2fcda568ae1718939be759993913e95ed2ed38810964be913fa75eda554b2e6bebbb232bad5643c773a3aa1b1
 MISC metadata.xml 1045 SHA256 8fca8605bebf933527d992e67d15b73a73ffb10ceaa23369b9243f9aca546a94 SHA512 95b9494ea6fa7771e53b2300e7bb3c795f0869e2aea0f8c56e307836cb152082c584daa935eb99416e1cacec4e22a370812da7dca7689d408b232c58eb4cd514 WHIRLPOOL 895778a343a2f24edf5083236e8489570e739ce3023491c8b6f483a14c3343931e340fec227fb5f0250c902692dcc8841d4bd976d13490d361e4599424658693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUXfmbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88M/0P/1o5+qdeE4BXnom5CjM5SxxF
-5rLMCcnvC+qWsgDeqemrRH2TLCp3Od2aMB6R8n1u/bQ1mm/DmCDyPLDNPIThWHgD
-xKZ6DZ5QX3yyS1WrQxcc8FOKuJ0a8nih5THDs8ykQcr8nTkbac7WEgtzjgl9YRca
-z055y0sS04udNaRIzwVxIbQPsY/wQj+7eVGXlSlkApYFbioso2l2UnleY37NDEib
-ScOjTxODM+ItsTf/VZL4ZnfY3qSR0Ra2MSIySvgnEWzsRwEP8PmM+y62aaR1IsmO
-nMd2QBnlORWcpWahVN+/87lnJ0cKl9zTIA50urMLq2WCRVYwyIAEcruzJHUzhaHt
-2MqT1FA223dNUn44DRmE1tKjMKsz96L3tQ9UC3IhotAcWt+tZv3xw5IOpZiyxWR/
-QRrhUMltKyP8P0/lHO7UsmLKHGAwph4gbhw/Feyz9xuydGwqMOd6lmqmTEDKJJY0
-9Qr2zzLACbacxgKsOiRqUpCNyVg022ci83z8GPJPwYqYBwty4cJ5FoqT9pWwD4+8
-VUIL4JhqwtnPK9MCtR2uaxOiYSL/KtJSDgxR0khdWoAihD704pCggPcFnLW1a8uJ
-Wtq+JJ36KPZjrJ0EjWc1d8zC1lN1EQoRlLqL7VnzeDuMS0J07I1+xObJHjnnKDL3
-Eyof3hu4SvJALrITx8vd
-=G7wg
+iQIcBAEBCAAGBQJUaq0zAAoJEJIMDbyqvv1Vq3AQAOO6Ar7PFtye1rC82m4y0T5F
+/flp7DHIJ5P7/suiutMFKwtJ5RVbDabSwMouit8CgCvP+wshMRlKFd0i5DB7rHLG
+51ARAuSXATjoQYnWUTtKr4A+95CzEM886QMe/wqO87U4+rGEdrGqa9w3YFBty0CB
+GtQ+ys1U1sJ6MgrUAHHR7ALD6tiLoO0XFrerGVYUMyZTEZyKEdvEJDTDqypHBWub
+hN7w3LKdLe2+n16Po71oOQ/8SIXpe6q7zAsk03rSuUcEy3/QW6Lv2fwVcvRNQv/r
+kx31dcTJTIEjsd/DsZBuozsLHMD7cBPDcSPeEdK0mUqgrbYgxsgSwQdhVTWBpvPA
+1BahwJbDOrIU42b24joO+341cG7XWPodAVaFSrq2qj6WpQDQf7sQc+2MiQryfekc
+HijZ74eMdU8fq94f2fUBMaZG8EM20e08rNScbQT/uYaPks0m8rRSvKz6VA3lhkPf
+fPWVtwgcIKU9EZZH+wInB7ls+tv1sSVCxGxEzWvLM0FSyyTiFH6AML6KUJSjPR3z
+j2+YlAD7aq5GKtBfSkzns2+ZJyRPF/VT516eXrIApBUd7x+xX0qU/LZrmUgZ2zqO
+dk8tI13wWxWoA6GYZcjlpfX95xe9lKXZxyjG5/eRrxdxBu35Wu6YIJoExQYhSoLg
+I8kr42HgxZYfVphIc9QU
+=Xp+b
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
new file mode 100644
index 000000000000..f8c10622e229
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
@@ -0,0 +1,100 @@
+From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+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 <pablo@netfilter.org>
+
+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 <laforge@gnumonks.org>
++ * 
++ * 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.0.4
+
diff --git a/app-admin/ulogd/ulogd-2.0.4.ebuild b/app-admin/ulogd/ulogd-2.0.4.ebuild
index 5fdbd2c92c90..ffe146855663 100644
--- a/app-admin/ulogd/ulogd-2.0.4.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4.ebuild,v 1.4 2014/11/08 11:08:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4.ebuild,v 1.5 2014/11/18 02:21:24 dlan Exp $
 
 EAPI="5"
 
@@ -34,7 +34,6 @@ RDEPEND="net-firewall/iptables
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
-	<sys-kernel/linux-headers-3.17
 	doc? (
 		app-text/linuxdoc-tools
 		app-text/texlive-core
@@ -73,6 +72,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch"
+
 	# - make all logs to be kept in a single dir /var/log/ulogd
 	# - place sockets in /run instead of /tmp
 	sed -i \