diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-05 12:58:32 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-05 12:59:01 +0000 |
| commit | 9a95a4af072de5cedf2be02ecefe9aa001de54b9 (patch) | |
| tree | 9cba177001281d0c712e4deb29a68546abf732d9 /testing/ipt-netflow-grsec | |
| parent | 2cdac16a897049564f79ef72e48c6b98ea68d390 (diff) | |
| download | aports-9a95a4af072de5cedf2be02ecefe9aa001de54b9.tar.bz2 aports-9a95a4af072de5cedf2be02ecefe9aa001de54b9.tar.xz | |
testing/ipt-netflow-grsec: upgrade to 3.10 kernel
Diffstat (limited to 'testing/ipt-netflow-grsec')
| -rw-r--r-- | testing/ipt-netflow-grsec/0001-Fix-compilation-with-3.10.y-kernel.patch | 32 | ||||
| -rw-r--r-- | testing/ipt-netflow-grsec/APKBUILD | 6 |
2 files changed, 37 insertions, 1 deletions
diff --git a/testing/ipt-netflow-grsec/0001-Fix-compilation-with-3.10.y-kernel.patch b/testing/ipt-netflow-grsec/0001-Fix-compilation-with-3.10.y-kernel.patch new file mode 100644 index 0000000000..99ebffe380 --- /dev/null +++ b/testing/ipt-netflow-grsec/0001-Fix-compilation-with-3.10.y-kernel.patch @@ -0,0 +1,32 @@ +From b1588f736edbeeb2b3de6081e92dde8840cef66d Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 5 Aug 2013 12:56:19 +0000 +Subject: [PATCH] Fix compilation with 3.10.y kernel + +use proc_create instead of create_proc_entry +--- + ipt_NETFLOW.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c +index 4e1b9f3..758bccc 100644 +--- a/ipt_NETFLOW.c ++++ b/ipt_NETFLOW.c +@@ -1432,12 +1432,12 @@ static int __init ipt_netflow_init(void) + } + + #ifdef CONFIG_PROC_FS +- proc_stat = create_proc_entry("ipt_netflow", S_IRUGO, INIT_NET(proc_net_stat)); ++ proc_stat = proc_create("ipt_netflow", S_IRUGO, INIT_NET(proc_net_stat), ++ &nf_seq_fops); + if (!proc_stat) { + printk(KERN_ERR "Unable to create /proc/net/stat/ipt_netflow entry\n"); + goto err_free_netflow_slab; + } +- proc_stat->proc_fops = &nf_seq_fops; + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) + proc_stat->owner = THIS_MODULE; + #endif +-- +1.8.3.4 + diff --git a/testing/ipt-netflow-grsec/APKBUILD b/testing/ipt-netflow-grsec/APKBUILD index 499cc2078d..f7a389163b 100644 --- a/testing/ipt-netflow-grsec/APKBUILD +++ b/testing/ipt-netflow-grsec/APKBUILD @@ -28,10 +28,11 @@ pkgver=$_kver pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Linux kernel netflow sensor module" url="http://ipt-netflow.sourceforge.net/" -arch= +arch="all" license=GPL-2 source="ipt-netflow-$_ver.tar.gz::https://github.com/RushOnline/ipt-netflow/archive/v$_ver.tar.gz 0001-Fix-compilation-with-3.9.y-kernel.patch + 0001-Fix-compilation-with-3.10.y-kernel.patch constify.patch" depends="$_kpkg-dev=$_kpkgver" makedepends="linux-${_flavor}-dev=$_kpkgver iptables-dev bash" @@ -67,10 +68,13 @@ dev() { md5sums="a5d564dd5f30d5b61a93decf29e3a208 ipt-netflow-1.8.4.tar.gz b300776001b3cc8448ec4019ac9e3b2e 0001-Fix-compilation-with-3.9.y-kernel.patch +ba1be5dd6b61bb78c9bf2e4c4fbf7341 0001-Fix-compilation-with-3.10.y-kernel.patch 2d9335c3d5c32c1e18a67fbb83018bae constify.patch" sha256sums="bb2446a0b16aa7f6052599410c2b4ce184d40893ec2ca12756f3bcb341890f43 ipt-netflow-1.8.4.tar.gz f1f5d33c4f000e22c34a954856ef7d23c24106465c61209c0267f76c7d49011b 0001-Fix-compilation-with-3.9.y-kernel.patch +f76a4a43f66d05639617b56a4c6e90c373f93548130456484c27206516784d90 0001-Fix-compilation-with-3.10.y-kernel.patch 5a86c64bdc536bddb780ebaa4aa5fe3bede93d645ed0f00afb41f23314662d1f constify.patch" sha512sums="e15ad33b4b3df9e1e53fbac6334dbe08802d66f4850cbf489d7a60184cdb47d94448ae13480d586474a6bec6204680d059543b619ae40a0f74fad22fed1b024a ipt-netflow-1.8.4.tar.gz ae42d882ff10f4f8062ca4e2ad9cb2b5bfd05dfde829ffa23b683ee9dcb9aa9063b391171e07f61f6d0d158f1c35e381236e625b7ecaf8192fc6c5964acb6bb8 0001-Fix-compilation-with-3.9.y-kernel.patch +c0466a9d96eaa5879ac4267de5c44aa8e64bc3f4712fbb28e2f700fc3615980eccff95487689d1356393c9b1ceb1fe75cfabbdaf1b616be7eeb4337f3b9f0092 0001-Fix-compilation-with-3.10.y-kernel.patch 08835d3de5925d868b70c240e65094a9262c5871d7ca0290001697cf8b7cee74bfc8ac2897b30c3d5ec89700b329d30b539699596f15c1150e18a85234484758 constify.patch" |