From ac85a00a9c91227695c63b0eb2b73ce80c398303 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 6 Jun 2015 17:40:04 +0200 Subject: [PATCH] pdns-recursor: Drop package pdns-recursor is not needed any more has we have replaced it mostly by unbound already where ever we are using it. The main reason for that is the lack of support for DNSSEC. Signed-off-by: Michael Tremer --- .../patches/pdns-recursor-fixmakefile.patch | 19 --- .../patches/pdns-recursor-fixsysconfdir.patch | 9 -- pdns-recursor/pdns-recursor.nm | 108 ------------------ pdns-recursor/pdns-recursor.tmpfiles | 1 - pdns-recursor/recursor.conf | 19 --- pdns-recursor/systemd/pdns-recursor.service | 12 -- pdns/pdns.nm | 6 +- 7 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 pdns-recursor/patches/pdns-recursor-fixmakefile.patch delete mode 100644 pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch delete mode 100644 pdns-recursor/pdns-recursor.nm delete mode 100644 pdns-recursor/pdns-recursor.tmpfiles delete mode 100644 pdns-recursor/recursor.conf delete mode 100644 pdns-recursor/systemd/pdns-recursor.service diff --git a/pdns-recursor/patches/pdns-recursor-fixmakefile.patch b/pdns-recursor/patches/pdns-recursor-fixmakefile.patch deleted file mode 100644 index 2c391873c..000000000 --- a/pdns-recursor/patches/pdns-recursor-fixmakefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up pdns-recursor-3.2-rc2/Makefile.orig pdns-recursor-3.2-rc2/Makefile ---- pdns-recursor-3.2-rc2/Makefile.orig 2010-03-01 16:52:23.000000000 +0100 -+++ pdns-recursor-3.2-rc2/Makefile 2010-03-01 16:53:10.000000000 +0100 -@@ -71,15 +71,12 @@ basic_checks: - 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: binclean - -rm -f dep *~ *.gcda *.gcno optional/*.gcda optional/*.gcno diff --git a/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch b/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch deleted file mode 100644 index 1ea6f3fca..000000000 --- a/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up pdns-recursor-3.2-rc2/config.h.orig pdns-recursor-3.2-rc2/config.h ---- pdns-recursor-3.2-rc2/config.h.orig 2010-03-01 16:54:06.000000000 +0100 -+++ pdns-recursor-3.2-rc2/config.h 2010-03-01 16:54:18.000000000 +0100 -@@ -1,4 +1,4 @@ --#define SYSCONFDIR "/etc/powerdns/" -+#define SYSCONFDIR "/etc/pdns-recursor/" - #define LOCALSTATEDIR "/var/run/" - #define VERSION "3.2" - #define RECURSOR diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm deleted file mode 100644 index cbcaa2ebe..000000000 --- a/pdns-recursor/pdns-recursor.nm +++ /dev/null @@ -1,108 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team # -############################################################################### - -name = pdns-recursor -version = 3.3 -release = 9 - -groups = Networking/DNS -url = http://powerdns.com/ -license = GPLv2 -summary = A modern, advanced and high performance recursing nameserver. - -description - PowerDNS Recursor is a non authoritative/recursing DNS server. Use this - package if you need a dns cache for your network. -end - -source_dl = http://downloads.powerdns.com/releases/ -sources = %{thisapp}.tar.bz2 - -build - requires - gcc-c++ - boost-devel - lua-devel - shadow-utils - end - - prepare_cmds - %{create_user} - end - - build - LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua \ - make OPTFLAGS="%{CFLAGS}" #%{PARALLELISMFLAGS} - end - - install - make install DESTDIR=%{BUILDROOT} \ - CONFIGDIR="%{sysconfdir}/pdns" - - # Remove sysvinit file - rm -rf %{BUILDROOT}/etc/init.d - - # Remove shipped config file - rm -rf %{BUILDROOT}%{sysconfdir}/pdns/recursor.conf-dist - - # Install our default config file - cp -vf %{DIR_SOURCE}/recursor.conf \ - %{BUILDROOT}%{sysconfdir}/pdns/recursor.conf - - # Create folder for chroot - mkdir -pv %{BUILDROOT}/var/lib/pdns-recursor - - # Create directory for socket and stuff. - mkdir -pv %{BUILDROOT}/run/pdns-recursor - chown -v pdns-recursor.pdns-recursor %{BUILDROOT}/run/pdns-recursor - end -end - -create_user - getent group pdns-recursor >/dev/null || groupadd -r pdns-recursor - getent passwd pdns-recursor >/dev/null || \ - useradd -r -g pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin \ - pdns-recursor -end - -packages - package %{name} - configfiles - %{sysconfdir}/pdns/recursor.conf - end - - prerequires - shadow-utils - systemd-units - end - - script prein - %{create_user} - end - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl --no-reload enable pdns-recursor.service >/dev/null 2>&1 || : - end - - script preun - /bin/systemctl --no-reload disable pdns-recursor.service >/dev/null 2>&1 || : - /bin/systemctl stop pdns-recursor.service >/dev/null 2>&1 || : - end - - script postun - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl try-restart pdns-recursor.service >/dev/null 2>&1 || : - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/pdns-recursor/pdns-recursor.tmpfiles b/pdns-recursor/pdns-recursor.tmpfiles deleted file mode 100644 index 2fbee002e..000000000 --- a/pdns-recursor/pdns-recursor.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/pdns-recursor 0755 pdns-recursor pdns-recursor - diff --git a/pdns-recursor/recursor.conf b/pdns-recursor/recursor.conf deleted file mode 100644 index 284da990d..000000000 --- a/pdns-recursor/recursor.conf +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team # -############################################################################### - -# Listen settings -local-address=::1 -local-port=54 - -# Socket settings -socket-dir=/run/pdns-recursor -socket-group=pdns-recursor -socket-owner=pdns-recursor -socket-mode=660 - -# Security settings -chroot=/var/lib/pdns-recursor -setgid=pdns-recursor -setuid=pdns-recursor diff --git a/pdns-recursor/systemd/pdns-recursor.service b/pdns-recursor/systemd/pdns-recursor.service deleted file mode 100644 index 095b595af..000000000 --- a/pdns-recursor/systemd/pdns-recursor.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Power DNS Recursor Daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/pdns_recursor --config-dir=/etc/pdns --daemon=no -ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid -ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 7d2714993..3c25e9d46 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -5,7 +5,7 @@ name = pdns version = 3.3.1 -release = 1 +release = 2 groups = Networking/DNS url = http://powerdns.com/ @@ -99,10 +99,6 @@ packages sqlite end - requires - pdns-recursor >= 3.3-8 - end - configfiles %{sysconfdir}/pdns/pdns.conf end -- 2.39.2