diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2005-09-13 14:04:42 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2005-09-13 14:04:42 +0000 |
commit | d32e5ce44887eee2a4682ff4b3afd3075f5cca61 (patch) | |
tree | 03a71a5e853a172f6b218d5c37b104ed6a218ffb /sys-apps | |
parent | Mark 3.4.1 stable on alpha (diff) | |
download | gentoo-2-d32e5ce44887eee2a4682ff4b3afd3075f5cca61.tar.gz gentoo-2-d32e5ce44887eee2a4682ff4b3afd3075f5cca61.tar.bz2 gentoo-2-d32e5ce44887eee2a4682ff4b3afd3075f5cca61.zip |
Fix 'mount -f' not updating /etc/mtab.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/util-linux/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/util-linux/Manifest | 58 | ||||
-rw-r--r-- | sys-apps/util-linux/files/digest-util-linux-2.12q-r2 | 4 | ||||
-rw-r--r-- | sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch | 40 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-2.12q-r2.ebuild | 165 |
5 files changed, 243 insertions, 33 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index f81ac6c63f1d..1b97a0992e82 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.107 2005/09/05 04:48:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.108 2005/09/13 14:04:42 azarah Exp $ + +*util-linux-2.12q-r2 (13 Sep 2005) + + 13 Sep 2005; Martin Schlemmer <azarah@gentoo.org> + +files/util-linux-2.12q-more-fake-checks-v2.patch, + +util-linux-2.12q-r2.ebuild: + Fix 'mount -f' not updating /etc/mtab. 05 Sep 2005; Mike Frysinger <vapier@gentoo.org> +files/util-linux-2.12q-update-mtab-when-moving.patch, diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index b1a364f201a0..04275a348dbf 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,45 +1,39 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785 -MD5 3539732064102ec9896b7ae3b90e8e99 util-linux-2.12p-r1.ebuild 4396 MD5 615dd5dc24cb67c6ff5d7f4f8fd64b50 util-linux-2.12q-r1.ebuild 5124 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 af4d9067188d2b9be9ff65f0a2482a1f util-linux-2.12i-r1.ebuild 3846 MD5 6c5bc8e71db0b375818df454ba43eeb3 ChangeLog 18348 -MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlinks.patch 864 -MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369 -MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239 -MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875 -MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558 -MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r1 292 -MD5 6eba0a390d20cd25c0d23e3155755f31 files/util-linux-2.12q-more-fake-checks.patch 612 +MD5 3539732064102ec9896b7ae3b90e8e99 util-linux-2.12p-r1.ebuild 4396 +MD5 3bf6e9e487f4cea6448032141837c226 util-linux-2.12q-r2.ebuild 5127 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785 MD5 e8c2796a3427138ca8a09a69db357a1f files/util-linux-2.12q-update-mtab-when-moving.patch 1031 -MD5 d448f3b1b3ea21db4c2c4f303b48c1c8 files/digest-util-linux-2.12p-r1 294 +MD5 8937dff27200f1f2a2a10ea74537f2a2 files/util-linux-2.12q-update-mtab-on-fake.patch 1162 +MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlinks.patch 864 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642 -MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289 +MD5 c9c2c92d7bba0652f22b638127c2107e files/util-linux-2.12i-pic.patch 2457 MD5 570b9b148cbb60ec16de30940990ab53 files/util-linux-2.12q-i18n-update.patch 344 MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854 +MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810 MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806 -MD5 e2d566b683bb1b9b1c3e127b2bbd258b files/digest-util-linux-2.12q 294 -MD5 bc90959c4718e7dc5d53dcddac1172f5 files/util-linux-2.12q-debian-10cfdisk.patch 1888 +MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442 -MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583 -MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810 -MD5 c9c2c92d7bba0652f22b638127c2107e files/util-linux-2.12i-pic.patch 2457 -MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316 -MD5 d20405e12353610b3ef8fbc2e1d57f2a files/crypto-loop.initd 1625 -MD5 61beee95fb4696a6af11ffb84ddb055c files/util-linux-2.12i-ignore-managed.patch 506 +MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r1 292 +MD5 99fa2ff2cb56217b6971e76e275923f9 files/util-linux-2.12q-more-fake-checks-v2.patch 1176 +MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964 MD5 a9bc06c292401d6f2d27e8e4ebf7e6ae files/util-linux-2.12i-fat-LABEL-support.patch 2304 +MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558 +MD5 bc90959c4718e7dc5d53dcddac1172f5 files/util-linux-2.12q-debian-10cfdisk.patch 1888 +MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316 +MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239 +MD5 d448f3b1b3ea21db4c2c4f303b48c1c8 files/digest-util-linux-2.12p-r1 294 +MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r2 292 MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056 -MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964 -MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505 +MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583 MD5 b360252f16d707f668b605d7a2abb791 files/util-linux-2.12q-dont-umask.patch 439 MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD4DBQFDG845gIKl8Uu19MoRAtE5AJ0Ri+tY5B+aDnXgmYIxzQZuiJFP1gCXb9ub -0o8h/wGrtqrm/J4u8WLUzQ== -=yX/B ------END PGP SIGNATURE----- +MD5 61beee95fb4696a6af11ffb84ddb055c files/util-linux-2.12i-ignore-managed.patch 506 +MD5 6eba0a390d20cd25c0d23e3155755f31 files/util-linux-2.12q-more-fake-checks.patch 612 +MD5 e2d566b683bb1b9b1c3e127b2bbd258b files/digest-util-linux-2.12q 294 +MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289 +MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369 +MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505 +MD5 d20405e12353610b3ef8fbc2e1d57f2a files/crypto-loop.initd 1625 diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12q-r2 b/sys-apps/util-linux/files/digest-util-linux-2.12q-r2 new file mode 100644 index 000000000000..408880da56d5 --- /dev/null +++ b/sys-apps/util-linux/files/digest-util-linux-2.12q-r2 @@ -0,0 +1,4 @@ +MD5 004b971441ef89e0b93076c21806cc7d util-linux-2.12q.tar.gz 1992810 +MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468 +MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 +MD5 650186003f301362247a7d16f138eb43 loop-AES-v3.0d.tar.bz2 165472 diff --git a/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch b/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch new file mode 100644 index 000000000000..f598a8da350f --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch @@ -0,0 +1,40 @@ +> Running `mount -fv /mnt/pnt` incorrectly updates /etc/mtab + +This one is bogus. + +Manpage: + +===== +-f Causes everything to be done except for the actual system call; + if it's not obvious, this ``fakes'' mounting the file system. This option + is useful in conjunction with the -v flag to determine what the mount + command is trying to do. It can also be used to add entries for devices that + were mounted earlier with the -n option. +===== + +Also, we need it in /etc/init.d/checkroot to regen /etc/mtab ... + + +======================================================================= +Running `mount -afvt type` incorrectly warns that 'nothing was mounted' + +--- mount/mount.c ++++ mount/mount.c +#@@ -659,7 +659,7 @@ +# if (verbose) +# print_one (&mnt); +# +#- if (!nomtab && mtab_is_writable()) { +#+ if (!fake && !nomtab && mtab_is_writable()) { +# if (flags & MS_REMOUNT) +# update_mtab (mnt.mnt_dir, &mnt); +# else { +@@ -1629,7 +1629,7 @@ + case 0: + /* mount -a */ + result = do_mount_all (types, options, test_opts); +- if (result == 0 && verbose) ++ if (result == 0 && verbose && !fake) + error(_("nothing was mounted")); + break; + diff --git a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild b/sys-apps/util-linux/util-linux-2.12q-r2.ebuild new file mode 100644 index 000000000000..08e90297de03 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.12q-r2.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12q-r2.ebuild,v 1.1 2005/09/13 14:04:42 azarah Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +OLD_CRYPT_VER=2.12i +LOOP_AES_VER=3.0d +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" +SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz + old-crypt? ( + mirror://kernel/linux/utils/${PN}/${PN}-${OLD_CRYPT_VER}.tar.gz + mirror://gentoo/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch.bz2 + ) + crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${LOOP_AES_VER}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="crypt old-crypt nls static pam selinux perl" + +RDEPEND=">=sys-libs/ncurses-5.2-r2 + >=sys-fs/e2fsprogs-1.34 + selinux? ( sys-libs/libselinux ) + pam? ( sys-apps/pam-login ) + crypt? ( app-crypt/hashalot ) + perl? ( dev-lang/perl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/os-headers" + +OLD_CRYPT_P=${WORKDIR}/${PN}-${OLD_CRYPT_VER} + +yesno() { useq $1 && echo yes || echo no; } + +src_unpack() { + unpack ${A} + + # Old crypt support + if use old-crypt ; then + cd ${OLD_CRYPT_P} + epatch ${WORKDIR}/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch + fi + + cd "${S}" + + # crypto support + use crypt && epatch "${WORKDIR}"/loop-AES-v${LOOP_AES_VER}/${P}.diff + + # Fix rare failures with -j4 or higher + epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch + + # Fix -f usage with -a and in general + epatch ${FILESDIR}/${PN}-2.12q-more-fake-checks-v2.patch + + # Fix mtab updates with `mount --move /foo /bar` + epatch ${FILESDIR}/${PN}-2.12q-update-mtab-when-moving.patch + + # Fix unreadable df output when using devfs ... this check is kind of + # a hack, but whatever, the output isnt critical at all :P + [[ -e /dev/.devfsd ]] && epatch ${FILESDIR}/no-symlink-resolve.patch + + # Add the O option to agetty to display DNS domainname in the issue + # file, thanks to Marius Mauch <genone@genone.de>, bug #22275. + # + # NOTE: Removing this will break future baselayout, so PLEASE + # consult with me before doing so. + # + # <azarah@gentoo.org> (17 Jul 2003) + epatch ${FILESDIR}/${PN}-2.11z-agetty-domainname-option.patch + + # Fix french translation typo #75693 + epatch ${FILESDIR}/${P}-i18n-update.patch + + # Add NFS4 support (kernel 2.5/2.6) + epatch ${FILESDIR}/${PN}-2.12i-nfsv4.patch + + # ignore managed/kudzu options #70873 + epatch ${FILESDIR}/${PN}-2.12i-ignore-managed.patch + + # Allow util-linux to be built with -fPIC + epatch ${FILESDIR}/${PN}-2.12i-pic.patch + + # swapon gets confused by symlinks in /dev #69162 + epatch ${FILESDIR}/${PN}-2.12p-swapon-check-symlinks.patch + + # fix simple buffer overflow (from Debian) + epatch ${FILESDIR}/${PN}-2.12q-debian-10cfdisk.patch + + # don't build fdisk on m68k + epatch ${FILESDIR}/${PN}-2.12q-no-m68k-fdisk.patch + + # don't force umask to 022 #93671 + epatch ${FILESDIR}/${PN}-2.12q-dont-umask.patch + + # Enable random features + local mconfigs="MCONFIG" + use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG" + sed -i \ + -e "/^HAVE_PAM=/s:no:$(yesno pam):" \ + -e "/^HAVE_SELINUX=/s:no:$(yesno selinux):" \ + -e "/^DISABLE_NLS=/s:no:$(yesno !nls):" \ + -e "/^HAVE_KILL=/s:no:yes:" \ + -e "/^HAVE_SLN=/s:no:yes:" \ + -e "/^HAVE_TSORT/s:no:yes:" \ + -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \ + -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ + -e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \ + ${mconfigs} || die "MCONFIG sed" +} + +src_compile() { + append-ldflags -Wl,-z,now + use static && append-ldflags -static + export CC="$(tc-getCC)" + + econf || die "configure failed" + emake || die "emake failed" + + cd partx + has_version '>=sys-kernel/linux-headers-2.6' && append-flags -include linux/compiler.h + emake CFLAGS="${CFLAGS}" || die "make partx failed" + + if use old-crypt ; then + cd ${OLD_CRYPT_P} + econf || die "old configure failed" + emake -C lib || die "old lib failed" + emake -C mount losetup mount || die "old make failed" + fi +} + +src_install() { + make install DESTDIR="${D}" || die "install failed" + dosym ../man8/agetty.8 /usr/share/man/man1/getty.1 + dosbin partx/{addpart,delpart,partx} || die "dosbin" + use perl || rm -f "${D}"/usr/bin/chkdupexe + + newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop + newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop + + # man-pages installs renice(1p) but util-linux does renice(8) + dosym ../man8/renice.8 /usr/share/man/man1/renice.1 + + dodoc HISTORY MAINTAINER README VERSION + docinto examples + dodoc example.files/* + + if use old-crypt ; then + cd ${OLD_CRYPT_P}/mount + into / + newsbin mount mount-old-crypt || die + newsbin losetup losetup-old-crypt || die + fi +} + +pkg_postinst() { + if ! use old-crypt ; then + ewarn "This version of util-linux includes crypto support" + ewarn "for loop-aes instead of the old cryptoapi." + ewarn "If you need the older support, please re-emerge" + ewarn "util-linux with USE=old-crypt. This will create" + ewarn "/sbin/mount-old-crypt and /sbin/losetup-old-crypt." + fi +} |