rpms/unbound
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Modified scandir patch to silently fail when wildcard matches nothing

Browse Source 
- Patch to allow unbound-checkconf to find empty wildcard matches
This commit is contained in:
Paul Wouters 2009-01-05 13:19:32 +00:00
parent 1555a15e2e
commit 482e5e4041
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unbound-1.1-checkconf.patch Normal file
View File

@ -0,0 +1,15 @@
Index: smallapp/unbound-checkconf.c
===================================================================
--- smallapp/unbound-checkconf.c (revision 1404)
+++ smallapp/unbound-checkconf.c (working copy)
@@ -258,7 +258,9 @@
{
struct config_strlist* p;
for(p=list; p; p=p->next) {
- check_chroot_string(desc, &p->str, chrootdir, cfg);
+ /* skip wildcard checks, may fail */
+ if(strstr(p->str,"*") == NULL)
+ check_chroot_string(desc, &p->str, chrootdir, cfg);
}
}

2
unbound-1.1-scandir.patch
View File

@ -38,7 +38,7 @@ Index: validator/val_anchor.c
+ free(fnameb);
+ free(fnamef);
+ free(globmatch);
+ return 0;
+ return 1;
+ }
+ else {
+ while(n--) {

8
unbound.spec
View File

@ -1,7 +1,7 @@
Summary: Validating, recursive, and caching DNS(SEC) resolver
Name: unbound
Version: 1.1.1
Release: 6%{?dist}
Release: 7%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/unbound/
Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@ -9,6 +9,7 @@ Source1: unbound.init
Source2: unbound.conf
Source3: unbound.munin
Patch0: unbound-1.1-scandir.patch
Patch1: unbound-1.1-checkconf.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
@ -63,6 +64,7 @@ Contains libraries used by the unbound server and client applications
%prep
%setup -q
%patch0 -p0
%patch1 -p0
%build
%configure --with-ldns= --with-libevent --with-pthreads --with-ssl \
@ -147,6 +149,10 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
* Mon Jan 5 2009 Paul Wouters <paul@xelerance.com> - 1.1.1-7
- Modified scandir patch to silently fail when wildcard matches nothing
- Patch to allow unbound-checkconf to find empty wildcard matches
* Mon Jan 5 2009 Paul Wouters <paul@xelerance.com> - 1.1.1-6
- Added scandir patch for trusted-keys-file: option, which
is used to load multiple dnssec keys in bind file format