Bump SMTP-AUTH/TLS composite patch to 20070417. This makes my own patch obsolete

Package-Manager: portage-2.1.2.5

diff --git a/mail-mta/netqmail/ChangeLog b/mail-mta/netqmail/ChangeLog
index 837a4105ebde87919569127b08c8d7be2830d4de..d970803ee5ec02f19c29086f118b5bd83b7b3500 100644 (file)
--- a/mail-mta/netqmail/ChangeLog
+++ b/mail-mta/netqmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/netqmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.33 2007/04/10 18:11:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.34 2007/04/27 19:50:05 hansmi Exp $
+
+*netqmail-1.05-r8 (27 Apr 2007)
+
+  27 Apr 2007; Michael Hanselmann <hansmi@gentoo.org>
+  -files/1.05-r7-sslfix.diff, -netqmail-1.05-r7.ebuild,
+  +netqmail-1.05-r8.ebuild:
+  Bump SMTP-AUTH/TLS composite patch to 20070417. This makes my own patch
+  obsolete.
 
   10 Apr 2007; Michael Hanselmann <hansmi@gentoo.org>
   netqmail-1.05-r7.ebuild:

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 6cea2cded2cc8ce7d0787dd7d1cfdd855e96b2fc..48f67c3c4280c9003b7e6873cbfd42d77d89254c 100644 (file)
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,7 +1,3 @@
-AUX 1.05-r7-sslfix.diff 473 RMD160 88b997ec74482fca96b8f507c2fceaa69b957d98 SHA1 9a941698ab047c466963e41ccde8a71a6f4464a1 SHA256 ae545c7f22ed9d52045328697b396ae27089a7a652f18406a98c7418f210fe53
-MD5 94c96d2675574649286b64096d429dfc files/1.05-r7-sslfix.diff 473
-RMD160 88b997ec74482fca96b8f507c2fceaa69b957d98 files/1.05-r7-sslfix.diff 473
-SHA256 ae545c7f22ed9d52045328697b396ae27089a7a652f18406a98c7418f210fe53 files/1.05-r7-sslfix.diff 473
 AUX 99qmail 137 RMD160 bb1d8b76562c60df05b1e10811d479ca24fdad48 SHA1 d370193dd2be29226fecd399c3bef93aec0011b8 SHA256 b721c405ab3a13803c4647b98a3c0ffbdfb450e4a0f9e5476c1633470b0d6e50
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
 RMD160 bb1d8b76562c60df05b1e10811d479ca24fdad48 files/99qmail 137
@@ -116,21 +112,21 @@ RMD160 275cf670b111f0673be05c5bb6362943af34e1f2 files/tcprules.d-Makefile.qmail
 SHA256 505e202a5a28a036669e51d3fb51d3c02a3a35d76764c5e3f4fa0c43564a89d6 files/tcprules.d-Makefile.qmail 132
 DIST big-todo.103.patch 5546 RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 SHA1 ba5c3923ff972a4f3ddd5ae1519938a4716612d1 SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72
 DIST netqmail-1.05-tls-smtpauth-20060105.patch 147837 RMD160 18a3edd3ea7e7a8e4d6cadbd3c0bd5e8cb041caa SHA1 1a0fb2367504a4c0f2196e13f753437f47d4b621 SHA256 326af9647e752e158f7672ca3fb592fe23c5f44502ddfcd6b5b6bc6c7ecf4c27
-DIST netqmail-1.05-tls-smtpauth-20070321.patch 67641 RMD160 7ec6ee04046217c1c2158df36ca6bd4d82b6eab7 SHA1 cab82b1edde2ea342275eb67354431d0b78f06a9 SHA256 66423c706fe77cd546588736f30e475f114d5a134a07a746aaabaad9b66c7aca
+DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 RMD160 81a00e06fa67a4073b1a5bf5195fbbac675cd46b SHA1 d24cb13cf1371044fc2dfe20471478f59b5524e5 SHA256 573de07d57ac6941a42dda645079213cf36fcbb7f3a8c254b8447709e5e5cd60
 DIST netqmail-1.05.tar.gz 252264 RMD160 e5bd8557c58a2686233449254b146e74389a7652 SHA1 fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829 SHA256 59788abf252e2da224542c1c8b727311335c61d990f24f4edf28f6eb5483f676
 DIST qmail-spp-0.42.tar.gz 18689 RMD160 5511722c52346692488a63bca53106d580a004c7 SHA1 76a94051b017dd331d8c791e466bb2a936ceba41 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d
 EBUILD netqmail-1.05-r4.ebuild 13056 RMD160 d41fa69b8712d232e84ffccd0b673d079cd78833 SHA1 9724e4ef098653a9a071baf6f9767087f1e4d128 SHA256 3726e2ebba9cc30013c0bf211b9417a65f88fa8fca7c624d4140af6f5758e346
 MD5 33dfe1adeeca9c2f8e2c46ec5da02a61 netqmail-1.05-r4.ebuild 13056
 RMD160 d41fa69b8712d232e84ffccd0b673d079cd78833 netqmail-1.05-r4.ebuild 13056
 SHA256 3726e2ebba9cc30013c0bf211b9417a65f88fa8fca7c624d4140af6f5758e346 netqmail-1.05-r4.ebuild 13056
-EBUILD netqmail-1.05-r7.ebuild 13760 RMD160 3eaa433faab12dacfb641daa9f8a8d420ef38330 SHA1 1c8b3271b46fdf86522845072e5a6b8f7139c120 SHA256 d55c0aac9cc0e71af1818535e00dac0ff3f1385924dc4dcedc21ce244ab31cf6
-MD5 de8322d323cf4f67e3172a8f03d5d48d netqmail-1.05-r7.ebuild 13760
-RMD160 3eaa433faab12dacfb641daa9f8a8d420ef38330 netqmail-1.05-r7.ebuild 13760
-SHA256 d55c0aac9cc0e71af1818535e00dac0ff3f1385924dc4dcedc21ce244ab31cf6 netqmail-1.05-r7.ebuild 13760
-MISC ChangeLog 5144 RMD160 53de0ab22a00815a7cb10e54200f65e6f7582293 SHA1 6e9bc3d70ec646f4911665c23853c0adc332bc63 SHA256 56e8eb81f3160695016e0f2643580ab3ab2740966bfa8ff6a8591daef3ffdb0f
-MD5 7db0cb3eb75b106e3c73fe09ff5aaf2d ChangeLog 5144
-RMD160 53de0ab22a00815a7cb10e54200f65e6f7582293 ChangeLog 5144
-SHA256 56e8eb81f3160695016e0f2643580ab3ab2740966bfa8ff6a8591daef3ffdb0f ChangeLog 5144
+EBUILD netqmail-1.05-r8.ebuild 13662 RMD160 dd207d604ec0c1ab382e32b84737135b4440fcfb SHA1 2eed95d2ea7a560bea2faf1233553b0c61c06284 SHA256 344515948bbb09487b1af0fb3cad1f4b47659896e91d60d2b8f8b56efa409a68
+MD5 eccd6b24272768a147b7d6abd3a89283 netqmail-1.05-r8.ebuild 13662
+RMD160 dd207d604ec0c1ab382e32b84737135b4440fcfb netqmail-1.05-r8.ebuild 13662
+SHA256 344515948bbb09487b1af0fb3cad1f4b47659896e91d60d2b8f8b56efa409a68 netqmail-1.05-r8.ebuild 13662
+MISC ChangeLog 5402 RMD160 8caf28544fd91d4e75407f42b5342c4ee2d1637b SHA1 3802e36351dbdd4fe0a91e185f7af776e82ce30f SHA256 7b64c7b5e1ff482157d46e90648e00f9681e606783f6becf4af659def877757e
+MD5 ec36624af6bc22efe233929c87fbfcd0 ChangeLog 5402
+RMD160 8caf28544fd91d4e75407f42b5342c4ee2d1637b ChangeLog 5402
+SHA256 7b64c7b5e1ff482157d46e90648e00f9681e606783f6becf4af659def877757e ChangeLog 5402
 MISC metadata.xml 278 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 SHA1 2ea5039fde031f70169844e9ff5bcd4a20e32666 SHA256 0d8d56eeab2c34a34acb9f558c9198d843e4666bdbe061f6ec87ab4396a75d2a
 MD5 1f12f659d2cf9550971387cb78c2f0af metadata.xml 278
 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 metadata.xml 278
@@ -138,6 +134,6 @@ SHA256 0d8d56eeab2c34a34acb9f558c9198d843e4666bdbe061f6ec87ab4396a75d2a metadata
 MD5 b3f63b32fd284e450fa4c057fd563f8b files/digest-netqmail-1.05-r4 1015
 RMD160 225c6860fbfcaf81c448c51d02aff3bd73fa1a44 files/digest-netqmail-1.05-r4 1015
 SHA256 a36f48dee042213e5b7ac5f480422db5bbec2f1d6fa5cf1b623a213d5def387e files/digest-netqmail-1.05-r4 1015
-MD5 12315a018714da299781aa2768a874e9 files/digest-netqmail-1.05-r7 1012
-RMD160 ba27ee348f5cb6f8234f0c64e739ccae88ef1704 files/digest-netqmail-1.05-r7 1012
-SHA256 886d1b3ca737e01b434160e62ec643360c0fc6c60af5098fb05afc863ef0a14e files/digest-netqmail-1.05-r7 1012
+MD5 5a0e7fe528ed3310f051b09133b61d0a files/digest-netqmail-1.05-r8 1012
+RMD160 3ca05a0b359ff54fc7082b520b1060806e40779a files/digest-netqmail-1.05-r8 1012
+SHA256 86ebc3f880a1af55cfd744402a4062bbbdbe95e722978fff074650846b8ceaa4 files/digest-netqmail-1.05-r8 1012

diff --git a/mail-mta/netqmail/files/1.05-r7-sslfix.diff b/mail-mta/netqmail/files/1.05-r7-sslfix.diff
deleted file mode 100644 (file)
index b7116a4..0000000
--- a/mail-mta/netqmail/files/1.05-r7-sslfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- qmail-smtpd.c.orig 2007-04-06 00:05:37.000000000 +0200
-+++ qmail-smtpd.c      2007-04-06 00:05:42.000000000 +0200
-@@ -965,7 +965,7 @@
- 
-   ciphers = env_get("TLSCIPHERS");
-   if (!ciphers) {
--    if (control_readfile(&saciphers, "control/tlsserverciphers") == -1)
-+    if (control_readfile(&saciphers, "control/tlsserverciphers", 0) == -1)
-       { SSL_free(myssl); die_control(); }
-     if (saciphers.len) { /* convert all '\0's except the last one to ':' */
-       int i;

diff --git a/mail-mta/netqmail/files/digest-netqmail-1.05-r7 b/mail-mta/netqmail/files/digest-netqmail-1.05-r8
similarity index 70%
rename from mail-mta/netqmail/files/digest-netqmail-1.05-r7
rename to mail-mta/netqmail/files/digest-netqmail-1.05-r8
index a90c705acec8c153517b456c449f0710d8f746c4..ea08e6e0291e319ced851d0585fb702a3ad17039 100644 (file)
--- a/mail-mta/netqmail/files/digest-netqmail-1.05-r7
+++ b/mail-mta/netqmail/files/digest-netqmail-1.05-r8
@@ -1,9 +1,9 @@
 MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
 RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 big-todo.103.patch 5546
 SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72 big-todo.103.patch 5546
-MD5 be4c48b61c6ddd302f73ebfd68b5e34c netqmail-1.05-tls-smtpauth-20070321.patch 67641
-RMD160 7ec6ee04046217c1c2158df36ca6bd4d82b6eab7 netqmail-1.05-tls-smtpauth-20070321.patch 67641
-SHA256 66423c706fe77cd546588736f30e475f114d5a134a07a746aaabaad9b66c7aca netqmail-1.05-tls-smtpauth-20070321.patch 67641
+MD5 675dbb0b578f80f168b31e90d19e1594 netqmail-1.05-tls-smtpauth-20070417.patch 67942
+RMD160 81a00e06fa67a4073b1a5bf5195fbbac675cd46b netqmail-1.05-tls-smtpauth-20070417.patch 67942
+SHA256 573de07d57ac6941a42dda645079213cf36fcbb7f3a8c254b8447709e5e5cd60 netqmail-1.05-tls-smtpauth-20070417.patch 67942
 MD5 4c03848af9d37e281f3b82cc59230d9b netqmail-1.05.tar.gz 252264
 RMD160 e5bd8557c58a2686233449254b146e74389a7652 netqmail-1.05.tar.gz 252264
 SHA256 59788abf252e2da224542c1c8b727311335c61d990f24f4edf28f6eb5483f676 netqmail-1.05.tar.gz 252264

diff --git a/mail-mta/netqmail/netqmail-1.05-r7.ebuild b/mail-mta/netqmail/netqmail-1.05-r8.ebuild
similarity index 98%
rename from mail-mta/netqmail/netqmail-1.05-r7.ebuild
rename to mail-mta/netqmail/netqmail-1.05-r8.ebuild
index 50337542782ed6392d45c961dfc1a3bfc1591cd8..3369090cd911a25f44f14470769914c12df7ccdb 100644 (file)
--- a/mail-mta/netqmail/netqmail-1.05-r7.ebuild
+++ b/mail-mta/netqmail/netqmail-1.05-r8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r7.ebuild,v 1.4 2007/04/10 18:11:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r8.ebuild,v 1.1 2007/04/27 19:50:05 hansmi Exp $
 
 inherit eutils toolchain-funcs fixheadtails flag-o-matic
 
-TLS_AUTH_PATCH=20070321
+TLS_AUTH_PATCH=20070417
 QMAIL_SPP_PATCH=0.42
 
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
@@ -78,9 +78,6 @@ src_unpack() {
        if ! use vanilla; then
                use ssl && epatch ${DISTDIR}/netqmail-${PV}-tls-smtpauth-${TLS_AUTH_PATCH}.patch
 
-               # Temporary patch until upstream fixes it
-               use ssl && epatch "${FILESDIR}/${PVR}-sslfix.diff"
-
                if use highvolume; then
                        epatch ${DISTDIR}/big-todo.103.patch
                fi