mail-filter/libspf2: fix building with GCC5, bug #570486

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch b/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch
new file mode 100644 (file)
index 0000000..d36ec96
--- /dev/null
+++ b/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch
@@ -0,0 +1,22 @@
+https://github.com/shevek/libspf2/issues/13
+https://bugs.gentoo.org/show_bug.cgi?id=570486
+
+Index: libspf2-1.2.10/src/include/spf_log.h
+===================================================================
+--- libspf2-1.2.10/src/include/spf_log.h
++++ libspf2-1.2.10/src/include/spf_log.h    2015-10-20 23:23:04.579055906 +0200
+@@ -60,10 +60,10 @@
+
+ #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
+
+-#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ )
++#define SPF_errorf(...) SPF_errorx( __FILE__, __LINE__, __VA_ARGS__ )
++#define SPF_warningf(...) SPF_warningx( __FILE__, __LINE__, __VA_ARGS__ )
++#define SPF_infof(...) SPF_infox( __FILE__, __LINE__, __VA_ARGS__ )
++#define SPF_debugf(...) SPF_debugx( __FILE__, __LINE__, __VA_ARGS__ )
+
+ #elif defined( __GNUC__ )
+

diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 117a1e816f4c2654731514e8afcde710731f80c0..b5eb7acc548b9c0ad6ba986bf1c1950b71c39934 100644 (file)
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair"
 HOMEPAGE="http://www.libspf2.org"
@@ -26,6 +26,7 @@ src_prepare() {
                        || die
                #eautoreconf
        fi
+       epatch "${FILESDIR}"/${P}-gcc5.patch #570486
 
        sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
        eautoreconf