summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/util-linux/ChangeLog7
-rw-r--r--sys-apps/util-linux/Manifest15
-rw-r--r--sys-apps/util-linux/util-linux-2.17.ebuild6
3 files changed, 12 insertions, 16 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 372c723423eb..153b24a6bcf8 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.293 2010/01/08 09:55:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.294 2010/01/23 10:07:38 ssuominen Exp $
+
+ 23 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+ util-linux-2.17.ebuild:
+ Update loop-aes patch to upstream SRC_URI wrt #300869, thanks to James
+ Ausmus and others.
*util-linux-2.17 (08 Jan 2010)
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 1083b144c303..ed822fee5bd5 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch 1790 RMD160 2f9f49edb7b3f654af01c7de72284b7bf1cd431c SHA1 285db975b2e6c98e876302b2c1397f4c734bf1e9 SHA256 3568943453f765bc246eb05cdcc8269f79f8de0feaabc6539d2e6759b4ed9d49
AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
@@ -22,20 +19,14 @@ DIST util-linux-ng-2.16-20090725.diff.bz2 57349 RMD160 ad172122dfd7ab9001f18335a
DIST util-linux-ng-2.16.1.tar.bz2 3489006 RMD160 1531884c047ab2d799ddb1f8b8fcc89284fa6399 SHA1 53ba63988a82e8e3a71c96df5488959617e2a3ed SHA256 8f9fd83144f35dbd57d53eea914acd6dfad54b414ded0723f6efe06b3a167f36
DIST util-linux-ng-2.16.2.tar.bz2 3521956 RMD160 8c27748d804ad00efb153bf62f8c74756413888b SHA1 ace7a87ea61154210d9a11dd66b1b49d8130a828 SHA256 b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
DIST util-linux-ng-2.16.tar.bz2 3470040 RMD160 bb704fc0fdeaee2cc64abf239dfb22a7b6c8e291 SHA1 8d39c85337f8aa97cce23fefe4414335b1f79d97 SHA256 a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
+DIST util-linux-ng-2.17-20100120.diff.bz2 57932 RMD160 5525da9a83d0134b1e59e14e25b3c1a212acaa78 SHA1 e7cf9c9160fb81c099987d71971a35c3c94f8cdf SHA256 7ea15a8f3aa5c2c4073449f64ef3b1db898d81d583eb04718615fca160c57443
DIST util-linux-ng-2.17.tar.bz2 3767857 RMD160 adedfb12e415b5e48067c579ada4b6a9317e72dd SHA1 3be54ede41d0aff87a717a0d75c8f3c0171f85f6 SHA256 8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3
EBUILD util-linux-2.14.2.ebuild 2960 RMD160 bb86a67ebe82888e5f0e9917463f280729c03952 SHA1 eecccb3d0059756fd79d38c00ded2357c59ce834 SHA256 e36620d0c48b56c71c7c08b6034f4b3f600619e3f9956bcfd8dbccd19a94aff8
EBUILD util-linux-2.15.1.ebuild 2611 RMD160 47356112e60c06cebe6ac1dbaa8044c7c478acc8 SHA1 1c3510c2e37697ad1250e583aabfd04dadca4aa3 SHA256 b7285a7b88833ed06b5f52412eae67bc9347b23469f73d2c5fa64a51f2fdae0b
EBUILD util-linux-2.16-r1.ebuild 2511 RMD160 6ad4dc42e6eeee38e58ee9987b52adf51d28c4ec SHA1 eb8bb2227defc66536e4294db53cd822ad5678cd SHA256 d12a8f68cd739f51d88aa7a19dc794f338ba06d1dbf2e95513f5debbfddca21a
EBUILD util-linux-2.16.1.ebuild 2579 RMD160 a3634e859af22b6231d1e024d226529e5e9e99be SHA1 e7ca1f320f52d3c713e382923c8663954b057617 SHA256 438b76c9003f643950b7d16da81b97f4423876d46e6832ac982aa30da56c6a38
EBUILD util-linux-2.16.2.ebuild 2623 RMD160 68ec813220a0e4bfdab924c9b8fca97cb1b193ce SHA1 f8bea18827f6f60daa72201212c442511d3aa4d3 SHA256 1ab9e2de779929559d803807d9b1a30a14a80da729189339bb816e4557dd4ca1
-EBUILD util-linux-2.17.ebuild 2622 RMD160 fe6ca7b2ff0c924d7a67f36efedf1c594927b49f SHA1 0cd1df2809cd8b6cdf42498ddf0b082613684735 SHA256 222a8e095ccdaded531337837289e267ad9ef34c1bb2046a939078e53ba5152c
+EBUILD util-linux-2.17.ebuild 2630 RMD160 699e758f0d33872a873c5172ed5cf2ca7bf4af3c SHA1 512eeda6b7178e39246b1738790146412d894442 SHA256 f01102e7fe9016cad08b899219e0de1bfad4d07aaaaec7b5c8e923ed56476dac
EBUILD util-linux-9999.ebuild 2630 RMD160 5d43edb79aee7b5ee9007f34ade094f28bbc59f4 SHA1 de01bb30e5a93fdd79c3120ac06105b1c2627944 SHA256 d20f9093ac903a641831c5aff4725b9523205faec28aeb70861a4c6707bfa692
-MISC ChangeLog 44893 RMD160 568bc300ed84b33436cc8f84f74d7da9326b8a3d SHA1 64f7ec5d6981eec6b807981df969e1718f8965f8 SHA256 7aa7ec0e605e5ddd67ae11f4f96449227c356778162919b66c17ca2cf6b2fdae
+MISC ChangeLog 45071 RMD160 201056f0244a831650de14d9492beb6672249e3e SHA1 53f080077bb4ddfc39897932345a5de7ebf9419d SHA256 a7b8911180b1fc426103665c2b83c94d1bf55a117b2d8e1f30655b3add92f36a
MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAktHAPkACgkQTwhj9JtAlp5gsQD/Z+tdxHh3d/sT86Bsgp7s3iqX
-JMrS+8cMN5VGv1d3xcoBAIT8vGSz6NNHKJilFkFBMQLDLfh07VDwGfhA3PpaNi5U
-=BCNZ
------END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.17.ebuild b/sys-apps/util-linux/util-linux-2.17.ebuild
index 1fbeada93285..c789dd5c7d58 100644
--- a/sys-apps/util-linux/util-linux-2.17.ebuild
+++ b/sys-apps/util-linux/util-linux-2.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.17.ebuild,v 1.1 2010/01/08 09:55:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.17.ebuild,v 1.2 2010/01/23 10:07:38 ssuominen Exp $
EAPI="2"
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
- loop-aes? ( http://dev.gentoo.org/~ssuominen/${PN}-2.16.1-loop-aes.patch.bz2 )"
+ loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17-20100120.diff.bz2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
@@ -44,7 +44,7 @@ src_prepare() {
autopoint --force
eautoreconf
else
- use loop-aes && epatch "${WORKDIR}"/${PN}-2.16.1-loop-aes.patch
+ use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
fi
use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
elibtoolize