OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Feb-2007 09:12:37
Branch: HEAD Handle: 2007021608123600
Modified files:
openpkg-src/powerdns powerdns.patch powerdns.spec
Log:
Add optional support for SQLite. Contributed by: Olivier Kaloudoff
<kalou at kalou.net>
Summary:
Revision Changes Path
1.4 +27 -15 openpkg-src/powerdns/powerdns.patch
1.56 +21 -5 openpkg-src/powerdns/powerdns.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/powerdns.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 powerdns.patch
--- openpkg-src/powerdns/powerdns.patch 14 Nov 2005 11:49:27 -0000
1.3
+++ openpkg-src/powerdns/powerdns.patch 16 Feb 2007 08:12:36 -0000
1.4
@@ -1,7 +1,19 @@
-diff -Naur pdns/backends/bind/bindbackend.cc.orig
pdns/backends/bind/bindbackend.cc
---- pdns/backends/bind/bindbackend.cc.orig 2003-08-22 15:33:31.000000000
+0200
-+++ pdns/backends/bind/bindbackend.cc 2003-10-09 18:24:43.000000000
+0200
-@@ -40,9 +40,21 @@
+Index: configure
+--- configure.orig 2006-03-15 19:29:56 +0100
++++ configure 2007-02-16 09:06:21 +0100
+@@ -21663,7 +21663,7 @@
+
+
+
+-modules="gmysql geo"
++modules="geo"
+
+ # Check whether --with-modules or --without-modules was given.
+ if test "${with_modules+set}" = set; then
+Index: pdns/backends/bind/bindbackend.cc
+--- pdns/backends/bind/bindbackend.cc.orig 2006-03-15 19:29:38 +0100
++++ pdns/backends/bind/bindbackend.cc 2007-02-16 09:06:21 +0100
+@@ -39,9 +39,21 @@
#include "misc.hh"
#include "dynlistener.hh"
#include "lock.hh"
@@ -23,10 +35,10 @@
cmap_t BindBackend::d_qnames;
map<int,vector<vector<BBResourceRecord>* > > BindBackend::d_zone_id_map;
set<string> BindBackend::s_contents;
-diff -Naur pdns/backends/bind/bindbackend2.cc.orig
pdns/backends/bind/bindbackend2.cc
---- pdns/backends/bind/bindbackend2.cc.orig 2003-08-22 15:33:31.000000000
+0200
-+++ pdns/backends/bind/bindbackend2.cc 2003-10-09 18:24:11.000000000
+0200
-@@ -42,8 +42,21 @@
+Index: pdns/backends/bind/bindbackend2.cc
+--- pdns/backends/bind/bindbackend2.cc.orig 2006-03-15 19:29:38 +0100
++++ pdns/backends/bind/bindbackend2.cc 2007-02-16 09:06:21 +0100
+@@ -41,8 +41,21 @@
#include "misc.hh"
#include "dynlistener.hh"
#include "lock.hh"
@@ -47,10 +59,10 @@
+
/** new scheme of things:
we have zone-id map
- a zone-id has a vector of DNSResourceRecords */
-diff -Naur pdns/backends/gsql/gsqlbackend.cc.orig
pdns/backends/gsql/gsqlbackend.cc
---- pdns/backends/gsql/gsqlbackend.cc.orig 2003-08-22 15:33:31.000000000
+0200
-+++ pdns/backends/gsql/gsqlbackend.cc 2003-10-09 18:25:07.000000000
+0200
+ a zone-id has a vector of DNSResourceRecords
+Index: pdns/backends/gsql/gsqlbackend.cc
+--- pdns/backends/gsql/gsqlbackend.cc.orig 2006-03-15 19:29:38 +0100
++++ pdns/backends/gsql/gsqlbackend.cc 2007-02-16 09:06:21 +0100
@@ -19,6 +19,18 @@
#include <sstream>
@@ -70,9 +82,9 @@
void GSQLBackend::setNotified(uint32_t domain_id, uint32_t serial)
{
char output[1024];
-diff -Naur pdns/randombackend.cc.orig pdns/randombackend.cc
---- pdns/randombackend.cc.orig 2003-08-22 14:57:14.000000000 +0200
-+++ pdns/randombackend.cc 2003-10-09 18:25:23.000000000 +0200
+Index: pdns/randombackend.cc
+--- pdns/randombackend.cc.orig 2006-03-15 19:29:38 +0100
++++ pdns/randombackend.cc 2007-02-16 09:06:21 +0100
@@ -24,6 +24,18 @@
#include "ahuexception.hh"
#include "logger.hh"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/powerdns.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 powerdns.spec
--- openpkg-src/powerdns/powerdns.spec 15 Feb 2007 06:46:00 -0000
1.55
+++ openpkg-src/powerdns/powerdns.spec 16 Feb 2007 08:12:36 -0000
1.56
@@ -33,13 +33,14 @@
Group: DNS
License: GPL
Version: 2.9.20
-Release: 20070215
+Release: 20070216
# package options
-%option with_fsl yes
-%option with_pipe no
-%option with_mysql no
-%option with_pgsql no
+%option with_fsl yes
+%option with_pipe no
+%option with_mysql no
+%option with_pgsql no
+%option with_sqlite no
# list of sources
Source0: http://downloads.powerdns.com/releases/pdns-%{version}.tar.gz
@@ -67,6 +68,10 @@
BuildPreReq: postgresql, postgresql::with_cxx = yes
PreReq: postgresql, postgresql::with_cxx = yes
%endif
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite, sqlite::with_v2 = yes
+PreReq: sqlite, sqlite::with_v2 = yes
+%endif
AutoReq: no
AutoReqProv: no
Conflicts: bind, bind8
@@ -115,6 +120,9 @@
%if "%{with_pgsql}" == "yes"
MODULES="$MODULES gpgsql"
%endif
+%if "%{with_sqlite}" == "yes"
+ MODULES="$MODULES gsqlite"
+%endif
MODULES=`echo "$MODULES" | sed 's;^ ;;'`
CC="%{l_cc}" \
CXX="%{l_cxx}" \
@@ -139,6 +147,14 @@
%else
--disable-pgsql \
%endif
+%if "%{with_sqlite}" == "yes"
+ --enable-sqlite \
+ --with-sqlite=%{l_prefix} \
+ --with-sqlite-includes=%{l_prefix}/include \
+ --with-sqlite-lib=%{l_prefix}/lib \
+%else
+ --disable-sqlite \
+%endif
--with-modules="$MODULES" \
--with-dynmodules="" \
--disable-shared
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
