change selinux patches for new (2.6) selinux api

7 files changed, 23 insertions, 23 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
new 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
 }