[pdns-recursor/el5] Update to 3.3

Morten Stevens mstevens at fedoraproject.org
Fri Mar 22 22:24:03 UTC 2013 

commit 400ed7a47453f13a4272b1bbd592099c4877441e
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Fri Mar 22 23:22:33 2013 +0100

    Update to 3.3

 pdns-recursor-fixsysconfdir.patch |    7 +--
 pdns-recursor.spec                |   74 ++++++++++++++++++++++---------------
 sources                           |    2 +-
 3 files changed, 48 insertions(+), 35 deletions(-)
---
diff --git a/pdns-recursor-fixsysconfdir.patch b/pdns-recursor-fixsysconfdir.patch
index 367d78a..49f6220 100644
--- a/pdns-recursor-fixsysconfdir.patch
+++ b/pdns-recursor-fixsysconfdir.patch
@@ -1,9 +1,8 @@
-diff -up pdns-recursor-3.1.7.2/config.h.orig pdns-recursor-3.1.7.2/config.h
---- pdns-recursor-3.1.7.2/config.h.orig	2010-01-06 14:08:08.000000000 +0100
-+++ pdns-recursor-3.1.7.2/config.h	2010-01-06 14:08:18.000000000 +0100
+--- pdns-recursor-3.3/config.h.orig	2010-09-21 18:22:09.000000000 +0200
++++ pdns-recursor-3.3/config.h	2013-03-22 23:20:27.916995751 +0100
 @@ -1,4 +1,4 @@
 -#define SYSCONFDIR "/etc/powerdns/" 
 +#define SYSCONFDIR "/etc/pdns-recursor/" 
  #define LOCALSTATEDIR "/var/run/" 
- #define VERSION "3.1.7.2"
+ #define VERSION "3.3"
  #define RECURSOR
diff --git a/pdns-recursor.spec b/pdns-recursor.spec
index 40a1393..c5aa6a5 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -1,22 +1,24 @@
-Summary:		Modern, advanced and high performance recursing/non authoritative nameserver
-Name:			pdns-recursor
-Version:		3.1.7.2
-Release:		1%{?dist}
-
-Group:			System Environment/Daemons
-License:		GPLv2
-URL:			http://powerdns.com
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:		http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
-Source1:		pdns-recursor.init	
-
-Patch0:			pdns-recursor-fixsysconfdir.patch
-Patch1:			pdns-recursor-fixmakefile.patch
-
-Provides:		powerdns-recursor = %{version}-%{release}
-BuildRequires:		boost-devel, lua-devel, lua
-Requires(post):		/sbin/chkconfig
-Requires(preun):	/sbin/chkconfig, /sbin/service
+Name: pdns-recursor
+Version: 3.3
+Release: 1%{?dist}
+Summary: Modern, advanced and high performance recursing/non authoritative name server
+Group: System Environment/Daemons
+License: GPLv2
+URL: http://powerdns.com
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
+Source1: pdns-recursor.init
+Patch0: pdns-recursor-fixsysconfdir.patch
+Patch1: pdns-recursor-fixmakefile.patch
+
+Provides: powerdns-recursor = %{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: boost141-devel
+BuildRequires: lua-devel
+
+Requires(pre): shadow-utils
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 
 %description
 PowerDNS Recursor is a non authoritative/recursing DNS server. Use this
@@ -28,11 +30,13 @@ package if you need a dns cache for your network.
 %patch1 -p1 -b .fixmakefile
 
 %build
-LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags}
+CXXFLAGS="-I/usr/include/boost141" LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 make install DESTDIR=%{buildroot} CONFIGDIR="%{_sysconfdir}/%{name}"
+chmod 0755 %{buildroot}/%{_bindir}/rec_control
+chmod 0755 %{buildroot}/%{_sbindir}/pdns_recursor
 %{__install} -D -p %{SOURCE1} %{buildroot}%{_initrddir}/pdns-recursor
 
 %{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf{-dist,}
@@ -41,14 +45,16 @@ make install DESTDIR=%{buildroot} CONFIGDIR="%{_sysconfdir}/%{name}"
 sed -i '1i\setuid=pdns-recursor' %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
 sed -i '2i\setgid=pdns-recursor' %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
 
+%pre
+getent group pdns-recursor > /dev/null || groupadd -r pdns-recursor
+getent passwd pdns-recursor > /dev/null || \
+    useradd -r -g pdns-recursor -d / -s /sbin/nologin \
+    -c "PowerDNS Recursor user" pdns-recursor
+exit 0
+
 %post
-if [ $1 -eq 1 ]; then
-	/sbin/chkconfig --add %{name}
-	userid=`id -u pdns-recursor 2>/dev/null`
-	if [ x"$userid" = x ]; then
-		%{_sbindir}/useradd -c "PowerDNS Recursor user" -s /sbin/nologin -r -d / pdns-recursor >/dev/null 2>&1 || :
-	fi
-fi
+/sbin/chkconfig --add pdns-recursor
+
 %preun
 if [ $1 -eq 0 ]; then
 	/sbin/service %{name} stop >/dev/null 2>&1 || :
@@ -74,8 +80,14 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/recursor.conf
 %doc COPYING README
 
-
 %changelog
+* Fri Mar 22 2013 Morten Stevens <mstevens at imt-systems.com> - 3.3-1
+- Update to 3.3
+- Fix for bz#719457
+- Fix bogus date in changelog
+- Some rpmlint fixes
+- Rebuild for Boost 1.41
+
 * Wed Jan 06 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 3.1.7.2-1
 - Upstream released new version
 - Fixes CVE-2009-4009 and CVE-2009-4010
@@ -84,10 +96,12 @@ fi
 * Sat Aug 02 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 3.1.7-1
 - Upstream released new version
 
-* Sun Jan 27 2007 <ruben at rubenkerkhof.com> 3.1.4-4
+* Sat Jan 27 2007 <ruben at rubenkerkhof.com> 3.1.4-4
 - Now really fix the description in init script
+
 * Sat Jan 27 2007 <ruben at rubenkerkhof.com> 3.1.4-3
 - Fixed Description in init script
+
 * Wed Jan 24 2007 <ruben at rubenkerkhof.com> 3.1.4-2
 - Fixes per bz review 221188:
 - Changed user to pdns-recursor
@@ -95,6 +109,6 @@ fi
 - Skipped the configure step, it didn't do much
 - Added a more Fedora-centric initscript
 - Use condrestart instead of restart in %%postun
+
 * Sun Dec 31 2006 <ruben at rubenkerkhof.com> 3.1.4-1
 - Initial import
-
diff --git a/sources b/sources
index 48963a8..80ada59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fdba3612e281bf65c6c9f665673dc4e  pdns-recursor-3.1.7.2.tar.bz2
+87daeeebb6f7af9e07814ff6c43300dd  pdns-recursor-3.3.tar.bz2

More information about the scm-commits mailing list