summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-12-10 21:02:47 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-12-10 21:02:47 +0000
commitcf66fc87a54f47a21b0abc06edff64a559224e2f (patch)
tree944291289f7fa7000ba9a971f131956a4e291bb2
parenthppa has pa2 now (diff)
downloadgentoo-2-cf66fc87a54f47a21b0abc06edff64a559224e2f.tar.gz
gentoo-2-cf66fc87a54f47a21b0abc06edff64a559224e2f.tar.bz2
gentoo-2-cf66fc87a54f47a21b0abc06edff64a559224e2f.zip
Update selinux check.
-rw-r--r--sys-apps/baselayout/ChangeLog6
-rw-r--r--sys-apps/baselayout/Manifest10
-rw-r--r--sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild7
3 files changed, 14 insertions, 9 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index c374c334ad28..4914c8eca834 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for sys-apps/baselayout
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.105 2003/11/30 09:57:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.106 2003/12/10 21:02:36 azarah Exp $
# See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
# http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
+ 10 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
+ baselayout-1.8.6.12-r2.ebuild:
+ Update selinux check.
+
30 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
baselayout-1.8.6.12-r2.ebuild:
Fix format of calling chown, bug #34612.
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 51408db923e2..3b2bfe2feb4c 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,12 +1,12 @@
-MD5 2ef25d05023a823034080bac1de24cc1 ChangeLog 19924
+MD5 a376a9183f575cae744a22be561de340 baselayout-1.8.6.8-r1.ebuild 19092
MD5 08d4f1d2390a81d1e05097a2d2d2af9d baselayout-1.8.5.9.ebuild 15442
MD5 c457d23a83e5fe95e018b99f2ee2741d baselayout-1.8.6.10-r1.ebuild 19801
-MD5 c8d6959941cb3c36296321844ddfc44e baselayout-1.8.6.12-r2.ebuild 20002
-MD5 a376a9183f575cae744a22be561de340 baselayout-1.8.6.8-r1.ebuild 19092
+MD5 097f365d1dc0100743b08dd9bdf24296 ChangeLog 20034
+MD5 18385b13db891d652e93305d45dab644 baselayout-1.8.6.12-r2.ebuild 20064
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138
MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397
+MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
MD5 791058728d722586ebd7f7d93efac22f files/digest-baselayout-1.8.5.9 134
-MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
-MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138
MD5 a6c521e030d8c87b9617f701fa1ec0f8 files/digest-baselayout-1.8.6.8-r1 136
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
index 1e778a3f3efd..2828b8b472a9 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.12-r2.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/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.2 2003/11/30 09:57:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.3 2003/12/10 21:02:36 azarah Exp $
# This ebuild needs to be merged "live". You can't simply make a package
# of it and merge it later.
@@ -544,8 +544,9 @@ pkg_postinst() {
if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
then
- if [ -z "$(use selinux)" -a \
- -z "$(use build)" -a -z "$(use bootstrap)" ]
+ if [ -z "$(use build)" -a -z "$(use bootstrap)" ] || \
+ ([ -n "$(use selinux)" ] && \
+ [ -n "$(use build)" -o -n "$(use bootstrap)" ])
then
einfo "Populating /dev with device nodes..."
tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \