Commit e64df37d authored by Natanael Copa's avatar Natanael Copa

main/*-grsec: upgrade grsecurity patch to 200908132040

parent d228cc7e
...@@ -14,7 +14,7 @@ _realname=dahdi-linux ...@@ -14,7 +14,7 @@ _realname=dahdi-linux
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=2.2.0 pkgver=2.2.0
pkgrel=6 pkgrel=7
pkgdesc="Digium Asterisk Hardware Device Interface drivers" pkgdesc="Digium Asterisk Hardware Device Interface drivers"
url="http://www.asterisk.org" url="http://www.asterisk.org"
license="GPL" license="GPL"
......
...@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then ...@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then
fi fi
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-0.4.17} pkgver=${pkgver:-0.4.17}
pkgrel=6 pkgrel=7
pkgdesc="$_flavor kernel modules for iscsitarget" pkgdesc="$_flavor kernel modules for iscsitarget"
url="http://iscsitarget.sourceforge.net/" url="http://iscsitarget.sourceforge.net/"
license="GPL-2" license="GPL-2"
......
...@@ -4,7 +4,7 @@ _flavor=grsec ...@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor} pkgname=linux-${_flavor}
pkgver=2.6.30.4 pkgver=2.6.30.4
_kernver=2.6.30 _kernver=2.6.30
pkgrel=4 pkgrel=5
pkgdesc="Linux kernel with grsecurity" pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net url=http://grsecurity.net
depends="mkinitfs" depends="mkinitfs"
...@@ -13,7 +13,7 @@ _config=${config:-kernelconfig} ...@@ -13,7 +13,7 @@ _config=${config:-kernelconfig}
install="$pkgname.post-install $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
grsecurity-2.1.14-2.6.30.4-200908122115.patch grsecurity-2.1.14-2.6.30.4-200908132040.patch
linux-nbma-mroute-v4-2.6.30.diff linux-nbma-mroute-v4-2.6.30.diff
net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
$_config $_config
...@@ -113,7 +113,7 @@ dev() { ...@@ -113,7 +113,7 @@ dev() {
md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2 md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
d0fc44b54ba5953140b3f2aa9a1f2580 patch-2.6.30.4.bz2 d0fc44b54ba5953140b3f2aa9a1f2580 patch-2.6.30.4.bz2
8b90a9def6800972fd09685bb73c5945 grsecurity-2.1.14-2.6.30.4-200908122115.patch 624831f0d2b2caeb2b4756a5b6290c7d grsecurity-2.1.14-2.6.30.4-200908132040.patch
7420c0b1095335990313656b114e1379 linux-nbma-mroute-v4-2.6.30.diff 7420c0b1095335990313656b114e1379 linux-nbma-mroute-v4-2.6.30.diff
ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
60adb085be0ab268c0f27279ae2b2bab kernelconfig 60adb085be0ab268c0f27279ae2b2bab kernelconfig
......
...@@ -43653,7 +43653,7 @@ diff -urNp linux-2.6.30.4/net/sctp/socket.c linux-2.6.30.4/net/sctp/socket.c ...@@ -43653,7 +43653,7 @@ diff -urNp linux-2.6.30.4/net/sctp/socket.c linux-2.6.30.4/net/sctp/socket.c
if (pp->fastreuse && sk->sk_reuse && if (pp->fastreuse && sk->sk_reuse &&
diff -urNp linux-2.6.30.4/net/socket.c linux-2.6.30.4/net/socket.c diff -urNp linux-2.6.30.4/net/socket.c linux-2.6.30.4/net/socket.c
--- linux-2.6.30.4/net/socket.c 2009-07-24 17:47:51.000000000 -0400 --- linux-2.6.30.4/net/socket.c 2009-07-24 17:47:51.000000000 -0400
+++ linux-2.6.30.4/net/socket.c 2009-07-30 11:29:24.032618401 -0400 +++ linux-2.6.30.4/net/socket.c 2009-08-13 20:40:32.961482335 -0400
@@ -86,6 +86,7 @@ @@ -86,6 +86,7 @@
#include <linux/audit.h> #include <linux/audit.h>
#include <linux/wireless.h> #include <linux/wireless.h>
...@@ -43702,6 +43702,15 @@ diff -urNp linux-2.6.30.4/net/socket.c linux-2.6.30.4/net/socket.c ...@@ -43702,6 +43702,15 @@ diff -urNp linux-2.6.30.4/net/socket.c linux-2.6.30.4/net/socket.c
static struct file_system_type sock_fs_type = { static struct file_system_type sock_fs_type = {
.name = "sockfs", .name = "sockfs",
@@ -736,7 +752,7 @@ static ssize_t sock_sendpage(struct file
if (more)
flags |= MSG_MORE;
- return sock->ops->sendpage(sock, page, offset, size, flags);
+ return kernel_sendpage(sock, page, offset, size, flags);
}
static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
@@ -1283,6 +1299,16 @@ SYSCALL_DEFINE3(socket, int, family, int @@ -1283,6 +1299,16 @@ SYSCALL_DEFINE3(socket, int, family, int
if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
...@@ -16,7 +16,7 @@ fi ...@@ -16,7 +16,7 @@ fi
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-1.17} pkgver=${pkgver:-1.17}
pkgrel=4 pkgrel=5
pkgdesc="Iptables extensions kernel modules" pkgdesc="Iptables extensions kernel modules"
url="http://xtables-addons.sourceforge.net/" url="http://xtables-addons.sourceforge.net/"
license="GPL" license="GPL"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment