Bug 830026 – mail-filter/libspf2-1.2.11: fails to apply patch libspf2-1.2.10-mga-varargs.patch

• Status: RESOLVED INVALID
• Product: Gentoo Linux

[Description doj 2021-12-27 00:00:34 UTC]

>>> Emerging (11 of 25) mail-filter/libspf2-1.2.11::gentoo
 * libspf2-1.2.11.tar.gz BLAKE2B SHA512 size ;-) ...                                                                                                [ ok ]
>>> Unpacking source...
>>> Unpacking libspf2-1.2.11.tar.gz to /var/tmp/portage/mail-filter/libspf2-1.2.11/work
>>> Source unpacked in /var/tmp/portage/mail-filter/libspf2-1.2.11/work
>>> Preparing source in /var/tmp/portage/mail-filter/libspf2-1.2.11/work/libspf2-4915c308d57ff3abac9fb241f09c4bed2ab54815 ...
 * Applying libspf2-1.2.11-memset-include-string-h.patch ...                                                                                        [ ok ]
 * Applying libspf2-1.2.11-undefined-dn_.patch ...                                                                                                  [ ok ]
 * Applying libspf2-1.2.11-musl.patch ...                                                                                                           [ ok ]
 * Applying libspf2-1.2.10-mga-varargs.patch ...
patching file src/include/spf_log.h
Hunk #1 FAILED at 60.
1 out of 1 hunk FAILED -- saving rejects to file src/include/spf_log.h.rej   


Reproducible: Always

[Comment 1 doj 2021-12-27 00:02:20 UTC]

Created attachment 760224 [details]
output of emerge --info '=mail-filter/libspf2-1.2.11::gentoo'

[Comment 2 doj 2021-12-27 00:02:41 UTC]

Created attachment 760225 [details]
output of emerge -pqv '=mail-filter/libspf2-1.2.11::gentoo'

[Comment 3 doj 2021-12-27 00:05:06 UTC]

# cat $(find /var/tmp/ -name spf_log.h.rej)
--- src/include/spf_log.h
+++ 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__ )

[Comment 4 Sam James 2021-12-27 00:06:03 UTC]

libspf2-1.2.10-mga-varargs.patch is not in the ebuild though? Where's this coming from?

[Comment 5 doj 2021-12-27 00:15:07 UTC]

I don't understand where my build gets this patch file libspf2-1.2.10-mga-varargs.patch from? It's not listed in the file /usr/portage/mail-filter/libspf2/libspf2-1.2.11.ebuild and it's not present in the /usr/portage/mail-filter/libspf2/files/ directory.

[Comment 6 Sam James 2021-12-27 00:16:46 UTC]

(In reply to doj from comment #5)
> I don't understand where my build gets this patch file
> libspf2-1.2.10-mga-varargs.patch from? It's not listed in the file
> /usr/portage/mail-filter/libspf2/libspf2-1.2.11.ebuild and it's not present
> in the /usr/portage/mail-filter/libspf2/files/ directory.

Please attach the full build.log from when it fails.

[Comment 7 doj 2021-12-27 00:21:26 UTC]

Hmm, I found:

# find / -name libspf2-1.2.10-mga-varargs.patch
/etc/portage/patches/mail-filter/libspf2/libspf2-1.2.10-mga-varargs.patch

I have no idea what that file is doing in that directory. I have removed that whole directory /etc/portage/patches/ and now my build works.

[Comment 8 Sam James 2021-12-27 00:24:47 UTC]

(In reply to doj from comment #7)
> Hmm, I found:
> 
> # find / -name libspf2-1.2.10-mga-varargs.patch
> /etc/portage/patches/mail-filter/libspf2/libspf2-1.2.10-mga-varargs.patch
> 
> I have no idea what that file is doing in that directory. I have removed
> that whole directory /etc/portage/patches/ and now my build works.

You probably added it years ago to fix a build failure, maybe https://github.com/shevek/libspf2/issues/13.

Newer Portage versions will add a nice banner to make very clear that you're applying user patches.

I suspect you cut out a bit of output though because it does already say it's applying a user patch ;)

Thanks for the response.