From a6d2955b73becbcf890c914ef3e51d88372edfd7 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Fri, 6 Apr 2007 17:33:40 +0000 Subject: [PATCH] Apply 1.05-r7-sslfix.diff only when SSL is enabled. Package-Manager: portage-2.1.2.3 --- mail-mta/netqmail/ChangeLog | 6 +++++- mail-mta/netqmail/Manifest | 16 ++++++++-------- mail-mta/netqmail/netqmail-1.05-r7.ebuild | 8 ++++---- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mail-mta/netqmail/ChangeLog b/mail-mta/netqmail/ChangeLog index d2cb66d89d4e..a19819fbbe75 100644 --- a/mail-mta/netqmail/ChangeLog +++ b/mail-mta/netqmail/ChangeLog @@ -1,6 +1,10 @@ # 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.30 2007/04/05 22:14:18 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.31 2007/04/06 17:33:40 hansmi Exp $ + + 06 Apr 2007; Michael Hanselmann + netqmail-1.05-r7.ebuild: + Apply 1.05-r7-sslfix.diff only when SSL is enabled. *netqmail-1.05-r7 (06 Apr 2007) diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest index 30c447c2da6e..b048bebbae8a 100644 --- a/mail-mta/netqmail/Manifest +++ b/mail-mta/netqmail/Manifest @@ -123,14 +123,14 @@ EBUILD netqmail-1.05-r4.ebuild 13077 RMD160 2e216cf6a9dc59e40cbe77e4164e022a25ea MD5 36b5fa4992bbb3113e9c118b9f40a368 netqmail-1.05-r4.ebuild 13077 RMD160 2e216cf6a9dc59e40cbe77e4164e022a25ea421f netqmail-1.05-r4.ebuild 13077 SHA256 1ee475dcca885783fc700aff335447d3b5b97fd93b0fd22df8f62d1c452b9edb netqmail-1.05-r4.ebuild 13077 -EBUILD netqmail-1.05-r7.ebuild 13726 RMD160 fd297f8241faf4442514537b0ed53d1e8465cd56 SHA1 e1221d68fb6268ebb9fa1f0b717e98cf409a0c87 SHA256 282ac257411cef7be04208d4849c2c83e4115ab5b7f808709b61c3383500565a -MD5 b7f9f6754d6b5ecc1df019af8cad56bf netqmail-1.05-r7.ebuild 13726 -RMD160 fd297f8241faf4442514537b0ed53d1e8465cd56 netqmail-1.05-r7.ebuild 13726 -SHA256 282ac257411cef7be04208d4849c2c83e4115ab5b7f808709b61c3383500565a netqmail-1.05-r7.ebuild 13726 -MISC ChangeLog 4766 RMD160 882cecfe4cb743e4fe0bcfd62f8ec0c9849e0ba6 SHA1 45b61ef3116d11944dd73d91d1c63d32c8ea46e7 SHA256 3cd2c252c538b3f18186731f3d5a3aeed1785cc75ab917595cda20ed62af4209 -MD5 73273be9609c926484243cff82088798 ChangeLog 4766 -RMD160 882cecfe4cb743e4fe0bcfd62f8ec0c9849e0ba6 ChangeLog 4766 -SHA256 3cd2c252c538b3f18186731f3d5a3aeed1785cc75ab917595cda20ed62af4209 ChangeLog 4766 +EBUILD netqmail-1.05-r7.ebuild 13739 RMD160 3e567f15d8dc9ab0ae173b33c612ba56d28374db SHA1 31fed29f44043c2ed0d7b03f461659ea5b411420 SHA256 293bd23a9ec5c0ec06d8a12780b53c8d1d7dffa3a87ae399b204615222568828 +MD5 689e88e7c5073e75dc70ee2b86386864 netqmail-1.05-r7.ebuild 13739 +RMD160 3e567f15d8dc9ab0ae173b33c612ba56d28374db netqmail-1.05-r7.ebuild 13739 +SHA256 293bd23a9ec5c0ec06d8a12780b53c8d1d7dffa3a87ae399b204615222568828 netqmail-1.05-r7.ebuild 13739 +MISC ChangeLog 4902 RMD160 a4d983b863eb0567a302781044dc32b3e537aa07 SHA1 2b5a1eae2c6dbb32af912665ffa50fd549aeda9e SHA256 b3a784cfa1c0f9185ff09c4c8f0e00d0d2924bd17c301beaa1aa869837d20b60 +MD5 368f65ae259450df7e158a565c82b5a6 ChangeLog 4902 +RMD160 a4d983b863eb0567a302781044dc32b3e537aa07 ChangeLog 4902 +SHA256 b3a784cfa1c0f9185ff09c4c8f0e00d0d2924bd17c301beaa1aa869837d20b60 ChangeLog 4902 MISC metadata.xml 278 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 SHA1 2ea5039fde031f70169844e9ff5bcd4a20e32666 SHA256 0d8d56eeab2c34a34acb9f558c9198d843e4666bdbe061f6ec87ab4396a75d2a MD5 1f12f659d2cf9550971387cb78c2f0af metadata.xml 278 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 metadata.xml 278 diff --git a/mail-mta/netqmail/netqmail-1.05-r7.ebuild b/mail-mta/netqmail/netqmail-1.05-r7.ebuild index 6213d663959a..25c1052a825e 100644 --- a/mail-mta/netqmail/netqmail-1.05-r7.ebuild +++ b/mail-mta/netqmail/netqmail-1.05-r7.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/mail-mta/netqmail/netqmail-1.05-r7.ebuild,v 1.1 2007/04/05 22:14:18 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r7.ebuild,v 1.2 2007/04/06 17:33:40 hansmi Exp $ inherit eutils toolchain-funcs fixheadtails flag-o-matic @@ -78,6 +78,9 @@ 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 @@ -91,9 +94,6 @@ src_unpack() { fi fi - # Temporary patch until upstream fixes it - epatch "${FILESDIR}/${PVR}-sslfix.diff" - if [[ -n "${QMAIL_PATCH_DIR}" && -d "${QMAIL_PATCH_DIR}" ]] then echo -- 2.26.2