[packages/masqmail] - remove ancient patch that only breaks build now

baggins baggins at pld-linux.org
Wed Oct 24 00:38:12 CEST 2018


commit 0a6963cf205602df66771995790f0bac43a272ca
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Oct 24 00:37:52 2018 +0200

    - remove ancient patch that only breaks build now

 masqmail-resolv.patch | 16 ----------------
 masqmail.spec         |  6 ------
 2 files changed, 22 deletions(-)
---
diff --git a/masqmail.spec b/masqmail.spec
index 907c5d7..046c5c8 100644
--- a/masqmail.spec
+++ b/masqmail.spec
@@ -10,7 +10,6 @@ Source0:	http://ftp.debian.org/debian/pool/main/m/masqmail/%{name}_%{version}.or
 Source1:	%{name}.aliases
 Source2:	%{name}.conf
 Source3:	%{name}.default.route
-Patch0:		%{name}-resolv.patch
 URL:		http://packages.debian.org/masqmail
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -38,13 +37,8 @@ Zastępuje sendmaila oraz inne MTA jak qmail czy exim.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	--with-confdir=%{_sysconfdir} \
diff --git a/masqmail-resolv.patch b/masqmail-resolv.patch
deleted file mode 100644
index b70eeda..0000000
--- a/masqmail-resolv.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- masqmail-0.3.4/configure.ac~	2012-01-18 09:31:45.000000000 +0100
-+++ masqmail-0.3.4/configure.ac	2018-09-26 13:27:12.085535818 +0200
-@@ -37,11 +37,9 @@ if test "$resolver_enabled" = yes; then
- dnl checks necessary for libc5:
- dnl if there is res_search in libc, it is probably libc5
- dnl if not, it is probably libc6 and we need libresolv
--	AC_CHECK_LIB(c, res_search, need_resolv=no, need_resolv=yes)
-+	AC_CHECK_LIB(c, res_search, need_resolv=no, [AC_CHECK_LIB(c, __res_search, need_resolv=no, need_resolv=yes)])
- 	if test "$need_resolv" = yes; then
--		AC_CHECK_LIB(resolv, res_search,
--			has_resolv=yes; RESOLV_LIBS="-lresolv",
--			has_resolv=no)
-+		AC_CHECK_LIB(resolv, res_search,has_resolv=yes, [AC_CHECK_LIB(resolv, __res_search, has_resolv=yes; RESOLV_LIBS="-lresolv", [AC_MSG_ERROR("no libresolv")])])
- 		if test "$has_resolv" = no; then
- 			saved_LIBS="$LIBS"
- 			LIBS="$LIBS -lresolv"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/masqmail.git/commitdiff/0a6963cf205602df66771995790f0bac43a272ca



More information about the pld-cvs-commit mailing list