Version bump #108042 by Alon Bar-Lev.

Package-Manager: portage-2.0.51.22-r2

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index f29ca628d8a54e89097f26051adc330c07278b13..ddb82cf629e68fdf1e178762d92edb5f25bf263e 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.122 2005/09/20 06:22:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.123 2005/10/05 00:08:01 vapier Exp $
+
+*util-linux-2.12r (05 Oct 2005)
+
+  05 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  -util-linux-2.12q-r2.ebuild, +util-linux-2.12r.ebuild:
+  Version bump #108042 by Alon Bar-Lev.
 
   20 Sep 2005; Hardave Riar <hardave@gentoo.org> util-linux-2.12q-r3.ebuild:
   Stable on mips, bug #105805.

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a00df27d105e04fe0c49fb519f46b34a1ff6496e..73899b595c9bc9069fbb398a85912411dd4f8b44 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,9 +4,9 @@ Hash: SHA1
 MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 5497e9050dc8cde95a0e015edcd59c81 util-linux-2.12i-r1.ebuild 3960
-MD5 42a00cdd523f8facea7f10a9f4df86a1 util-linux-2.12q-r2.ebuild 5692
+MD5 0fa072288048ab73c7da495402392575 util-linux-2.12r.ebuild 5546
 MD5 5caff498045d46b5ee7afbb9aad0a357 util-linux-2.12q-r3.ebuild 5853
-MD5 37089f71e91dec5ebbcc7506bbaf4334 ChangeLog 20615
+MD5 c41c6a03eba5e5c09e5eab336a63e34a ChangeLog 20795
 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
@@ -16,13 +16,13 @@ MD5 f182d2c3c90cdc74c816a4656a8f3bbf files/util-linux-2.12q-update_mtab-fixes.pa
 MD5 3708f6eda344a2aa0a4d85d49f69dcee files/util-linux-2.12q-update-mtab-when-moving.patch 1036
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
-MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r2 292
 MD5 570b9b148cbb60ec16de30940990ab53 files/util-linux-2.12q-i18n-update.patch 344
 MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854
 MD5 9d4c2454a6506ec913d901830ab06a22 files/util-linux-2.12-only-root-can-remount.patch 294
 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 3f20c16ba5d68bfe7518f72d771170ce files/digest-util-linux-2.12r 292
 MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r3 292
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
 MD5 99fa2ff2cb56217b6971e76e275923f9 files/util-linux-2.12q-more-fake-checks-v2.patch 1176
@@ -43,7 +43,7 @@ MD5 8a13c61b447c1533df4b919cf2646fea files/util-linux-2.12q-umount-dont-write-mt
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDOc/hgIKl8Uu19MoRAgAGAJ43Ztei7cLCwQBa982jnaooyCM/mQCdFHNA
-dReicDM7OGMTh5qC3/BqTiw=
-=7cgX
+iD8DBQFDQxm6gIKl8Uu19MoRAgjEAJ4yFDMXw2hBsbEZpUArv+U0KRTL9wCbB5kn
+JVWtG/4fY8TJ1dhj2pU/0x4=
+=sUZ+
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12q-r2 b/sys-apps/util-linux/files/digest-util-linux-2.12r
similarity index 53%
rename from sys-apps/util-linux/files/digest-util-linux-2.12q-r2
rename to sys-apps/util-linux/files/digest-util-linux-2.12r
index 408880da56d50184bc50c7f4b6b41f95e8ab155d..f625ad6fbd021504d577d75fdc7d5d4d3a2d5767 100644 (file)
--- a/sys-apps/util-linux/files/digest-util-linux-2.12q-r2
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12r
@@ -1,4 +1,4 @@
-MD5 004b971441ef89e0b93076c21806cc7d util-linux-2.12q.tar.gz 1992810
+MD5 c261230b27fc0fbcc287c76884caf2d3 util-linux-2.12r.tar.gz 1992725
 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
+MD5 ab453b8d81bd36d5e56e391ee36ec5d6 loop-AES-v3.1b.tar.bz2 167804

diff --git a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild b/sys-apps/util-linux/util-linux-2.12r.ebuild
similarity index 89%
rename from sys-apps/util-linux/util-linux-2.12q-r2.ebuild
rename to sys-apps/util-linux/util-linux-2.12r.ebuild
index 57bd4839e63675f88f6859bb977eeb823e658719..d57216cbd55b650793ddb778a499928d100bd47c 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.12q-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r.ebuild
@@ -1,11 +1,11 @@
 # 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.4 2005/09/14 09:07:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r.ebuild,v 1.1 2005/10/05 00:08:01 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 OLD_CRYPT_VER=2.12i
-LOOP_AES_VER=3.0d
+LOOP_AES_VER=3.1b
 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
@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="crypt old-crypt nls static pam selinux perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2
@@ -59,15 +59,15 @@ src_unpack() {
        # Fix mtab updates with `mount --move /foo /bar` #104697
        epatch "${FILESDIR}"/${PN}-2.12q-update-mtab-when-moving.patch
 
-       # Disable the -r option for non-root users #105805
-       epatch "${FILESDIR}"/${PN}-2.12-only-root-can-remount.patch
-
        # Respect -n with -r and umount #98675
        epatch "${FILESDIR}"/${PN}-2.12q-umount-dont-write-mtab-with-remount.patch
 
        # A few fixes to beat update_mtab() into submission.
        epatch "${FILESDIR}"/${PN}-2.12q-update_mtab-fixes.patch
 
+       # Use update_mtab() to avoid dups in mtab for 'mount -f'
+       epatch "${FILESDIR}"/${PN}-2.12q-use-update_mtab-for-fake.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
@@ -80,7 +80,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-2.11z-agetty-domainname-option.patch
 
        # Fix french translation typo #75693
-       epatch "${FILESDIR}"/${P}-i18n-update.patch
+       epatch "${FILESDIR}"/${PN}-2.12q-i18n-update.patch
 
        # Add NFS4 support (kernel 2.5/2.6)
        epatch "${FILESDIR}"/${PN}-2.12i-nfsv4.patch
@@ -88,11 +88,6 @@ src_unpack() {
        # ignore managed/kudzu options #70873
        epatch "${FILESDIR}"/${PN}-2.12i-ignore-managed.patch
 
-       # Allow util-linux to be built with -fPIC
-       # XXX: this needs to be punted as the error is in the
-       #      syscall macro which is part of linux-headers
-       epatch "${FILESDIR}"/${PN}-2.12i-pic.patch
-
        # swapon gets confused by symlinks in /dev #69162
        epatch "${FILESDIR}"/${PN}-2.12p-swapon-check-symlinks.patch
 
@@ -160,8 +155,9 @@ src_install() {
        if use old-crypt ; then
                cd "${OLD_CRYPT_P}"/mount
                into /
-               newsbin mount mount-old-crypt || die
-               newsbin losetup losetup-old-crypt || die
+               newbin mount mount-old-crypt || die
+               newbin losetup losetup-old-crypt || die
+               fperms 4711 /bin/{mount,losetup}-old-crypt
        fi
 }