From 3a23cc34025121b3e0bc338ccec003e1c1b659b1 Mon Sep 17 00:00:00 2001 From: John Mylchreest Date: Wed, 15 Mar 2006 14:33:36 +0000 Subject: [PATCH] Adding several patches to fix lib64 path errors, supporting newer rbac grsec fixes in hardened-2.6.4-r6 and a silly little interface bug. This requires some additional attention from people with older versions of grsec + rbac for regression testing. Package-Manager: portage-2.1_pre6-r2 --- sys-apps/gradm/ChangeLog | 12 +++- sys-apps/gradm/Manifest | 31 ++++++---- .../files/digest-gradm-2.1.8.200601212342-r1 | 3 + ....200601212342-fix_gradm_pam_symlinks.patch | 13 ++++ ...8.200601212342-increase_num_pointers.patch | 13 ++++ ....200601212342-ip_state_interface_fix.patch | 10 ++++ .../gradm/gradm-2.1.8.200601212342-r1.ebuild | 60 +++++++++++++++++++ 7 files changed, 128 insertions(+), 14 deletions(-) create mode 100644 sys-apps/gradm/files/digest-gradm-2.1.8.200601212342-r1 create mode 100644 sys-apps/gradm/files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch create mode 100644 sys-apps/gradm/files/gradm_2.1.8.200601212342-increase_num_pointers.patch create mode 100644 sys-apps/gradm/files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch create mode 100644 sys-apps/gradm/gradm-2.1.8.200601212342-r1.ebuild diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog index 6f25b87bb044..a8067213fecc 100644 --- a/sys-apps/gradm/ChangeLog +++ b/sys-apps/gradm/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-apps/gradm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.70 2006/03/10 01:21:33 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.71 2006/03/15 14:33:36 johnm Exp $ + +*gradm-2.1.8.200601212342-r1 (15 Mar 2006) + + 15 Mar 2006; John Mylchreest + +files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch, + +files/gradm_2.1.8.200601212342-increase_num_pointers.patch, + +files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch, + +gradm-2.1.8.200601212342-r1.ebuild: + Bumping to support hardened-sources-2.6.14-r6, namely the inodev_entry grsec + fix 10 Mar 2006; Aron Griffis gradm-2.1.8.200601212342.ebuild: diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest index e5481085616b..8551127d6927 100644 --- a/sys-apps/gradm/Manifest +++ b/sys-apps/gradm/Manifest @@ -1,9 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 e21c0e9b553b530a2683fc50dd622229 ChangeLog 10990 -RMD160 7efca573937ddded19518b9add6f646bfafe0958 ChangeLog 10990 -SHA256 aa730ddbc4f9c8f46241c7a024650533e192337776dd05bbc49b9050f6e6a35e ChangeLog 10990 +MD5 5aa8ea8811106a1b07810cd5c83e9079 ChangeLog 11397 +RMD160 013e1e43f2dff2f719d10bc29e5930e7381d7b96 ChangeLog 11397 +SHA256 83e5a877e332d059358520344e7d070459a3c6585cc82f7bcd760deaa0dc18d5 ChangeLog 11397 MD5 0433ac1be1a1e05d61281b7a1ebe377b files/2.1.6.200506131347-non-lazy-bindings.patch 546 RMD160 ee9f2d6b432047e4d897845b861abc3372524d92 files/2.1.6.200506131347-non-lazy-bindings.patch 546 SHA256 b563e83c088ffef37fa1a8c05cfc7f071a61a56b398dc729844bee59f0c910da files/2.1.6.200506131347-non-lazy-bindings.patch 546 @@ -22,6 +19,18 @@ SHA256 01dc52073e032935882e94135e119b876d08ad65a285bcf0c7722070399e6e3c files/di MD5 5a01659b115b2ca7a3b11b653e5a7bb2 files/digest-gradm-2.1.8.200601212342 271 RMD160 540e10a27af85b701cb2672590cb638f82fd86ec files/digest-gradm-2.1.8.200601212342 271 SHA256 31ad9d577cd080a839f93111abea760f0d877ea01886572ddafb238022566b2d files/digest-gradm-2.1.8.200601212342 271 +MD5 2652b20f2425997b79d8e0f511aaea8e files/digest-gradm-2.1.8.200601212342-r1 271 +RMD160 cd41e10fb17b0acdcd0698b5e785beba94185741 files/digest-gradm-2.1.8.200601212342-r1 271 +SHA256 fee9eb07208226cc448b8ed667126c5fee9de0059f844206d76c317f130917d0 files/digest-gradm-2.1.8.200601212342-r1 271 +MD5 37bb56087b8e8f6554aabcf157c7d1f1 files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch 961 +RMD160 bf21d1e98f2b6728e44ee14352b416983805ac9f files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch 961 +SHA256 fb9e2fb83b2674d0adffbdb0f1c36b8654859d9d2242b52e99709b23dcdfac47 files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch 961 +MD5 3214a3bdb8f7d9ce8c1b5cbe1a9a8c9b files/gradm_2.1.8.200601212342-increase_num_pointers.patch 535 +RMD160 4ebcb3f1b6d6037455444d5c5e06c330b17fc1aa files/gradm_2.1.8.200601212342-increase_num_pointers.patch 535 +SHA256 5de6fd9913d9b99cc42a54e0cf963498be9161f406a1121c592b1be2e468bed1 files/gradm_2.1.8.200601212342-increase_num_pointers.patch 535 +MD5 82df4c77af57fac78bd81901e85525c9 files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch 374 +RMD160 51b85cb798f1bf78aadbefd8b21e6054bdaadfa7 files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch 374 +SHA256 4824f65f8d2b50b2e524d32836a73f79f0f74b78aa4a0d1e2e3183ed094e303c files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch 374 MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325 RMD160 82eb389001e61972de04bbe68655f1b6fe3c41d4 files/grsecurity 2325 SHA256 52d03ea1e5aba102019918edcf5ab45cb01e3c9a2eb553ce7addd5e58425d4e6 files/grsecurity 2325 @@ -37,16 +46,12 @@ SHA256 3efeacb2999731f864d13c65b8f0303d20b83db6170fc303a61caa212944f68c gradm-2. MD5 4ddc40a5191bb60b4a7b1c91d32b166f gradm-2.1.7.200511041858.ebuild 1494 RMD160 9e81f0056482792dc0a99b6f1fa15a1539c13a43 gradm-2.1.7.200511041858.ebuild 1494 SHA256 109b9df7c1e3142504c8976f0664132191085f80440ae530215f455505b54f41 gradm-2.1.7.200511041858.ebuild 1494 +MD5 2932e32abef9519a6ddfca42abff40fa gradm-2.1.8.200601212342-r1.ebuild 1755 +RMD160 5189be4720b58a75d8491a6a2307d4b1c67f9427 gradm-2.1.8.200601212342-r1.ebuild 1755 +SHA256 83358a020fcf1a7b02750f616ddc36ff5c27bc11dce92fadd7547997ef18ed38 gradm-2.1.8.200601212342-r1.ebuild 1755 MD5 c53fd509e1d49e537f975c490654a44d gradm-2.1.8.200601212342.ebuild 1510 RMD160 16a844f8ca25b7ee0015b282aae60f637d16702c gradm-2.1.8.200601212342.ebuild 1510 SHA256 2bb5d438f91bcaaa4477a0d9d450a257083e6693ddde7d29f3a86ab3a9637fc5 gradm-2.1.8.200601212342.ebuild 1510 MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221 RMD160 36e39e492da72726b330a86dc95ede87e651d931 metadata.xml 221 SHA256 3a74e36f71a920efbf1527328945aff900bc54184c50c4da80f024d35a3e25f2 metadata.xml 221 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFEENSmJrHF4yAQTrARAsxKAKCzJGlMhtb0eSYZjFdfIpC0qL0+BgCePxhj -A3jkGv1leioMTPYjZn4yuoU= -=bXmU ------END PGP SIGNATURE----- diff --git a/sys-apps/gradm/files/digest-gradm-2.1.8.200601212342-r1 b/sys-apps/gradm/files/digest-gradm-2.1.8.200601212342-r1 new file mode 100644 index 000000000000..2b014206f690 --- /dev/null +++ b/sys-apps/gradm/files/digest-gradm-2.1.8.200601212342-r1 @@ -0,0 +1,3 @@ +MD5 c8e9670798cb224300aaf2a869b28b43 gradm-2.1.8-200601212342.tar.gz 61615 +RMD160 fec5ea79cffeca2ec202f3de4adebc8ed028b980 gradm-2.1.8-200601212342.tar.gz 61615 +SHA256 55d0e85265ba6237679a85e654b17fd50ec0af82016e24cf39cf449110f26e36 gradm-2.1.8-200601212342.tar.gz 61615 diff --git a/sys-apps/gradm/files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch b/sys-apps/gradm/files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch new file mode 100644 index 000000000000..95a441aa8913 --- /dev/null +++ b/sys-apps/gradm/files/gradm_2.1.8.200601212342-fix_gradm_pam_symlinks.patch @@ -0,0 +1,13 @@ +--- gradm2/gradm_adm.c 2005/12/07 00:15:18 1.73 ++++ gradm2/gradm_adm.c 2006/02/05 22:51:05 1.74 +@@ -158,8 +158,8 @@ add_gradm_pam_acl(struct role_acl *role) + add_proc_object_acl(current_subject, "/dev/null", proc_object_mode_conv("rw"), GR_FEXIST); + add_proc_object_acl(current_subject, "/lib", proc_object_mode_conv("rx"), GR_FEXIST); + add_proc_object_acl(current_subject, "/usr/lib", proc_object_mode_conv("rx"), GR_FEXIST); +- add_proc_object_acl(current_subject, "/lib64", proc_object_mode_conv("rx"), GR_FEXIST); +- add_proc_object_acl(current_subject, "/usr/lib64", proc_object_mode_conv("rx"), GR_FEXIST); ++ add_proc_object_acl(current_subject, "/lib64", proc_object_mode_conv("rx"), GR_FEXIST | GR_SYMLINK); ++ add_proc_object_acl(current_subject, "/usr/lib64", proc_object_mode_conv("rx"), GR_FEXIST | GR_SYMLINK); + add_proc_object_acl(current_subject, GRPAM_PATH, proc_object_mode_conv("x"), GR_FEXIST); + + add_cap_acl(current_subject, "-CAP_ALL"); diff --git a/sys-apps/gradm/files/gradm_2.1.8.200601212342-increase_num_pointers.patch b/sys-apps/gradm/files/gradm_2.1.8.200601212342-increase_num_pointers.patch new file mode 100644 index 000000000000..2613b09db4bc --- /dev/null +++ b/sys-apps/gradm/files/gradm_2.1.8.200601212342-increase_num_pointers.patch @@ -0,0 +1,13 @@ +--- gradm2/gradm_parse.c 2006/01/22 04:40:42 1.105 ++++ gradm2/gradm_parse.c 2006/02/08 00:42:51 1.106 +@@ -576,8 +576,8 @@ add_proc_object_acl(struct proc_acl *sub + file_len++; + + num_objects++; +- /* one for the object, one for the filename, one for the name entry struct in the kernel*/ +- num_pointers += 3; ++ /* one for the object, one for the filename, one for the name entry struct, and one for the inodev_entry struct in the kernel*/ ++ num_pointers += 4; + + if (lstat(filename, &fstat)) { + dfile = add_deleted_file(filename); diff --git a/sys-apps/gradm/files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch b/sys-apps/gradm/files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch new file mode 100644 index 000000000000..e048375ea20e --- /dev/null +++ b/sys-apps/gradm/files/gradm_2.1.8.200601212342-ip_state_interface_fix.patch @@ -0,0 +1,10 @@ +--- gradm2/gradm.l 2006/01/02 01:44:39 1.90 ++++ gradm2/gradm.l 2006/02/06 23:27:16 1.91 +@@ -125,6 +125,7 @@ IP [0-9]{1,3}"."[0-9]{1,3}"."[0-9]{1,3}" + return NOT; + } + [-a-zA-Z0-9_]{1,7}("#"[0-9]{1,3})? { ++ BEGIN(IP_STATE); + gr_line = yytext; + gradmlval.string = gr_strdup(gr_line); + gr_line = strchr(gradmlval.string, '#'); diff --git a/sys-apps/gradm/gradm-2.1.8.200601212342-r1.ebuild b/sys-apps/gradm/gradm-2.1.8.200601212342-r1.ebuild new file mode 100644 index 000000000000..19c7f081b593 --- /dev/null +++ b/sys-apps/gradm/gradm-2.1.8.200601212342-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.8.200601212342-r1.ebuild,v 1.1 2006/03/15 14:33:36 johnm Exp $ + +inherit flag-o-matic toolchain-funcs eutils versionator + +myPV="$(replace_version_separator 3 -)" + +DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system" +HOMEPAGE="http://www.grsecurity.net/" +SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz" +#SRC_URI="mirror://gentoo/gradm-${myPV}.tar.gz" +#RESTRICT=primaryuri +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="pam" +RDEPEND="" +DEPEND="virtual/libc + sys-devel/bison + sys-devel/flex + pam? ( virtual/pam ) + || ( + sys-apps/paxctl + sys-apps/chpax + )" + +S="${WORKDIR}/${PN}2" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/2.1.7.200511041858-non-lazy-bindings.patch + + # All of these patches can be dropped in gradm-2.1.9 + epatch "${FILESDIR}/${PN}_${PV}-fix_gradm_pam_symlinks.patch" + epatch "${FILESDIR}/${PN}_${PV}-increase_num_pointers.patch" + epatch "${FILESDIR}/${PN}_${PV}-ip_state_interface_fix.patch" +} + +src_compile() { + local target="" + use pam || target="nopam" + + emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "compile problem" +} + +src_install() { + einstall DESTDIR="${D}" || die "einstall failed" + fperms 711 /sbin/gradm +} + +pkg_postinst() { + if [ ! -e "${ROOT}"/dev/grsec ] ; then + einfo "Making character device for grsec2 learning mode" + mkdir -p -m 755 "${ROOT}"/dev/ + mknod -m 0622 "${ROOT}"/dev/grsec c 1 12 || die "Cant mknod for grsec learning device" + fi + ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode" +} -- 2.26.2