Version bump, as requested by Samuli Suominen in bug #472342. To confirm, this has the commits to fix the losetup offset bug reported by Andreas Klauer.

Package-Manager: portage-2.1.12.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 134 insertions, 17 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index ad4098a91bfe..9f733a4b53a9 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.431 2013/06/05 00:35:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.432 2013/06/11 20:58:47 chainsaw Exp $
+
+*util-linux-2.23.1 (11 Jun 2013)
+
+  11 Jun 2013; Tony Vroon <chainsaw@gentoo.org> +util-linux-2.23.1.ebuild:
+  Version bump, as requested by Samuli Suominen in bug #472342. To confirm,
+  this has the commits to fix the losetup offset bug reported by Andreas
+  Klauer.
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3b857d89fa37..868748833e17 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -23,6 +23,7 @@ DIST util-linux-2.21.tar.xz 2954504 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb
 DIST util-linux-2.22.1.tar.xz 3194800 SHA256 c6de9f59882d7adedc2d2e7fdb940e8cdb256080491f632cabe7edde5764d82f SHA512 c19a71a0a3e1edb6e8bba86b3393dd0ce88c001f5c725e8fe99ae227895dfda627bd81ca5cb74e2ed1e1b33e0e7029a8955e1b0f32602d05564ccbf49829501f WHIRLPOOL 8cff22c01d0dfe23e37c265bf03f1ade95d151179dc35ee1a0b9bb0a59e45b7d87bdfd12ce71580b90e548757262e2f70ab13beecb23f42e2d8a32ed53e4d4ee
 DIST util-linux-2.22.2.tar.xz 3100832 SHA256 929b517fa39b16a61ec536514e08940a381b92befc629d0348e3097920dd2f12 SHA512 4b6ae8e6091f4f3c21c1b1d361660767380c4965e40e2222724122b60cc1be1b10149b86f2559b3b72f42675fb790bc3ea86e159233d00c44ee39ec9373317c1 WHIRLPOOL 2e784e92abf4a055c6f0bf55914b0a17d21ac370eb30df2b6d68c0521743ec5306603d9ec60ac0bee75c51f20b2ca8cd76cdccf6256e5098ec42f16359a8b5d7
 DIST util-linux-2.22.tar.xz 3183868 SHA256 32b329aa72c2ea546378bf81f08e30cf30440196c2edf7777b4f509a3fdbe5a2 SHA512 575905498edba18475e71d93613ba3579f69e61d18038c6b677eecb0ab7ce1e1cc4f1a2b16783d92239a626187ccb6723e8508a2e8a61dc7b50f2be66e5fd543 WHIRLPOOL 11eda802e1b9c459826bb5cb2509ad4d81a4278480f62edb31c2f47ea804138c67066d27be76fedcac7f14b82721f92961eb5a9496b9c969776a1de2aa81f8bd
+DIST util-linux-2.23.1.tar.xz 3368432 SHA256 76fe4c11cf69f4293a676a61eb92710771f7514fd603d7192411b89bbf50d4e6 SHA512 bbe3cb82c35a78331067ce098396acabf83599d7061e3b8ddc063411327dca8ba0ba4e1b258a25d6a37a124342f381dd77c7e70c04adb508f6ddc18e437cd73f WHIRLPOOL 94fbd667b7a0a149953e201965034daac088e9c7036314bd11d51f6872e3e97b1aa843b479a2fef69e8c5e15d0ee940440a4f45ae775bbabea30abf1bbc0b2d9
 DIST util-linux-2.23.tar.xz 3320020 SHA256 b19b25b7cdb16ed3decc2228788193629e5bc912f042e66d0308616c44671531 SHA512 442b300dbccd0035b211af3b5105951d6361efea506e3170677d76089a17767e33d114ba43de8227d6b9ccfe2cb54224ea0291cb7f782fa0709e89c6895b3892 WHIRLPOOL 54f28488dceae59e498ead767e8ddf5d122688e0427b35bc4fd0a90e3ad6c2ba90da86f9606ea476cc9419621b3dcc37e3c282be6d74c283cf10e97f7235267e
 EBUILD util-linux-2.19.1-r1.ebuild 3585 SHA256 1620da88a7e8bf090f2356d3d43ac6f280d9cedd165e144a4ba0ecee14872859 SHA512 1587c57f414eeb15d547e60e32b35e0411882dcac42ae0ed824349cc178eb73778721c6fbf803c1affe23328373ff46d7ced4dffdd1de8db974d00da43cd6bb7 WHIRLPOOL 836330940023d74355754fc064c47b90728e5a2530e33554abae2d0eaad3c7afd7d942d233f4e38ed6e661d06c762075c91e56005355ab4f33ff80ea936c9e9b
 EBUILD util-linux-2.20-r1.ebuild 3669 SHA256 c932592dbcd7e3b6e493bba111f6d76ad75d28ed3532e6bd1eb57c921fc8622d SHA512 83cf20e566b959fa7edabddc6a3731e00ace7ee8ff0553f2085e3363c5e9bea5beaa10f0ced2706a4aa65257beaea0ea49508542788327ae2418f1348c5fcb8a WHIRLPOOL f4eeda0ff1a0aa2729edbc84243221fec50cb9eba26d349f4aa32454f2931267425d57e6c47195d85f456656ba0ac149ab6180bb19a4346117835a3b320b1306
@@ -35,25 +36,15 @@ EBUILD util-linux-2.21.ebuild 3463 SHA256 10524af8156aa643a6f7525914c96971cbb640
 EBUILD util-linux-2.22.1.ebuild 3163 SHA256 e142c265d715fe8d33dce299ed31dde0906e29c3a4da8232e6df27b36bcb480b SHA512 03befb5575bc40afbff8fa5a9fe7ef67d69a80616b94307716bcf4836c55c498cd2a5e7570a2de939cc4ce095d032bb57a1dbfd1309cce446d081702c4c5318d WHIRLPOOL 16e330454b32f01b1391e59c2e140cea464d137826c79c52073c5df5a031db87f2ee25d1c8b37ac450deacd96d035896be7889dd19e7f4c23efe702836d8b294
 EBUILD util-linux-2.22.2.ebuild 3289 SHA256 5447c9aec9f4a281a0829e3d34f57e48f13eb21e8b3ca2dbd51c302e12416743 SHA512 5dbc3b3a4eb118b21d99b9a2d0d0868a54d70fe6c9b450783b072e765f24240215aa73f4aae9d431796d693efa52d3f8d87e2823505917efaeb50af67d7f57ab WHIRLPOOL d16ce5aeb4d8f693c2aa5c14ae48d9fd70d0aed3dbdfd08426c45cea6b39666654d4dd016ecaf5f8ff5f9d502ac777f606e499b229e5a487f46e8c55cd84594e
 EBUILD util-linux-2.22.ebuild 3147 SHA256 67fa123550783ffe22964256ddbdb927fce64b320a0f67fe0c5ed945cfff3668 SHA512 93ed7ff470dcddf4a15c22b22d7e9bbb716492939fcef6b5e16299f604ce39b3c44154082246f91541fff8f1e375b5015744fc2789d84afad95175317b28bd0b WHIRLPOOL b1ac0d2ddfbe7bdd24c718cfaa735f3703586c38b06d5d0e1885031625e4aaa5842f66f232d70c35a0aec9ce7b4ed6f393c293029a06143e18f389e142cd3238
+EBUILD util-linux-2.23.1.ebuild 3397 SHA256 b7652eb86c0ad48f0970c3ebf491700bd5925d9fa6350f823e867a959b833a6a SHA512 ca9ff9a258539c835fdda4710c71c2eadfc1a8eacc317c60691ec82736485ee7d80affb774bf58ccff4fc8a688b000283761544b113c60673d76537f7462317f WHIRLPOOL e0cc53fe31f6a7db44d485e65d3c9290da10b1194e73359bba96a5f2d00eaf6505fee2c7903f30a6edaed9b4e1404b9a9d043cfd5e77daee1a8cc7b5690ec8aa
 EBUILD util-linux-2.23.ebuild 3393 SHA256 b4a256fb297c657c06b7708848f887a7cc6238ac87b6f1afea990bfc993c3de7 SHA512 9e6081da539ee17ed8f47b5913b22b5cfbbe6689893f2fcc8dc3f69a2e3c19c145ac54227db43b5e56bb5374f63cf625b910f71df953bc974eee3a4439056dbd WHIRLPOOL 0e2b2223c56b278a1d62189e5325171d5846d0b4ce916544600551808ffd9071e12af8ed4d8a2ef412c49f46fcaaabd7a8f19f3b1e705dfee01b5269a2bad4cd
 EBUILD util-linux-9999.ebuild 3394 SHA256 73527a7477126b8742c4ca619c349e5f50ebedfd009cce050f9c172f9050f247 SHA512 bf4715eba8b576b70e1fc20e0df0f302149221a0ec19adb71796871e1a94a612f50e629ef6e61c74335a0fbed12386e9ba8dab04c858889fcd73c7b50912b538 WHIRLPOOL 4533a268dc5e524bca868bb96b59b0d6021e66eb2bb6bc5d0db115cabb8a4899f5b57e0f13b6af6a1193f125e345e6f3b6e0f7f5ffdaef430dc089a4f24b87af
-MISC ChangeLog 66211 SHA256 a32bab1706333b1757eb8e7e06b7e9cdb4e447d13fe3c1480f92b031de4f4c45 SHA512 e4a6d75c2458159ed1d703aaedcaf7da98158895436fb559b1354bce899956f683aa1c5866f3d238236b375cf42fede8cb13282536c0501c741bff3b5e52e9e8 WHIRLPOOL c3dee97cc06229fb9cdc8e5d613759619983525ee265bddff59af74e6e6e3dd839f236e8abafbb90c95d3bdf58c863f506986fe2b1568235adeda6db580e94c5
+MISC ChangeLog 66482 SHA256 e87aaa98106a092767dd08020f662f4c03e649be0fbf6c3011d5fcb8f132cf4b SHA512 8e5bc75205a846637a8eb316098e9c3db33db522a583ef40f47449151a761fe92c8c00cf0a477c22ccd1134fa1e265ca4f7c48a10adffc859896eca8c7d754d4 WHIRLPOOL a3478ae566c4b7cf3ce83aa207ba4195469daebe9995e5cd2c164001eeedd2c389f8f26817082609b1743de17b6d4e825bb609cdca36799b7c2971c862c037b1
 MISC metadata.xml 1043 SHA256 5f87995cffbbf75bf971619094abf33f4b41ec04127960d30e3a7ce670e95fc1 SHA512 68bbb4efb492c6476a4df2943acc17d12fbeb4d92c9f073ee9336e64bd0c9992ed67fc766685a669e00f6731af04ac65b7241728cb2c38cebeb9870c54ea417d WHIRLPOOL 21b5b709760b43acc6315565fb4fd9a3a3a058cb9bedf2c0f7fbac32508b03a35b1ca22ab3d56d410b623b42a406ffde28d8346985d3c4001fc4893cfb50c3ac
-MISC metadata.xml.orig 1079 SHA256 68e6c0bc2a127e5f7595d93a1f83abde357e911d4e92b61272e20fb38491bd18 SHA512 16ebf2ea38d79d21a94328d7d415e9751d9e1a56249a32ed6bab1b85c9b177f7d78ed9d9d937a8d8249d3d3cd51f39355b16d929049d214bb9e54656db91df30 WHIRLPOOL 4af098ee9a00f9c564f48dad2313f2e5bb41ac3fe5c6b097639584cf7109dda17460a1fed537c49c626d5fe24a9161a0fc9530b8849fc41d939e3f59921067c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrofMAAoJELEHsLL7fEFWYO4QAK1Dqc055l7rQPhHYYyFDjQ/
-drS8CUtUtLL/J54w/mtF4c8wgaYNyCsNw5EIy47AjCE9sDprWN6kpEB/oJs9n6ns
-YPoXdwSpFszsjr9HMVE8aGJTzOP7n56mbnaxiynGl/SVDTFL4l0RChOcVzG/k08X
-cbvXwDlbPary1EMnazZAOQiX1q0hmvxRvkxaS13LhQZ0p4ahvMIvZWo3B+xHqMur
-QhgarwAgiksl2XLETg8YxR1WNnKpZfx80mzoPClVrGhl6GN+UDWPhWFWtlE99U9A
-am7I8B4Sgo5PkefRNNnlDEvwelcTAVPVUy0jmQ1Z3ohxC4o6HiBT+67LrrRkHiIR
-Nzhk2ACAgjCT3kmGRC+cQa7dj+M/4xn8OtdhbIoOHrVInpZKYpaEZyAjbLS1daWU
-6B70u8xVsQqY0lXp2/oFzysBQVZlLc7g+1lC1ncsXcm6FgzcTdj2cH5NetuEq/jj
-hlkNdmGuM9mxXYJRIBMLarWsDAAK0nFw9XI67Oy8um0R/mABo9DlLOlbVWvY6SYe
-8K4G6MjcgM0dvsMBg3/8w90YnCgBoqPETXSuLfFFNUsKdi4m2e16wlos7YHcfO9P
-+rRYwUgJlrSOPQPHuraz2kCNWbDojJkc2f3M6DvRv4spOIXFy1jLTVxPc1gxzvk1
-5Z1b6cHxbxaGnZyevlGP
-=Q7Mc
+iEYEAREIAAYFAlG3kC4ACgkQp5vW4rUFj5ozMwCgkpyadAyyPrmNYdN4rqTBbPIz
+u7MAoLP574/1i8mg5g97YbavvurjIyOK
+=8WVj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.23.1.ebuild b/sys-apps/util-linux/util-linux-2.23.1.ebuild
new file mode 100644
index 000000000000..204ff84dfc67
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.23.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 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.23.1.ebuild,v 1.1 2013/06/11 20:58:47 chainsaw Exp $
+
+EAPI="3"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+inherit eutils toolchain-funcs libtool flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+	#KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test tty-helpers udev unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r5
+	!sys-block/eject
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-1.3-r2
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )
+	udev? ( virtual/udev )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.c
+	#define _GNU_SOURCE
+	#include <fcntl.h>
+	main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.c
+}
+
+src_configure() {
+	lfs_fallocate_test
+	econf \
+		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
+		$(use_enable nls) \
+		--enable-agetty \
+		--with-bashcompletiondir='${datarootdir}/bash-completion' \
+		$(use_enable bash-completion) \
+		$(use_enable caps setpriv) \
+		$(use_enable cramfs) \
+		$(use_enable cytune) \
+		$(use_enable fdformat) \
+		$(use_enable old-linux elvtune) \
+		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
+		--disable-kill \
+		--disable-last \
+		--disable-login \
+		$(use_enable tty-helpers mesg) \
+		--enable-partx \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--enable-schedutils \
+		--disable-su \
+		$(use_enable tty-helpers wall) \
+		$(use_enable tty-helpers write) \
+		$(use_enable suid makeinstall-chown) \
+		$(use_enable suid makeinstall-setuid) \
+		$(use_with selinux) \
+		$(use_with slang) \
+		$(use_enable static-libs static) \
+		$(use_with udev) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# need the libs in /
+	gen_usr_ldscript -a blkid mount uuid
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	elog "The agetty util now clears the terminal by default.  You"
+	elog "might want to add --noclear to your /etc/inittab lines."
+}