Version bump to grsec 3.1

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 102 insertions, 23 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 482c2d84f41d..f3ca4dd25e62 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/gradm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.222 2014/08/31 12:44:53 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.223 2015/02/23 20:01:39 blueness Exp $
+
+*gradm-3.1.201502222102 (23 Feb 2015)
+
+  23 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/respect-gentoo-env-r3.patch, +gradm-3.1.201502222102.ebuild:
+  Version bump to grsec 3.1
 
 *gradm-3.0.201408301734 (31 Aug 2014)
 
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index accd3e2b0b83..021b771558e3 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,27 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX respect-gentoo-env-r2.patch 1977 SHA256 d0070c4f631379f9099d8f21b6ec1ea3f4b9ef36b266a99a037af2f59eac3036 SHA512 8f28e1c97eff22bdfd50d106fa9abc6f4c6d66d4c44bab6494527161c54bb588280ee70af592c0922f72beeec4740f98ade26c15f75f96b2f105ca39dda1410c WHIRLPOOL 306338b60d29ad85ebfab11eae52036e4187c17852fb609754010babecdffdbd81fcde07cf051c992d4aad90ed266897376b8448342690bbc146ee836595b61a
+AUX respect-gentoo-env-r3.patch 1999 SHA256 e326de4772ad07f2259b22b328a05f27b62118589421c1b1113dc83e90b199a4 SHA512 61e7919f138525b3a674e36a90e921ca6a5ea61334d2af102b2d90b4eae0e2a4ad5af6abdaa89cb456f3c4263aa44a945d4cd21b857a8428a56f1ee2caac96b0 WHIRLPOOL ee4106f4e1c2acf4a36a79d69e178d2d32cd542a5b7ca5e21b216700bbe859aa70e5d46e7918a47250e195f9a63df147db99259786c252731b6401795c325a5f
 DIST gradm-3.0-201407222118.tar.gz 91320 SHA256 6c29274d63293540646be8c8c2c131654ec307b17674c25085b352305562e7e8 SHA512 53d27126d6421e47351e6863858195fc6e9efa7003c487015884e791cc22256d6b8363dff3bf00c10ab1466a919059f1ac8bb7233ef97887fb971f82f1725cc2 WHIRLPOOL a4fa0620e3950c1864e980580043959f6e5db0db01a887ff5343ba0551cd7daa4edc78a97277d94fff36e1a7cab263bad79831a51d32ba7f6f838d52f4a1c1c8
 DIST gradm-3.0-201408301734.tar.gz 91335 SHA256 b190e5afecdf3ac5020a4e5e4b698645f1c01b20d036129dd8b609c4bd0c319c SHA512 d0e57e28f130572ab759d38be2818e2cf646e16942e7bf3089e26d5ab1e1652e644c19a3f7e7af6be596dc0066a8648fdaeb28e66d881106904e8344cf3c06d9 WHIRLPOOL eed32087f22bc6257f85b8751054ab439aa4424f7d95ccdb699c9ca82eb385b97746aba33ed12612fdd4667a0c4451bc4b564876930ebdf16dad1e85baabc81a
+DIST gradm-3.1-201502222102.tar.gz 91405 SHA256 37f7304ebf314a5480f5e00a502919ef2b5001874916412a93105e84bd947fb7 SHA512 7878242202979d7bed4c2eb38a8dac963046d449bd1ef3e5edae1743cc80384a93fb7aac3bdf50bcd28414ef95e8e1891cf0b0036ecc31aba888fd4f9b191788 WHIRLPOOL fb1491540c29a9d6c69a295814a6c78ba01018c026925988d6123632663112e833194003316da99d6962b09408f1c426d431c44151fc934af584bf30ccc5d8d2
 EBUILD gradm-3.0.201407222118.ebuild 1194 SHA256 2450c8f24f8fd0ed2bc05b7fc93c64f4b206f01d941e15fcc3bbda8aed6d9c94 SHA512 354e250bd935ec318172ecdb3516b933af95a09cf070f52bdbf517777d526f465f7f8ebd5751344f2752ca3d3b2582184d3ccdb599c346208a3811e05f1b0d8e WHIRLPOOL d88203e52cd7c3f564d74314388489e2e9a809a2818a9ea392a215509924806f617a27ad978c2452c717484d61e6494c78fa8bed6379b3f0b2340ac5bb040491
 EBUILD gradm-3.0.201408301734.ebuild 1196 SHA256 373e72488f467b82c760f8a17839d961fe267dc593ae50b8309f3a14022fe288 SHA512 a49374aad4648c5eac078cf10b87633f1f80cc7427597b063da6cf60e9f308631c75066b4e5bc65679ff14719366cc2b3fae0c2b0f46331bea260522568011af WHIRLPOOL d0f49e382ac9f6d8bec6c206582b983bd16b56f90b4fc7c8089c99bf77a63cf0c865c9412d8bad67c577d803959702c6420ea402a165b3ff0f5641adb5c03adb
-MISC ChangeLog 37147 SHA256 623455f86fb205cc32984f5b995c4377eeacd9b8ad1e27891c850ebb39cdbfb5 SHA512 d45d85afca180aa8d30e1cae2196885423a6404102e5569fb6ac1beb0758bccba5a4a0309136d7ff911dca1262a54e05e48ee6ee44c82cd01e85d29b3af63d89 WHIRLPOOL a03412473e0729b6a8443d2c36877fc88fd3952490a453aead99f393bddd5756129a82cb080dc907e7c0347d65c47d564ed81afeb67901fe363b64f1b601ffa1
+EBUILD gradm-3.1.201502222102.ebuild 1196 SHA256 dffdf3419c000482dda6eddf53f3de811e08776e2ce9f5023a690e385c224d72 SHA512 c6be838577b85013cff943489e123551af38bd8367b0e7ee89e5f7b32733d68ff272cd66edf4f6ef8fd806b53679fbc0f97c7b2b2a804efd292c5f5e9a197c74 WHIRLPOOL 28b6332228ee0746540698b1081d50d785a92ae303e1e4fff329c4418bfda8bf7cf46d713def0d6886974d0d4ecb89e975d1f490282dfc3364ff70c9b80d1fc8
+MISC ChangeLog 37340 SHA256 b7b1e8c828131cfd30d78ec900eb60481e7198805f464082396df5afd08146fe SHA512 7a55cd76a31739cb533c589697bcea052fb633bfc9b84e9c3d43d939de6a8966af5dae76d4e34e86ae6b1b38a180b797d1fdc8155e7522fb27a6e26c4136a8c6 WHIRLPOOL 917b0a646bc5ce7b17e4308550cb280c32c3f48e92b71a1f435be8c417734993d901571344ac62f432a662df87904a6ecfd0d8847f6bac9957de492ea2916279
 MISC metadata.xml 261 SHA256 8f10a5b7f7571c6e73739c4bed1ecaf34aa8278355e9d163f8bbae77a11575a4 SHA512 7350bedbae4104f555ee7f95e7858069ec6cf5a2d41ffba46aa669dfa5663b100b39cc5f1502b6515aa149d1e661cce1e7e36fbfa350ed086fdf678dbe87661f WHIRLPOOL aa6a80ddc7a5dc80a6cf892e2bfb21616b80c05978435e4f4c6ba7b3be4685a9d15b92a23db0bf333373c436c4e256f02795f6064b476bd7d82309394bd15b3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUAxl8AAoJEJOE+m71LUu6nuAP/2eJuDRd5FfMGvc+f5e84tfh
-qB+DwF4sMK01dRWf/n96ShReZYpdMgkLgzhYy/dcGuuVCQHSVmjoR6/9T/Ur8UTm
-oxujE5kHXbRqwMGuA0Uj7vMNpBObPNYyAv9ccH64gy4FZNIZ1FqrUBEajJfbJOi/
-2aqcCOJl7GuYdp9An3YYo5zHSGHA7Z/0t28zl6KpQ5u7/BsA2F2ItMqdzHZYBjOQ
-6OZezGrdz5lpMKCwA/I/QWrP4vAmC5ANNJMpy/p6l6lNG3UpUI2UW44IktRpYH6n
-m0Qje9fBdWpGo/H0LCtbNo4R2cmQBZsjgj09dTPsYw4kQmGA0jhP2QtyVzPj+IYn
-44NMQEUyn/79PHQd+rWVUK8Y91okD5ZAktaQAOGygqoK2wTS7VFMgXT+VGhALj+T
-UxbJqc8xwFn6eL6iru+Z7SCkjiH1xI+T5W+WhNIoI6tcXbjkognW/9tH+Wcrr9LO
-Ask2GXRYnVT8WcFbLJxxbGHJDRqCuvee8N8d7E0sSCEgqkSMjctvh1iEoWbb93je
-MLuKlod6QzwN3bQhmR+tRMvn5PcwBAl7Z+Pu+UDehSttKROXkrE7iNMrBIDl1/pW
-jzqiId8Q2jQoxVHRY569s9zADnIvFLeeSAVTZpjI8uYaIh+ESo/fumaVfE/uzUxh
-KGEzxYJe593BUVT2kI6o
-=dn/l
------END PGP SIGNATURE-----
diff --git a/sys-apps/gradm/files/respect-gentoo-env-r3.patch b/sys-apps/gradm/files/respect-gentoo-env-r3.patch
new file mode 100644
index 000000000000..7c899b139745
--- /dev/null
+++ b/sys-apps/gradm/files/respect-gentoo-env-r3.patch
@@ -0,0 +1,42 @@
+diff -Naur gradm2.orig/Makefile gradm2/Makefile
+--- gradm2.orig/Makefile	2013-08-09 16:28:37.000000000 -0400
++++ gradm2/Makefile	2013-08-10 07:57:12.000000000 -0400
+@@ -18,18 +18,18 @@
+ BISON=/usr/bin/bison
+ #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
+ YACC=$(BISON)
+-MKNOD=/bin/mknod
++MKNOD=true
+ #for dietlibc
+ #CC=/usr/bin/diet /usr/bin/gcc
+ CC=/usr/bin/gcc
+ FIND=/usr/bin/find
+-STRIP=/usr/bin/strip
++STRIP=true
+ LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi)
+ OPT_FLAGS := -O2
+ # for older versions of grsecurity, comment the above line and uncomment the below:
+ #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
+-CFLAGS := $(OPT_FLAGS) -fPIE -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE
+-LDFLAGS= -pie
++CFLAGS := $(OPT_FLAGS) -fPIE -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE $(CFLAGS)
++LDFLAGS+= -pie
+ INSTALL = /usr/bin/install -c
+ 
+ # FHS
+@@ -167,10 +167,11 @@
+ 			$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
+ 		fi \
+ 	fi
+-	@if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
+-		echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
+-		echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
+-		echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
++	@mkdir -p $(DESTDIR)/lib/udev/rules.d
++	@if [ -d $(DESTDIR)/lib/udev/rules.d ] ; then \
++		echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
++		echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
++		echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/lib/udev/rules.d/80-grsec.rules ; \
+ 	fi
+ 	@if [ -f $(DESTDIR)/sbin/udevadm ] ; then \
+ 		$(DESTDIR)/sbin/udevadm trigger --action=change ; \
diff --git a/sys-apps/gradm/gradm-3.1.201502222102.ebuild b/sys-apps/gradm/gradm-3.1.201502222102.ebuild
new file mode 100644
index 000000000000..16684cdaa952
--- /dev/null
+++ b/sys-apps/gradm/gradm-3.1.201502222102.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-3.1.201502222102.ebuild,v 1.1 2015/02/23 20:01:39 blueness Exp $
+
+EAPI="5"
+inherit flag-o-matic toolchain-funcs versionator eutils udev
+
+MY_PV="$(replace_version_separator 2 -)"
+
+DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
+HOMEPAGE="http://www.grsecurity.net/"
+SRC_URI="http://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam"
+
+RDEPEND=""
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	pam? ( virtual/pam )"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
+}
+
+src_compile() {
+	local target
+	use pam || target="nopam"
+
+	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	fperms 711 /sbin/gradm
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
+	ewarn
+}