diff --git a/ldns-swig4.0.patch b/ldns-swig4.0.patch new file mode 100644 index 0000000..4ecff0d --- /dev/null +++ b/ldns-swig4.0.patch @@ -0,0 +1,12 @@ +diff -up ldns-1.7.0/contrib/python/ldns_key.i.swig4 ldns-1.7.0/contrib/python/ldns_key.i +--- ldns-1.7.0/contrib/python/ldns_key.i.swig4 2016-12-20 11:48:22.000000000 +0100 ++++ ldns-1.7.0/contrib/python/ldns_key.i 2019-03-15 12:21:22.608314831 +0100 +@@ -41,7 +41,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN | 0 )); + } + +-%exception ldns_key_set_pubkey_owner(ldns_key *k, ldns_rdf *r) %{ $action Py_INCREF(obj1); %} ++%typemap(argout) ldns_rdf *r "Py_INCREF($input);" + + %nodefaultctor ldns_struct_key; //no default constructor & destructor + %nodefaultdtor ldns_struct_key; diff --git a/ldns.changes b/ldns.changes index 652343d..ea8cc97 100644 --- a/ldns.changes +++ b/ldns.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 7 14:18:17 UTC 2019 - Dominique Leuenberger + +- Add ldns-swig4.0.patch: Fix build wih SWIG 4.0 (boo#1135750). + ------------------------------------------------------------------- Mon Jan 8 10:08:13 UTC 2018 - tchvatal@suse.com diff --git a/ldns.spec b/ldns.spec index 2877b6f..752d59c 100644 --- a/ldns.spec +++ b/ldns.spec @@ -1,7 +1,7 @@ # # spec file for package ldns # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,8 +23,10 @@ Release: 0 Summary: A library for developing the Domain Name System License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: http://www.nlnetlabs.nl/projects/ldns/ +URL: http://www.nlnetlabs.nl/projects/ldns/ Source: http://www.nlnetlabs.nl/downloads/ldns/ldns-%{version}.tar.gz +# https://github.com/NLnetLabs/ldns/issues/7 +Patch0: ldns-swig4.0.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libopenssl-devel @@ -83,6 +85,7 @@ Perl bindings for the ldns library. %prep %setup -q +%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -161,8 +164,8 @@ rm -v %{buildroot}%{_libdir}/libldns.*a %{_bindir}/ldns-zsplit %{_bindir}/ldnsd %{_bindir}/ldns-dane -%{_mandir}/man1/drill.1* -%{_mandir}/man1/ldns*.1* +%{_mandir}/man1/drill.1%{?ext_man} +%{_mandir}/man1/ldns*.1%{?ext_man} %files -n %{libname} %{_libdir}/libldns.so.* @@ -171,8 +174,9 @@ rm -v %{buildroot}%{_libdir}/libldns.*a %{_bindir}/ldns-config %{_includedir}/ldns/ %{_libdir}/libldns.so -%{_mandir}/man3/ldns*.3* -%doc libdns.vim LICENSE README* +%{_mandir}/man3/ldns*.3%{?ext_man} +%license LICENSE +%doc libdns.vim README* %files -n perl-DNS-LDNS %{perl_vendorarch}/DNS/LDNS.pm