Revision bump - fix bug #281512. Thanks to Matthew Thode for reporting and providing a patch.

(Portage version: 2.1.6.13/cvs/Linux i686, RepoMan options: --force)

3 files changed, 32 insertions, 4 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 8445033bee60..f92ea4dc8ae3 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/gradm
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.112 2009/05/27 16:55:37 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.113 2009/08/21 18:56:27 gengor Exp $
+
+*gradm-2.1.13.200902232204-r1 (21 Aug 2009)
+
+  21 Aug 2009; Gordon Malm <gengor@gentoo.org>
+  -gradm-2.1.13.200902232204.ebuild, +gradm-2.1.13.200902232204-r1.ebuild,
+  +files/gradm-2.1.13.200902232204-fix-segfault-in-newlearn.patch:
+  Revision bump - fix bug #281512. Thanks to Matthew Thode for reporting and
+  providing a patch.
 
   27 May 2009; nixnut <nixnut@gentoo.org> gradm-2.1.12.200812271437.ebuild:
   ppc stable
diff --git a/sys-apps/gradm/files/gradm-2.1.13.200902232204-fix-segfault-in-newlearn.patch b/sys-apps/gradm/files/gradm-2.1.13.200902232204-fix-segfault-in-newlearn.patch
new file mode 100644
index 000000000000..e72aaeb8df6f
--- /dev/null
+++ b/sys-apps/gradm/files/gradm-2.1.13.200902232204-fix-segfault-in-newlearn.patch
@@ -0,0 +1,19 @@
+Added-By: Gordon Malm <gengor@gentoo.org>
+
+Fix segmentation fault in gradm newlearn.
+
+Reference:
+http://bugs.gentoo.org/show_bug.cgi?id=281512
+http://forums.grsecurity.net/viewtopic.php?f=3&t=2126
+
+--- a/gradm_newlearn.c
++++ b/gradm_newlearn.c
+@@ -1204,7 +1204,7 @@ show_ips:
+ 			display_ip_tree(connect, GR_IP_CONNECT, stream);
+ 		else
+ 			fprintf(stream, "\tconnect\tdisabled\n");
+-		if (node->subject->inaddr_any_override) {
++		if (node->subject != NULL && node->subject->inaddr_any_override) {
+ 			struct in_addr addr;
+ 			addr.s_addr = node->subject->inaddr_any_override;
+ 			fprintf(stream, "\tip_override\t%s\n", inet_ntoa(addr));
diff --git a/sys-apps/gradm/gradm-2.1.13.200902232204.ebuild b/sys-apps/gradm/gradm-2.1.13.200902232204-r1.ebuild
index 4d3afcc5b800..030cce78be3b 100644
--- a/sys-apps/gradm/gradm-2.1.13.200902232204.ebuild
+++ b/sys-apps/gradm/gradm-2.1.13.200902232204-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.13.200902232204.ebuild,v 1.4 2009/05/25 03:02:05 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.13.200902232204-r1.ebuild,v 1.1 2009/08/21 18:56:27 gengor Exp $
 
 inherit flag-o-matic toolchain-funcs eutils versionator
 
@@ -26,7 +26,8 @@ S="${WORKDIR}/${PN}2"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/2.1.7.200511041858-non-lazy-bindings.patch
+	epatch "${FILESDIR}"/2.1.7.200511041858-non-lazy-bindings.patch \
+		"${FILESDIR}"/${P}-fix-segfault-in-newlearn.patch
 	sed -i -e s/MKNOD=/'MKNOD ?='/ -e s/STRIP=/'STRIP ?='/ "${S}/Makefile"
 }