Fix patch

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 13 insertions, 8 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 1ba6ef2536d8..e88f2b9689df 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.142 2009/09/03 17:53:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.143 2009/09/03 20:19:18 dertobi123 Exp $
+
+  03 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  cyrus-imapd-2.3.14-r3.ebuild, +files/cyrus-imapd-2.3.14-bug283596-2.patch,
+  -files/cyrus-imapd-2.3.14-bug283596.patch:
+  Fix patch
 
 *cyrus-imapd-2.3.14-r3 (03 Sep 2009)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 8ae3984788c2..3468e461cc2b 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,6 +1,6 @@
 AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
 AUX cyrus-imapd-2.3.14-add-db47-support.patch 805 RMD160 18acd706ecdb14e8dc8713e1b66140fa13c65927 SHA1 e0008e89c924edb0f66587f2a312a06385a9a335 SHA256 09b275e21999355fea14ee173c9360658c02854b492c532b4bc58d301c387132
-AUX cyrus-imapd-2.3.14-bug283596.patch 2948 RMD160 4e404b1739f865edbc8358498a5899d3326f459e SHA1 0210e98a90420b2c0972890d64828a902a9bd6a5 SHA256 ea40b59dd2e644151bff03799ec9fd2ef76c40b89b5def74193cc0f4859919a1
+AUX cyrus-imapd-2.3.14-bug283596-2.patch 2888 RMD160 668bb8caa2768fab0670818267d447d8dfd2ca74 SHA1 13dabf135e80283cf7fc0b59dc7978cdef097105 SHA256 bf231f56605b3d9da4ef591765a097d2cad558dc06b466e8df856934a32797ff
 AUX cyrus-imapd-2.3.14-fix-db-rpath.patch 3212 RMD160 f594023539f679df4f3eecbce20a65a73c460798 SHA1 bace3014a88b0d2b2daad2b3c7580196f9db953b SHA256 74b4cef7ecc2fe58bc448b88f0ed8e138c77a8870aa64bddca66a5ce96680486
 AUX cyrus-imapd-parallel.patch 256 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c SHA1 8f4a7cbf91652354681e81e5c31f53728273a1c9 SHA256 adc6d031f2e9f547b192b36685d7873fdb5c5cb690e951b173fdcd55163cc68c
 AUX cyrus-imapd-strip.patch 527 RMD160 83dda22c91798715c7790c3964705b60edeab904 SHA1 624635c7a3dd17e0d3ed84c2c7b07fe042d54cc0 SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18
@@ -24,7 +24,7 @@ AUX kolab/2.3.14/Logging.patch 1880 RMD160 a69ccc5fba3e200c5cf4bd91c22b5a7e97130
 AUX kolab/2.3.14/UID.patch 4328 RMD160 24a8e27218923e4284815439c889c208fbfc8be0 SHA1 e8a532d5f0462b07a90ff55f750ed313ec50141c SHA256 725a753fe877fb0bf257ef6968e64f15ad8758fbe9993dab310c0bbfb0b2c1b9
 AUX kolab/2.3.14/timsieved_starttls-sendcaps.patch 849 RMD160 88fd0aff780cd21f61b7e1ffd8dcc7321fd1f6cd SHA1 f543dbaae4af33913f5247fadfdcd5cc34f3c96b SHA256 f4706fd7a09a95371b62ffe6651d2ac4d1c4105f4d66c5d4eb7b44593cec5814
 DIST cyrus-imapd-2.3.14.tar.gz 2348808 RMD160 03fd8bdef669786f58ddf8b3fa0e0a57b2ee6b69 SHA1 cf046e2399b5ae84c654c6ab04eb047341d93002 SHA256 fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
-EBUILD cyrus-imapd-2.3.14-r3.ebuild 8161 RMD160 d94c721c1237ffb00bea7e4b6bf2c9dbaebaaf23 SHA1 a34dcd624330e6d8c25ccdbbbc5582712e0db45d SHA256 be536d525f5d33658b66bf03e5523bdac3c4fac0c1ef0709185bffc3217023f2
+EBUILD cyrus-imapd-2.3.14-r3.ebuild 8163 RMD160 cf037db941480c591b2608a83fe07cd98a9011ed SHA1 c140797302ffd5c52b8d8aad6b4a4cecff1d512a SHA256 f795a5fcb1756d21ba3677f1c59f76fcd38f0a5c6e4d5c71a33a2aed6e57a167
 EBUILD cyrus-imapd-2.3.14.ebuild 7396 RMD160 aa8db8f452f048e9db056062e524f6afcc09059b SHA1 20f2d7ef78caf7a883473780d07049b089d6bdf6 SHA256 088d29ea46912afc31bf06f213fcdd8fb585423e45e64b42f3d0ef697337c12f
-MISC ChangeLog 28280 RMD160 5b2ef743fb732b6bfdf223a75af77c0d2eb4c6d7 SHA1 05b87f7a5a9ca5fe67e85ff817cd92c4f23a6bd4 SHA256 65d44bdb92586b942fba41e796d72bd3fd6fdd5f546f84e8f71313830c50ed10
+MISC ChangeLog 28471 RMD160 893027ee61ca8710bf0adee403a1d494b78e0152 SHA1 78a1c60b73366b9c63d94c0f4c42e7c3246ed9ba SHA256 7ce767d94dcd788582e90b461b29b9dd546c4590c8191509a195ae2090ce4d53
 MISC metadata.xml 530 RMD160 4b85a3b38cdb914534cfcaa71ca2f4fae9008877 SHA1 c2c1e1fbd96b1cef19f8726df8be134be0486d1e SHA256 1fc6c39dad8d48c120738b017aab2e874f5c774169082e555a60c0f82b31ee02
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
index 67ed343f20e4..fcbf852048b9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild,v 1.2 2009/09/03 20:19:18 dertobi123 Exp $
 
 EAPI=1
 
@@ -107,7 +107,7 @@ src_unpack() {
 	# Fix prestripped binaries
 	epatch "${FILESDIR}/${PN}-strip.patch"
 
-	epatch "${FILESDIR}/${P}-bug283596.patch"
+	epatch "${FILESDIR}/${P}-bug283596-2.patch"
 
 	if use kolab ; then
 		EPATCH_SOURCE="${FILESDIR}/kolab/${PV}" EPATCH_SUFFIX="patch" \
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch
index 12beb841cf01..a223fe41dace 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch
@@ -4,8 +4,8 @@
   * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
-- * $Id: cyrus-imapd-2.3.14-bug283596.patch,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $
-+ * $Id: cyrus-imapd-2.3.14-bug283596.patch,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $
+- * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $
++ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $
   */
  
  #ifdef HAVE_CONFIG_H