diff options
80 files changed, 580 insertions, 348 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog index 94bfb431cf10..9e99638575e1 100644 --- a/app-admin/logrotate/ChangeLog +++ b/app-admin/logrotate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/logrotate # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.17 2003/06/09 21:04:39 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.18 2003/10/29 03:16:04 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> logrotate-3.6.5-r1.ebuild, + logrotate-3.6.5.ebuild, files/logrotate-3.6.5-selinux.diff.bz2: + Switch SELinux patch from old API to new API. 09 Jun 2003; <msterret@gentoo.org> logrotate-3.6.5-r1.ebuild: unmask for everyone diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 320fca080820..a5b51cfe73eb 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,9 +1,10 @@ -MD5 fca2d73679c337cab29715ae11ea2eb7 ChangeLog 2877 MD5 b90d0d641a7a40105ce6b5774973536e logrotate-3.5.9-r1.ebuild 818 -MD5 cc9f8ce2f385c3d783ee705926889c1e logrotate-3.6.5.ebuild 1068 -MD5 c60ccf72ed78f7d188b03f7a29f3e77b logrotate-3.6.5-r1.ebuild 1556 -MD5 60b5761bada5528ca3e3e9582b56dbfe files/digest-logrotate-3.5.9-r1 71 -MD5 c0d3db322cf626f01a0adea55cdf6b78 files/digest-logrotate-3.6.5 149 -MD5 c0d3db322cf626f01a0adea55cdf6b78 files/digest-logrotate-3.6.5-r1 149 -MD5 28159ca93a9002428ba650c15d5f0191 files/logrotate.conf 729 +MD5 17cb8e7293eef49dc14ed94673396386 logrotate-3.6.5.ebuild 882 +MD5 67c308f732c2d710bf9330fe3550836a logrotate-3.6.5-r1.ebuild 1514 +MD5 48dab7115365a1c4b87326c900f813b0 ChangeLog 3071 MD5 cf1ca2cfa810abaefc504a76ca38b52a files/logrotate.cron 52 +MD5 ef1405c48d23249f97330709d1d2a093 files/logrotate-3.6.5-selinux.diff.bz2 1440 +MD5 bdf48119e016d4ee8b829da9e83959bf files/digest-logrotate-3.6.5 71 +MD5 bdf48119e016d4ee8b829da9e83959bf files/digest-logrotate-3.6.5-r1 71 +MD5 28159ca93a9002428ba650c15d5f0191 files/logrotate.conf 729 +MD5 60b5761bada5528ca3e3e9582b56dbfe files/digest-logrotate-3.5.9-r1 71 diff --git a/app-admin/logrotate/files/digest-logrotate-3.6.5 b/app-admin/logrotate/files/digest-logrotate-3.6.5 index 7976aabdbaaa..a2b611fc81fc 100644 --- a/app-admin/logrotate/files/digest-logrotate-3.6.5 +++ b/app-admin/logrotate/files/digest-logrotate-3.6.5 @@ -1,2 +1 @@ MD5 1c707f826f783ffc461a32b34cba5056 logrotate_3.6.5.orig.tar.gz 32086 -MD5 cf9643c28649e31409c9db21acc0dc35 logrotate-3.6.5-2003011510.patch.gz 1850 diff --git a/app-admin/logrotate/files/digest-logrotate-3.6.5-r1 b/app-admin/logrotate/files/digest-logrotate-3.6.5-r1 index 7976aabdbaaa..a2b611fc81fc 100644 --- a/app-admin/logrotate/files/digest-logrotate-3.6.5-r1 +++ b/app-admin/logrotate/files/digest-logrotate-3.6.5-r1 @@ -1,2 +1 @@ MD5 1c707f826f783ffc461a32b34cba5056 logrotate_3.6.5.orig.tar.gz 32086 -MD5 cf9643c28649e31409c9db21acc0dc35 logrotate-3.6.5-2003011510.patch.gz 1850 diff --git a/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2 b/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2 Binary files differnew file mode 100644 index 000000000000..48bb3877bbbb --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.6.5-selinux.diff.bz2 diff --git a/app-admin/logrotate/logrotate-3.6.5-r1.ebuild b/app-admin/logrotate/logrotate-3.6.5-r1.ebuild index b8dcb1947823..36e5308767ff 100644 --- a/app-admin/logrotate/logrotate-3.6.5-r1.ebuild +++ b/app-admin/logrotate/logrotate-3.6.5-r1.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5-r1.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5-r1.ebuild,v 1.7 2003/10/29 03:16:04 pebenito Exp $ inherit eutils +SELINUX_PATCH="logrotate-3.6.5-selinux.diff.bz2" + DESCRIPTION="Rotates, compresses, and mails system logs" HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html" -SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz - selinux? http://www.nsa.gov/selinux/patches/${P}-2003011510.patch.gz" +SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -17,12 +18,12 @@ IUSE="selinux" DEPEND=">=sys-apps/portage-2.0.47-r10 >=dev-libs/popt-1.5 >=sys-apps/sed-4 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + selinux? ( sys-libs/libselinux )" src_unpack() { unpack ${PN}_${PV}.orig.tar.gz - use selinux && epatch ${DISTDIR}/${P}-2003011510.patch.gz + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} sed -i \ -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" \ diff --git a/app-admin/logrotate/logrotate-3.6.5.ebuild b/app-admin/logrotate/logrotate-3.6.5.ebuild index 5a1deedd05f4..c657ddf919e4 100644 --- a/app-admin/logrotate/logrotate-3.6.5.ebuild +++ b/app-admin/logrotate/logrotate-3.6.5.ebuild @@ -1,26 +1,22 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5.ebuild,v 1.10 2003/09/23 20:20:55 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5.ebuild,v 1.11 2003/10/29 03:16:04 pebenito Exp $ inherit eutils DESCRIPTION="Rotates, compresses, and mails system logs" HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html" -SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz - selinux? http://www.nsa.gov/selinux/patches/${P}-2003011510.patch.gz" +SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ppc ~sparc ~alpha" -IUSE="selinux" +IUSE="" DEPEND=">=sys-apps/portage-2.0.47-r10 - >=dev-libs/popt-1.5 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + >=dev-libs/popt-1.5" src_compile() { - use selinux && epatch ${DISTDIR}/${P}-2003011510.patch.gz - sed -i -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" Makefile make || die } diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 8fa98bda37e1..a2d1d17d2a7b 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.54 2003/09/30 17:49:24 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.55 2003/10/29 03:17:56 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> openssh-3.5_p1-r1.ebuild, + openssh-3.6.1_p2.ebuild, openssh-3.7.1_p2.ebuild, + files/openssh-3.7.1_p1-selinux.diff: + Switch SELinux patch from old API to new API. 30 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2.ebuild : Add X509 patch back in, closes #29664. diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index d9ef7a1c31f6..11c6d4824248 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,11 +1,12 @@ -MD5 504ad7df05ca6fd1502a9e09c789f3f9 ChangeLog 8684 -MD5 1a78187fa0276dd70838221652de9904 openssh-3.5_p1-r1.ebuild 3952 -MD5 7da0d74da62cb106957c26ad08235c30 openssh-3.6.1_p2.ebuild 3968 -MD5 f0fd721647f9585bce6cc709b7a69411 openssh-3.7.1_p2.ebuild 4173 +MD5 dd18c67f333d21115a68c7f028a8879a openssh-3.5_p1-r1.ebuild 3574 +MD5 d6e7d6966badc556772e2a9462eae053 openssh-3.7.1_p2.ebuild 4018 +MD5 f06870a4ed8746032e81561c4e59ecb5 ChangeLog 8906 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329 -MD5 f2472f97f00f203eee538d04a25acac5 files/digest-openssh-3.5_p1-r1 136 -MD5 3d26d49ccd595bca906f540f5d8b8c31 files/digest-openssh-3.6.1_p2 139 -MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315 +MD5 137be01859a55aee00b52284b6905f34 openssh-3.6.1_p2.ebuild 3595 +MD5 49cc9062ff27ad7d4e8f94b136ed76a2 files/openssh-3.7.1_p1-selinux.diff 3394 +MD5 8f421fd8d19a104dc78150e4b1904a46 files/digest-openssh-3.5_p1-r1 65 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294 +MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2 142 +MD5 31789e51878741d2af4b1312db79fa2f files/digest-openssh-3.6.1_p2 67 +MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315 MD5 17b2fa077852f2c2990ec97c51bf198b files/sshd.rc6 1233 -MD5 027945e85c6dd7964b26e6bf10756200 files/digest-openssh-3.7.1_p2 218 diff --git a/net-misc/openssh/files/digest-openssh-3.5_p1-r1 b/net-misc/openssh/files/digest-openssh-3.5_p1-r1 index e343647cc782..e24f781804e4 100644 --- a/net-misc/openssh/files/digest-openssh-3.5_p1-r1 +++ b/net-misc/openssh/files/digest-openssh-3.5_p1-r1 @@ -1,2 +1 @@ MD5 42bd78508d208b55843c84dd54dea848 openssh-3.5p1.tar.gz 851486 -MD5 03c080bfe302f8eb7c6d4d79f5994310 openssh_3.5p1-5.se1.diff.gz 60431 diff --git a/net-misc/openssh/files/digest-openssh-3.6.1_p2 b/net-misc/openssh/files/digest-openssh-3.6.1_p2 index 7576198e5d33..70f355454a00 100644 --- a/net-misc/openssh/files/digest-openssh-3.6.1_p2 +++ b/net-misc/openssh/files/digest-openssh-3.6.1_p2 @@ -1,2 +1 @@ MD5 f3879270bffe479e1bd057aa36258696 openssh-3.6.1p2.tar.gz 879629 -MD5 c425e65927b359382bf3618d265d45f1 openssh_3.6p1-5.se1.diff.bz2 54985 diff --git a/net-misc/openssh/files/digest-openssh-3.7.1_p2 b/net-misc/openssh/files/digest-openssh-3.7.1_p2 index d46309c81b8c..920c333856ca 100644 --- a/net-misc/openssh/files/digest-openssh-3.7.1_p2 +++ b/net-misc/openssh/files/digest-openssh-3.7.1_p2 @@ -1,3 +1,2 @@ MD5 61cf5b059938718308836d00f6764a94 openssh-3.7.1p2.tar.gz 792280 -MD5 d8f4c22cec973d2e22551455fe5bc28c openssh-3.7.1_p1-selinux.diff.bz2 7677 MD5 83e000a867eba10ef7f18c169d979360 openssh-3.7.1p2+x509g2.diff.gz 125455 diff --git a/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff b/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff new file mode 100644 index 000000000000..97bcc75f95b1 --- /dev/null +++ b/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff @@ -0,0 +1,116 @@ +diff -urN openssh-3.7.1p1.orig/Makefile.in openssh-3.7.1p1/Makefile.in +--- openssh-3.7.1p1.orig/Makefile.in 2003-09-13 20:40:36.000000000 -0500 ++++ openssh-3.7.1p1/Makefile.in 2003-09-19 19:08:04.000000000 -0500 +@@ -40,7 +40,7 @@ + + CC=@CC@ + LD=@LD@ +-CFLAGS=@CFLAGS@ ++CFLAGS=@CFLAGS@ -DWITH_SELINUX + CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ + LIBS=@LIBS@ + LIBPAM=@LIBPAM@ +@@ -53,7 +53,7 @@ + SED=@SED@ + ENT=@ENT@ + XAUTH_PATH=@XAUTH_PATH@ +-LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ ++LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ -lselinux + EXEEXT=@EXEEXT@ + + INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ +diff -urN openssh-3.7.1p1.orig/session.c openssh-3.7.1p1/session.c +--- openssh-3.7.1p1.orig/session.c 2003-09-15 20:52:19.000000000 -0500 ++++ openssh-3.7.1p1/session.c 2003-09-19 19:08:36.000000000 -0500 +@@ -62,6 +62,11 @@ + #include "ssh-gss.h" + #endif + ++#ifdef WITH_SELINUX ++#include <selinux/get_context_list.h> ++#include <selinux/selinux.h> ++#endif ++ + /* func */ + + Session *session_new(void); +@@ -1291,6 +1296,19 @@ + #endif + if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) + fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); ++#ifdef WITH_SELINUX ++ if (is_selinux_enabled()) ++ { ++ security_context_t scontext; ++ if (get_default_context(pw->pw_name,NULL,&scontext)) ++ fatal("Failed to get default security context for %s.", pw->pw_name); ++ if (setexeccon(scontext)) { ++ freecon(scontext); ++ fatal("Failed to set exec security context %s for %s.", scontext, pw->pw_name); ++ } ++ freecon(scontext); ++ } ++#endif + } + + static void +diff -urN openssh-3.7.1p1.orig/sshpty.c openssh-3.7.1p1/sshpty.c +--- openssh-3.7.1p1.orig/sshpty.c 2003-08-24 20:16:21.000000000 -0500 ++++ openssh-3.7.1p1/sshpty.c 2003-09-19 19:08:04.000000000 -0500 +@@ -22,6 +22,12 @@ + #include "log.h" + #include "misc.h" + ++#ifdef WITH_SELINUX ++#include <selinux/flask.h> ++#include <selinux/get_context_list.h> ++#include <selinux/selinux.h> ++#endif ++ + /* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */ + #if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY) + #undef HAVE_DEV_PTMX +@@ -386,6 +392,37 @@ + * Warn but continue if filesystem is read-only and the uids match/ + * tty is owned by root. + */ ++#ifdef WITH_SELINUX ++ if (is_selinux_enabled()) { ++ security_context_t new_tty_context=NULL, ++ user_context=NULL, old_tty_context=NULL; ++ ++ if (get_default_context(pw->pw_name,NULL,&user_context)) ++ fatal("Failed to get default security context for %s.", pw->pw_name); ++ ++ if (getfilecon(ttyname, &old_tty_context)<0) { ++ error("getfilecon(%.100s) failed: %.100s", ttyname, ++ strerror(errno)); ++ } ++ else ++ { ++ if ( security_compute_relabel(user_context,old_tty_context,SECCLASS_CHR_FILE,&new_tty_context)!=0) { ++ error("security_compute_relabel(%.100s) failed: %.100s", ttyname, ++ strerror(errno)); ++ } ++ else ++ { ++ if (setfilecon (ttyname, new_tty_context) != 0) { ++ error("setfilecon(%.100s, %s) failed: %.100s", ++ ttyname, new_tty_context, strerror(errno)); ++ } ++ freecon(new_tty_context); ++ } ++ freecon(old_tty_context); ++ } ++ freecon(user_context); ++ } ++#endif + if (stat(ttyname, &st)) + fatal("stat(%.100s) failed: %.100s", ttyname, + strerror(errno)); +@@ -415,4 +452,5 @@ + ttyname, (u_int)mode, strerror(errno)); + } + } ++ + } diff --git a/net-misc/openssh/openssh-3.5_p1-r1.ebuild b/net-misc/openssh/openssh-3.5_p1-r1.ebuild index 87e954547e68..319ed3082aa2 100644 --- a/net-misc/openssh/openssh-3.5_p1-r1.ebuild +++ b/net-misc/openssh/openssh-3.5_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.5_p1-r1.ebuild,v 1.17 2003/09/26 06:05:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.5_p1-r1.ebuild,v 1.18 2003/10/29 03:17:56 pebenito Exp $ inherit eutils @@ -10,20 +10,18 @@ PARCH=${P/_/} S=${WORKDIR}/${PARCH} DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" -SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${PARCH}.tar.gz - selinux? ( http://www.coker.com.au/selinux/ssh/openssh_3.5p1-5.se1.diff.gz )" +SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${PARCH}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="x86 ppc ~sparc alpha mips ~hppa arm" -IUSE="ipv6 static pam tcpd kerberos selinux" +IUSE="ipv6 static pam tcpd kerberos" # openssh recognizes when openssl has been slightly upgraded and refuses to run. # This new rev will use the new openssl. RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 ) kerberos? ( app-crypt/mit-krb5 ) - selinux? ( sys-apps/selinux-small ) >=dev-libs/openssl-0.9.6d sys-libs/zlib" @@ -36,7 +34,6 @@ PROVIDE="virtual/ssh" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/openssh_3.5p1-5.se1.diff.gz if [ `use alpha` ]; then epatch ${FILESDIR}/${P}-gentoo-sshd-gcc3.patch || die @@ -61,8 +58,6 @@ src_compile() { myconf="${myconf} --with-kerberos4=/usr/athena" fi - use selinux && CFLAGS="${CFLAGS} -DWITH_SELINUX" - ./configure \ --prefix=/usr \ --sysconfdir=/etc/ssh \ @@ -81,13 +76,6 @@ src_compile() { perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile fi - if [ "`use selinux`" ] - then - #add -lsecure - sed "s:LIBS=\(.*\):LIBS=\1 -lsecure:" < Makefile > Makefile.new - mv Makefile.new Makefile - fi - emake || die "compile problem" } diff --git a/net-misc/openssh/openssh-3.6.1_p2.ebuild b/net-misc/openssh/openssh-3.6.1_p2.ebuild index ba1ac5dccf46..9bc6eb98b463 100644 --- a/net-misc/openssh/openssh-3.6.1_p2.ebuild +++ b/net-misc/openssh/openssh-3.6.1_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.6.1_p2.ebuild,v 1.8 2003/09/26 06:05:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.6.1_p2.ebuild,v 1.9 2003/10/29 03:17:56 pebenito Exp $ inherit eutils @@ -10,20 +10,18 @@ PARCH=${P/_/} S=${WORKDIR}/${PARCH} DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" -SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${PARCH}.tar.gz - selinux? ( http://lostlogicx.com/gentoo/openssh_3.6p1-5.se1.diff.bz2 )" +SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${PARCH}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="x86 ppc sparc alpha mips hppa arm amd64" -IUSE="ipv6 static pam tcpd kerberos selinux" +IUSE="ipv6 static pam tcpd kerberos" # openssh recognizes when openssl has been slightly upgraded and refuses to run. # This new rev will use the new openssl. RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 ) kerberos? ( app-crypt/mit-krb5 ) - selinux? ( sys-apps/selinux-small ) >=dev-libs/openssl-0.9.6d sys-libs/zlib" @@ -36,7 +34,6 @@ PROVIDE="virtual/ssh" src_unpack() { unpack ${PARCH}.tar.gz cd ${S} - use selinux && epatch ${DISTDIR}/openssh_3.6p1-5.se1.diff.bz2 if [ `use alpha` ]; then epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch || die @@ -61,8 +58,6 @@ src_compile() { myconf="${myconf} --with-kerberos4=/usr/athena" fi - use selinux && CFLAGS="${CFLAGS} -DWITH_SELINUX" - ./configure \ --prefix=/usr \ --sysconfdir=/etc/ssh \ @@ -81,13 +76,6 @@ src_compile() { perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile fi - if [ "`use selinux`" ] - then - #add -lsecure - sed "s:LIBS=\(.*\):LIBS=\1 -lsecure:" < Makefile > Makefile.new - mv Makefile.new Makefile - fi - emake || die "compile problem" } diff --git a/net-misc/openssh/openssh-3.7.1_p2.ebuild b/net-misc/openssh/openssh-3.7.1_p2.ebuild index 0b6d7815211c..4f166a20d002 100644 --- a/net-misc/openssh/openssh-3.7.1_p2.ebuild +++ b/net-misc/openssh/openssh-3.7.1_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2.ebuild,v 1.6 2003/09/30 17:49:24 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2.ebuild,v 1.7 2003/10/29 03:17:56 pebenito Exp $ inherit eutils flag-o-matic ccc [ `use kerberos` ] && append-flags -I/usr/include/gssapi @@ -10,13 +10,12 @@ inherit eutils flag-o-matic ccc PARCH=${P/_/} X509_PATCH="${PARCH}+x509g2.diff.gz" -SELINUX_PATCH="openssh-3.7.1_p1-selinux.diff.bz2" +SELINUX_PATCH="openssh-3.7.1_p1-selinux.diff" S=${WORKDIR}/${PARCH} DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" SRC_URI="mirror://openssh/${PARCH}.tar.gz - selinux? ( http://dev.gentoo.org/~pebenito/${SELINUX_PATCH} ) X509? ( http://roumenpetrov.info/openssh/x509g2/${X509_PATCH} )" LICENSE="as-is" @@ -30,7 +29,7 @@ RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 ) kerberos? ( app-crypt/mit-krb5 ) - selinux? ( sys-apps/selinux-small ) + selinux? ( sys-libs/libselinux ) skey? ( app-admin/skey ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.1.4 @@ -45,7 +44,7 @@ PROVIDE="virtual/ssh" src_unpack() { unpack ${PARCH}.tar.gz ; cd ${S} - use selinux && epatch ${DISTDIR}/${SELINUX_PATCH} + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch use X509 && epatch ${DISTDIR}/${X509_PATCH} @@ -93,11 +92,6 @@ src_compile() { sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" Makefile } - use selinux && { - #add -lsecure - sed -i "s:LIBS=\(.*\):LIBS=\1 -lsecure:" Makefile - } - emake || die "compile problem" } diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog index 45e782e1e319..dbbe1c060e14 100644 --- a/sys-apps/coreutils/ChangeLog +++ b/sys-apps/coreutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/coreutils # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.41 2003/10/01 18:21:57 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.42 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r1.ebuild, + coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0.91.ebuild: + Switch SELinux patch from old API to new API. 01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> coreutils-5.0.91.ebuild: missing help2man dependency diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index f530ca08f5da..bfcb2a1dc3a2 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,11 +1,11 @@ -MD5 1b03da8571751263f1a63aed600fab4c files/digest-coreutils-5.0.91 227 -MD5 d0d4edd45d2bebd31947fec9818be33e files/digest-coreutils-5.0-r1 213 -MD5 4f881af0d43d43da188e159999bc5f56 files/digest-coreutils-5.0-r2 216 -MD5 174f99d91c509210fda44c172686864d files/digest-coreutils-5.0-r3 216 -MD5 4c297e5aecd29157a82e5ada19c5382d files/digest-coreutils-5.0-r4 217 +MD5 bf02875b53f5188bf75f5e1796b6dbfe coreutils-5.0-r2.ebuild 2623 MD5 473b76dd0e401d64b5aa72918f9dd5a5 coreutils-5.0-r4.ebuild 3483 -MD5 0f25ad4219809353fcc8e75a11ab7e5d coreutils-5.0-r1.ebuild 2760 -MD5 67ed5e2884a18acb0f0be3468372c96a coreutils-5.0-r3.ebuild 2910 -MD5 b3a4d7aec1332b60a203299808a5ff96 coreutils-5.0.91.ebuild 3926 -MD5 01f1cd2e85e47020f36ec1332f18bb70 ChangeLog 7905 -MD5 39c38c9fcae4d968c7a4237b89ab0bd8 coreutils-5.0-r2.ebuild 2796 +MD5 7d6759d3ae8b38e49ac0984104d50f8e ChangeLog 8110 +MD5 8cb475010cc493c6df8d356b315fa72f coreutils-5.0-r1.ebuild 2593 +MD5 28c3f9e8ca2cfb6039827f203f76bf7d coreutils-5.0.91.ebuild 3828 +MD5 fd60467c5fb00dfd07df0a90e7d1c9aa coreutils-5.0-r3.ebuild 2738 +MD5 76472cadee79dff1a2a26d8ae8a74866 files/digest-coreutils-5.0-r2 138 +MD5 c9b338f24be4a49f01620b40b0e18cfb files/digest-coreutils-5.0-r1 138 +MD5 981d1c1d7cf8006aa46b44f269697262 files/digest-coreutils-5.0-r3 138 +MD5 4c297e5aecd29157a82e5ada19c5382d files/digest-coreutils-5.0-r4 217 +MD5 b5d176b166158cfe97d58ad43eec055e files/digest-coreutils-5.0.91 149 diff --git a/sys-apps/coreutils/coreutils-5.0-r1.ebuild b/sys-apps/coreutils/coreutils-5.0-r1.ebuild index 4b8fc5cb8a77..5f89e568a9fc 100644 --- a/sys-apps/coreutils/coreutils-5.0-r1.ebuild +++ b/sys-apps/coreutils/coreutils-5.0-r1.ebuild @@ -1,17 +1,16 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r1.ebuild,v 1.10 2003/09/24 21:39:52 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r1.ebuild,v 1.11 2003/10/29 03:14:07 pebenito Exp $ inherit eutils -IUSE="nls build selinux static" +IUSE="nls build static" S="${WORKDIR}/${P}" DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)" HOMEPAGE="http://www.gnu.org/software/coreutils/" SRC_URI="http://ftp.gnu.org/pub/gnu/coreutils/${P}.tar.bz2 - mirror://gentoo/${PN}-gentoo-1.2.tar.bz2 - selinux? mirror://gentoo/${P}-selinux.patch.bz2" + mirror://gentoo/${PN}-gentoo-1.2.tar.bz2" SLOT="0" LICENSE="GPL-2" @@ -20,8 +19,7 @@ KEYWORDS="~x86 amd64 ~ppc ~sparc alpha ~hppa arm mips" DEPEND=">=sys-apps/portage-2.0.48-r3 sys-devel/automake sys-devel/autoconf - nls? ( sys-devel/gettext ) - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + nls? ( sys-devel/gettext )" # the sandbox code in portage-2.0.48 causes breakage export SANDBOX_DISABLED="1" @@ -30,8 +28,6 @@ src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2 - # patch to remove Stallman's su/wheel group rant (which doesn't apply, # since Gentoo's su is not GNU/su, but that from shadow. epatch ${WORKDIR}/${PN}-gentoo-patches/${PN}-gentoo-rms.patch diff --git a/sys-apps/coreutils/coreutils-5.0-r2.ebuild b/sys-apps/coreutils/coreutils-5.0-r2.ebuild index 753e6e1c380e..fb085fa9ec5e 100644 --- a/sys-apps/coreutils/coreutils-5.0-r2.ebuild +++ b/sys-apps/coreutils/coreutils-5.0-r2.ebuild @@ -1,17 +1,16 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r2.ebuild,v 1.5 2003/09/24 21:39:52 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r2.ebuild,v 1.6 2003/10/29 03:14:07 pebenito Exp $ inherit eutils -IUSE="nls build selinux static" +IUSE="nls build static" S="${WORKDIR}/${P}" DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)" HOMEPAGE="http://www.gnu.org/software/coreutils/" SRC_URI="http://ftp.gnu.org/pub/gnu/coreutils/${P}.tar.bz2 - mirror://gentoo/${PN}-gentoo-1.3.tar.bz2 - selinux? mirror://gentoo/${P}-r2-selinux.patch.bz2" + mirror://gentoo/${PN}-gentoo-1.3.tar.bz2" SLOT="0" LICENSE="GPL-2" @@ -20,8 +19,7 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc alpha ~hppa ~arm ~mips" DEPEND=">=sys-apps/portage-2.0.48-r3 sys-devel/automake sys-devel/autoconf - nls? ( sys-devel/gettext ) - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + nls? ( sys-devel/gettext )" # the sandbox code in portage-2.0.48 causes breakage export SANDBOX_DISABLED="1" @@ -34,8 +32,6 @@ src_unpack() { epatch ${PATCHDIR}/${PN}-progress-bar.patch - use selinux && epatch ${DISTDIR}/${P}-r2-selinux.patch.bz2 - # patch to remove Stallman's su/wheel group rant (which doesn't apply, # since Gentoo's su is not GNU/su, but that from shadow. epatch ${PATCHDIR}/${PN}-gentoo-rms.patch diff --git a/sys-apps/coreutils/coreutils-5.0-r3.ebuild b/sys-apps/coreutils/coreutils-5.0-r3.ebuild index a4f1078d5d59..936ed1d2c348 100644 --- a/sys-apps/coreutils/coreutils-5.0-r3.ebuild +++ b/sys-apps/coreutils/coreutils-5.0-r3.ebuild @@ -1,17 +1,16 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r3.ebuild,v 1.9 2003/09/24 21:39:52 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r3.ebuild,v 1.10 2003/10/29 03:14:07 pebenito Exp $ inherit eutils -IUSE="nls build selinux static" +IUSE="nls build static" S="${WORKDIR}/${P}" DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)" HOMEPAGE="http://www.gnu.org/software/coreutils/" SRC_URI="http://ftp.gnu.org/pub/gnu/coreutils/${P}.tar.bz2 - mirror://gentoo/${PN}-gentoo-1.4.tar.bz2 - selinux? mirror://gentoo/${P}-r2-selinux.patch.bz2" + mirror://gentoo/${PN}-gentoo-1.4.tar.bz2" SLOT="0" LICENSE="GPL-2" @@ -20,8 +19,7 @@ KEYWORDS="x86 ~amd64 ~ppc sparc alpha hppa ~arm ~mips" DEPEND=">=sys-apps/portage-2.0.49 sys-devel/automake sys-devel/autoconf - nls? ( sys-devel/gettext ) - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + nls? ( sys-devel/gettext )" # the sandbox code in portage-2.0.48 causes breakage export SANDBOX_DISABLED="1" @@ -34,8 +32,6 @@ src_unpack() { epatch ${PATCHDIR}/${PN}-progress-bar.patch - use selinux && epatch ${DISTDIR}/${P}-r2-selinux.patch.bz2 - # patch to remove Stallman's su/wheel group rant (which doesn't apply, # since Gentoo's su is not GNU/su, but that from shadow. epatch ${PATCHDIR}/${PN}-gentoo-rms.patch diff --git a/sys-apps/coreutils/coreutils-5.0.91.ebuild b/sys-apps/coreutils/coreutils-5.0.91.ebuild index 18949eb518e9..c40120d6e0fc 100644 --- a/sys-apps/coreutils/coreutils-5.0.91.ebuild +++ b/sys-apps/coreutils/coreutils-5.0.91.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0.91.ebuild,v 1.4 2003/10/06 15:23:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0.91.ebuild,v 1.5 2003/10/29 03:14:07 pebenito Exp $ inherit eutils flag-o-matic IUSE="nls build acl selinux static" -PATCH_VER="1.0" +PATCH_VER="1.1" PATCHDIR="${WORKDIR}/patch" -SELINUX_PATCH="coreutils-5.0.91-selinux.patch.bz2" S="${WORKDIR}/${P}" DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)" @@ -16,8 +15,7 @@ HOMEPAGE="http://www.gnu.org/software/coreutils/" SRC_URI="mirror://gnu/coreutils/${P}.tar.bz2 mirror://gnu/coreutils/${P}.tar.bz2 mirror://coreutils/${P}.tar.bz2 - mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2 - selinux? mirror://gentoo/${SELINUX_PATCH}" + mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2" SLOT="0" LICENSE="GPL-2" @@ -30,7 +28,7 @@ DEPEND="virtual/glibc sys-apps/help2man nls? ( sys-devel/gettext ) acl? ( sys-apps/acl ) - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + selinux? ( sys-libs/libselinux )" src_unpack() { unpack ${A} @@ -78,8 +76,7 @@ src_unpack() { EPATCH_SUFFIX="patch" epatch ${PATCHDIR} - use selinux && epatch ${DISTDIR}/${SELINUX_PATCH} - + use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux } src_compile() { diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0-r1 b/sys-apps/coreutils/files/digest-coreutils-5.0-r1 index 1924d396f643..588e7becbeab 100644 --- a/sys-apps/coreutils/files/digest-coreutils-5.0-r1 +++ b/sys-apps/coreutils/files/digest-coreutils-5.0-r1 @@ -1,3 +1,2 @@ MD5 94e5558ee2a65723d4840bfde2d323f0 coreutils-5.0.tar.bz2 3952653 MD5 3fe23ebb1368a0deac013b7c394722c5 coreutils-gentoo-1.2.tar.bz2 4154 -MD5 a2ac2771e84905282b5653c9b35a58d6 coreutils-5.0-selinux.patch.bz2 20084 diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0-r2 b/sys-apps/coreutils/files/digest-coreutils-5.0-r2 index de4bf118c80d..22e215f32fda 100644 --- a/sys-apps/coreutils/files/digest-coreutils-5.0-r2 +++ b/sys-apps/coreutils/files/digest-coreutils-5.0-r2 @@ -1,3 +1,2 @@ MD5 94e5558ee2a65723d4840bfde2d323f0 coreutils-5.0.tar.bz2 3952653 MD5 cf4bfc66000d44133652696d539218e9 coreutils-gentoo-1.3.tar.bz2 8157 -MD5 56309285e57c7175a993c20a2084c0e3 coreutils-5.0-r2-selinux.patch.bz2 20091 diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0-r3 b/sys-apps/coreutils/files/digest-coreutils-5.0-r3 index 8d03e4909dd9..5092d06abbd0 100644 --- a/sys-apps/coreutils/files/digest-coreutils-5.0-r3 +++ b/sys-apps/coreutils/files/digest-coreutils-5.0-r3 @@ -1,3 +1,2 @@ MD5 94e5558ee2a65723d4840bfde2d323f0 coreutils-5.0.tar.bz2 3952653 MD5 f21f22359ace9cdae063912f5d1b500c coreutils-gentoo-1.4.tar.bz2 8170 -MD5 56309285e57c7175a993c20a2084c0e3 coreutils-5.0-r2-selinux.patch.bz2 20091 diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0.91 b/sys-apps/coreutils/files/digest-coreutils-5.0.91 index 8b8a2ba2a1cd..d2f2674e8a2e 100644 --- a/sys-apps/coreutils/files/digest-coreutils-5.0.91 +++ b/sys-apps/coreutils/files/digest-coreutils-5.0.91 @@ -1,3 +1,2 @@ MD5 e62c18cde8b254c2512e47dd0c47c332 coreutils-5.0.91.tar.bz2 4183673 -MD5 8fdd07e159bf5983a7d009acc1065195 coreutils-5.0.91-gentoo-1.0.tar.bz2 45706 -MD5 9ea313ce0ac705f81eea2a119b2428eb coreutils-5.0.91-selinux.patch.bz2 19547 +MD5 531136192ddd0398d2237e1cca9f5eea coreutils-5.0.91-gentoo-1.1.tar.bz2 60131 diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog index bd34f2f23783..278b93adf7f0 100644 --- a/sys-apps/findutils/ChangeLog +++ b/sys-apps/findutils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/findutils # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.22 2003/10/23 20:00:16 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.23 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> + findutils-4.1.20-r1.ebuild, findutils-4.1.20.ebuild, + findutils-4.1.7-r3.ebuild, findutils-4.1.7-r4.ebuild, + findutils-4.1.7-r5.ebuild, files/findutils-4.1.20-selinux.diff.bz2: + Switch SELinux patch from old API to new API. *findutils-4.1.7-r5 (23 Oct 2003) diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest index ac7d4b56762b..c9c31af7a27c 100644 --- a/sys-apps/findutils/Manifest +++ b/sys-apps/findutils/Manifest @@ -1,16 +1,17 @@ -MD5 bb77a313043bf852abde778b33873a13 ChangeLog 3743 +MD5 b555f506633d8fea1802b60b0acb2f04 findutils-4.1.20.ebuild 1745 +MD5 4c6a909441bc5e7c0f66cd8cfb80ae1b findutils-4.1.7-r3.ebuild 1462 MD5 b92f7c59f607a94b3422d6ec5b4f64c1 findutils-4.1.7-r1.ebuild 1392 MD5 4d717bd3a8b1379d34f1a479fc500ca5 findutils-4.1.7-r2.ebuild 1540 -MD5 e8d15cea8b64b0944e5b0dbd814591cf findutils-4.1.7-r3.ebuild 1649 -MD5 8fc76e43de3e427dd3a438072cd3bb54 findutils-4.1.7-r4.ebuild 1882 -MD5 1881e21684c89ee5c0298fbd815287a6 findutils-4.1.20.ebuild 1931 -MD5 2cd340ee43809b5b54676bc6f0677342 findutils-4.1.20-r1.ebuild 2037 -MD5 26760f50b3501714617ed7775456497a findutils-4.1.7-r5.ebuild 1985 -MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r1 67 -MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r2 67 -MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r3 161 -MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r4 161 -MD5 0f46bcbcd2bbd50b40c7d29499686ca6 files/digest-findutils-4.1.20 163 +MD5 162fbcd88b09e5220bfa78d3d0073e2f ChangeLog 4027 +MD5 b10590ef0635bf4f23a97f65f06fa2e2 findutils-4.1.7-r5.ebuild 1799 +MD5 f9b56f3761a3c9e0a7734d36737b9f5d findutils-4.1.20-r1.ebuild 1997 +MD5 ba0f08982fefb5eb863553f81ff96bae findutils-4.1.7-r4.ebuild 1697 +MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r5 67 +MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20-r1 68 MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672 -MD5 0f46bcbcd2bbd50b40c7d29499686ca6 files/digest-findutils-4.1.20-r1 163 -MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r5 161 +MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r4 67 +MD5 214b1bc8ab622fdccc95a2ad658e7dad files/findutils-4.1.20-selinux.diff.bz2 3550 +MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r2 67 +MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r1 67 +MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20 68 +MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r3 67 diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20 b/sys-apps/findutils/files/digest-findutils-4.1.20 index f304c6405801..ee97aa90b56d 100644 --- a/sys-apps/findutils/files/digest-findutils-4.1.20 +++ b/sys-apps/findutils/files/digest-findutils-4.1.20 @@ -1,2 +1 @@ MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980 -MD5 0fe2231e7a309c98077b7290b6269e49 findutils-4.1.20-2003011510-selinux-gentoo.patch.bz2 4407 diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20-r1 b/sys-apps/findutils/files/digest-findutils-4.1.20-r1 index f304c6405801..ee97aa90b56d 100644 --- a/sys-apps/findutils/files/digest-findutils-4.1.20-r1 +++ b/sys-apps/findutils/files/digest-findutils-4.1.20-r1 @@ -1,2 +1 @@ MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980 -MD5 0fe2231e7a309c98077b7290b6269e49 findutils-4.1.20-2003011510-selinux-gentoo.patch.bz2 4407 diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r3 b/sys-apps/findutils/files/digest-findutils-4.1.7-r3 index b2cddade2458..71e0d8a53382 100644 --- a/sys-apps/findutils/files/digest-findutils-4.1.7-r3 +++ b/sys-apps/findutils/files/digest-findutils-4.1.7-r3 @@ -1,2 +1 @@ MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058 -MD5 b6849c4f026a8c9b3015c2ca5b10f509 findutils-4.1.7-2003011510-selinux-gentoo.patch.bz2 4165 diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r4 b/sys-apps/findutils/files/digest-findutils-4.1.7-r4 index b2cddade2458..71e0d8a53382 100644 --- a/sys-apps/findutils/files/digest-findutils-4.1.7-r4 +++ b/sys-apps/findutils/files/digest-findutils-4.1.7-r4 @@ -1,2 +1 @@ MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058 -MD5 b6849c4f026a8c9b3015c2ca5b10f509 findutils-4.1.7-2003011510-selinux-gentoo.patch.bz2 4165 diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r5 b/sys-apps/findutils/files/digest-findutils-4.1.7-r5 index b2cddade2458..71e0d8a53382 100644 --- a/sys-apps/findutils/files/digest-findutils-4.1.7-r5 +++ b/sys-apps/findutils/files/digest-findutils-4.1.7-r5 @@ -1,2 +1 @@ MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058 -MD5 b6849c4f026a8c9b3015c2ca5b10f509 findutils-4.1.7-2003011510-selinux-gentoo.patch.bz2 4165 diff --git a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2 b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2 Binary files differnew file mode 100644 index 000000000000..bbf61aa14a5c --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2 diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild index 1fcf0e9534de..bf1a4a0976b2 100644 --- a/sys-apps/findutils/findutils-4.1.20-r1.ebuild +++ b/sys-apps/findutils/findutils-4.1.20-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.1 2003/10/23 10:51:39 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $ IUSE="nls build afs selinux" @@ -13,18 +13,19 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" # supplying the development versions. If it comes back in the future # then we might want to redirect the link. See bug 18729 SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz - mirror://gentoo/${P}.tar.gz - selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2" + mirror://gentoo/${P}.tar.gz" KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~arm ~alpha ~ia64" SLOT="0" LICENSE="GPL-2" +SELINUX_PATCH="findutils-4.1.20-selinux.diff.bz2" + DEPEND="virtual/glibc >=sys-apps/sed-4 nls? ( sys-devel/gettext ) afs? ( net-fs/openafs ) - selinux? ( sys-apps/selinux-small )" + selinux? ( sys-libs/libselinux )" RDEPEND="virtual/glibc" src_unpack() { @@ -38,7 +39,7 @@ src_unpack() { #get a bigger environment as ebuild.sh is growing large epatch ${FILESDIR}/findutils-env-size.patch - use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2 + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} } src_compile() { diff --git a/sys-apps/findutils/findutils-4.1.20.ebuild b/sys-apps/findutils/findutils-4.1.20.ebuild index 5d24c2acfb94..aa5ffa70db22 100644 --- a/sys-apps/findutils/findutils-4.1.20.ebuild +++ b/sys-apps/findutils/findutils-4.1.20.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.1 2003/09/28 16:23:14 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $ -IUSE="nls build afs selinux" +IUSE="nls build afs" inherit eutils @@ -13,8 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" # supplying the development versions. If it comes back in the future # then we might want to redirect the link. See bug 18729 SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz - mirror://gentoo/${P}.tar.gz - selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2" + mirror://gentoo/${P}.tar.gz" KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~arm ~alpha ~ia64" SLOT="0" @@ -23,8 +22,7 @@ LICENSE="GPL-2" DEPEND="virtual/glibc >=sys-apps/sed-4 nls? ( sys-devel/gettext ) - afs? ( net-fs/openafs ) - selinux? ( sys-apps/selinux-small )" + afs? ( net-fs/openafs )" RDEPEND="virtual/glibc" src_unpack() { @@ -34,8 +32,6 @@ src_unpack() { # Don't build or install locate because it conflicts with slocate, # which is a secure version of locate. See bug 18729 sed -i '/^SUBDIRS/s/locate//' Makefile.in - - use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2 } src_compile() { diff --git a/sys-apps/findutils/findutils-4.1.7-r3.ebuild b/sys-apps/findutils/findutils-4.1.7-r3.ebuild index 1b83cbb1a523..a152bc6bcd1a 100644 --- a/sys-apps/findutils/findutils-4.1.7-r3.ebuild +++ b/sys-apps/findutils/findutils-4.1.7-r3.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.7 2003/09/07 01:34:23 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.8 2003/10/29 03:14:07 pebenito Exp $ -IUSE="nls build afs selinux" +IUSE="nls build afs" inherit eutils S=${WORKDIR}/${P} DESCRIPTION="GNU utilities to find files" -SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz - selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2" +SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" @@ -20,13 +19,11 @@ LICENSE="GPL-2" DEPEND="virtual/glibc nls? ( sys-devel/gettext ) - afs? ( net-fs/openafs ) - selinux? ( sys-apps/selinux-small )" + afs? ( net-fs/openafs )" RDEPEND="virtual/glibc" src_compile() { - use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2 local myconf use nls || myconf="${myconf} --disable-nls" diff --git a/sys-apps/findutils/findutils-4.1.7-r4.ebuild b/sys-apps/findutils/findutils-4.1.7-r4.ebuild index bc4cd62ac33d..69f2189b7d06 100644 --- a/sys-apps/findutils/findutils-4.1.7-r4.ebuild +++ b/sys-apps/findutils/findutils-4.1.7-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.12 2003/09/18 00:07:12 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.13 2003/10/29 03:14:07 pebenito Exp $ -IUSE="nls build afs selinux" +IUSE="nls build afs" inherit eutils @@ -12,8 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" # Note this doesn't point to gnu.org because alpha.gnu.org has quit # supplying the development versions. If it comes back in the future # then we might want to redirect the link. See bug 18729 -SRC_URI="mirror://gentoo/${P}.tar.gz - selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2" +SRC_URI="mirror://gentoo/${P}.tar.gz" KEYWORDS="x86 amd64 ppc sparc hppa ~arm alpha ia64" SLOT="0" @@ -22,8 +21,7 @@ LICENSE="GPL-2" DEPEND="virtual/glibc >=sys-apps/sed-4 nls? ( sys-devel/gettext ) - afs? ( net-fs/openafs ) - selinux? ( sys-apps/selinux-small )" + afs? ( net-fs/openafs )" RDEPEND="virtual/glibc" src_unpack() { @@ -33,8 +31,6 @@ src_unpack() { # Don't build or install locate because it conflicts with slocate, # which is a secure version of locate. See bug 18729 sed -i '/^SUBDIRS/s/locate//' Makefile.in - - use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2 } src_compile() { diff --git a/sys-apps/findutils/findutils-4.1.7-r5.ebuild b/sys-apps/findutils/findutils-4.1.7-r5.ebuild index dc72582f491a..be7e7ba3d5fd 100644 --- a/sys-apps/findutils/findutils-4.1.7-r5.ebuild +++ b/sys-apps/findutils/findutils-4.1.7-r5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r5.ebuild,v 1.1 2003/10/23 20:00:16 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r5.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $ -IUSE="nls build afs selinux" +IUSE="nls build afs" inherit eutils @@ -12,8 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" # Note this doesn't point to gnu.org because alpha.gnu.org has quit # supplying the development versions. If it comes back in the future # then we might want to redirect the link. See bug 18729 -SRC_URI="mirror://gentoo/${P}.tar.gz - selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2" +SRC_URI="mirror://gentoo/${P}.tar.gz" KEYWORDS="x86 amd64 ppc sparc hppa ~arm alpha ia64" SLOT="0" @@ -22,8 +21,7 @@ LICENSE="GPL-2" DEPEND="virtual/glibc >=sys-apps/sed-4 nls? ( sys-devel/gettext ) - afs? ( net-fs/openafs ) - selinux? ( sys-apps/selinux-small )" + afs? ( net-fs/openafs )" RDEPEND="virtual/glibc" src_unpack() { @@ -36,8 +34,6 @@ src_unpack() { #get a bigger environment as ebuild.sh is growing large epatch ${FILESDIR}/findutils-env-size.patch - - use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2 } src_compile() { diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog index 52661b7697b9..24846ccb8e0e 100644 --- a/sys-apps/procps/ChangeLog +++ b/sys-apps/procps/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/procps # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.45 2003/10/24 10:01:17 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.46 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> procps-3.1.11-r1.ebuild, + procps-3.1.12.ebuild, procps-3.1.13.ebuild, procps-3.1.14.ebuild, + procps-3.1.8.ebuild, procps-3.1.9.ebuild, + files/procps-3.1.12-selinux.diff.bz2: + Switch SELinux patch from old API to new API. *procps-3.1.14 (22 Oct 2003) diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest index 61eaa85cce3f..ec2728d4813e 100644 --- a/sys-apps/procps/Manifest +++ b/sys-apps/procps/Manifest @@ -1,20 +1,21 @@ -MD5 670a82e980b52b5e7c2f8e9e341bd49d ChangeLog 7544 -MD5 f0e072627571655893d0099f0ad2c9ec procps-2.0.10-r1.ebuild 1898 -MD5 c934206d172d7d6db7db66022f721272 procps-2.0.11.ebuild 1885 -MD5 7b48ded996ed30b210515cf9852f0509 procps-3.1.8.ebuild 1459 -MD5 b45542475578901ed01f590365a139e6 procps-3.1.9.ebuild 1471 -MD5 363bee0d4034490d2d1f0f7f23528408 procps-3.1.12.ebuild 1467 -MD5 1fc7b387238bb8bdc45096891e517fcf procps-3.1.11-r1.ebuild 1653 +MD5 e0a14ac6c4ec157164fe79797b669499 procps-3.1.9.ebuild 1290 MD5 67d6ad41f90d9a757901ce164b1e9c8e procps-2.0.16.ebuild 2020 -MD5 f4e116024bc8a3869b647b87d8300d82 procps-3.1.13.ebuild 1442 -MD5 b43c25e3bdc56b76400bd87581bb3fa7 procps-3.1.14.ebuild 1443 +MD5 c934206d172d7d6db7db66022f721272 procps-2.0.11.ebuild 1885 +MD5 c6837e9674b55f71f9ed875b311cae4a procps-3.1.13.ebuild 1261 +MD5 f0e072627571655893d0099f0ad2c9ec procps-2.0.10-r1.ebuild 1898 +MD5 946ab5956f8d3774449c44e5df5e9768 procps-3.1.14.ebuild 1263 +MD5 e8586d81e5deac7d9bcd182a328877fd procps-3.1.12.ebuild 1405 +MD5 66a880a55e8d5e04eae6ce6237215dce ChangeLog 7826 +MD5 c8985fd2d809441bddeea8e8943c5e7a procps-3.1.8.ebuild 1292 +MD5 2704d61dc19aed93e2a6b4e8394dedc3 procps-3.1.11-r1.ebuild 1475 +MD5 9a240e887d0ca5948c23825937bcf53c files/digest-procps-3.1.9 64 +MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12 65 +MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515 +MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800 MD5 fe8c47a48243025d5ec650370012c15b files/digest-procps-2.0.10-r1 66 +MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13 65 MD5 b4d64145eb394bd49421f63d182313d0 files/digest-procps-2.0.11 66 -MD5 0fd90d51ff8a0ebb2611d5a978931397 files/digest-procps-3.1.8 136 -MD5 9b6e44ab96ca5da78ac7dcbb43c5d87c files/digest-procps-3.1.9 136 -MD5 8932eac2d657eb8555b9d7b70ab3f175 files/digest-procps-3.1.12 138 -MD5 690fe9639c02050c56bc9c54ad0318c1 files/digest-procps-3.1.11-r1 137 -MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515 +MD5 63bfed08ef66560a298069b405fb5d37 files/digest-procps-3.1.11-r1 65 +MD5 4b01561bf8dc6371f2b36a477812d42a files/digest-procps-3.1.8 64 MD5 7d8e6a0530e7ebd56a0445da8dcefb9b files/digest-procps-2.0.16 65 -MD5 6c1c3a8e609620e85c255191c9d4facf files/digest-procps-3.1.13 137 -MD5 53d263ae44c73022d521eb0168b0b9f9 files/digest-procps-3.1.14 137 +MD5 74e03ab7d527f0d3a5ccde0b4502b132 files/digest-procps-3.1.14 65 diff --git a/sys-apps/procps/files/digest-procps-3.1.11-r1 b/sys-apps/procps/files/digest-procps-3.1.11-r1 index 4dc6defd33a7..2f227017357e 100644 --- a/sys-apps/procps/files/digest-procps-3.1.11-r1 +++ b/sys-apps/procps/files/digest-procps-3.1.11-r1 @@ -1,2 +1 @@ MD5 18d6c40c61fd8a94b315c07e949837ab procps-3.1.11.tar.gz 242320 -MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764 diff --git a/sys-apps/procps/files/digest-procps-3.1.12 b/sys-apps/procps/files/digest-procps-3.1.12 index 2483a10981e4..de593ab37df1 100644 --- a/sys-apps/procps/files/digest-procps-3.1.12 +++ b/sys-apps/procps/files/digest-procps-3.1.12 @@ -1,2 +1 @@ MD5 419b312699ac01b25259769a1bfb7ca4 procps-3.1.12.tar.gz 244651 -MD5 8507c309a1fb17484e715c0be028a581 procps-3.1.12-selinux.patch.bz2 658 diff --git a/sys-apps/procps/files/digest-procps-3.1.13 b/sys-apps/procps/files/digest-procps-3.1.13 index a7f21c0dfeb6..5455cedd15b4 100644 --- a/sys-apps/procps/files/digest-procps-3.1.13 +++ b/sys-apps/procps/files/digest-procps-3.1.13 @@ -1,2 +1 @@ MD5 459a361ad73ecb4cf4346b8d3ce7a27f procps-3.1.13.tar.gz 246880 -MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764 diff --git a/sys-apps/procps/files/digest-procps-3.1.14 b/sys-apps/procps/files/digest-procps-3.1.14 index 3694dfebca4d..d2cc9c955864 100644 --- a/sys-apps/procps/files/digest-procps-3.1.14 +++ b/sys-apps/procps/files/digest-procps-3.1.14 @@ -1,2 +1 @@ MD5 e146860df435f863811206e4f9d3becf procps-3.1.14.tar.gz 250300 -MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764 diff --git a/sys-apps/procps/files/digest-procps-3.1.8 b/sys-apps/procps/files/digest-procps-3.1.8 index 71cf703e7965..b02f7793a416 100644 --- a/sys-apps/procps/files/digest-procps-3.1.8 +++ b/sys-apps/procps/files/digest-procps-3.1.8 @@ -1,2 +1 @@ MD5 617e282bf3eefbd1753529aa8df4144f procps-3.1.8.tar.gz 239249 -MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764 diff --git a/sys-apps/procps/files/digest-procps-3.1.9 b/sys-apps/procps/files/digest-procps-3.1.9 index a4975a84ae42..a25b174cfea4 100644 --- a/sys-apps/procps/files/digest-procps-3.1.9 +++ b/sys-apps/procps/files/digest-procps-3.1.9 @@ -1,2 +1 @@ MD5 2b0d8ba21a20699439cdb1f272dd67cf procps-3.1.9.tar.gz 239260 -MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764 diff --git a/sys-apps/procps/files/procps-3.1.12-selinux.diff.bz2 b/sys-apps/procps/files/procps-3.1.12-selinux.diff.bz2 Binary files differnew file mode 100644 index 000000000000..48adc916289b --- /dev/null +++ b/sys-apps/procps/files/procps-3.1.12-selinux.diff.bz2 diff --git a/sys-apps/procps/procps-3.1.11-r1.ebuild b/sys-apps/procps/procps-3.1.11-r1.ebuild index 5c65ada8eef2..9e76a3a9a9d4 100644 --- a/sys-apps/procps/procps-3.1.11-r1.ebuild +++ b/sys-apps/procps/procps-3.1.11-r1.ebuild @@ -1,13 +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/procps/procps-3.1.11-r1.ebuild,v 1.3 2003/09/18 00:15:19 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.11-r1.ebuild,v 1.4 2003/10/29 03:14:07 pebenito Exp $ -IUSE="selinux" +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl" -SRC_URI="http://${PN}.sf.net/${P}.tar.gz - selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2" +SRC_URI="http://${PN}.sf.net/${P}.tar.gz" HOMEPAGE="http://procps.sourceforge.net/" inherit flag-o-matic @@ -20,15 +19,12 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ia64" RDEPEND=">=sys-libs/ncurses-5.2-r2" DEPEND="${RDEPEND} - >=sys-devel/gettext-0.10.35 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + >=sys-devel/gettext-0.10.35" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2 - # fix multiple-pids for cli top einfo "Applying ${PN}-3.1.11-multipids.patch .." cd ${S}; patch -p0 < ${FILESDIR}/${PN}-3.1.11-multipids.patch || die "patch failed" diff --git a/sys-apps/procps/procps-3.1.12.ebuild b/sys-apps/procps/procps-3.1.12.ebuild index ea7b1d0106c1..44a10fe76002 100644 --- a/sys-apps/procps/procps-3.1.12.ebuild +++ b/sys-apps/procps/procps-3.1.12.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.12.ebuild,v 1.2 2003/09/24 19:08:06 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.12.ebuild,v 1.3 2003/10/29 03:14:07 pebenito Exp $ IUSE="selinux" -SELINUX_PATCH="procps-3.1.12-selinux.patch.bz2" +SELINUX_PATCH="procps-3.1.12-selinux.diff.bz2" S=${WORKDIR}/${P} DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl" -SRC_URI="http://${PN}.sf.net/${P}.tar.gz - selinux? mirror://gentoo/${SELINUX_PATCH}" +SRC_URI="http://${PN}.sf.net/${P}.tar.gz" HOMEPAGE="http://procps.sourceforge.net/" inherit flag-o-matic @@ -23,13 +22,13 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64" RDEPEND=">=sys-libs/ncurses-5.2-r2" DEPEND="${RDEPEND} >=sys-devel/gettext-0.10.35 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + selinux? ( sys-libs/libselinux )" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${SELINUX_PATCH} + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} # Use the CFLAGS from /etc/make.conf. for file in `find . -iname "Makefile"`;do diff --git a/sys-apps/procps/procps-3.1.13.ebuild b/sys-apps/procps/procps-3.1.13.ebuild index 0144615308a7..1f67c379ce36 100644 --- a/sys-apps/procps/procps-3.1.13.ebuild +++ b/sys-apps/procps/procps-3.1.13.ebuild @@ -1,13 +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/procps/procps-3.1.13.ebuild,v 1.3 2003/10/08 03:47:31 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.13.ebuild,v 1.4 2003/10/29 03:14:07 pebenito Exp $ -IUSE="selinux" +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl" -SRC_URI="http://${PN}.sf.net/${P}.tar.gz - selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2" +SRC_URI="http://${PN}.sf.net/${P}.tar.gz" HOMEPAGE="http://procps.sourceforge.net/" inherit flag-o-matic @@ -20,15 +19,12 @@ KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ia64" RDEPEND=">=sys-libs/ncurses-5.2-r2" DEPEND="${RDEPEND} - >=sys-devel/gettext-0.10.35 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + >=sys-devel/gettext-0.10.35" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2 - # Use the CFLAGS from /etc/make.conf. for file in `find . -iname "Makefile"`;do sed -i "s:-O2:${CFLAGS}:" ${file} diff --git a/sys-apps/procps/procps-3.1.14.ebuild b/sys-apps/procps/procps-3.1.14.ebuild index 55850501c452..2a3d18af6979 100644 --- a/sys-apps/procps/procps-3.1.14.ebuild +++ b/sys-apps/procps/procps-3.1.14.ebuild @@ -1,13 +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/procps/procps-3.1.14.ebuild,v 1.1 2003/10/22 22:32:42 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.14.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $ -IUSE="selinux" +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl" -SRC_URI="http://${PN}.sf.net/${P}.tar.gz - selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2" +SRC_URI="http://${PN}.sf.net/${P}.tar.gz" HOMEPAGE="http://procps.sourceforge.net/" inherit flag-o-matic @@ -20,15 +19,12 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64" RDEPEND=">=sys-libs/ncurses-5.2-r2" DEPEND="${RDEPEND} - >=sys-devel/gettext-0.10.35 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + >=sys-devel/gettext-0.10.35" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2 - # Use the CFLAGS from /etc/make.conf. for file in `find . -iname "Makefile"`;do sed -i "s:-O2:${CFLAGS}:" ${file} diff --git a/sys-apps/procps/procps-3.1.8.ebuild b/sys-apps/procps/procps-3.1.8.ebuild index 4a6267b4dca5..785e32bd5de8 100644 --- a/sys-apps/procps/procps-3.1.8.ebuild +++ b/sys-apps/procps/procps-3.1.8.ebuild @@ -1,13 +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/procps/procps-3.1.8.ebuild,v 1.8 2003/09/07 00:40:40 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.8.ebuild,v 1.9 2003/10/29 03:14:07 pebenito Exp $ -IUSE="selinux" +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl" -SRC_URI="http://${PN}.sf.net/${P}.tar.gz - selinux? mirror://gentoo/${P}-selinux.patch.bz2" +SRC_URI="http://${PN}.sf.net/${P}.tar.gz" HOMEPAGE="http://procps.sourceforge.net/" inherit flag-o-matic @@ -20,15 +19,12 @@ KEYWORDS="x86 amd64 ppc sparc ~alpha ~hppa arm ~mips" RDEPEND=">=sys-libs/ncurses-5.2-r2" DEPEND="${RDEPEND} - >=sys-devel/gettext-0.10.35 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + >=sys-devel/gettext-0.10.35" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2 - # Use the CFLAGS from /etc/make.conf. for file in `find . -iname "Makefile"`;do mv ${file} ${file}.orig diff --git a/sys-apps/procps/procps-3.1.9.ebuild b/sys-apps/procps/procps-3.1.9.ebuild index 11560f1096be..b7c2d10e1c1e 100644 --- a/sys-apps/procps/procps-3.1.9.ebuild +++ b/sys-apps/procps/procps-3.1.9.ebuild @@ -1,13 +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/procps/procps-3.1.9.ebuild,v 1.8 2003/09/07 00:40:40 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.9.ebuild,v 1.9 2003/10/29 03:14:07 pebenito Exp $ -IUSE="selinux" +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl" -SRC_URI="http://${PN}.sf.net/${P}.tar.gz - selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2" +SRC_URI="http://${PN}.sf.net/${P}.tar.gz" HOMEPAGE="http://procps.sourceforge.net/" inherit flag-o-matic @@ -20,15 +19,12 @@ KEYWORDS="x86 amd64 ppc sparc alpha hppa ~arm mips" RDEPEND=">=sys-libs/ncurses-5.2-r2" DEPEND="${RDEPEND} - >=sys-devel/gettext-0.10.35 - selinux? ( >=sys-apps/selinux-small-2003011510-r2 )" + >=sys-devel/gettext-0.10.35" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2 - # Use the CFLAGS from /etc/make.conf. for file in `find . -iname "Makefile"`;do mv ${file} ${file}.orig 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 <pebenito@gentoo.org> 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 <azarah@gentoo.org> : 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 Binary files differnew file mode 100644 index 000000000000..4219df816cda --- /dev/null +++ b/sys-apps/psmisc/files/psmisc-21.2-selinux.diff.bz2 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. # <azarah@gentoo.org> (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. + # <azarah@gentoo.org> (18 May 2003) + + # the section that this patch fixes + # is deleted by the above selinux patch + # so should only needed for ! use selinux + # <pebenito@gentoo.org> (09 Aug 2003) - # Fix gcc-3.3 compile issues. - # <azarah@gentoo.org> (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 diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index 68dde6963d82..c9206b7d30d5 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/shadow # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.38 2003/09/26 19:55:11 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.39 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.3-r7.ebuild, + files/shadow-4.0.3-selinux.diff: + Add new API SELinux patch 26 Sep 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r7.ebuild: Mark stable. diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index 5217b3080ea4..376aca2ec323 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -1,17 +1,18 @@ -MD5 42246feac32ca68c3a050455c5977415 ChangeLog 7758 +MD5 780ec3471b88252f77c32dfb003dba70 ChangeLog 7900 MD5 003bd580ea2d0ead2894f10331e7eef0 shadow-4.0.3-r6.ebuild 4858 -MD5 305e699027bf80e2c1f036f747de8358 shadow-4.0.3-r7.ebuild 4873 -MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230 -MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r6 65 -MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882 +MD5 e0603805089500860a529dc37add3fe9 shadow-4.0.3-r7.ebuild 5047 +MD5 94728414b91e556a211379f6acc9b52d files/shadow-4.0.3-selinux.diff 3940 MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972 -MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804 +MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230 MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r7 65 -MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96 -MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198 +MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804 +MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882 +MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r6 65 MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247 +MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499 MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214 -MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227 -MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431 MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491 +MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431 +MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198 +MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96 diff --git a/sys-apps/shadow/files/shadow-4.0.3-selinux.diff b/sys-apps/shadow/files/shadow-4.0.3-selinux.diff new file mode 100644 index 000000000000..5187c9cbcff1 --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.0.3-selinux.diff @@ -0,0 +1,163 @@ +diff -urN shadow-4.0.3.orig/lib/Makefile.am shadow-4.0.3/lib/Makefile.am +--- shadow-4.0.3.orig/lib/Makefile.am 2001-10-06 14:53:20.000000000 -0500 ++++ shadow-4.0.3/lib/Makefile.am 2003-08-07 08:38:20.000000000 -0500 +@@ -1,7 +1,7 @@ + + AUTOMAKE_OPTIONS = 1.0 foreign + +-DEFS = ++DEFS = -DWITH_SELINUX + INCLUDES = -I$(top_srcdir) + + lib_LTLIBRARIES = libshadow.la +diff -urN shadow-4.0.3.orig/lib/commonio.c shadow-4.0.3/lib/commonio.c +--- shadow-4.0.3.orig/lib/commonio.c 2001-11-17 07:15:52.000000000 -0600 ++++ shadow-4.0.3/lib/commonio.c 2003-08-07 08:38:20.000000000 -0500 +@@ -15,7 +15,10 @@ + #ifdef HAVE_SHADOW_H + #include <shadow.h> + #endif +- ++#ifdef WITH_SELINUX ++#include <selinux/selinux.h> ++static security_context_t old_context=NULL; ++#endif + #include "commonio.h" + + /* local function prototypes */ +@@ -437,6 +440,15 @@ + return 0; + } + ++#ifdef WITH_SELINUX ++ db->scontext=NULL; ++ if (is_selinux_enabled() && (! db->readonly)) { ++ if (fgetfilecon(fileno(db->fp),&db->scontext) < 0) { ++ goto cleanup; ++ } ++ } ++#endif ++ + buflen = BUFLEN; + buf = (char *) malloc(buflen); + if (!buf) +@@ -492,6 +504,12 @@ + free(buf); + cleanup: + free_linked_list(db); ++#ifdef WITH_SELINUX ++ if (db->scontext!= NULL) { ++ freecon(db->scontext); ++ db->scontext=NULL; ++ } ++#endif + fclose(db->fp); + db->fp = NULL; + errno = ENOMEM; +@@ -627,6 +645,19 @@ + goto fail; + } + ++#ifdef WITH_SELINUX ++ if (db->scontext != NULL) { ++ int stat=getfscreatecon(&old_context); ++ if (stat< 0) { ++ errors++; ++ goto fail; ++ } ++ if (setfscreatecon(db->scontext)<0) { ++ errors++; ++ goto fail; ++ } ++ } ++#endif + /* + * Create backup file. + */ +@@ -683,14 +714,26 @@ + goto fail; + + nscd_need_reload = 1; +- ++ goto success; ++fail: ++ errors++; + success: +- free_linked_list(db); +- return 1; + +-fail: ++#ifdef WITH_SELINUX ++ if (db->scontext != NULL) { ++ if (setfscreatecon(old_context)<0) { ++ errors++; ++ } ++ if (old_context != NULL) { ++ freecon(old_context); ++ old_context=NULL; ++ } ++ freecon(db->scontext); ++ db->scontext=NULL; ++ } ++#endif + free_linked_list(db); +- return 0; ++ return errors==0; + } + + +diff -urN shadow-4.0.3.orig/lib/commonio.h shadow-4.0.3/lib/commonio.h +--- shadow-4.0.3.orig/lib/commonio.h 2001-08-14 16:09:54.000000000 -0500 ++++ shadow-4.0.3/lib/commonio.h 2003-08-07 08:38:20.000000000 -0500 +@@ -1,5 +1,8 @@ + /* $Id: shadow-4.0.3-selinux.diff,v 1.1 2003/10/29 03:14:07 pebenito Exp $ */ + ++#ifdef WITH_SELINUX ++#include <selinux/selinux.h> ++#endif + /* + * Linked list entry. + */ +@@ -70,6 +73,9 @@ + */ + FILE *fp; + ++#ifdef WITH_SELINUX ++ security_context_t scontext; ++#endif + /* + * Head, tail, current position in linked list. + */ +diff -urN shadow-4.0.3.orig/src/Makefile.am shadow-4.0.3/src/Makefile.am +--- shadow-4.0.3.orig/src/Makefile.am 2002-03-10 01:12:52.000000000 -0600 ++++ shadow-4.0.3/src/Makefile.am 2003-08-07 08:38:20.000000000 -0500 +@@ -4,7 +4,7 @@ + ubindir = ${prefix}/bin + usbindir = ${prefix}/sbin + +-DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" ++DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -DWITH_SELINUX + + INCLUDES = -I${top_srcdir} \ + -I${top_srcdir}/lib \ +@@ -35,7 +35,7 @@ + suidubins = chage chfn chsh expiry gpasswd newgrp passwd + + LDADD = $(top_builddir)/libmisc/libmisc.la \ +- $(top_builddir)/lib/libshadow.la ++ $(top_builddir)/lib/libshadow.la -lselinux + + chpasswd_LDADD = $(LDADD) $(LIBPAM) + chage_LDADD = $(LDADD) $(LIBPAM) +diff -urN shadow-4.0.3.orig/src/Makefile.in shadow-4.0.3/src/Makefile.in +--- shadow-4.0.3.orig/src/Makefile.in 2002-03-13 13:04:10.000000000 -0600 ++++ shadow-4.0.3/src/Makefile.in 2003-08-07 08:45:13.000000000 -0500 +@@ -145,7 +145,7 @@ + suidubins = chage chfn chsh expiry gpasswd newgrp passwd + + LDADD = $(top_builddir)/libmisc/libmisc.la \ +- $(top_builddir)/lib/libshadow.la ++ $(top_builddir)/lib/libshadow.la -lselinux + + + chpasswd_LDADD = $(LDADD) $(LIBPAM) diff --git a/sys-apps/shadow/shadow-4.0.3-r7.ebuild b/sys-apps/shadow/shadow-4.0.3-r7.ebuild index b94f9914f916..4f4deb63f963 100644 --- a/sys-apps/shadow/shadow-4.0.3-r7.ebuild +++ b/sys-apps/shadow/shadow-4.0.3-r7.ebuild @@ -1,13 +1,15 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r7.ebuild,v 1.5 2003/09/26 19:55:11 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r7.ebuild,v 1.6 2003/10/29 03:14:07 pebenito Exp $ -IUSE="" +IUSE="selinux" inherit eutils libtool gnuconfig FORCE_SYSTEMAUTH_UPDATE="yes" +SELINUX_PATCH="shadow-4.0.3-selinux.diff" + S="${WORKDIR}/${P}" HOMEPAGE="http://shadow.pld.org.pl/" DESCRIPTION="Utilities to deal with user accounts" @@ -19,10 +21,12 @@ KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm ia64" DEPEND=">=sys-libs/pam-0.75-r4 >=sys-libs/cracklib-2.7-r3 - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + selinux? ( sys-libs/libselinux )" RDEPEND=">=sys-libs/pam-0.75-r4 - >=sys-libs/cracklib-2.7-r3" + >=sys-libs/cracklib-2.7-r3 + selinux? ( sys-libs/libselinux )" pkg_preinst() { @@ -33,6 +37,9 @@ src_unpack() { unpack ${A} cd ${S} + + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} + # Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY, # else the session entries in /etc/pam.d/su never get executed, and # pam_xauth for one, is then never used. This should close bug #8831. diff --git a/sys-apps/tar/ChangeLog b/sys-apps/tar/ChangeLog index ac962f8a7032..970b0f1e020a 100644 --- a/sys-apps/tar/ChangeLog +++ b/sys-apps/tar/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/tar # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/ChangeLog,v 1.19 2003/09/02 19:01:32 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/ChangeLog,v 1.20 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> tar-1.13.25-r3.ebuild: + Remove unneeded old API SELinux patch 02 Sep 2003; Martin Holzer <mholzer@gentoo.org> tar-1.13.25-r1.ebuild, tar-1.13.25-r2.ebuild, tar-1.13.25-r3.ebuild: diff --git a/sys-apps/tar/Manifest b/sys-apps/tar/Manifest index 3382d5c1f6d0..feb923bcf02b 100644 --- a/sys-apps/tar/Manifest +++ b/sys-apps/tar/Manifest @@ -1,11 +1,11 @@ -MD5 f584e386933eb54c5a5509a955e77810 ChangeLog 2987 -MD5 1d2c159974ee50d7d30df3711c63fffc tar-1.13.25-r1.ebuild 1150 +MD5 d555b132feb6f768b3da52c79bb5b1e9 tar-1.13.25-r3.ebuild 1409 MD5 d2452f27258c5b8a7929ceabf929b071 tar-1.13.25-r2.ebuild 1216 -MD5 eb812ce203d9c131390305622c3ce957 tar-1.13.25-r3.ebuild 1579 -MD5 ebfd134ad54b3a6a08124bef38ecdad6 files/digest-tar-1.13.25-r1 64 +MD5 8622f4e57a934d5d58fd1433498099d6 ChangeLog 3104 +MD5 1d2c159974ee50d7d30df3711c63fffc tar-1.13.25-r1.ebuild 1150 MD5 ebfd134ad54b3a6a08124bef38ecdad6 files/digest-tar-1.13.25-r2 64 -MD5 2fd1441d3b74350616626b5cbdccb099 files/digest-tar-1.13.25-r3 147 -MD5 a1ab9f186c82b2894e285c1945dcbbcc files/tar-1.13.19-r1-gentoo.diff 706 +MD5 a5f8c5da7a9465ea1978145f3ef0610c files/tar.1 7113 MD5 a1ab9f186c82b2894e285c1945dcbbcc files/tar-1.13.19.patch 706 +MD5 ebfd134ad54b3a6a08124bef38ecdad6 files/digest-tar-1.13.25-r3 64 +MD5 ebfd134ad54b3a6a08124bef38ecdad6 files/digest-tar-1.13.25-r1 64 +MD5 a1ab9f186c82b2894e285c1945dcbbcc files/tar-1.13.19-r1-gentoo.diff 706 MD5 4518c28dd014a2efcc10690d53b58ffd files/tar-1.13.25-r3.gentoo.diff 314 -MD5 a5f8c5da7a9465ea1978145f3ef0610c files/tar.1 7113 diff --git a/sys-apps/tar/files/digest-tar-1.13.25-r3 b/sys-apps/tar/files/digest-tar-1.13.25-r3 index 1d4043112f04..467f114af098 100644 --- a/sys-apps/tar/files/digest-tar-1.13.25-r3 +++ b/sys-apps/tar/files/digest-tar-1.13.25-r3 @@ -1,2 +1 @@ MD5 6ef8c906e81eee441f8335652670ac4a tar-1.13.25.tar.gz 1312227 -MD5 e76a29c002cfd5e455e17919892b956c tar-1.13.25-2003011510-selinux.patch.bz2 5206 diff --git a/sys-apps/tar/tar-1.13.25-r3.ebuild b/sys-apps/tar/tar-1.13.25-r3.ebuild index dc7c0643149a..40a0bf215609 100644 --- a/sys-apps/tar/tar-1.13.25-r3.ebuild +++ b/sys-apps/tar/tar-1.13.25-r3.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r3.ebuild,v 1.18 2003/09/18 00:20:20 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r3.ebuild,v 1.19 2003/10/29 03:14:07 pebenito Exp $ inherit eutils gnuconfig -IUSE="nls static build selinux" +IUSE="nls static build" S=${WORKDIR}/${P} DESCRIPTION="Use this to try make tarballs :)" -SRC_URI="mirror://gnu/tar/${P}.tar.gz - selinux? mirror://gentoo/${P}-2003011510-selinux.patch.bz2" +SRC_URI="mirror://gnu/tar/${P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/tar/" SLOT="0" @@ -18,15 +17,13 @@ KEYWORDS="x86 amd64 alpha mips hppa arm ppc ia64" DEPEND="sys-apps/gzip sys-apps/bzip2 - app-arch/ncompress - selinux? ( sys-apps/selinux-small )" + app-arch/ncompress" RDEPEND="nls? ( >=sys-devel/gettext-0.10.35 )" src_unpack() { unpack ${A} cd ${S} - use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux.patch.bz2 epatch ${FILESDIR}/${PF}.gentoo.diff } diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 1d8cc2abd84e..a3ba3304ef14 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.59 2003/10/09 18:59:21 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.60 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> util-linux-2.12.ebuild, + files/util-linux-2.12-selinux.diff.bz2: + Add new API SELinux patch 09 Oct 2003; Alexander Gabert <pappy@gentoo.org> util-linux-2.11z-r6.ebuild: removed hardened-gcc appendix flags again diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index cc7337c28c78..753f161f6f53 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,23 +1,24 @@ -MD5 c6692828888581ffce700c60c14ea9b8 util-linux-2.11z-r5.ebuild 2776 MD5 10ccac17abb08cd30711a1cd4dc4c8c5 util-linux-2.11y.ebuild 2107 MD5 11c630af9afcb46fa6240b4eac732a50 util-linux-2.11z-r7.ebuild 3333 -MD5 b73abbe53ce7a49cad81cc855b7d5924 util-linux-2.11z-r4.ebuild 2410 -MD5 6266d6273a515fef0c0a70c5578f50a5 util-linux-2.12.ebuild 3077 +MD5 2fa09c44b77b652d4f9f704fc181e2b8 ChangeLog 9733 +MD5 3b0660f770fc2196fcfd1c6e697b2402 util-linux-2.12.ebuild 3222 +MD5 c6692828888581ffce700c60c14ea9b8 util-linux-2.11z-r5.ebuild 2776 MD5 c9ddba73f3eba7bc701c2b727c67a453 util-linux-2.11z-r6.ebuild 3139 -MD5 0342cf72ae8687736fd38b73dffeb096 ChangeLog 9583 -MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442 -MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12 151 -MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152 +MD5 b73abbe53ce7a49cad81cc855b7d5924 util-linux-2.11z-r4.ebuild 2410 MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056 -MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369 -MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460 -MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r4 153 -MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r5 153 +MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580 +MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r6 153 +MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r4 153 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r7 153 -MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698 -MD5 50b088dbe0471cb0a49ad1f9b967ee04 files/util-linux-2.11u-gentoo.patch 367 -MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316 MD5 b5a7097b2c3372d333485da73cd7a41e files/util-linux-2.11z-agetty-domainname-option.patch 1809 -MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580 +MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369 +MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460 +MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316 +MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r5 153 +MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12 151 +MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152 +MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369 +MD5 50b088dbe0471cb0a49ad1f9b967ee04 files/util-linux-2.11u-gentoo.patch 367 +MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698 diff --git a/sys-apps/util-linux/files/util-linux-2.12-selinux.diff.bz2 b/sys-apps/util-linux/files/util-linux-2.12-selinux.diff.bz2 Binary files differnew file mode 100644 index 000000000000..6e5382b4f3b8 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.12-selinux.diff.bz2 diff --git a/sys-apps/util-linux/util-linux-2.12.ebuild b/sys-apps/util-linux/util-linux-2.12.ebuild index 1b73e6d6c75b..998bfbee4c44 100644 --- a/sys-apps/util-linux/util-linux-2.12.ebuild +++ b/sys-apps/util-linux/util-linux-2.12.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12.ebuild,v 1.4 2003/09/20 05:14:23 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12.ebuild,v 1.5 2003/10/29 03:14:07 pebenito Exp $ -IUSE="crypt nls static pam" +IUSE="crypt nls static pam selinux" inherit eutils flag-o-matic @@ -17,6 +17,7 @@ esac S="${WORKDIR}/${P}" CRYPT_PATCH_P="${PN}-2.11z-crypt-gentoo" +SELINUX_PATCH="util-linux-2.12-selinux.diff.bz2" DESCRIPTION="Various useful Linux utilities" SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz ftp://ftp.cwi.nl/pub/aeb/${PN}/${P}.tar.gz @@ -30,6 +31,7 @@ LICENSE="GPL-2" DEPEND="virtual/glibc >=sys-apps/sed-4.0.5 >=sys-libs/ncurses-5.2-r2 + selinux? ( sys-libs/libselinux ) pam? ( sys-apps/pam-login )" RDEPEND="${DEPEND} dev-lang/perl @@ -75,6 +77,8 @@ src_unpack() { #enable pam only if we use it use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} + sed -i \ -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \ -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ diff --git a/sys-apps/vcron/ChangeLog b/sys-apps/vcron/ChangeLog index 4af922ed048a..82a6d1d2d429 100644 --- a/sys-apps/vcron/ChangeLog +++ b/sys-apps/vcron/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/vcron # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/ChangeLog,v 1.17 2003/10/17 03:42:09 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/ChangeLog,v 1.18 2003/10/29 03:14:07 pebenito Exp $ + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> vcron-3.0.1-r1.ebuild, + vcron-3.0.1-r2.ebuild, files/vcron-3.0.1-selinux.diff.bz2: + Switch SELinux patch from old API to new API. *vcron-3.0.1-r2 (16 Oct 2003) diff --git a/sys-apps/vcron/Manifest b/sys-apps/vcron/Manifest index 430daf9c8be1..e7dc67326bc7 100644 --- a/sys-apps/vcron/Manifest +++ b/sys-apps/vcron/Manifest @@ -1,9 +1,10 @@ -MD5 a6b11a0284a2f2059672f4faeb5f5fe2 ChangeLog 2444 -MD5 f736fe5ee6f82e92efa1a2b6ba15122f vcron-3.0.1-r1.ebuild 1558 -MD5 a97fcb10d409de6f9e5efe5efcead2cc vcron-3.0.1-r2.ebuild 1611 +MD5 0c1ced878df37a66b0cbc4ceff57b375 vcron-3.0.1-r1.ebuild 1371 +MD5 21046442a3aa7088c5b069da5707f92e ChangeLog 2629 +MD5 3fabf5e44bccaccd4a56bd35cdc06829 vcron-3.0.1-r2.ebuild 1596 +MD5 c8e987ea566611c641316ff140c8d91c files/vixie-cron-3.0.1-gentoo.patch 27121 +MD5 42a9b1ba7246f2fb453203eaccbb0e08 files/digest-vcron-3.0.1-r2 68 MD5 7f79290c2f51c9dcee459c8a5636f652 files/vcron.rc6 520 MD5 6a065c2a4012e573ebb852275516a1d4 files/crontab 563 -MD5 21a88e40cea6fde9bf6163e501b993dd files/digest-vcron-3.0.1-r1 140 -MD5 c8e987ea566611c641316ff140c8d91c files/vixie-cron-3.0.1-gentoo.patch 27121 -MD5 21a88e40cea6fde9bf6163e501b993dd files/digest-vcron-3.0.1-r2 140 +MD5 42a9b1ba7246f2fb453203eaccbb0e08 files/digest-vcron-3.0.1-r1 68 +MD5 9495caecef1f8b925d19a1d34c4ff405 files/vcron-3.0.1-selinux.diff.bz2 1931 MD5 73b3a3fde51e9070b50a5a4482a1b5b4 files/vcron-3.0.1-close_stdin.diff 323 diff --git a/sys-apps/vcron/files/digest-vcron-3.0.1-r1 b/sys-apps/vcron/files/digest-vcron-3.0.1-r1 index 213b21a53c3a..730747648de8 100644 --- a/sys-apps/vcron/files/digest-vcron-3.0.1-r1 +++ b/sys-apps/vcron/files/digest-vcron-3.0.1-r1 @@ -1,2 +1 @@ MD5 369390355808fcf947cd2f9847f88859 vixie-cron-3.0.1.tar.bz2 50376 -MD5 d82f9e7688f59255493f4386e7d51503 vcron-3.0.1-selinux.patch.bz2 2624 diff --git a/sys-apps/vcron/files/digest-vcron-3.0.1-r2 b/sys-apps/vcron/files/digest-vcron-3.0.1-r2 index 213b21a53c3a..730747648de8 100644 --- a/sys-apps/vcron/files/digest-vcron-3.0.1-r2 +++ b/sys-apps/vcron/files/digest-vcron-3.0.1-r2 @@ -1,2 +1 @@ MD5 369390355808fcf947cd2f9847f88859 vixie-cron-3.0.1.tar.bz2 50376 -MD5 d82f9e7688f59255493f4386e7d51503 vcron-3.0.1-selinux.patch.bz2 2624 diff --git a/sys-apps/vcron/files/vcron-3.0.1-selinux.diff.bz2 b/sys-apps/vcron/files/vcron-3.0.1-selinux.diff.bz2 Binary files differnew file mode 100644 index 000000000000..ad9c644223b0 --- /dev/null +++ b/sys-apps/vcron/files/vcron-3.0.1-selinux.diff.bz2 diff --git a/sys-apps/vcron/vcron-3.0.1-r1.ebuild b/sys-apps/vcron/vcron-3.0.1-r1.ebuild index 98616593493a..2161a632cd61 100644 --- a/sys-apps/vcron/vcron-3.0.1-r1.ebuild +++ b/sys-apps/vcron/vcron-3.0.1-r1.ebuild @@ -1,29 +1,26 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r1.ebuild,v 1.24 2003/09/18 01:30:15 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r1.ebuild,v 1.25 2003/10/29 03:14:07 pebenito Exp $ inherit eutils -IUSE="selinux" +IUSE="" MY_P=${P/vcron/vixie-cron} S=${WORKDIR}/${MY_P} DESCRIPTION="The Vixie cron daemon" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 - selinux? mirror://gentoo/${P}-selinux.patch.bz2" +SRC_URI="mirror://gentoo/${MY_P}.tar.bz2" HOMEPAGE="" KEYWORDS="x86 amd64 ppc sparc alpha arm mips hppa ia64" SLOT="0" LICENSE="as-is" DEPEND=">=sys-apps/portage-2.0.47-r10 - >=sys-apps/sed-4.0.5 - selinux? ( sys-apps/selinux-small )" + >=sys-apps/sed-4.0.5" RDEPEND="!virtual/cron sys-apps/cronbase - virtual/mta - selinux? ( sys-apps/selinux-small )" + virtual/mta" PROVIDE="virtual/cron" @@ -34,8 +31,6 @@ src_unpack() { epatch ${FILESDIR}/${MY_P}-gentoo.patch - use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2 - sed -i "s:-O2:${CFLAGS}:" Makefile } diff --git a/sys-apps/vcron/vcron-3.0.1-r2.ebuild b/sys-apps/vcron/vcron-3.0.1-r2.ebuild index 2228aff2dcdc..67846ae6b769 100644 --- a/sys-apps/vcron/vcron-3.0.1-r2.ebuild +++ b/sys-apps/vcron/vcron-3.0.1-r2.ebuild @@ -1,16 +1,17 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r2.ebuild,v 1.1 2003/10/17 03:42:09 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r2.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $ inherit eutils IUSE="selinux" +SELINUX_PATCH="vcron-3.0.1-selinux.diff.bz2" + MY_P=${P/vcron/vixie-cron} S=${WORKDIR}/${MY_P} DESCRIPTION="The Vixie cron daemon" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 - selinux? mirror://gentoo/${P}-selinux.patch.bz2" +SRC_URI="mirror://gentoo/${MY_P}.tar.bz2" HOMEPAGE="" KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~ia64" SLOT="0" @@ -18,12 +19,12 @@ LICENSE="as-is" DEPEND=">=sys-apps/portage-2.0.47-r10 >=sys-apps/sed-4.0.5 - selinux? ( sys-apps/selinux-small )" + selinux? ( sys-libs/libselinux )" RDEPEND="!virtual/cron sys-apps/cronbase virtual/mta - selinux? ( sys-apps/selinux-small )" + selinux? ( sys-libs/libselinux )" PROVIDE="virtual/cron" @@ -35,7 +36,7 @@ src_unpack() { epatch ${FILESDIR}/${MY_P}-gentoo.patch epatch ${FILESDIR}/${P}-close_stdin.diff - use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2 + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} sed -i "s:-O2:${CFLAGS}:" Makefile } |