Changed from dnsmasq to pdns (and its recursor).

diff --git a/lfs/dnsmasq b/lfs/pdns
similarity index 70%
rename from lfs/dnsmasq
rename to lfs/pdns
index ce5b0750cf9d117a04048425c273616db4e0e3ef..8ea1bbd87a384028c8e7e7475bf072e55cfc5817 100644 (file)
--- a/lfs/dnsmasq
+++ b/lfs/pdns
@@ -24,35 +24,31 @@
 
 include Config
 
-PKG_NAME   = dnsmasq
-PKG_VER    = 2.40
-PKG_REL    = 0
+PKG_NAME   = pdns
+VER        = 2.9.22
+PKG_VER    = 0
 
-THISAPP    = $(PKG_NAME)-$(PKG_VER)
+THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 MAINTAINER =
-GROUP      = Networking/Daemons
+GROUP      = Networking/DNS
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = boost openldap sqlite
 
-URL        = http://www.thekelleys.org.uk/dnsmasq/
-LICENSE    = GPLv2 GPLv3
-SHORT_DESC = A lightweight DHCP/caching DNS server.
+URL        = http://powerdns.com/
+LICENSE    = GPLv2
+SHORT_DESC = A modern, advanced and high performance authoritative-only nameserver.
 
 define LONG_DESC
-       Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. \
-       It is designed to provide DNS and, optionally, DHCP, to a small network. \
-       It can serve the names of local machines which are not in the global \
-       DNS. The DHCP server integrates with the DNS server and allows machines \
-       with DHCP-allocated addresses to appear in the DNS with names configured \
-       either in each host or in a central configuration file. Dnsmasq supports \
-       static and dynamic DHCP leases and BOOTP for network booting of diskless \
-       machines.
+       The PowerDNS Nameserver is a modern, advanced and high performance \
+       authoritative-only nameserver. It is written from scratch and conforms \
+       to all relevant DNS standards documents. \
+       Furthermore, PowerDNS interfaces with almost any database.
 endef
 
 ###############################################################################
@@ -81,11 +77,15 @@ $(objects):
 $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP)/src && sed -i \
-               -e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-               -e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' \
-               -e 's/^#define CACHESIZ .*$$/#define CACHESIZ 512/' config.h
+       cd $(DIR_APP) && CPPFLAGS="-DLDAP_DEPRECATED" \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr \
+                       --sysconfdir=/etc/pdns \
+                       --disable-static \
+                       --with-modules="" \
+                       --with-dynmodules="pipe geo ldap gsqlite3"
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && PREFIX=/usr make install
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/pdns-recursor b/lfs/pdns-recursor
new file mode 100644 (file)
index 0000000..0a7037b
--- /dev/null
+++ b/lfs/pdns-recursor
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME   = pdns-recursor
+VER        = 3.1.7
+PKG_VER    = 0
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = Networking/DNS
+EXTRA      = no
+DEBUG      = no
+DEPS       = lua boost
+
+URL        = http://powerdns.com/
+LICENSE    = GPLv2
+SHORT_DESC = A modern, advanced and high performance recursing nameserver.
+
+define LONG_DESC
+       PowerDNS Recursor is a non authoritative/recursing DNS server. Use this \
+       package if you need a dns cache for your network.
+endef
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) \
+       $(THISAPP)-boost.patch
+
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(OBJECT): $(objects)
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-boost.patch
+       cd $(DIR_APP) && LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua \
+               make OPTFLAGS= PROFILEFLAGS=-fprofile-use $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)