From bc5740f803883fe3edc5ad188600c232271446c2 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Fri, 10 Jan 2014 20:01:38 -0500 Subject: [PATCH] * Fri Jan 10 2014 Paul Wouters - 1.6.17-1 - Updated to 1.6.17 - Enable perl bindings via new ldns-perl sub-package - Enable ECDSA/GOST which is now allowed in Fedora --- .gitignore | 1 + ldns.spec | 93 ++++++++++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 74 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 3491fe7..7ba328a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ ldns-1.6.6.tar.gz /ldns-1.6.14.tar.gz /ldns-1.6.15.tar.gz /ldns-1.6.16.tar.gz +/ldns-1.6.17.tar.gz diff --git a/ldns.spec b/ldns.spec index bc43116..fa8b222 100644 --- a/ldns.spec +++ b/ldns.spec @@ -1,4 +1,6 @@ %{?!with_python: %global with_python 1} +%{?!with_perl: %global with_perl 1} +%{?!with_ecc: %global with_ecc 1} %if %{with_python} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -7,18 +9,21 @@ Summary: Low-level DNS(SEC) library with API Name: ldns -Version: 1.6.16 +Version: 1.6.17 Release: 1%{?dist} License: BSD Url: http://www.nlnetlabs.nl/%{name}/ Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz Group: System Environment/Libraries -BuildRequires: perl, libpcap-devel, openssl-devel, gcc-c++, doxygen, +BuildRequires: libpcap-devel, openssl-devel, gcc-c++, doxygen, # for snapshots only # BuildRequires: libtool, autoconf, automake %if %{with_python} BuildRequires: python-devel, swig %endif +%if %{with_perl} +BuildRequires: perl perl-ExtUtils-MakeMaker +%endif Requires: ca-certificates %description @@ -45,6 +50,17 @@ Requires: %{name} = %{version}-%{release} Python extensions for ldns %endif +%if %{with_perl} +%package perl +Summary: Perl extensions for ldns +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description perl +Perl extensions for ldns +%endif + %prep %setup -q # To built svn snapshots @@ -54,22 +70,44 @@ Python extensions for ldns # autoreconf --install %build -# as long as ECC is banned we cannot enable GOST or ECDSA -%configure --disable-rpath --disable-static --disable-gost --disable-ecdsa \ +%configure --disable-rpath --disable-static \ --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/ \ +%if %{with_ecc} + --enable-gost --enable-ecdsa \ +%else + --disable-gost --disable-ecdsa \ +%endif %if %{with_python} - --with-pyldns + --with-pyldns \ %endif -(cd drill ; %configure --disable-rpath --disable-static --disable-gost \ - --disable-ecdsa \ - --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/ +(cd drill ; %configure --disable-rpath --disable-static \ + --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/ \ +%if %{with_ecc} + --enable-gost --enable-ecdsa \ +%else + --disable-gost --disable-ecdsa \ +%endif ) -(cd examples ; %configure --disable-rpath --disable-static --disable-gost \ - --disable-ecdsa \ - --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/ + +(cd examples ; %configure --disable-rpath --disable-static \ + --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/ \ +%if %{with_ecc} + --enable-gost --enable-ecdsa \ +%else + --disable-gost --disable-ecdsa \ +%endif ) +# We cannot use the built-in --with-p5-dns-ldns +%if %{with_perl} +( + cd contrib/DNS-LDNS + perl Makefile.PL INSTALLDIRS=vendor + make +) +%endif + make %{?_smp_mflags} ( cd drill ; make %{?_smp_mflags} ) ( cd examples ; make %{?_smp_mflags} ) @@ -83,18 +121,22 @@ make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-doc # don't package building script for install-doc in doc section rm doc/doxyparse.pl -#remove double set of man pages +# remove double set of man pages rm -rf doc/man # remove .la files rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la + (cd drill ; make DESTDIR=%{buildroot} install) (cd examples; make DESTDIR=%{buildroot} install) -%clean -rm -rf %{buildroot} +%if %{with_perl} +( + cd contrib/DNS-LDNS + make DESTDIR=%{buildroot} pure_install +) +%endif %files -%defattr(-,root,root) %{_libdir}/libldns*so.* %{_bindir}/drill %{_bindir}/ldnsd @@ -102,10 +144,9 @@ rm -rf %{buildroot} %{_bindir}/ldns-compare-zones %{_bindir}/ldns-[d-z]* %doc README LICENSE -%{_mandir}/*/* +%{_mandir}/*/*.[1358]* %files devel -%defattr(-,root,root,-) %{_libdir}/libldns*so %{_bindir}/ldns-config %dir %{_includedir}/ldns @@ -114,15 +155,25 @@ rm -rf %{buildroot} %if %{with_python} %files python -%defattr(-,root,root) %{python_sitearch}/* %endif +%if %{with_perl} +%files perl +%{perl_vendorarch}/* +%exclude %dir %{perl_vendorarch}/auto/ +%endif + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog +* Fri Jan 10 2014 Paul Wouters - 1.6.17-1 +- Updated to 1.6.17 +- Enable perl bindings via new ldns-perl sub-package +- Enable ECDSA/GOST which is now allowed in Fedora + * Tue Oct 30 2012 Paul Wouters - 1.6.16-1 - Updated to 1.6.16 - Addresses bug in 1.6.14 and 1.6.15 that affects opendnssec @@ -153,7 +204,7 @@ rm -rf %{buildroot} * Wed Jan 11 2012 Paul Wouters - 1.6.12-1 - Upgraded to 1.6.12, fixes important end of year handling date bug -* Thu Oct 5 2011 Paul Wouters - 1.6.11-2 +* Wed Oct 5 2011 Paul Wouters - 1.6.11-2 - Updated to 1.6.11, fixes rhbz#741026 which is CVE-2011-3581 - Python goes into sitearch, not sitelib - Fix source link and spelling errors in description @@ -243,7 +294,7 @@ rm -rf %{buildroot} * Wed Feb 25 2009 Fedora Release Engineering - 1.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Mon Feb 10 2009 Paul Wouters - 1.5.1-1 +* Tue Feb 10 2009 Paul Wouters - 1.5.1-1 - Updated to new version, 1.5.0 had a bug preventing zone signing. @@ -322,7 +373,7 @@ rm -rf %{buildroot} * Sun Dec 18 2005 Paul Wouters 1.0.0-7 - Patched 'make clean' target to get rid of object files shipped with 1.0.0 -* Sun Dec 13 2005 Paul Wouters 1.0.0-6 +* Tue Dec 13 2005 Paul Wouters 1.0.0-6 - added a make clean for 2.3.3 since .o files were left behind upstream, causing failure on ppc platform diff --git a/sources b/sources index 1beb0c3..4b9e900 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ab2b402127cf24dffefaacbb727cad7 ldns-1.6.16.tar.gz +a79423bcc4129e6d59b616b1cae11e5e ldns-1.6.17.tar.gz