Subject: [alpine-aports] [PATCH] main/libspf2: fix gcc variadic macros

From: Christian Kampka <[email-masked]>
Date: Fri, 6 Nov 2015 13:56:54 +0100

---
 main/libspf2/APKBUILD                      | 12 ++++++++----
 main/libspf2/fix-gcc-variadic-macros.patch | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 main/libspf2/fix-gcc-variadic-macros.patch

diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 213e7b8..5484e46 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=libspf2
 pkgver=1.2.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
 url="http://www.libspf2.org"
 arch="all"
@@ -14,6 +14,7 @@ source="http://www.libspf2.org/spf/libspf2-$pkgver.tar.gz
 	libspf2-libreplace-fix.patch
 	netdb_success.patch
 	musl-res_close.patch
+	fix-gcc-variadic-macros.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -47,14 +48,17 @@ md5sums="7bb9937d0705649eaa8646de66dc3562  libspf2-1.2.10.tar.gz
 24b77cb74901d56de89b24ef10b46b85  0001-provide-dn_skipname.patch
 6dd2d5f33c5f1a5b7c14eec4c71767cd  libspf2-libreplace-fix.patch
 e364ae123e18ec330339824e71774b44  netdb_success.patch
-984f356b97d936395ee061d6c6003d0a  musl-res_close.patch"
+984f356b97d936395ee061d6c6003d0a  musl-res_close.patch
+6b3c05768fe5adb2cc65fb8d5c0a42c2  fix-gcc-variadic-macros.patch"
 sha256sums="d91e3de81ae287a2976c44f60283bd3000d720e6a112dc7142eedf1831b821c9  libspf2-1.2.10.tar.gz
 b6038c035c08e31a5407ed06d4af490aea357c1e51c218a02c703a9eace9a072  0001-provide-dn_skipname.patch
 f9ee6d10be25a52d2432ac62114c37e2dd4c00c8e11d908f2f2ed0d4ba71b139  libspf2-libreplace-fix.patch
 381d3cb2ef4257eb93dc52b39944948705feaf29223fa263af9c362963eb136e  netdb_success.patch
-8d7392aaf3db6f32c96c3f3dac6d928762e0149d966e98fbedc434308894e03b  musl-res_close.patch"
+8d7392aaf3db6f32c96c3f3dac6d928762e0149d966e98fbedc434308894e03b  musl-res_close.patch
+96ce1bb636942923ef17505dd42b9de8b8cd4d817f84a315c8053c263725c5ec  fix-gcc-variadic-macros.patch"
 sha512sums="162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130  libspf2-1.2.10.tar.gz
 cc8c77963a3bc0c54442c81146cc27e482c43787586ab8885e3fe0fd2cfcba089f5a5cfeda4c3307fe5cc36ac8768f748d9a8467e9b8ca41e9ad157b61bbce49  0001-provide-dn_skipname.patch
 226e1d7a1d381f35206aaecafb33955a6ecd08c8c18f4d6fe443e359f0139aeeb314012296a53e7c017d68373f4e1fa27010514296f15ab86f059e531866b95a  libspf2-libreplace-fix.patch
 033dd1e959004f7a1026fb1de73813e934560101e04897297e468918ee28e4d7d0f271d6f05d984db22dd43e097f6aa133df18d11419b085d89db89b120750c9  netdb_success.patch
-4fb8a28a667d8fe54a48fa89230446b758c6d532866ee26e8b9ef3032f6e0993ec19a2cc2fb265d18d259e35de6fe66183763bbc69c424de70ad8fe0dbcf7a2f  musl-res_close.patch"
+4fb8a28a667d8fe54a48fa89230446b758c6d532866ee26e8b9ef3032f6e0993ec19a2cc2fb265d18d259e35de6fe66183763bbc69c424de70ad8fe0dbcf7a2f  musl-res_close.patch
+2face288cfb2cbcfced0f6d47f905b9efdccf696de780892c4e36b134bb4dbe77416b42f42f8ccb16da47551d800fe037899324dec33e140fb8cea0f201abd74  fix-gcc-variadic-macros.patch"
diff --git a/main/libspf2/fix-gcc-variadic-macros.patch b/main/libspf2/fix-gcc-variadic-macros.patch
new file mode 100644
index 0000000..caac94a
--- /dev/null
+++ b/main/libspf2/fix-gcc-variadic-macros.patch
@@ -0,0 +1,18 @@
+diff --git a/src/include/spf_log.h b/src/include/spf_log.h
+index 0d2adeb..4e22ef4 100644
+--- a/src/include/spf_log.h
++++ b/src/include/spf_log.h
+@@ -60,10 +60,10 @@ void SPF_debugv( const char *file, int line, const char *format, va_list ap ) __
+
+ #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(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__ )
+
+ #elif defined( __GNUC__ )
-- 
2.6.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---