cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update libspf2 to a github checkout which is likely to be what becomes libspf2-1.2.11

Browse Source 
various security fixes including CVE-2021-20314 https://seclists.org/oss-sec/2021/q3/94
This commit is contained in:
sthen 2021-08-12 10:44:23 +00:00
parent 6c21a00ffa
commit d4c218b088
13 changed files with 36 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mail/libspf2/Makefile
View File

@ -1,17 +1,18 @@
# $OpenBSD: Makefile,v 1.16 2021/03/19 13:09:13 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2021/08/12 10:44:23 sthen Exp $
COMMENT= SPF library
DISTNAME= libspf2-1.2.10
REVISION= 6
GH_ACCOUNT= shevek
GH_PROJECT= libspf2
GH_COMMIT= 4915c308d57ff3abac9fb241f09c4bed2ab54815
DISTNAME= libspf2-1.2.11pre20210609
SHARED_LIBS += spf2 4.0 # 3.0
CATEGORIES= mail
HOMEPAGE= https://www.libspf2.org/
MASTER_SITES= ${HOMEPAGE}/spf/
# BSD
PERMIT_PACKAGE= Yes
@ -19,13 +20,15 @@ WANTLIB += c iconv intl pthread
LIB_DEPENDS= devel/gettext,-runtime
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68
CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
CONFIGURE_ARGS= --bindir=${PREFIX}/libexec/libspf2
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
SEPARATE_BUILD= Yes
# broken test cases
NO_TEST= yes
post-install:
rm ${PREFIX}/libexec/libspf2/*_static
.include <bsd.port.mk>

4
mail/libspf2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libspf2-1.2.10.tar.gz) = 2R496Brih6KXbET2AoO9MADXIOahEtxxQu7fGDG4Ick=
SIZE (libspf2-1.2.10.tar.gz) = 508842
SHA256 (libspf2-1.2.11pre20210609-4915c308.tar.gz) = 1S2zOt1D7pPnkpo+eLk4lVkrdHJltj+W2m97PeLiZEk=
SIZE (libspf2-1.2.11pre20210609-4915c308.tar.gz) = 565497

10
mail/libspf2/patches/patch-configure_ac
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.1 2016/10/11 20:35:39 sthen Exp $
--- configure.ac.orig Tue Oct 11 21:28:19 2016
+++ configure.ac Tue Oct 11 21:31:12 2016
@@ -111,39 +111,6 @@ AC_CHECK_HEADER(pthread.h, , [
$OpenBSD: patch-configure_ac,v 1.2 2021/08/12 10:44:23 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -112,39 +112,6 @@ AC_CHECK_HEADER(pthread.h, , [
exit 1;
])

12
mail/libspf2/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2015/01/26 22:36:00 sthen Exp $
--- src/Makefile.in.orig Mon Feb 20 07:31:47 2012
+++ src/Makefile.in Mon Jan 26 22:34:55 2015
@@ -151,7 +151,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SUBDIRS = include libreplace libspf2 spfquery spftest spfd spf_example
+SUBDIRS = include libreplace libspf2 spfquery spftest spfd
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

3
mail/libspf2/patches/patch-src_libspf2_spf_compile_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_libspf2_spf_compile_c,v 1.4 2017/04/19 16:56:04 jca Exp $
$OpenBSD: patch-src_libspf2_spf_compile_c,v 1.5 2021/08/12 10:44:23 sthen Exp $
--- src/libspf2/spf_compile.c.orig Mon Feb 20 08:26:43 2012
+++ src/libspf2/spf_compile.c Wed Apr 19 18:53:10 2017
@@ -577,7 +577,7 @@ SPF_c_parse_macro(SPF_server_t *spf_server,

3
mail/libspf2/patches/patch-src_libspf2_spf_dns_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_libspf2_spf_dns_c,v 1.1 2017/04/19 16:49:49 jca Exp $
$OpenBSD: patch-src_libspf2_spf_dns_c,v 1.2 2021/08/12 10:44:23 sthen Exp $
--- src/libspf2/spf_dns.c.orig Wed Apr 19 18:35:29 2017
+++ src/libspf2/spf_dns.c Wed Apr 19 18:35:40 2017
@@ -105,7 +105,7 @@ SPF_dns_debug_post(SPF_dns_server_t *spf_dns_server, S

10
mail/libspf2/patches/patch-src_libspf2_spf_dns_resolv_c
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_libspf2_spf_dns_resolv_c,v 1.3 2016/10/11 20:35:39 sthen Exp $
--- src/libspf2/spf_dns_resolv.c.orig Sat Jan 28 08:24:47 2012
+++ src/libspf2/spf_dns_resolv.c Tue Oct 11 21:28:06 2016
@@ -607,7 +607,10 @@ SPF_dns_resolv_free(SPF_dns_server_t *spf_dns_server)
$OpenBSD: patch-src_libspf2_spf_dns_resolv_c,v 1.4 2021/08/12 10:44:23 sthen Exp $
Index: src/libspf2/spf_dns_resolv.c
--- src/libspf2/spf_dns_resolv.c.orig
+++ src/libspf2/spf_dns_resolv.c
@@ -609,7 +609,10 @@ SPF_dns_resolv_free(SPF_dns_server_t *spf_dns_server)
SPF_ASSERT_NOTNULL(spf_dns_server);
#if ! HAVE_DECL_RES_NINIT

3
mail/libspf2/patches/patch-src_libspf2_spf_dns_zone_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_libspf2_spf_dns_zone_c,v 1.1 2017/04/19 16:49:49 jca Exp $
$OpenBSD: patch-src_libspf2_spf_dns_zone_c,v 1.2 2021/08/12 10:44:23 sthen Exp $
--- src/libspf2/spf_dns_zone.c.orig Wed Apr 19 18:36:06 2017
+++ src/libspf2/spf_dns_zone.c Wed Apr 19 18:36:36 2017
@@ -114,7 +114,7 @@ SPF_dns_zone_find(SPF_dns_server_t *spf_dns_server,

3
mail/libspf2/patches/patch-src_libspf2_spf_id2str_c
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_libspf2_spf_id2str_c,v 1.3 2017/04/19 16:49:49 jca Exp $
$OpenBSD: patch-src_libspf2_spf_id2str_c,v 1.4 2021/08/12 10:44:23 sthen Exp $
--- src/libspf2/spf_id2str.c.orig Wed Apr 19 18:36:58 2017
+++ src/libspf2/spf_id2str.c Wed Apr 19 18:37:08 2017
@@ -52,7 +52,7 @@ SPF_record_stringify_data(SPF_data_t *data, SPF_data_t

12
mail/libspf2/patches/patch-src_spfd_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_spfd_Makefile_in,v 1.3 2015/01/26 22:36:00 sthen Exp $
--- src/spfd/Makefile.in.orig Mon Feb 20 07:31:47 2012
+++ src/spfd/Makefile.in Mon Jan 26 22:34:55 2015
@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = spfd$(EXEEXT) spfd_static$(EXEEXT)
+bin_PROGRAMS = spfd$(EXEEXT)
subdir = src/spfd
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

12
mail/libspf2/patches/patch-src_spfquery_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_spfquery_Makefile_in,v 1.3 2015/01/26 22:36:00 sthen Exp $
--- src/spfquery/Makefile.in.orig Mon Feb 20 07:31:47 2012
+++ src/spfquery/Makefile.in Mon Jan 26 22:34:55 2015
@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = spfquery$(EXEEXT) spfquery_static$(EXEEXT)
+bin_PROGRAMS = spfquery$(EXEEXT)
subdir = src/spfquery
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

12
mail/libspf2/patches/patch-src_spftest_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_spftest_Makefile_in,v 1.3 2015/01/26 22:36:00 sthen Exp $
--- src/spftest/Makefile.in.orig Mon Feb 20 07:31:48 2012
+++ src/spftest/Makefile.in Mon Jan 26 22:34:55 2015
@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = spftest$(EXEEXT) spftest_static$(EXEEXT)
+bin_PROGRAMS = spftest$(EXEEXT)
subdir = src/spftest
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

3
mail/libspf2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2021/03/19 13:09:13 sthen Exp $
@comment $OpenBSD: PLIST,v 1.5 2021/08/12 10:44:23 sthen Exp $
include/spf2/
include/spf2/spf.h
include/spf2/spf_dns.h
@ -18,6 +18,7 @@ include/spf2/spf_server.h
lib/libspf2.la
@lib lib/libspf2.so.${LIBspf2_VERSION}
libexec/libspf2/
@bin libexec/libspf2/spf_example
@bin libexec/libspf2/spfd
@bin libexec/libspf2/spfquery
@bin libexec/libspf2/spftest