Skip to content
Snippets Groups Projects
Commit c385248c authored by Ariadne Conill's avatar Ariadne Conill
Browse files

main/ipfw-grsec: merge 3.14.2 changes

parent 2f4ba4fe
No related branches found
No related tags found
No related merge requests found
......@@ -63,3 +63,18 @@ package() {
done
}
md5sums="004e65e6d545a89c4dcc3e741e287444 20130607-ipfw3.tgz
c4f9a8065d448da3901b3d8219dd98ca ipfw-kmod-dereffix.patch
f0d782e9869b26aae8a919645a48fc88 ipfw-cgroup.patch
5a7390c6dcdb49b576c2a74071d7e3dd ipfw-strict-uidgid.patch
ee8b1d86c92e47dc7b188486441653cc ipfw-hookops.patch"
sha256sums="7dc80437b137e629f8ef3a7889b24ffbd1c27274e9cce15fd1f3b2c8620c6d64 20130607-ipfw3.tgz
84967fe411d8c35343c39b321aaddc830ef955ab2e27f78de1cf99c496b2cbfa ipfw-kmod-dereffix.patch
7538104b3ae3ea175c06b3d021877f1961688e9f6a897a80f75e864c21c162d1 ipfw-cgroup.patch
4d96448496b6fecc0ca13aedb19f08b28769a66c82d301c8f57dced117e537b7 ipfw-strict-uidgid.patch
7fd0388d86dc375c74ff2083ae2a099b5a96339f253e5c606806c23cf5db939a ipfw-hookops.patch"
sha512sums="6c4c2c7d4795094b9ff72212394e7dee44e5f9e09e97021b5ac9c3fad6de5a32b1d608ae9572da17f62cb37d076d89ab26859c61255d03d6bce22ca527f2c8ec 20130607-ipfw3.tgz
e445c17ebc01feea5ce473819c386c7e07507889365a8790d8a8e8f41bbea70b06fc7e0a7e98d558b9653abe1c175706684a5222f0003f5350902c6927df9b72 ipfw-kmod-dereffix.patch
c1841f7a47ef840a8fde575e84ea47d71b7f80dbb0606f4a53f6c58bfcd157b26db003f1ecf2ff61c0138f81f8e56835c0866ed6ca31188a0bad6790a78edae8 ipfw-cgroup.patch
a9c89d5c2310d5d4e76747a191767dc2acef8d149377d5f943d4969137a68d42feae8c9e9aef4fe688221f933762a61b444f96d68f6db0b31efbd845c3d591c3 ipfw-strict-uidgid.patch
768ea00a64205a05b12ed2a8da08b6d3d4d142a13b1dd6ca25d493a46f72a951faca40b6e796240bdec3c37ba249b215c082caeeda7ecd7056d05396ad591340 ipfw-hookops.patch"
--- 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment