Fix pre-stripped binaries as reported by Jorge Manuel B. S. Vicetto per bug #187138

Package-Manager: portage-2.1.2.12

7 files changed, 48 insertions, 23 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 111fc41edd15..d19afc87d645 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.104 2007/09/03 19:47:05 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.105 2007/09/07 19:53:24 dertobi123 Exp $
+
+  07 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/cyrus-imapd-strip.patch, cyrus-imapd-2.2.13-r1.ebuild,
+  cyrus-imapd-2.3.9.ebuild:
+  Fix pre-stripped binaries as reported by Jorge Manuel B. S. Vicetto per bug
+  #187138
 
 *cyrus-imapd-2.3.9 (03 Sep 2007)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 7bb8e7c18a9c..c2ca37e883ce 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -50,6 +50,10 @@ AUX cyrus-imapd-parallel.patch 256 RMD160 fa7c53c847c4af9a7c218943be46b136b69f91
 MD5 9e059d45972ef25f2c05753867aa54c5 files/cyrus-imapd-parallel.patch 256
 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c files/cyrus-imapd-parallel.patch 256
 SHA256 adc6d031f2e9f547b192b36685d7873fdb5c5cb690e951b173fdcd55163cc68c files/cyrus-imapd-parallel.patch 256
+AUX cyrus-imapd-strip.patch 527 RMD160 83dda22c91798715c7790c3964705b60edeab904 SHA1 624635c7a3dd17e0d3ed84c2c7b07fe042d54cc0 SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18
+MD5 39e967597f06873c10a001c7316743de files/cyrus-imapd-strip.patch 527
+RMD160 83dda22c91798715c7790c3964705b60edeab904 files/cyrus-imapd-strip.patch 527
+SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18 files/cyrus-imapd-strip.patch 527
 AUX cyrus-imapd-unsupported-8bit.patch 3342 RMD160 b175b6799723c54110880ad93a4ee2795b40f69e SHA1 87303ffa37dd3e48e1a8133ffda87c6e7db6ea6e SHA256 e44ad27b5acf20a9bce95815d5fa25f040eb06870feb87cddf59204f1d8a2867
 MD5 e76f31d728a283bf2dd2fb5b5a853af8 files/cyrus-imapd-unsupported-8bit.patch 3342
 RMD160 b175b6799723c54110880ad93a4ee2795b40f69e files/cyrus-imapd-unsupported-8bit.patch 3342
@@ -96,18 +100,18 @@ EBUILD cyrus-imapd-2.2.12-r6.ebuild 9423 RMD160 3dc7922bb0a189d1aee35feb469ead62
 MD5 d16903ef3c543083650c282e6ce000b3 cyrus-imapd-2.2.12-r6.ebuild 9423
 RMD160 3dc7922bb0a189d1aee35feb469ead6231183b61 cyrus-imapd-2.2.12-r6.ebuild 9423
 SHA256 30afd0cdcba3573aff925325fb4e1a92b8ff0e55934293e511533581e65d7cd0 cyrus-imapd-2.2.12-r6.ebuild 9423
-EBUILD cyrus-imapd-2.2.13-r1.ebuild 9448 RMD160 9b0151ec2eae39759087841917a87a87f084ab82 SHA1 b5dea8cb6228b7d6cd79a407417085a9830afb0b SHA256 244f783e3094e71a1c3333338a6bd4361816cee8e805e3c660c882a15a0b4553
-MD5 fdb824bf276af27f4881095d5566b5ec cyrus-imapd-2.2.13-r1.ebuild 9448
-RMD160 9b0151ec2eae39759087841917a87a87f084ab82 cyrus-imapd-2.2.13-r1.ebuild 9448
-SHA256 244f783e3094e71a1c3333338a6bd4361816cee8e805e3c660c882a15a0b4553 cyrus-imapd-2.2.13-r1.ebuild 9448
-EBUILD cyrus-imapd-2.3.9.ebuild 7856 RMD160 12305de592e767c50fd22a05bd465fbd420eed4b SHA1 47d2946d80dbefffd4575feb0a16bf46d8a035ea SHA256 78aea5e67dbd54be79b121ab7441baf50e93a408120a16ac6a0f0f9dc45f1a32
-MD5 6a808633c5c675005f935386b8395e06 cyrus-imapd-2.3.9.ebuild 7856
-RMD160 12305de592e767c50fd22a05bd465fbd420eed4b cyrus-imapd-2.3.9.ebuild 7856
-SHA256 78aea5e67dbd54be79b121ab7441baf50e93a408120a16ac6a0f0f9dc45f1a32 cyrus-imapd-2.3.9.ebuild 7856
-MISC ChangeLog 20628 RMD160 8addff8b6f284532a45c59a159d74d9c9e9ec586 SHA1 1959b5d6cd96a7537fc57eae9c4cecba03debb5d SHA256 0c55542bc2804b6f0922002fded26e872f55f3e7acea3c63d9d38d1fc3713099
-MD5 88dca3641ec25bcc08056bf9682cb0cc ChangeLog 20628
-RMD160 8addff8b6f284532a45c59a159d74d9c9e9ec586 ChangeLog 20628
-SHA256 0c55542bc2804b6f0922002fded26e872f55f3e7acea3c63d9d38d1fc3713099 ChangeLog 20628
+EBUILD cyrus-imapd-2.2.13-r1.ebuild 9522 RMD160 9b494cd4dc6864fc5b70a630e6e5adafd4692c66 SHA1 1e41fa0c4fd9c4353d3be6eb967f97e46b957aa6 SHA256 504c9c1c6c2068b2ea96df65c0f03db98e5e911e2421bc30de5d8a819cb8a4c3
+MD5 e1281f2e9ac495c17659c13743d6d8e2 cyrus-imapd-2.2.13-r1.ebuild 9522
+RMD160 9b494cd4dc6864fc5b70a630e6e5adafd4692c66 cyrus-imapd-2.2.13-r1.ebuild 9522
+SHA256 504c9c1c6c2068b2ea96df65c0f03db98e5e911e2421bc30de5d8a819cb8a4c3 cyrus-imapd-2.2.13-r1.ebuild 9522
+EBUILD cyrus-imapd-2.3.9.ebuild 7925 RMD160 780a086aebbbf5e52d7fc8896fb933a82d9b980d SHA1 610c75e4718cdea0158efa5ca48c1622f952af08 SHA256 de1427e0aed2287e18457ea3458c9842941a4269ec56b7bccd85b9696c7919ce
+MD5 ddc581c54dc4147c5265770a5b0c578a cyrus-imapd-2.3.9.ebuild 7925
+RMD160 780a086aebbbf5e52d7fc8896fb933a82d9b980d cyrus-imapd-2.3.9.ebuild 7925
+SHA256 de1427e0aed2287e18457ea3458c9842941a4269ec56b7bccd85b9696c7919ce cyrus-imapd-2.3.9.ebuild 7925
+MISC ChangeLog 20865 RMD160 58277d6b363ab3e79dce065e81cab778e607b96c SHA1 cce3903cb78f79694fcc01a1e4e9d7134e4bb121 SHA256 00a162555f3c329db5f50ec1a4dfb59f8c21c83f1704377170292b9a645ed9d5
+MD5 0fd5e9b716417f3bf66b0841ea802a1e ChangeLog 20865
+RMD160 58277d6b363ab3e79dce065e81cab778e607b96c ChangeLog 20865
+SHA256 00a162555f3c329db5f50ec1a4dfb59f8c21c83f1704377170292b9a645ed9d5 ChangeLog 20865
 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
 MD5 a562a93428a4efa4b0b4c0943075e3ff metadata.xml 227
 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 metadata.xml 227
@@ -115,12 +119,12 @@ SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c metadata
 MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imapd-2.2.12-r4 259
 RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imapd-2.2.12-r4 259
 SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imapd-2.2.12-r4 259
-MD5 7f11e6246a6c05fa75edb1d390b9aab8 files/digest-cyrus-imapd-2.2.12-r5 536
-RMD160 709d6bc114a3bae15efd905a4ccdd94f8acad157 files/digest-cyrus-imapd-2.2.12-r5 536
-SHA256 c91c6ebeb4fc1b8871b1aaedd708ea747f7242c31eadef15b08a3157cf4e236d files/digest-cyrus-imapd-2.2.12-r5 536
-MD5 910af2936a45ea0f3b82e4aabd0f8683 files/digest-cyrus-imapd-2.2.12-r6 557
-RMD160 1a52f85a408e19658272bca033e57c126765beaa files/digest-cyrus-imapd-2.2.12-r6 557
-SHA256 3760068629a0eb327e951c8f1f47f02f8e8e97db9929720386044f2d0b507cff files/digest-cyrus-imapd-2.2.12-r6 557
+MD5 0f7867dce15e788f110a51468ceb0e11 files/digest-cyrus-imapd-2.2.12-r5 459
+RMD160 3be72d5e18b7be021ec706d34c5240aa34d51404 files/digest-cyrus-imapd-2.2.12-r5 459
+SHA256 d8a93a2fea8f053f3a023263cb7f3c59563d83db07f90bff7ff7653f4ffed553 files/digest-cyrus-imapd-2.2.12-r5 459
+MD5 cf643d981b8245ea4e899eca71c8bb4d files/digest-cyrus-imapd-2.2.12-r6 473
+RMD160 1224d1dd72feee75034a573d7b9d98f6b76f93ef files/digest-cyrus-imapd-2.2.12-r6 473
+SHA256 11e46576597b1303e4759710ecea7763aee729332e553694d9d47990fc5ab90b files/digest-cyrus-imapd-2.2.12-r6 473
 MD5 557d07d40c036efbbd10ef852a0b6c57 files/digest-cyrus-imapd-2.2.13-r1 259
 RMD160 232835b5f24ede499731cb761b501e47d4c884be files/digest-cyrus-imapd-2.2.13-r1 259
 SHA256 7afc422d893280bcc49f9e7bf45d2292f6560132160d5c7f98d35782a6167291 files/digest-cyrus-imapd-2.2.13-r1 259
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild
index ec64c4d58a2a..69fe99acaf99 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.13-r1.ebuild,v 1.4 2007/09/02 07:48:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.13-r1.ebuild,v 1.5 2007/09/07 19:53:24 dertobi123 Exp $
 
 inherit autotools eutils ssl-cert fixheadtails pam
 
@@ -142,6 +142,9 @@ src_unpack() {
 
 	ht_fix_file ${S}/imap/xversion.sh
 
+	# Fix prestripped binaries
+	epatch "${FILESDIR}/${PN}-strip.patch"
+
 	# fix segfault in deliver wrt #186338
 	epatch "${FILESDIR}/${P}-deliver.patch"
 
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
index 7df2bc8adbd5..11685a3be544 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9.ebuild,v 1.1 2007/09/03 19:47:05 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild,v 1.2 2007/09/07 19:53:24 dertobi123 Exp $
 
 inherit autotools eutils ssl-cert fixheadtails pam
 
@@ -98,6 +98,9 @@ src_unpack() {
 
 	ht_fix_file ${S}/imap/xversion.sh
 
+	# Fix prestripped binaries
+	epatch "${FILESDIR}/${PN}-strip.patch"
+
 	# Unsupported UoA patch. Bug #112912 .
 	# http://email.uoa.gr/projects/cyrus/autocreate/
 	if use autocreate ; then
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-strip.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-strip.patch
new file mode 100644
index 000000000000..fa82a4b18d8d
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-strip.patch
@@ -0,0 +1,11 @@
+--- imtest/Makefile.in.orig	2007-09-07 21:45:46.000000000 +0200
++++ imtest/Makefile.in	2007-09-07 21:45:52.000000000 +0200
+@@ -72,7 +72,7 @@
+ all: imtest
+ 
+ install:
+-	$(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
++	$(INSTALL) -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
+ 	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
+ 	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
+ 	ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5
index 1aeec9a2bcfe..3ba5ae518e8a 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5
@@ -1,4 +1,3 @@
-MD5 d0790375ccef27242003422da93309c1 cyrus-imapd-2.2.12-64bit-quota.tgz 6537
 RMD160 d739761d39656b7081f52f4ba2e5f3428c19203e cyrus-imapd-2.2.12-64bit-quota.tgz 6537
 SHA256 a7e1fde21479dbce7441f68e0a86de1947744cea0ec424f759e77583ee7e90f6 cyrus-imapd-2.2.12-64bit-quota.tgz 6537
 MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6
index 6ac96126c109..49d252f6719d 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6
@@ -1,4 +1,3 @@
-MD5 55bdd80ddec288c7a99715c05774f001 cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251
 RMD160 4c9493ee7f1a251dc8fff816341dbd7d32851e98 cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251
 SHA256 2a1b7eb5dee6bc6d3d7bd25ddb10a142d49cbde4af5982403362b09967d39069 cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251
 MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161