From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 23 Nov 2021 21:22:46 +0000 (+0100)
Subject: Build 1.2.11 version from git. Fixes CVE-2021-20314 and two other.
X-Git-Tag: auto/th/libspf2-1.2.11-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Flibspf2.git;a=commitdiff_plain;h=12ffadbc5e8472131f544909b83e83ef739ab682;hp=3692f1ad98973576c3d4532bdbdbb3f7aeedbe4b

Build 1.2.11 version from git. Fixes CVE-2021-20314 and two other.
---

diff --git a/0001-remove-libreplace-unneeded-on-Linux.patch b/0001-remove-libreplace-unneeded-on-Linux.patch
new file mode 100644
index 0000000..fae0021
--- /dev/null
+++ b/0001-remove-libreplace-unneeded-on-Linux.patch
@@ -0,0 +1,61 @@
+From d559339883f61bfb44188c4fe92851a2905e8a8e Mon Sep 17 00:00:00 2001
+From: Matt Domsch <mdomsch@fedoraproject.org>
+Date: Thu, 23 Jan 2014 10:51:07 -0600
+Subject: [PATCH 1/2] remove libreplace, unneeded on Linux
+
+---
+ configure.ac            | 3 ---
+ src/Makefile.am         | 2 +-
+ src/libspf2/Makefile.am | 4 ----
+ 3 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 63e398c..63e5392 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -273,8 +273,6 @@ AC_CHECK_FUNCS([strchr strcspn strdup strerror])
+ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul])
+ AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol])
+ 
+-AC_REPLACE_FUNCS([getopt_long_only strncasecmp])
+-AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag])
+ dnl Magnus Holmgren says this avoids linking a private function
+ AC_LIBOBJ([__ns_get16])
+ 
+@@ -282,7 +280,6 @@ AC_CONFIG_FILES([Makefile
+                  Doxyfile
+                  src/Makefile
+                  src/include/Makefile
+-                 src/libreplace/Makefile
+                  src/libspf2/Makefile
+                  src/spfquery/Makefile
+                  src/spftest/Makefile
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 307bf10..02f09b4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,5 +4,5 @@ AUTOMAKE_OPTIONS = foreign
+ # Attempt to disable parallel processing.
+ .NOTPARALLEL:
+ .NO_PARALLEL:
+-SUBDIRS =	include libreplace libspf2 spfquery spftest spfd spf_example
++SUBDIRS =	include libspf2 spfquery spftest spfd spf_example
+ TARGETS =
+diff --git a/src/libspf2/Makefile.am b/src/libspf2/Makefile.am
+index 6b5a147..77ef3b9 100644
+--- a/src/libspf2/Makefile.am
++++ b/src/libspf2/Makefile.am
+@@ -34,10 +34,6 @@ libspf2_la_SOURCES	= \
+ 	spf_utils.c \
+ 	spf_win32.c
+ 
+-libspf2_la_LIBADD	= $(top_builddir)/src/libreplace/libreplace.la
+-
+-
+-
+ libspf2_la_LDFLAGS	= -version-info 3:0:1
+ 
+ # Copied from the libtool info file:
+-- 
+1.8.4.2
+
diff --git a/libspf2.spec b/libspf2.spec
index 3d9cc0c..c99eed0 100644
--- a/libspf2.spec
+++ b/libspf2.spec
@@ -4,13 +4,15 @@
 Summary:	Implementation of the SPF specification
 Summary(pl.UTF-8):	Implementacja specyfikacji SPF
 Name:		libspf2
-Version:	1.2.10
-Release:	2
+Version:	1.2.11
+Release:	1
 License:	LGPL
 Group:		Libraries
-Source0:	http://www.libspf2.org/spf/%{name}-%{version}.tar.gz
-# Source0-md5:	7bb9937d0705649eaa8646de66dc3562
+# Source0:	http://www.libspf2.org/spf/%{name}-%{version}.tar.gz
+Source0:	https://github.com/shevek/libspf2/tarball/4915c30#/%{name}.tar.gz
+# Source0-md5:	ad5f1b48e4f2b5561df99ca7cbf30e92
 Patch0:		%{name}-link.patch
+Patch1:		0001-remove-libreplace-unneeded-on-Linux.patch
 URL:		http://www.libspf2.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -68,8 +70,10 @@ Static libspf2 library.
 Statyczna biblioteka libspf2.
 
 %prep
-%setup -q
+#%%setup -q
+%setup -q -n shevek-libspf2-4915c30
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}