From 60c154284f1fcf961c09c840700028f050144cf1 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 29 Oct 2003 03:14:12 +0000 Subject: change selinux patches for new (2.6) selinux api --- sys-apps/psmisc/ChangeLog | 8 +++++- sys-apps/psmisc/Manifest | 11 +++++---- sys-apps/psmisc/files/digest-psmisc-21.2-r3 | 1 - sys-apps/psmisc/files/digest-psmisc-21.2-r4 | 1 - sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 | Bin 0 -> 10102 bytes sys-apps/psmisc/psmisc-21.2-r3.ebuild | 14 +++-------- sys-apps/psmisc/psmisc-21.2-r4.ebuild | 27 ++++++++++++++------- 7 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 (limited to 'sys-apps/psmisc') diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog index 38550d911f21..a3a6b64b25e2 100644 --- a/sys-apps/psmisc/ChangeLog +++ b/sys-apps/psmisc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/psmisc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.20 2003/09/14 16:18:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.21 2003/10/29 03:14:07 pebenito Exp $ + +*psmisc-21.2-r4 (28 Oct 2003) + + 28 Oct 2003; Chris PeBenito psmisc-21.2-r3.ebuild, + psmisc-21.2-r4.ebuild, files/psmisc-21.2-selinux.diff.bz2: + Switch SELinux patch from old API to new API. 14 Sep 2003; Martin Schlemmer : Killall segfault if an command is longer than 128 bytes, as the realloc call diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest index 65a055e26024..674c10de7149 100644 --- a/sys-apps/psmisc/Manifest +++ b/sys-apps/psmisc/Manifest @@ -1,7 +1,8 @@ +MD5 0940ebffaf380f0ce71ea3369b791b5e psmisc-21.2-r3.ebuild 1155 +MD5 e5d529fa2ca2aaccf8a1cb65d9202e9d ChangeLog 3213 +MD5 18d434bc4392e4707f5f41964fdac192 psmisc-21.2-r4.ebuild 1855 MD5 c3fc900b7ebf1f4231b1ea416d908ce2 files/psmisc-21.2-fix-realloc.patch 368 -MD5 6103f4929ab117827385124493e78c77 files/digest-psmisc-21.2-r3 136 -MD5 6103f4929ab117827385124493e78c77 files/digest-psmisc-21.2-r4 136 +MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r3 63 MD5 b3c372e1b1ef54a8798b8526a2aa92d1 files/psmisc-21.2-gcc33.patch 547 -MD5 bcc6d87027c02bbac1a0fe39776894ca psmisc-21.2-r3.ebuild 1398 -MD5 370ab4f5dd1848c5ff2ad2b73e1cf854 psmisc-21.2-r4.ebuild 1693 -MD5 e318acd2d48c238dfa69d59de782c28b ChangeLog 2995 +MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r4 63 +MD5 75e16053b4cd5c14c747413ee46dbaa1 files/psmisc-21.2-selinux.diff.bz2 10102 diff --git a/sys-apps/psmisc/files/digest-psmisc-21.2-r3 b/sys-apps/psmisc/files/digest-psmisc-21.2-r3 index cbf11a229904..705ea95e0332 100644 --- a/sys-apps/psmisc/files/digest-psmisc-21.2-r3 +++ b/sys-apps/psmisc/files/digest-psmisc-21.2-r3 @@ -1,2 +1 @@ MD5 0749017f500b171f053d7c1fd72df537 psmisc-21.2.tar.gz 258561 -MD5 68f826245b24b3cbb5bf9ac193d00f10 psmisc-21.2-selinux.patch.bz2 84457 diff --git a/sys-apps/psmisc/files/digest-psmisc-21.2-r4 b/sys-apps/psmisc/files/digest-psmisc-21.2-r4 index cbf11a229904..705ea95e0332 100644 --- a/sys-apps/psmisc/files/digest-psmisc-21.2-r4 +++ b/sys-apps/psmisc/files/digest-psmisc-21.2-r4 @@ -1,2 +1 @@ MD5 0749017f500b171f053d7c1fd72df537 psmisc-21.2.tar.gz 258561 -MD5 68f826245b24b3cbb5bf9ac193d00f10 psmisc-21.2-selinux.patch.bz2 84457 diff --git a/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 b/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 new file mode 100644 index 000000000000..4219df816cda Binary files /dev/null and b/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 differ diff --git a/sys-apps/psmisc/psmisc-21.2-r3.ebuild b/sys-apps/psmisc/psmisc-21.2-r3.ebuild index 642188753def..9e391ee16ec5 100644 --- a/sys-apps/psmisc/psmisc-21.2-r3.ebuild +++ b/sys-apps/psmisc/psmisc-21.2-r3.ebuild @@ -1,27 +1,22 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r3.ebuild,v 1.3 2003/10/18 18:44:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r3.ebuild,v 1.4 2003/10/29 03:14:07 pebenito Exp $ DESCRIPTION="A set of tools that use the proc filesystem" HOMEPAGE="http://psmisc.sourceforge.net/" -SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz - selinux? mirror://gentoo/${P}-selinux.patch.bz2" +SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips" -IUSE="nls selinux" +IUSE="nls" -DEPEND=">=sys-libs/ncurses-5.2-r2 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" +DEPEND=">=sys-libs/ncurses-5.2-r2" src_unpack() { unpack ${A} cd ${S} - # Necessary selinux patch - use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2 - # Fix gcc-3.3 compile issues. # (18 May 2003) epatch ${FILESDIR}/${P}-gcc33.patch @@ -30,7 +25,6 @@ src_unpack() { src_compile() { local myconf="--with-gnu-ld" use nls || myconf="${myconf} --disable-nls" - use selinux && myconf="${myconf} --enable-flask" econf ${myconf} || die emake || die diff --git a/sys-apps/psmisc/psmisc-21.2-r4.ebuild b/sys-apps/psmisc/psmisc-21.2-r4.ebuild index 9425cb3f857e..a247d502b1e3 100644 --- a/sys-apps/psmisc/psmisc-21.2-r4.ebuild +++ b/sys-apps/psmisc/psmisc-21.2-r4.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r4.ebuild,v 1.3 2003/10/18 18:46:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r4.ebuild,v 1.4 2003/10/29 03:14:07 pebenito Exp $ + +SELINUX_PATCH="psmisc-21.2-selinux.diff.bz2" DESCRIPTION="A set of tools that use the proc filesystem" HOMEPAGE="http://psmisc.sourceforge.net/" -SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz - selinux? mirror://gentoo/${P}-selinux.patch.bz2" +SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -13,18 +14,26 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ia64" IUSE="nls selinux" DEPEND=">=sys-libs/ncurses-5.2-r2 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + selinux? ( sys-libs/libselinux )" src_unpack() { unpack ${A} cd ${S} - # Necessary selinux patch - use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2 + if use selinux; then + # Necessary selinux patch + epatch ${FILESDIR}/${SELINUX_PATCH} + else + # Fix gcc-3.3 compile issues. + # (18 May 2003) + + # the section that this patch fixes + # is deleted by the above selinux patch + # so should only needed for ! use selinux + # (09 Aug 2003) - # Fix gcc-3.3 compile issues. - # (18 May 2003) - epatch ${FILESDIR}/${P}-gcc33.patch + epatch ${FILESDIR}/${P}-gcc33.patch + fi # Killall segfault if an command is longer than 128 bytes, as # the realloc call is not done in such an way to update the -- cgit v1.2.3-65-gdbad