From b51bd8aa763cbf0f7f31a2ccde6fbeccec647367 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sun, 21 Jun 2009 04:23:10 +0000 Subject: [PATCH] - Added missing glob patch to cvs - Place python macros within the %with_python check --- unbound-1.2-glob.patch | 13 +++++++++++++ unbound.spec | 13 ++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 unbound-1.2-glob.patch diff --git a/unbound-1.2-glob.patch b/unbound-1.2-glob.patch new file mode 100644 index 0000000..996ceac --- /dev/null +++ b/unbound-1.2-glob.patch @@ -0,0 +1,13 @@ +diff -Naur unbound-1.2.0/validator/val_anchor.c unbound-1.2.0.new/validator/val_anchor.c +--- unbound-1.2.0/validator/val_anchor.c 2009-01-07 07:24:34.000000000 -0500 ++++ unbound-1.2.0.new/validator/val_anchor.c 2009-01-20 17:31:43.000000000 -0500 +@@ -718,7 +718,8 @@ + log_err("wildcard trusted-keys-file %s: expansion " + "failed (%s)", pat, strerror(errno)); + } +- return 0; ++ /* ignore globs that yield no files */ ++ return 1; + } + /* process files found, if any */ + for(i=0; i<(size_t)g.gl_pathc; i++) { diff --git a/unbound.spec b/unbound.spec index e57982d..08c421a 100644 --- a/unbound.spec +++ b/unbound.spec @@ -1,12 +1,15 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} # not ready yet %{?!with_python: %define with_python 0} +%if %{with_python} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif + Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://www.nlnetlabs.nl/unbound/ Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz @@ -190,6 +193,10 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Sat Jun 20 2009 Paul Wouters - 1.3.0-2 +- Added missing glob patch to cvs +- Place python macros within the %%with_python check + * Sat Jun 20 2009 Paul Wouters - 1.3.0-1 - Updated to 1.3.0 - Added unbound-python sub package. disabled for now