security patch failed to apply if USE="-nls". Bug #136773.

Package-Manager: portage-2.1

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index a8e52de8ac8e30dc6a3f3eefb0e7205d813d664f..204fce0fa08fc4a56d2e54f5c9ae9309695127f1 100644 (file)
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.56 2006/06/15 00:16:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.57 2006/06/15 21:25:09 langthang Exp $
+
+  15 Jun 2006; Tuấn Văn <langthang@gentoo.org>
+  squirrelmail-1.4.6-r3.ebuild:
+  security patch failed to apply if USE="-nls". Bug #136773.
 
   15 Jun 2006; Jason Wever <weeve@gentoo.org> squirrelmail-1.4.6-r3.ebuild:
   Stable on SPARC wrt security bug #135921.

diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index c3207c01880674511ae276396abcd9c8878bc5be..cc57acbef7c87d2d78b8be44a27131595ed8193d 100644 (file)
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ldapuserdata-0.4-gentoo.patch 709 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 SHA1 99f5dd6f4e9666d6d3915c3e52c2694d1dc06a9e SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 files/ldapuserdata-0.4-gentoo.patch 709
@@ -32,10 +35,10 @@ EBUILD squirrelmail-1.4.6-r2.ebuild 5657 RMD160 4e0c21570c704c302b8b41e7c10b9856
 MD5 7cac96a276a81a7ada66762b6c25efe5 squirrelmail-1.4.6-r2.ebuild 5657
 RMD160 4e0c21570c704c302b8b41e7c10b9856f1107708 squirrelmail-1.4.6-r2.ebuild 5657
 SHA256 2b2cf9e00aad4d62f7388402690628f7b88230d955b5a3ecbe607ac2215b7e2a squirrelmail-1.4.6-r2.ebuild 5657
-EBUILD squirrelmail-1.4.6-r3.ebuild 5728 RMD160 0281b9498a23d39b22a6bc2e918426618edde352 SHA1 aef760a9f52436022a629eec85ee743e5dc5d6e0 SHA256 78c30d0ffdbfdf37dda44c718922ba0035fd32836ac07d01435c19df0341cfc8
-MD5 2c6bb1de92d17e59ebf140a7742602ba squirrelmail-1.4.6-r3.ebuild 5728
-RMD160 0281b9498a23d39b22a6bc2e918426618edde352 squirrelmail-1.4.6-r3.ebuild 5728
-SHA256 78c30d0ffdbfdf37dda44c718922ba0035fd32836ac07d01435c19df0341cfc8 squirrelmail-1.4.6-r3.ebuild 5728
+EBUILD squirrelmail-1.4.6-r3.ebuild 5743 RMD160 a5b71172c1c8605137e072858b1aab81db0b78ac SHA1 0ac6824224df79e01ccab3b9044c452fe2fb76df SHA256 3ce3c692bbc3c68135a7955c86514d1fd9c5f7cd57de926b4e730b699bf31460
+MD5 1008bdd00351dc1a924c229d9e929e36 squirrelmail-1.4.6-r3.ebuild 5743
+RMD160 a5b71172c1c8605137e072858b1aab81db0b78ac squirrelmail-1.4.6-r3.ebuild 5743
+SHA256 3ce3c692bbc3c68135a7955c86514d1fd9c5f7cd57de926b4e730b699bf31460 squirrelmail-1.4.6-r3.ebuild 5743
 EBUILD squirrelmail-1.4.6.ebuild 5473 RMD160 314f04a3e8627fa7f40366a34757e9052a16d878 SHA1 25cbaab75f1d824f2add6735b77574fddb5e0370 SHA256 5c8739ce5b0f1fe2dde15a6ef961c6f06375d387b60c22838d5fee036747f9eb
 MD5 588992d86d51214c78b2734b356fa800 squirrelmail-1.4.6.ebuild 5473
 RMD160 314f04a3e8627fa7f40366a34757e9052a16d878 squirrelmail-1.4.6.ebuild 5473
@@ -44,10 +47,10 @@ EBUILD squirrelmail-1.5.1-r1.ebuild 4933 RMD160 3f9640895823780b313786eb297d410a
 MD5 928387d90667f9bd44a82832f98b46cc squirrelmail-1.5.1-r1.ebuild 4933
 RMD160 3f9640895823780b313786eb297d410a63cb2114 squirrelmail-1.5.1-r1.ebuild 4933
 SHA256 6dbcf5daedc849d9df6cb35d9843ddbbd586e5000a240d40701a36daced58687 squirrelmail-1.5.1-r1.ebuild 4933
-MISC ChangeLog 16521 RMD160 beeca9be1def8d518b0569cb7fe2aafd7a9f299d SHA1 0c5056c6d2d4df99a03bc66860ba42ae27fe41e8 SHA256 1d58b96f84917b1890ffe174c4f655a809207075c307c58072b7a9c778d2f9f5
-MD5 d6fc0b3c20da8c5e4b31895d4a2b44c5 ChangeLog 16521
-RMD160 beeca9be1def8d518b0569cb7fe2aafd7a9f299d ChangeLog 16521
-SHA256 1d58b96f84917b1890ffe174c4f655a809207075c307c58072b7a9c778d2f9f5 ChangeLog 16521
+MISC ChangeLog 16669 RMD160 bc40708141f1d109f3ae477edf41809ed1c09f2a SHA1 02146d953d2dd60c05186931c3b6810347dab401 SHA256 747a46804c22df37ec69eeca82f21c12986073aaa03e80f25d7a3aef0beee71b
+MD5 a1a09d4a7282d7894d6a0191636fd1a2 ChangeLog 16669
+RMD160 bc40708141f1d109f3ae477edf41809ed1c09f2a ChangeLog 16669
+SHA256 747a46804c22df37ec69eeca82f21c12986073aaa03e80f25d7a3aef0beee71b ChangeLog 16669
 MISC metadata.xml 258 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 SHA1 f969f9d21f42c6347a0509bacb7382b390c10ce8 SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680
 MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 metadata.xml 258
@@ -64,3 +67,10 @@ SHA256 4fc42d52adfcd59d91b6f343f8b01efd81a78a0ed22c68b41ae25efaa02c65e0 files/di
 MD5 10158f243a971cc8a428d8cf28277d6e files/digest-squirrelmail-1.5.1-r1 2620
 RMD160 9554715d0ebf965895727b5a18cb57b092e65376 files/digest-squirrelmail-1.5.1-r1 2620
 SHA256 cffb974aa68e0f7c611ea500a3664b6c781dc3682c645821f0b987a06fbcc20d files/digest-squirrelmail-1.5.1-r1 2620
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEkdBm5FrxP71izLARAr3dAKCs3YWN5uHvBjBtfyK34eYsrubf6gCgha+1
+I8kbSD+lKyzQVAAyUf22RIg=
+=/GxT
+-----END PGP SIGNATURE-----

diff --git a/mail-client/squirrelmail/squirrelmail-1.4.6-r3.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.6-r3.ebuild
index 347cd736d32e474d4cec1e308e3343bef841f189..3cc6be9a33c0b9fc0de75ab8609600bede3dd562 100644 (file)
--- a/mail-client/squirrelmail/squirrelmail-1.4.6-r3.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.6-r3.ebuild,v 1.5 2006/06/15 00:16:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.6-r3.ebuild,v 1.6 2006/06/15 21:25:09 langthang Exp $
 
 IUSE="crypt ldap spell ssl filter mysql postgres nls"
 
@@ -91,6 +91,7 @@ src_unpack() {
                unpack all_locales-${LOCALES_VER}.tar.bz2
 
        # security patch. Bug #135921.
+       cd "${S}"
        epatch "${FILESDIR}"/sec-135921.patch
 }