Changes - j0ke.net Open Build Service

Difference Between Revision 4 and home:netmax / pdns-recursor

[-] [+]	Changed	pdns-recursor.spec
@@ -1,5 +1,5 @@ # -# spec file for package pdns-recursor (Version 3.2) +# spec file for package pdns-recursor (Version 3.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,9 +11,9 @@ # norootforbuild Name: pdns-recursor -Version: 3.2 +Version: 3.3 Release: 102 -%define pkg_version 3.2 +%define pkg_version 3.3 # Group: Productivity/Networking/DNS/Servers License: GPL v2 or later @@ -21,14 +21,20 @@ %define home %{_var}/lib/pdns %define _localstatedir %{_var}/run/pdns BuildRequires: boost-devel gcc-c++ +%if 0%{?suse_version} +BuildRequires: pwdutils +Requires: pwdutils +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd +%endif # Url: http://www.powerdns.com/ Source: http://downloads.powerdns.com/releases/%{name}-%{pkg_version}.tar.bz2 Source1: pdns-recursor.init Source2: recursor.conf -Patch: pdns-recursor-%{version}_config.patch +Patch0: pdns-recursor-%{version}_config.patch Patch1: pdns-recursor-%{version}-strip.patch # Summary: Modern, advanced and high performance recursing/non authoritative nameserver @@ -45,7 +51,7 @@ %prep %setup -n %{name}-%{pkg_version} -%patch +%patch0 %patch1 %build @@ -53,7 +59,7 @@ %install %{__install} -Dd -m 0755 %{buildroot}{%{home},%{_localstatedir}} -%makeinstall CONFIGDIR="%{_sysconfdir}/pdns" BINDIR="%{_sbindir}" +%__make DESTDIR=%{buildroot} install CONFIGDIR="%{_sysconfdir}/pdns" BINDIR="%{_sbindir}" %{__install} -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/pdns/recursor.conf %{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name} %{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} @@ -67,14 +73,20 @@ /usr/sbin/useradd -o -g pdns -s /bin/false -r -c "pdns" -d %{home} pdns &>/dev/null \|\| : %post +%if 0%{?suse_version} %{fillup_and_insserv pdns-recursor} +%endif %preun +%if 0%{?suse_version} %stop_on_removal pdns-recursor +%endif %postun +%if 0%{?suse_version} %restart_on_update pdns-recursor %insserv_cleanup +%endif %files %defattr (-,root,root,-) @@ -98,6 +110,14 @@ %dir %{_localstatedir} %changelog +* Mon Jan 17 2011 Carsten Schoene <cs@linux-administrator.com> - 3.3-1 +- update to release 3.3 + - This version fixes a number of small but persistent issues + - Rounds off the IPv6 support + - Add an important feature for many users of the Lua scripts + - Scalability on Solaris 10 has been improved + - Compilation on RHEL5 has been fixed + * Mon Mar 08 2010 Carsten Schoene <cs@linux-administrator.com> - 3.2-1 - update to release 3.2 - This version contains a new "packet cache", which delivers a major performance boost.
[-] [+]	Deleted	pdns-recursor-3.1.5-strip.patch ^
@@ -1,13 +0,0 @@ ---- Makefile -+++ Makefile -@@ -54,10 +54,8 @@ - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Deleted	pdns-recursor-3.1.5_atomicity.patch ^
@@ -1,24 +0,0 @@ -Index: recursor_cache.cc -=================================================================== ---- recursor_cache.cc.orig 2006-11-12 17:56:13.000000000 +0100 -+++ recursor_cache.cc 2007-02-27 21:44:27.347571093 +0100 -@@ -9,9 +9,17 @@ using namespace std; - using namespace boost; - - #include "config.h" -- --#ifdef GCC_SKIP_LOCKING -+#if !(__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && defined(GCC_SKIP_LOCKING) -+#warning "using the optimized locking code on older gcc" -+#if HAVE_BITS_ATOMICITY_H - #include <bits/atomicity.h> -+#endif -+/* -+this is just a reminder. in gcc 4.2 it seems atomicity.h was moved under ext/ -+#if HAVE_EXT_ATOMICITY_H -+#include <ext/atomicity.h> -+#endif -+*/ - // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor - namespace __gnu_cxx - {
[-] [+]	Deleted	pdns-recursor-3.1.5_config.patch ^
@@ -1,12 +0,0 @@ -Index: config.h -=================================================================== ---- config.h.orig -+++ config.h -@@ -1,5 +1,5 @@ --#define SYSCONFDIR "/etc/powerdns/" --#define LOCALSTATEDIR "/var/run/" -+#define SYSCONFDIR "/etc/pdns/" -+#define LOCALSTATEDIR "/var/run/pdns/" - #define VERSION "3.1.5" - #define RECURSOR - #ifndef WIN32
[-] [+]	Deleted	pdns-recursor-3.1.6-strip.patch ^
@@ -1,13 +0,0 @@ ---- Makefile -+++ Makefile -@@ -54,10 +54,8 @@ - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Deleted	pdns-recursor-3.1.6_atomicity.patch ^
@@ -1,24 +0,0 @@ -Index: recursor_cache.cc -=================================================================== ---- recursor_cache.cc.orig 2006-11-12 17:56:13.000000000 +0100 -+++ recursor_cache.cc 2007-02-27 21:44:27.347571093 +0100 -@@ -9,9 +9,17 @@ using namespace std; - using namespace boost; - - #include "config.h" -- --#ifdef GCC_SKIP_LOCKING -+#if !(__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && defined(GCC_SKIP_LOCKING) -+#warning "using the optimized locking code on older gcc" -+#if HAVE_BITS_ATOMICITY_H - #include <bits/atomicity.h> -+#endif -+/* -+this is just a reminder. in gcc 4.2 it seems atomicity.h was moved under ext/ -+#if HAVE_EXT_ATOMICITY_H -+#include <ext/atomicity.h> -+#endif -+*/ - // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor - namespace __gnu_cxx - {
[-] [+]	Deleted	pdns-recursor-3.1.6_config.patch ^
@@ -1,12 +0,0 @@ -Index: config.h -=================================================================== ---- config.h.orig -+++ config.h -@@ -1,5 +1,5 @@ --#define SYSCONFDIR "/etc/powerdns/" --#define LOCALSTATEDIR "/var/run/" -+#define SYSCONFDIR "/etc/pdns/" -+#define LOCALSTATEDIR "/var/run/pdns/" - #define VERSION "3.1.6" - #define RECURSOR - #ifndef WIN32
[-] [+]	Deleted	pdns-recursor-3.1.7-makefile.patch ^
@@ -1,13 +0,0 @@ ---- Makefile.orig 2008-06-28 14:43:11.000000000 +0200 -+++ Makefile 2008-06-28 14:43:58.000000000 +0200 -@@ -42,7 +42,9 @@ - STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc - LINKCC=$(CC) - LDFLAGS += malloc.o -ldl -lm --else ifeq ($(STATIC),full) -+endif -+ -+ifeq ($(STATIC),full) - STATICFLAGS=-lstdc++ $(LUALIBS) -ldl -lm -static - LINKCC=$(CC) - else
[-] [+]	Deleted	pdns-recursor-3.1.7-strip.patch ^
@@ -1,13 +0,0 @@ ---- Makefile -+++ Makefile -@@ -54,10 +54,8 @@ - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Deleted	pdns-recursor-3.1.7.1-makefile.patch ^
@@ -1,13 +0,0 @@ ---- Makefile.orig 2008-06-28 14:43:11.000000000 +0200 -+++ Makefile 2008-06-28 14:43:58.000000000 +0200 -@@ -42,7 +42,9 @@ - STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc - LINKCC=$(CC) - LDFLAGS += malloc.o -ldl -lm --else ifeq ($(STATIC),full) -+endif -+ -+ifeq ($(STATIC),full) - STATICFLAGS=-lstdc++ $(LUALIBS) -ldl -lm -static - LINKCC=$(CC) - else
[-] [+]	Deleted	pdns-recursor-3.1.7.1-strip.patch ^
@@ -1,13 +0,0 @@ ---- Makefile -+++ Makefile -@@ -54,10 +54,8 @@ - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Deleted	pdns-recursor-3.1.7.1_atomicity.patch ^
@@ -1,24 +0,0 @@ -Index: recursor_cache.cc -=================================================================== ---- recursor_cache.cc.orig 2006-11-12 17:56:13.000000000 +0100 -+++ recursor_cache.cc 2007-02-27 21:44:27.347571093 +0100 -@@ -9,9 +9,17 @@ using namespace std; - using namespace boost; - - #include "config.h" -- --#ifdef GCC_SKIP_LOCKING -+#if !(__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && defined(GCC_SKIP_LOCKING) -+#warning "using the optimized locking code on older gcc" -+#if HAVE_BITS_ATOMICITY_H - #include <bits/atomicity.h> -+#endif -+/* -+this is just a reminder. in gcc 4.2 it seems atomicity.h was moved under ext/ -+#if HAVE_EXT_ATOMICITY_H -+#include <ext/atomicity.h> -+#endif -+*/ - // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor - namespace __gnu_cxx - {
[-] [+]	Deleted	pdns-recursor-3.1.7.1_config.patch ^
@@ -1,10 +0,0 @@ ---- config.h.orig 2009-08-02 22:22:51.000000000 +0200 -+++ config.h 2009-08-03 09:16:59.000000000 +0200 -@@ -1,5 +1,5 @@ --#define SYSCONFDIR "/etc/powerdns/" --#define LOCALSTATEDIR "/var/run/" -+#define SYSCONFDIR "/etc/pdns/" -+#define LOCALSTATEDIR "/var/run/pdns/" - #define VERSION "3.1.7.1" - #define RECURSOR - #ifndef WIN32
[-] [+]	Deleted	pdns-recursor-3.1.7.2-strip.patch ^
@@ -1,13 +0,0 @@ ---- Makefile -+++ Makefile -@@ -54,10 +54,8 @@ - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Deleted	pdns-recursor-3.1.7.2_atomicity.patch ^
@@ -1,24 +0,0 @@ -Index: recursor_cache.cc -=================================================================== ---- recursor_cache.cc.orig 2006-11-12 17:56:13.000000000 +0100 -+++ recursor_cache.cc 2007-02-27 21:44:27.347571093 +0100 -@@ -9,9 +9,17 @@ using namespace std; - using namespace boost; - - #include "config.h" -- --#ifdef GCC_SKIP_LOCKING -+#if !(__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && defined(GCC_SKIP_LOCKING) -+#warning "using the optimized locking code on older gcc" -+#if HAVE_BITS_ATOMICITY_H - #include <bits/atomicity.h> -+#endif -+/* -+this is just a reminder. in gcc 4.2 it seems atomicity.h was moved under ext/ -+#if HAVE_EXT_ATOMICITY_H -+#include <ext/atomicity.h> -+#endif -+*/ - // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor - namespace __gnu_cxx - {
[-] [+]	Deleted	pdns-recursor-3.1.7.2_config.patch ^
@@ -1,10 +0,0 @@ ---- config.h.orig 2009-08-02 22:22:51.000000000 +0200 -+++ config.h 2009-08-03 09:16:59.000000000 +0200 -@@ -1,5 +1,5 @@ --#define SYSCONFDIR "/etc/powerdns/" --#define LOCALSTATEDIR "/var/run/" -+#define SYSCONFDIR "/etc/pdns/" -+#define LOCALSTATEDIR "/var/run/pdns/" - #define VERSION "3.1.7.2" - #define RECURSOR - #ifndef WIN32
[-] [+]	Deleted	pdns-recursor-3.1.7_atomicity.patch ^
@@ -1,24 +0,0 @@ -Index: recursor_cache.cc -=================================================================== ---- recursor_cache.cc.orig 2006-11-12 17:56:13.000000000 +0100 -+++ recursor_cache.cc 2007-02-27 21:44:27.347571093 +0100 -@@ -9,9 +9,17 @@ using namespace std; - using namespace boost; - - #include "config.h" -- --#ifdef GCC_SKIP_LOCKING -+#if !(__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && defined(GCC_SKIP_LOCKING) -+#warning "using the optimized locking code on older gcc" -+#if HAVE_BITS_ATOMICITY_H - #include <bits/atomicity.h> -+#endif -+/* -+this is just a reminder. in gcc 4.2 it seems atomicity.h was moved under ext/ -+#if HAVE_EXT_ATOMICITY_H -+#include <ext/atomicity.h> -+#endif -+*/ - // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor - namespace __gnu_cxx - {
[-] [+]	Deleted	pdns-recursor-3.1.7_config.patch ^
@@ -1,12 +0,0 @@ -Index: config.h -=================================================================== ---- config.h.orig -+++ config.h -@@ -1,5 +1,5 @@ --#define SYSCONFDIR "/etc/powerdns/" --#define LOCALSTATEDIR "/var/run/" -+#define SYSCONFDIR "/etc/pdns/" -+#define LOCALSTATEDIR "/var/run/pdns/" - #define VERSION "3.1.7" - #define RECURSOR - #ifndef WIN32
[-] [+]	Deleted	pdns-recursor-3.2-strip.patch ^
@@ -1,13 +0,0 @@ ---- Makefile -+++ Makefile -@@ -54,10 +54,8 @@ - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Deleted	pdns-recursor-3.2_config.patch ^
@@ -1,9 +0,0 @@ ---- config.h.orig 2010-03-06 13:10:44.000000000 +0100 -+++ config.h 2010-03-08 07:04:56.000000000 +0100 -@@ -1,4 +1,4 @@ --#define SYSCONFDIR "/etc/powerdns/" --#define LOCALSTATEDIR "/var/run/" -+#define SYSCONFDIR "/etc/pdns/" -+#define LOCALSTATEDIR "/var/run/pdns" - #define VERSION "3.2" - #define RECURSOR
[-] [+]	Added	pdns-recursor-3.3-strip.patch ^
@@ -0,0 +1,13 @@ +--- Makefile ++++ Makefile +@@ -54,10 +54,8 @@ + install: all + -mkdir -p $(DESTDIR)/$(SBINDIR) + mv pdns_recursor $(DESTDIR)/$(SBINDIR) +- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor + mkdir -p $(DESTDIR)/$(BINDIR) + mv rec_control $(DESTDIR)/$(BINDIR) +- strip $(DESTDIR)/$(BINDIR)/rec_control + -mkdir -p $(DESTDIR)/$(CONFIGDIR) + $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist + -mkdir -p $(DESTDIR)/usr/share/man/man1
[-] [+]	Added	pdns-recursor-3.3_config.patch ^
@@ -0,0 +1,9 @@ +--- config.h.orig 2010-03-06 13:10:44.000000000 +0100 ++++ config.h 2010-03-08 07:04:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-#define SYSCONFDIR "/etc/powerdns/" +-#define LOCALSTATEDIR "/var/run/" ++#define SYSCONFDIR "/etc/pdns/" ++#define LOCALSTATEDIR "/var/run/pdns" + #define VERSION "3.2" + #define RECURSOR
	Deleted	pdns-recursor-3.1.6.tar.bz2 ^
	Deleted	pdns-recursor-3.1.7.1.tar.bz2 ^
	Deleted	pdns-recursor-3.1.7.2.tar.bz2 ^
	Deleted	pdns-recursor-3.1.7.tar.bz2 ^
	Deleted	pdns-recursor-3.2.tar.bz2 ^
	Changed	pdns-recursor-3.3.tar.bz2 ^