diff --git a/.gitignore b/.gitignore index a8fb770..39df5c0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ ldns-1.6.6.tar.gz /ldns-1.6.8.tar.gz /ldns-1.6.9.tar.gz /ldns-1.6.10.tar.gz +/ldns-1.6.11.tar.gz diff --git a/ldns.spec b/ldns.spec index 4f1c397..9ca5263 100644 --- a/ldns.spec +++ b/ldns.spec @@ -7,13 +7,11 @@ Summary: Lowlevel DNS(SEC) library with API Name: ldns -Version: 1.6.10 +Version: 1.6.11 Release: 2%{?dist} License: BSD Url: http://www.nlnetlabs.nl/%{name}/ -Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz -Source1: ldnsx.py -Patch1: ldns-fragmentdrop.patch +Source: http://www.nlnetlabs.nl/downloads/%{%name}/%{name}-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, libpcap-devel, openssl-devel, gcc-c++, doxygen, @@ -24,8 +22,8 @@ BuildRequires: python-devel, swig %endif %description -ldns is a library with the aim to simplify DNS programing in C. All -lowlevel DNS/DNSSEC operations are supported. We also define a higher +ldns is a library with the aim to simplify DNS programming in C. All +low-level DNS/DNSSEC operations are supported. We also define a higher level API which allows a programmer to (for instance) create or sign packets. @@ -47,19 +45,13 @@ Requires: %{name} = %{version}-%{release} Python extensions for ldns %endif - %prep %setup -q # To built svn snapshots -#rm config.guess config.sub ltmain.sh -#aclocal -#libtoolize -c --install -#autoreconf --install - -# Fix for wrong install path for python -sed -i "s/0,0/1,0/" acx_python.m4 - -%patch1 -p0 +# rm config.guess config.sub ltmain.sh +# aclocal +# libtoolize -c +# autoreconf %build %configure --disable-rpath --disable-static --with-sha2 --disable-gost \ @@ -81,21 +73,12 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-doc -%if %{with_python} -# remove execute perms from python files -chmod a-x %{buildroot}%{python_sitelib}/*py -cp %{SOURCE1} %{buildroot}%{python_sitelib} -%endif - -# don't package building script in doc +# don't package building script for install-doc in doc section rm doc/doxyparse.pl -#remove doc stubs -rm -rf doc/.svn #remove double set of man pages rm -rf doc/man - # remove .la files -rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitelib}/*.la +rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la (cd drill ; make DESTDIR=%{buildroot} install) (cd examples; make DESTDIR=%{buildroot} install) @@ -110,7 +93,7 @@ rm -rf %{buildroot} %{_bindir}/ldns-chaos %{_bindir}/ldns-compare-zones %{_bindir}/ldns-[d-z]* -%doc README LICENSE +%doc README LICENSE %{_mandir}/*/* %files devel @@ -124,7 +107,7 @@ rm -rf %{buildroot} %if %{with_python} %files python %defattr(-,root,root) -%{python_sitelib}/* +%{python_sitearch}/* %endif %post -p /sbin/ldconfig @@ -132,6 +115,11 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %changelog +* Thu 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 + * Mon Sep 19 2011 Paul Wouters - 1.6.10-2 - Fix for losing nameserver when it drops UDP fragments in ldns_resolver_send_pkt [Willem Toorop ] diff --git a/sources b/sources index 5de8091..33460c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ fc9db99cfe7c9d7f86da8f53efdbbbd6 ldns-1.6.9.tar.gz fadf8e38fbd2d3434a2c46097d9932d5 ldns-1.6.10.tar.gz +c55b592a679672281712c457fbb41eb5 ldns-1.6.11.tar.gz