- bug #108988 fdisk is unable to always lseek when omiting frame pointers

Package-Manager: portage-2.0.53_rc5

5 files changed, 239 insertions, 36 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index ddb82cf629e6..3adc5a0efd52 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.123 2005/10/05 00:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.124 2005/10/15 15:42:58 solar Exp $
+
+*util-linux-2.12r-r1 (15 Oct 2005)
+
+  15 Oct 2005; <solar.@gentoo.org>
+  +files/util-linux-2.12r-fdisk-frame-pointers.patch,
+  +util-linux-2.12r-r1.ebuild:
+  - bug #108988 fdisk is unable to always lseek when omiting frame pointers
 
 *util-linux-2.12r (05 Oct 2005)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 73899b595c9b..d23a40da944a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,49 +1,54 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 0fa072288048ab73c7da495402392575 util-linux-2.12r.ebuild 5546
-MD5 5caff498045d46b5ee7afbb9aad0a357 util-linux-2.12q-r3.ebuild 5853
-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
-MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875
-MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
-MD5 f182d2c3c90cdc74c816a4656a8f3bbf files/util-linux-2.12q-update_mtab-fixes.patch 2636
-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 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 49b60453751eddd960be9f59881eadc8 ChangeLog 21027
+MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505
+MD5 d20405e12353610b3ef8fbc2e1d57f2a files/crypto-loop.initd 1625
+MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156
 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 3f20c16ba5d68bfe7518f72d771170ce files/digest-util-linux-2.12r 292
+MD5 a1e7cbf002a6dd8bb39f2f533a3807a4 files/digest-util-linux-2.12r-r1 292
+MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
-MD5 99fa2ff2cb56217b6971e76e275923f9 files/util-linux-2.12q-more-fake-checks-v2.patch 1176
-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 202b78b99074c7c91faea44d1de6e1bd files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
-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 a9bc06c292401d6f2d27e8e4ebf7e6ae files/util-linux-2.12i-fat-LABEL-support.patch 2304
+MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
 MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
+MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
+MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
 MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
-MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505
+MD5 9d4c2454a6506ec913d901830ab06a22 files/util-linux-2.12-only-root-can-remount.patch 294
+MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
+MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
+MD5 a9bc06c292401d6f2d27e8e4ebf7e6ae files/util-linux-2.12i-fat-LABEL-support.patch 2304
+MD5 61beee95fb4696a6af11ffb84ddb055c files/util-linux-2.12i-ignore-managed.patch 506
+MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854
+MD5 c9c2c92d7bba0652f22b638127c2107e files/util-linux-2.12i-pic.patch 2457
+MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875
+MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlinks.patch 864
+MD5 bc90959c4718e7dc5d53dcddac1172f5 files/util-linux-2.12q-debian-10cfdisk.patch 1888
 MD5 b360252f16d707f668b605d7a2abb791 files/util-linux-2.12q-dont-umask.patch 439
-MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156
+MD5 570b9b148cbb60ec16de30940990ab53 files/util-linux-2.12q-i18n-update.patch 344
+MD5 99fa2ff2cb56217b6971e76e275923f9 files/util-linux-2.12q-more-fake-checks-v2.patch 1176
+MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239
 MD5 8a13c61b447c1533df4b919cf2646fea files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch 467
+MD5 3708f6eda344a2aa0a4d85d49f69dcee files/util-linux-2.12q-update-mtab-when-moving.patch 1036
+MD5 f182d2c3c90cdc74c816a4656a8f3bbf files/util-linux-2.12q-update_mtab-fixes.patch 2636
+MD5 202b78b99074c7c91faea44d1de6e1bd files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
+MD5 badd26600f4c31ecb524385ea1b7030c files/util-linux-2.12r-fdisk-frame-pointers.patch 355
+MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 5497e9050dc8cde95a0e015edcd59c81 util-linux-2.12i-r1.ebuild 3960
+MD5 5caff498045d46b5ee7afbb9aad0a357 util-linux-2.12q-r3.ebuild 5853
+MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785
+MD5 61496c2ccd898b689d10b06e01d81c72 util-linux-2.12r-r1.ebuild 5689
+MD5 0fa072288048ab73c7da495402392575 util-linux-2.12r.ebuild 5546
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDQxm6gIKl8Uu19MoRAgjEAJ4yFDMXw2hBsbEZpUArv+U0KRTL9wCbB5kn
-JVWtG/4fY8TJ1dhj2pU/0x4=
-=sUZ+
+iQCVAwUBQ1EjWJ4WFLgrx1GWAQIR3wP+NKQKMVpPtLz5f3L+dMosj2EL+vaiv2U5
+ReSl+b/xGAHdzWq6z/lhgwmi5svHkHH8Y7hi3pIAWzjujkgV9Nh7oYB1zG8TSML2
+fq0rnQj1HVo16OR8hzDqRcIvowHhGb0O/K/lR5lBZDPBOQCunHaElOv29IL80Avr
+Vqthij2xjZ8=
+=sUj2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12r-r1 b/sys-apps/util-linux/files/digest-util-linux-2.12r-r1
new file mode 100644
index 000000000000..0cc9d98a8dd3
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12r-r1
@@ -0,0 +1,4 @@
+MD5 ab453b8d81bd36d5e56e391ee36ec5d6 loop-AES-v3.1b.tar.bz2 167804
+MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
+MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468
+MD5 c261230b27fc0fbcc287c76884caf2d3 util-linux-2.12r.tar.gz 1992725
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-fdisk-frame-pointers.patch b/sys-apps/util-linux/files/util-linux-2.12r-fdisk-frame-pointers.patch
new file mode 100644
index 000000000000..1ad291665003
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12r-fdisk-frame-pointers.patch
@@ -0,0 +1,12 @@
+--- fdisk/Makefile.orig	2005-10-15 14:30:56.000000000 +0000
++++ fdisk/Makefile	2005-10-15 14:33:02.000000000 +0000
+@@ -6,6 +6,9 @@
+ include ../make_include
+ include ../MCONFIG
+ 
++# fdisk when built with ssp and omiting -fomit-frame-pointer causes fdisk/cfdisk/sfdisk to not see the device
++CFLAGS += -fno-omit-frame-pointer
++
+ MAN8=
+ SBIN=
+ CFDISK=cfdisk
diff --git a/sys-apps/util-linux/util-linux-2.12r-r1.ebuild b/sys-apps/util-linux/util-linux-2.12r-r1.ebuild
new file mode 100644
index 000000000000..fb46bd42d677
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.12r-r1.ebuild
@@ -0,0 +1,175 @@
+# 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.12r-r1.ebuild,v 1.1 2005/10/15 15:42:58 solar Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+OLD_CRYPT_VER=2.12i
+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
+	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 ~m68k ~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}"
+		ewarn "You should update your system as USE=old-crypt"
+		ewarn "support will be dropped in future versions."
+		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` #104697
+	epatch "${FILESDIR}"/${PN}-2.12q-update-mtab-when-moving.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
+
+	# 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.
+	epatch "${FILESDIR}"/${PN}-2.11z-agetty-domainname-option.patch
+
+	# Fix french translation typo #75693
+	epatch "${FILESDIR}"/${PN}-2.12q-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
+
+	# 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
+
+	# Bug #108988 unable to always seek when omiting frame pointers 
+	epatch "${FILESDIR}"/${PN}-2.12r-fdisk-frame-pointers.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 /
+		newbin mount mount-old-crypt || die
+		newbin losetup losetup-old-crypt || die
+		fperms 4711 /bin/{mount,losetup}-old-crypt
+	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
+}