CVS commit: pkgsrc/mail/libspf2

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun  2 15:57:58 UTC 2023

Modified Files:
        pkgsrc/mail/libspf2: Makefile distinfo
        pkgsrc/mail/libspf2/patches: patch-configure patch-configure.ac
Added Files:
        pkgsrc/mail/libspf2/patches: patch-src_include_spf__dns.h
            patch-src_libspf2_Makefile.in patch-src_libspf2_spf__utils.c
            patch-src_spfquery_spfquery.c
Removed Files:
        pkgsrc/mail/libspf2/patches: patch-src_libreplace_Makefile.in
            patch-src_libreplace_ensure__libreplace__symbol.c

Log Message:
libspf2: link with glibc>=2.34 and build with musl libc.

Newer glibc removes visibility of __dn_expand and __dn_skipname.
Borrow Fedora's fix: stop linking with libreplace for most platforms
(except OpenBSD).

For musl, provide a fallback definition of NETDB_SUCCESS.

Fixes build: Void Linux, Ubuntu 22, Arch, CentOS 9.
Continues to build: Ubuntu 20, CentOS 8 and 7, Debian, Tribblix, macOS,
NetBSD, FreeBSD, OpenBSD.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/libspf2/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/libspf2/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/libspf2/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/libspf2/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/libspf2/patches/patch-src_include_spf__dns.h \
    pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__utils.c \
    pkgsrc/mail/libspf2/patches/patch-src_spfquery_spfquery.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/mail/libspf2/patches/patch-src_libreplace_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/mail/libspf2/patches/patch-src_libreplace_ensure__libreplace__symbol.c
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/mail/libspf2/patches/patch-src_libspf2_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/libspf2/Makefile
diff -u pkgsrc/mail/libspf2/Makefile:1.15 pkgsrc/mail/libspf2/Makefile:1.16
--- pkgsrc/mail/libspf2/Makefile:1.15   Sat Apr  2 21:41:38 2022
+++ pkgsrc/mail/libspf2/Makefile        Fri Jun  2 15:57:57 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2022/04/02 21:41:38 spz Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/02 15:57:57 schmonz Exp $
 
 DISTNAME=      libspf2-1.2.11
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
@@ -14,5 +15,14 @@ USE_LIBTOOL= YES
 
 CONFLICTS+=    libspf_alt-[0-9]*
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "OpenBSD"
+SUBST_CLASSES+=                libreplace
+SUBST_STAGE.libreplace=        pre-configure
+SUBST_FILES.libreplace=        src/libspf2/Makefile.in
+SUBST_SED.libreplace=  -e 's|^\#pkgsrc\#||g'
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/libspf2/distinfo
diff -u pkgsrc/mail/libspf2/distinfo:1.14 pkgsrc/mail/libspf2/distinfo:1.15
--- pkgsrc/mail/libspf2/distinfo:1.14   Sat Apr  2 21:41:38 2022
+++ pkgsrc/mail/libspf2/distinfo        Fri Jun  2 15:57:57 2023
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.14 2022/04/02 21:41:38 spz Exp $
+$NetBSD: distinfo,v 1.15 2023/06/02 15:57:57 schmonz Exp $
 
 BLAKE2s (libspf2-1.2.11.tar.gz) = 47156637170752c1f614769befe9c2e384fca3d6d410b3a9f52d437dd1811af3
 SHA512 (libspf2-1.2.11.tar.gz) = 6a9505e68bd0f8b24acc98e8fd3a6815329a367c9a9cd3ec59d69eb6f9d1153fb2d1297f793828340050663a458a9bdb244d77a58253bfa7a3fbf74aadb01dfc
 Size (libspf2-1.2.11.tar.gz) = 530879 bytes
-SHA1 (patch-configure) = 0005180f6b9aedc45663dee6764c438d33078359
-SHA1 (patch-configure.ac) = eb0fae2a2bbe86f0e54b56c3ab2ec696f9a6788c
+SHA1 (patch-configure) = fea9a31e989d9ab36070a36e508ca44bc1f0af9e
+SHA1 (patch-configure.ac) = 825bf95570cfd8be8b7da3711fe2c0dc549d16a1
+SHA1 (patch-src_include_spf__dns.h) = f51a66f5b22c24ba7c95f3aa427e41cc215581e0
 SHA1 (patch-src_include_spf__log.h) = fdf6fe3447f465b364ddaa9f2d78f36458ba0266
-SHA1 (patch-src_libreplace_Makefile.in) = 12fab6f97efff6cc1944ebb5a5cf26fdb79971c2
-SHA1 (patch-src_libreplace_ensure__libreplace__symbol.c) = 1b2ccf11fe7cade3c7769e7388cdd79ee250b26e
+SHA1 (patch-src_libspf2_Makefile.in) = a7e989902af90d65adc9693159aae73c07df8dcc
 SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10
+SHA1 (patch-src_libspf2_spf__utils.c) = be60c232a45689ec4ba88b0e9e87d899890eaed2
+SHA1 (patch-src_spfquery_spfquery.c) = 3878362c6ab9e4badc2809bbb3a106378244f078

Index: pkgsrc/mail/libspf2/patches/patch-configure
diff -u pkgsrc/mail/libspf2/patches/patch-configure:1.4 pkgsrc/mail/libspf2/patches/patch-configure:1.5
--- pkgsrc/mail/libspf2/patches/patch-configure:1.4     Mon Dec 17 19:24:44 2018
+++ pkgsrc/mail/libspf2/patches/patch-configure Fri Jun  2 15:57:57 2023
@@ -1,9 +1,8 @@
-$NetBSD: patch-configure,v 1.4 2018/12/17 19:24:44 schmonz Exp $
+$NetBSD: patch-configure,v 1.5 2023/06/02 15:57:57 schmonz Exp $
 
-Ensure that libreplace contains at least one symbol.
-test for res_close, not available in OpenBSD
+Test for res_close, not available in OpenBSD.
 
---- configure.orig     2012-02-20 07:31:46.000000000 +0000
+--- configure.orig     2021-06-09 05:43:12.000000000 +0000
 +++ configure
 @@ -13494,6 +13494,33 @@ cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_RES_NDESTROY $ac_have_decl
@@ -39,12 +38,3 @@ test for res_close, not available in Ope
  
  ac_fn_c_check_decl "$LINENO" "ns_t_spf" "ac_cv_have_decl_ns_t_spf" "
        #ifdef HAVE_SYS_TYPES_H
-@@ -13577,7 +13604,7 @@ _ACEOF
- fi
- done
- 
--for ac_func in strcasecmp strncasecmp strspn strtoul
-+for ac_func in ensure_libreplace_symbol strcasecmp strncasecmp strspn strtoul
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

Index: pkgsrc/mail/libspf2/patches/patch-configure.ac
diff -u pkgsrc/mail/libspf2/patches/patch-configure.ac:1.1 pkgsrc/mail/libspf2/patches/patch-configure.ac:1.2
--- pkgsrc/mail/libspf2/patches/patch-configure.ac:1.1  Mon Dec 17 19:24:44 2018
+++ pkgsrc/mail/libspf2/patches/patch-configure.ac      Fri Jun  2 15:57:57 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.1 2018/12/17 19:24:44 schmonz Exp $
+$NetBSD: patch-configure.ac,v 1.2 2023/06/02 15:57:57 schmonz Exp $
 
 Test for res_close, not available in OpenBSD.
 
---- configure.ac.orig  2012-02-20 07:30:42.000000000 +0000
+--- configure.ac.orig  2021-06-09 05:43:12.000000000 +0000
 +++ configure.ac
-@@ -231,6 +231,23 @@ AC_CHECK_DECLS([res_ndestroy], [], [], [
+@@ -232,6 +232,23 @@ AC_CHECK_DECLS([res_ndestroy], [], [], [
        # include <resolv.h>
        #endif
        ]])

Added files:

Index: pkgsrc/mail/libspf2/patches/patch-src_include_spf__dns.h
diff -u /dev/null pkgsrc/mail/libspf2/patches/patch-src_include_spf__dns.h:1.1
--- /dev/null   Fri Jun  2 15:57:58 2023
+++ pkgsrc/mail/libspf2/patches/patch-src_include_spf__dns.h    Fri Jun  2 15:57:57 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_include_spf__dns.h,v 1.1 2023/06/02 15:57:57 schmonz Exp $
+
+Define NETDB_SUCCESS on musl libc (such as Void Linux).
+
+--- src/include/spf_dns.h.orig 2021-06-09 05:43:12.000000000 +0000
++++ src/include/spf_dns.h
+@@ -105,6 +105,9 @@ typedef int        ns_type;
+ #define       NO_RECOVERY             3               /**< invalid/unimplmeneted query        */
+ #define       NO_DATA                 4               /**< host found, but no RR of req type*/
+ #endif
++#if !defined(NETDB_SUCCESS)
++#define NETDB_SUCCESS 0
++#endif
+ typedef int SPF_dns_stat_t;
+ 
+ typedef struct SPF_dns_server_struct SPF_dns_server_t;
Index: pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__utils.c
diff -u /dev/null pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__utils.c:1.1
--- /dev/null   Fri Jun  2 15:57:58 2023
+++ pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__utils.c  Fri Jun  2 15:57:57 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libspf2_spf__utils.c,v 1.1 2023/06/02 15:57:57 schmonz Exp $
+
+Include <string.h> for memset().
+
+--- src/libspf2/spf_utils.c.orig       2021-06-09 05:43:12.000000000 +0000
++++ src/libspf2/spf_utils.c
+@@ -25,6 +25,9 @@
+ #include <memory.h>
+ #endif
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
+ 
+ 
+ #include "spf.h"
Index: pkgsrc/mail/libspf2/patches/patch-src_spfquery_spfquery.c
diff -u /dev/null pkgsrc/mail/libspf2/patches/patch-src_spfquery_spfquery.c:1.1
--- /dev/null   Fri Jun  2 15:57:58 2023
+++ pkgsrc/mail/libspf2/patches/patch-src_spfquery_spfquery.c   Fri Jun  2 15:57:58 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_spfquery_spfquery.c,v 1.1 2023/06/02 15:57:58 schmonz Exp $
+
+Avoid non-portable getopt_long_only (NetBSD lacks it).
+
+--- src/spfquery/spfquery.c.orig       2021-06-09 05:43:12.000000000 +0000
++++ src/spfquery/spfquery.c
+@@ -380,7 +380,7 @@ int main( int argc, char *argv[] )
+       for (;;) {
+               int option_index;       /* Largely unused */
+ 
+-              c = getopt_long_only (argc, argv, "f:i:s:h:r:lt::gemcnd::kz:a:v",
++              c = getopt_long (argc, argv, "f:i:s:h:r:lt::gemcnd::kz:a:v",
+                                 long_options, &option_index);
+ 
+               if (c == -1)

Index: pkgsrc/mail/libspf2/patches/patch-src_libspf2_Makefile.in
diff -u /dev/null pkgsrc/mail/libspf2/patches/patch-src_libspf2_Makefile.in:1.3
--- /dev/null   Fri Jun  2 15:57:58 2023
+++ pkgsrc/mail/libspf2/patches/patch-src_libspf2_Makefile.in   Fri Jun  2 15:57:57 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libspf2_Makefile.in,v 1.3 2023/06/02 15:57:57 schmonz Exp $
+
+By default, don't link with libreplace.
+
+--- src/libspf2/Makefile.in.orig       2021-06-09 05:43:12.000000000 +0000
++++ src/libspf2/Makefile.in
+@@ -289,7 +289,7 @@ libspf2_la_SOURCES = \
+       spf_utils.c \
+       spf_win32.c
+ 
+-libspf2_la_LIBADD = $(top_builddir)/src/libreplace/libreplace.la
++#pkgsrc#libspf2_la_LIBADD = $(top_builddir)/src/libreplace/libreplace.la
+ libspf2_la_LDFLAGS = -version-info 3:0:1
+ all: all-recursive
+