rpms/pdns-recursor/devel pdns-recursor-fixmakefile.patch, NONE, 1.1 pdns-recursor-fixsysconfdir.patch, NONE, 1.1 pdns-recursor.init, NONE, 1.1 pdns-recursor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ruben Kerkhof (ruben)
fedora-extras-commits at redhat.com
Sat Jan 27 22:13:45 UTC 2007
Author: ruben
Update of /cvs/extras/rpms/pdns-recursor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24154/devel
Modified Files:
.cvsignore sources
Added Files:
pdns-recursor-fixmakefile.patch
pdns-recursor-fixsysconfdir.patch pdns-recursor.init
pdns-recursor.spec
Log Message:
auto-import pdns-recursor-3.1.4-3 on branch devel from pdns-recursor-3.1.4-3.src.rpm
pdns-recursor-fixmakefile.patch:
--- NEW FILE pdns-recursor-fixmakefile.patch ---
--- pdns-recursor-3.1.4/Makefile.fixmakefile 2007-01-24 20:36:27.000000000 +0100
+++ pdns-recursor-3.1.4/Makefile 2007-01-24 20:38:55.000000000 +0100
@@ -54,15 +54,12 @@
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
cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
- $(OS_SPECIFIC_INSTALL)
clean:
-rm -f dep *.o *~ pdns_recursor rec_control optional/*.o
pdns-recursor-fixsysconfdir.patch:
--- NEW FILE pdns-recursor-fixsysconfdir.patch ---
--- pdns-recursor-3.1.4/config.h.fixsysconfdir 2007-01-01 16:03:47.000000000 +0100
+++ pdns-recursor-3.1.4/config.h 2007-01-01 16:04:00.000000000 +0100
@@ -1,4 +1,4 @@
-#define SYSCONFDIR "/etc/powerdns/"
+#define SYSCONFDIR "/etc/pdns-recursor/"
#define LOCALSTATEDIR "/var/run/"
#define VERSION "3.1.4"
#define RECURSOR
--- NEW FILE pdns-recursor.init ---
#!/bin/bash
#
# pdns-recursor This shell script controls the PowerDNS Recursor
#
# Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
#
# chkconfig: - 97 03
#
# description: This is a daemon which periodically checks for updates
# and can send notifications via mail, dbus or syslog.
# processname: pdns-recursor
# config: /etc/pdns-recursor/recursor.conf
# pidfile: /var/run/pdns_recursor.pid
#
# source function library
. /etc/rc.d/init.d/functions
RETVAL=0
start() {
echo -n $"Starting pdns-recursor: "
daemon /usr/sbin/pdns_recursor --daemon 2>/dev/null
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/pdns-recursor
}
stop() {
echo -n $"Stopping pdns-recursor: "
killproc pdns_recursor
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pdns-recursor && rm -f /var/run/pdns_recursor.controlsocket
}
restart() {
stop
start
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart|force-reload|reload)
restart
;;
condrestart)
[ -f /var/lock/subsys/pdns-recursor ] && restart
;;
status)
status pdns_recursor
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
exit 1
esac
exit $RETVAL
--- NEW FILE pdns-recursor.spec ---
Summary: Modern, advanced and high performance recursing/non authoritative nameserver
Name: pdns-recursor
Version: 3.1.4
Release: 3%{?dist}
Group: System Environment/Daemons
License: GPL
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
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
%description
PowerDNS Recursor is a non authoritative/recursing DNS server. Use this
package if you need a dns cache for your network.
%prep
%setup -q
%patch0 -p1 -b .fixsysconfdir
%patch1 -p1 -b .fixmakefile
# this file gets added to debuginfo rpm but has wrong permission
# already fixed upstream in trunk
chmod 0644 sstuff.hh
%build
make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
%install
%{__rm} -rf %{buildroot}
make install DESTDIR=%{buildroot} CONFIGDIR="%{_sysconfdir}/%{name}"
%{__install} -D -p %{SOURCE1} %{buildroot}%{_initrddir}/pdns-recursor
%{__mv} %{buildroot}%{_sysconfdir}/%{name}/recursor.conf{-dist,}
# add pdns user and group to top of configfile
sed -i '1i\setuid=pdns-recursor' %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
sed -i '2i\setgid=pdns-recursor' %{buildroot}%{_sysconfdir}/%{name}/recursor.conf
%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
%preun
if [ $1 -eq 0 ]; then
/sbin/service %{name} stop >/dev/null 2>&1 || :
/sbin/chkconfig --del %{name}
fi
%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/rec_control
%{_sbindir}/pdns_recursor
%{_mandir}/man1/pdns_recursor.1.gz
%{_mandir}/man1/rec_control.1.gz
%{_initrddir}/pdns-recursor
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/recursor.conf
%doc COPYING README
%changelog
* 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
- Patched the Makefile to not strip debugsymbols
- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pdns-recursor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Jan 2007 22:12:25 -0000 1.1
+++ .cvsignore 27 Jan 2007 22:13:15 -0000 1.2
@@ -0,0 +1 @@
+pdns-recursor-3.1.4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdns-recursor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Jan 2007 22:12:25 -0000 1.1
+++ sources 27 Jan 2007 22:13:15 -0000 1.2
@@ -0,0 +1 @@
+439a10639f53def0ba47c0851e4a2671 pdns-recursor-3.1.4.tar.bz2
More information about the scm-commits
mailing list