Update loop-aes patch from upstream #228691.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25 x86_64

4 files changed, 20 insertions, 15 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 2bde2f221ed4..57f0589ad789 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 AUX man-pages-2.08-updates.patch 351 RMD160 090c1d31d4589fa19f8cb7e287a84f4f18e612e1 SHA1 d0092cdc98bc4326c7b9deffbeb9fd4666635f3b SHA256 c1302276b420acf3d9447cb3436ee2b70567b92917d7cf912c59f622086d1e37
-DIST man-pages-2.79.tar.bz2 1871509 RMD160 034d3faac4d630ec2fcbe94669aaae7c8a1f1c70 SHA1 3faab2c76dc15a0d2f2d2d738a259b4cdd6d0eb8 SHA256 e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135
 DIST man-pages-2.80.tar.bz2 1876442 RMD160 2a2774bd95078c0df679caa07e2f84934adba79c SHA1 e5d6308ed3097d7a7938cf65ecf5d745be889ef3 SHA256 571f067aac972cf59ace23af1a87ad4e51ed0fde75f2df1da34dd754649ff642
 DIST man-pages-3.00.tar.bz2 897769 RMD160 246ac1a068633e83552fa30334bcd8ae8d1ae928 SHA1 72283ade835e1fe3c5d20916a04dfe6d5e625119 SHA256 7cc88feb4416f2d9bf16ed784bde8c1d4562903116afd10fbc31abcd0e5524cd
-EBUILD man-pages-2.79.ebuild 1573 RMD160 d6875fb79302432324b2a3246e359fff96efa734 SHA1 02fa23f1f846be5c4bc3aec7eaf8d8d0d33498ff SHA256 2d328bf355b01689385b5da42c0eeeb01548f35f70e3ae17118f271da8a070e2
+DIST man-pages-3.01.tar.bz2 920410 RMD160 3bb2d58854fa72cc1637c8c6a4ea0cf6ce03be90 SHA1 04292475b8bc4a22597377113e933761c744e786 SHA256 900eeb3be797a8ab1120af29c3fd78c460133a798b0849e26d477e212120a0f6
 EBUILD man-pages-2.80.ebuild 1573 RMD160 c023895f5c2dcee67780ce71fa9d1e25d4382dba SHA1 61b21bbc881f0208e73341c1df657b22881d5571 SHA256 c21d71f65b4bfbbbb3a97ac69591c19f9fd1d66a00becf89d57edb694ebc38a8
 EBUILD man-pages-3.00.ebuild 1507 RMD160 a1d098b6073925dc9014e80e122a3097971e2785 SHA1 e29f6608393e9e3d491469580b2ba7c215bdb0ca SHA256 817a4b8b61c368c41fe41b4d96cbe44e824a1f8064f5bb2a54e194cf9f5a003c
-MISC ChangeLog 13834 RMD160 330d2a6134b338cef83d5cf9a3e16a265ca56169 SHA1 878cb94846e534ffcdd4b5edf736e34c03c451d5 SHA256 afd74335a72de93e181751a46c4abb4137122f218e8162b8dceba26e2660e900
+EBUILD man-pages-3.01.ebuild 1507 RMD160 44a33b47288a9e4e6cb399cce568b5aa5e399178 SHA1 afff5b6e7b39c9edb06711b17c23dcad6784590d SHA256 53bec0002a64ddf83e3e4625002caeb6e7b896dc121b039f64ba6f7d341a3475
+MISC ChangeLog 13956 RMD160 f1ce3bc4f6f1f1e3fce45083f667b396988a1c41 SHA1 3ed430fe3927f367dadab647b3b2580fc7a75c05 SHA256 975f22fc8a427adffa22af67d0f249355bb3ecd75bee9c08a5fea0a94e9cbc31
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhXp/gACgkQj9hvisErhMIwXwCfaUoV140akro8J9oXNRFCf/Bp
-nR4AoJ0E3tA9PWRxUUZH2hSE7BrtDqbv
-=lsUr
+iEYEARECAAYFAkhmZQAACgkQ67wieSYcaxcB8wCeJncc95RufFabNclbytc5PuwQ
+/SgAnjzj7/h03Svk71XSnw+73aEZ0C/c
+=mgG4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index fc17f5e76ecc..9946a1866b88 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.240 2008/06/21 04:46:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.241 2008/06/28 16:19:02 vapier Exp $
+
+  28 Jun 2008; Mike Frysinger <vapier@gentoo.org> util-linux-2.14.ebuild:
+  Update loop-aes patch from upstream #228691.
 
 *util-linux-2.14 (21 Jun 2008)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index c514015cdcba..f4ed8e6b6d81 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -37,17 +37,18 @@ DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b6
 DIST util-linux-2.12i.tar.gz 1975468 RMD160 f055a94ad247dc59293f7b933c12bdda135159fc SHA1 deb940cb61d9ae0b481b6469ea496f762a2581a8 SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a
 DIST util-linux-2.12r.tar.bz2 1370907 RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 SHA1 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 DIST util-linux-ng-2.13.1.1.tar.bz2 2829838 RMD160 a9197881ff75214cfdcd9e9aaa372495f4ba0dda SHA1 9eb78ee1fc20ab11712fb58b3bb96c528d918e16 SHA256 5d3739fa2ba45ffffa0c61667a0b767a360be2fefec6b0dd165bab124cea5861
+DIST util-linux-ng-2.14-20080624.diff.bz2 50517 RMD160 c52789be6776e11e16fd3b97d32fa9ed1c3b93b8 SHA1 76d4f50a31cbcb69f3c460b80f7fdb042e9b7ef4 SHA256 21b43909776ebfb15d018fbee2429aa2fa20b4fd629d53c086151072ac2d4b18
 DIST util-linux-ng-2.14.tar.bz2 2868987 RMD160 fec30a2dd4c620f64765a90a9730cc76514fc48d SHA1 54e965ddf5a615cc38057eb7a74840c9a4675983 SHA256 7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
 EBUILD util-linux-2.12r-r8.ebuild 6784 RMD160 c84f893ea67a77fa83a2f04952ae745aaa4dcba4 SHA1 39cb035a05e3437e2a9cd28e4b6d7c0886e9a7b7 SHA256 23cdadb84a007b9560e6d70b0d42d51fca3902712c071790ec0676564c1ce3c0
 EBUILD util-linux-2.13.1.1.ebuild 2556 RMD160 d978885e3991f0fc3ad8c644dd18729a5e64e221 SHA1 88290c8a81bf5224857721d44bc0468ffb0a1538 SHA256 521ab0e1579b99e4f12cc371b2738744a7a2e4d94e4053c1607f1d5a2881ada1
-EBUILD util-linux-2.14.ebuild 2471 RMD160 95e4a4d9b25eab8cb5430c1b23197d06f2875a19 SHA1 3b6830f40e6e94571d51c71a64435a9d8624235d SHA256 28348240db28ae604ef14bc27aecbd9d0242fac4079b6391f28c17b622deeeaa
+EBUILD util-linux-2.14.ebuild 2567 RMD160 390a489ae34505eeaf0d3739c6e98ad6fc209788 SHA1 8a5ad8ef7710badc35c7d351f7c609d91bfb069b SHA256 26eb7c35a3bf48d7c391d67580dec230f4e120836930be5b8054a8de9bda2916
 EBUILD util-linux-9999.ebuild 2115 RMD160 2e24b69651286dc8c751b39c7b43a9cbd6f579ab SHA1 e6d713b5b4e75bf2ede0b4a817789e75a9ef52f7 SHA256 c96b58766ac5e81ca689d2ae3e84cb9252b3129b4ea7f88b15cc2d290b86515f
-MISC ChangeLog 37212 RMD160 aa1628d9c266dc95ce9d0f135031d10dc9322331 SHA1 1edf4889cf105df0ae91326ff760682cbb9172fc SHA256 54ffa69d4026770e41ccaa531f7df7026bbc28e4098dd3f0da41733bec527fde
+MISC ChangeLog 37334 RMD160 93cb92d9cdd1fe86b7e67874721fe08d351951cf SHA1 ee7916b1c1c1abbb03465286e0bd8f1cbde54c89 SHA256 bd4ed55f0b884e03f92e431f1a77c3725085c108dd5a4534d590fcbf978c4f2d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhch6oACgkQ67wieSYcaxeRBgCfRg4WPWsd2gf+cHMIbXfizBOB
-iggAoNTQCf2Z+M6jQY2Gu59RZiDjA57G
-=Hi95
+iEYEARECAAYFAkhmZH0ACgkQ67wieSYcaxcuKACgvSaYnpWs8in2i53yFp44Am20
+xRkAnRo+oFoev0EnPgV9EfQViJq/GND5
+=ZgSM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.14.ebuild b/sys-apps/util-linux/util-linux-2.14.ebuild
index 65bd47de2731..699f4f03f4d9 100644
--- a/sys-apps/util-linux/util-linux-2.14.ebuild
+++ b/sys-apps/util-linux/util-linux-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.14.ebuild,v 1.1 2008/06/21 04:46:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.14.ebuild,v 1.2 2008/06/28 16:19:02 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )"
+		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14-20080624.diff.bz2 )"
+#		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )"
 fi
 
 LICENSE="GPL-2"
@@ -43,7 +44,7 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
-		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-*.diff
+		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-2.14-20080624.diff
 		epatch "${FILESDIR}"/${PN}-2.13.1-no-a.out.patch #221939
 	fi
 }