From 3adc00b07e03b4c9bd16a8e449d762d392ee9f9f Mon Sep 17 00:00:00 2001 From: William Pitcock <nenolod@dereferenced.org> Date: Thu, 8 May 2014 22:25:21 +0000 Subject: [PATCH] main/ipfw-grsec: add missing ipfw-hookops.patch --- main/ipfw-grsec/APKBUILD | 9 ++++++--- main/ipfw-grsec/ipfw-hookops.patch | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 main/ipfw-grsec/ipfw-hookops.patch diff --git a/main/ipfw-grsec/APKBUILD b/main/ipfw-grsec/APKBUILD index efdad0de5396..49db52469e0e 100644 --- a/main/ipfw-grsec/APKBUILD +++ b/main/ipfw-grsec/APKBUILD @@ -67,14 +67,17 @@ md5sums="004e65e6d545a89c4dcc3e741e287444 20130607-ipfw3.tgz c4f9a8065d448da3901b3d8219dd98ca ipfw-kmod-dereffix.patch f0d782e9869b26aae8a919645a48fc88 ipfw-cgroup.patch 5a7390c6dcdb49b576c2a74071d7e3dd ipfw-strict-uidgid.patch -ee8b1d86c92e47dc7b188486441653cc ipfw-hookops.patch" +ee8b1d86c92e47dc7b188486441653cc ipfw-hookops.patch +8068980cffbdfb849e8adbc540ec63d9 ipfw-logging-device.patch" sha256sums="7dc80437b137e629f8ef3a7889b24ffbd1c27274e9cce15fd1f3b2c8620c6d64 20130607-ipfw3.tgz 84967fe411d8c35343c39b321aaddc830ef955ab2e27f78de1cf99c496b2cbfa ipfw-kmod-dereffix.patch 7538104b3ae3ea175c06b3d021877f1961688e9f6a897a80f75e864c21c162d1 ipfw-cgroup.patch 4d96448496b6fecc0ca13aedb19f08b28769a66c82d301c8f57dced117e537b7 ipfw-strict-uidgid.patch -7fd0388d86dc375c74ff2083ae2a099b5a96339f253e5c606806c23cf5db939a ipfw-hookops.patch" +7fd0388d86dc375c74ff2083ae2a099b5a96339f253e5c606806c23cf5db939a ipfw-hookops.patch +f8a06766930e551fc1570b6dd4875d9281c6d524d3e2190d8b439d02c21441aa ipfw-logging-device.patch" sha512sums="6c4c2c7d4795094b9ff72212394e7dee44e5f9e09e97021b5ac9c3fad6de5a32b1d608ae9572da17f62cb37d076d89ab26859c61255d03d6bce22ca527f2c8ec 20130607-ipfw3.tgz e445c17ebc01feea5ce473819c386c7e07507889365a8790d8a8e8f41bbea70b06fc7e0a7e98d558b9653abe1c175706684a5222f0003f5350902c6927df9b72 ipfw-kmod-dereffix.patch c1841f7a47ef840a8fde575e84ea47d71b7f80dbb0606f4a53f6c58bfcd157b26db003f1ecf2ff61c0138f81f8e56835c0866ed6ca31188a0bad6790a78edae8 ipfw-cgroup.patch a9c89d5c2310d5d4e76747a191767dc2acef8d149377d5f943d4969137a68d42feae8c9e9aef4fe688221f933762a61b444f96d68f6db0b31efbd845c3d591c3 ipfw-strict-uidgid.patch -768ea00a64205a05b12ed2a8da08b6d3d4d142a13b1dd6ca25d493a46f72a951faca40b6e796240bdec3c37ba249b215c082caeeda7ecd7056d05396ad591340 ipfw-hookops.patch" +768ea00a64205a05b12ed2a8da08b6d3d4d142a13b1dd6ca25d493a46f72a951faca40b6e796240bdec3c37ba249b215c082caeeda7ecd7056d05396ad591340 ipfw-hookops.patch +6d531ef3c7878f242fe4e119d258beab89408c55bf3b0655cf3cc3a48647fe58f45b368ddcb76424c5c6ea0d8cac5d13b80eab9259f1cc4a267ad1f2759a78cd ipfw-logging-device.patch" diff --git a/main/ipfw-grsec/ipfw-hookops.patch b/main/ipfw-grsec/ipfw-hookops.patch new file mode 100644 index 000000000000..f057f1e7476d --- /dev/null +++ b/main/ipfw-grsec/ipfw-hookops.patch @@ -0,0 +1,16 @@ +--- ipfw3-2012.orig/kipfw/ipfw2_mod.c ++++ ipfw3-2012/kipfw/ipfw2_mod.c +@@ -466,7 +466,12 @@ + * so we have an #ifdef to set the proper argument type. + */ + static unsigned int +-call_ipfw(unsigned int hooknum, ++call_ipfw( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) ++ unsigned int hooknum, ++#else ++ const struct nf_hook_ops *hooknum, ++#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) // in 2.6.22 we have ** + struct sk_buff **skb, + #else -- GitLab