diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2014-05-08 22:35:25 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2014-05-08 22:35:25 +0000 |
| commit | cdb73f6762fafe7b0a861fd0467c82fc23878e7a (patch) | |
| tree | 49333a7dc6a32670d732448f8649e3ea366ee9a9 /main | |
| parent | c385248c161e1099a11b1931a3630136272f5de4 (diff) | |
main/ipfw-grsec: update for 3.14
Diffstat (limited to 'main')
| -rw-r--r-- | main/ipfw-grsec/APKBUILD | 8 | ||||
| -rw-r--r-- | main/ipfw-grsec/ipfw-strict-uidgid.patch | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/ipfw-grsec/APKBUILD b/main/ipfw-grsec/APKBUILD index 5a54a823f54..2cc6b03ff78 100644 --- a/main/ipfw-grsec/APKBUILD +++ b/main/ipfw-grsec/APKBUILD @@ -26,7 +26,7 @@ pkgver=$_kver pkgrel=$(($_kpkgrel + $_mypkgrel)) pkgdesc="BSD ipfw firewall and dummynet suite (linux-grsec modules)" url="http://info.iet.unipi.it/~luigi/dummynet/" -arch="" +arch="all" license="BSD" depends="linux-${_flavor}=${_kernelver}" makedepends="linux-${_flavor}-dev=${_kernelver} iptables-dev pkgconfig" @@ -66,15 +66,15 @@ package() { md5sums="004e65e6d545a89c4dcc3e741e287444 20130607-ipfw3.tgz c4f9a8065d448da3901b3d8219dd98ca ipfw-kmod-dereffix.patch f0d782e9869b26aae8a919645a48fc88 ipfw-cgroup.patch -5a7390c6dcdb49b576c2a74071d7e3dd ipfw-strict-uidgid.patch +0784941754652eefcad39f84892857cc 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 +46ca93a91a4cb4a6e84b48c174f8250c3e4316c30035d30393370573c1a25f09 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 +ebdb75c96977e971a40e028ac64f32b6b91cb41b6d1ea17c0583d80880a9a59ede186f071aec2cdbe8aa34c713035c497a4e3cff131bf7e63be2909d8b9a5b1f ipfw-strict-uidgid.patch 768ea00a64205a05b12ed2a8da08b6d3d4d142a13b1dd6ca25d493a46f72a951faca40b6e796240bdec3c37ba249b215c082caeeda7ecd7056d05396ad591340 ipfw-hookops.patch" diff --git a/main/ipfw-grsec/ipfw-strict-uidgid.patch b/main/ipfw-grsec/ipfw-strict-uidgid.patch index cf4376b9569..ca4006aebda 100644 --- a/main/ipfw-grsec/ipfw-strict-uidgid.patch +++ b/main/ipfw-grsec/ipfw-strict-uidgid.patch @@ -8,8 +8,8 @@ +#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS +#include <linux/uidgid.h> + -+#define KUID_TO_SUID(x) (__kuid_val(x)) -+#define KGID_TO_SGID(x) (__kgid_val(x)) ++#define KUID_TO_SUID(x) (x.val) ++#define KGID_TO_SGID(x) (x.val) +#define SUID_TO_KUID(x) (KUIDT_INIT(x)) +#define SGID_TO_KGID(x) (KGIDT_INIT(x)) + @@ -33,8 +33,8 @@ if (sk->sk_socket && sk->sk_socket->file) { - u->uid = sk->sk_socket->file->_CURR_UID; - u->gid = sk->sk_socket->file->_CURR_GID; -+ u->uid = KUID_TO_SUID(sk->sk_socket->file->_CURR_UID); -+ u->gid = KGID_TO_SGID(sk->sk_socket->file->_CURR_GID); ++ u->uid = KUID_TO_SUID(sk->sk_socket->file->_CURR_UID.val); ++ u->gid = KGID_TO_SGID(sk->sk_socket->file->_CURR_GID.val); } read_unlock_bh(&sk->sk_callback_lock); } else { |