[packages/ldns] - updated to 1.7.0 (note: new soname) - removed obsolete gen-manpages patch - added link patch (link

qboosh qboosh at pld-linux.org
Mon Apr 17 10:35:39 CEST 2017


commit 45d04eb4e79b07498d95fb0378ebd0e7493f0329
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 17 10:35:51 2017 +0200

    - updated to 1.7.0 (note: new soname)
    - removed obsolete gen-manpages patch
    - added link patch (link python module with just built library instead of old system installed)

 gen-manpages.patch | 11 -----------
 ldns-link.patch    | 22 ++++++++++++++++++++++
 ldns.spec          | 25 ++++++++++++++++++-------
 3 files changed, 40 insertions(+), 18 deletions(-)
---
diff --git a/ldns.spec b/ldns.spec
index 844baae..449cad2 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -1,25 +1,31 @@
+# TODO: drop dane bcond after switch to openssl 1.1.0
 #
 # Conditional build:
+%bcond_with	dane		# OpenSSL DANE functions for verification (requires openssl >= 1.1.0)
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	python		# Python modules
 #
 Summary:	ldns - a library with the aim to simplify DNS programing in C
 Summary(pl.UTF-8):	ldns - biblioteka mająca na celu uproszczenie programowania DNS w C
 Name:		ldns
-Version:	1.6.17
-Release:	3
+Version:	1.7.0
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://www.nlnetlabs.nl/downloads/ldns/%{name}-%{version}.tar.gz
-# Source0-md5:	a79423bcc4129e6d59b616b1cae11e5e
-Patch0:		gen-manpages.patch
-Patch1:		python-install.patch
+# Source0-md5:	74b75c9ba69fb3af2a0c26244ecfd9f6
+Patch0:		python-install.patch
+Patch1:		%{name}-link.patch
 URL:		http://www.nlnetlabs.nl/ldns/
 BuildRequires:	autoconf >= 2.56
 BuildRequires:	automake
 BuildRequires:	doxygen
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
+%if %{with dane}
+BuildRequires:	openssl-devel >= 1.1.0
+%else
 BuildRequires:	openssl-devel >= 1.0.0
+%endif
 %if %{with python}
 BuildRequires:	python-devel >= 1:2.4.0
 BuildRequires:	rpmbuild(macros) >= 1.219
@@ -42,7 +48,11 @@ Summary:	Header files for ldns library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki ldns
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%if %{with dane}
+Requires:	openssl-devel >= 1.1.0
+%else
 Requires:	openssl-devel >= 1.0.0
+%endif
 
 %description devel
 Header files for ldns library.
@@ -99,6 +109,7 @@ zaprojektowane szczególnie z myślą o użyciu z DNSSEC.
 %{__autoconf}
 %{__autoheader}
 %configure \
+	%{!?with_dane:--disable-dane-ta-usage} \
 	--enable-static%{!?with_static_libs:=no} \
 	--with-drill \
 	%{?with_python:--with-pyldns}
@@ -139,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc Changelog LICENSE README
 %attr(755,root,root) %{_libdir}/libldns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libldns.so.1
+%attr(755,root,root) %ghost %{_libdir}/libldns.so.2
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/gen-manpages.patch b/gen-manpages.patch
deleted file mode 100644
index 1b9d14b..0000000
--- a/gen-manpages.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ldns-1.6.17/doc/doxyparse.pl~	2014-01-10 22:04:41.000000000 +0100
-+++ ldns-1.6.17/doc/doxyparse.pl	2016-05-05 19:51:32.259389955 +0200
-@@ -273,7 +273,7 @@
- 
- 	print MAN $MAN_MIDDLE;
- 
--	if (defined(@$also)) {
-+	if (@$also) {
- 		print MAN "\n.SH SEE ALSO\n\\fI";
- 		print MAN join "\\fR, \\fI", @$also;
- 		print MAN "\\fR.\nAnd ";
diff --git a/ldns-link.patch b/ldns-link.patch
new file mode 100644
index 0000000..af1dc06
--- /dev/null
+++ b/ldns-link.patch
@@ -0,0 +1,22 @@
+--- ldns-1.7.0/ax_python_devel.m4.orig	2017-04-17 10:21:17.538303304 +0200
++++ ldns-1.7.0/ax_python_devel.m4	2017-04-17 10:27:08.141632634 +0200
+@@ -227,7 +227,7 @@
+ 		then
+ 			# use the official shared library
+ 			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+-			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
++			PYTHON_LDFLAGS="-l$ac_python_library"
+ 		else
+ 			# old way: use libpython from python_configdir
+ 			ac_python_libdir=`$PYTHON -c \
+--- ldns-1.7.0/Makefile.in.orig	2016-12-20 11:48:22.000000000 +0100
++++ ldns-1.7.0/Makefile.in	2017-04-17 10:27:36.031632314 +0200
+@@ -286,7 +286,7 @@
+ 	$(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
+ 
+ _ldns.la: ldns_wrapper.lo libldns.la 
+-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) libldns.la $(PYTHON_LDFLAGS) $(LIBS)
+ 
+ $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
+ 	BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ldns.git/commitdiff/45d04eb4e79b07498d95fb0378ebd0e7493f0329



More information about the pld-cvs-commit mailing list