Change Debian package to use dynamic backend.

This hopefully does all that's required to build a Debian package with
all our backends but defaulting to db4 so we don't break those
upgrading.

diff --git a/Makefile.in b/Makefile.in
index 6a15a7fc90f004d80fadff803da4bb063a76b367..c3382a4469ebf715e354aa8afc4c6b57b0bde893 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,6 +101,7 @@ onak-mail.pl: onak-mail.pl.in
 
 onak.conf: onak.conf.in
        sed -e 's:@BINDIR@:@bindir@:g' \
 
 onak.conf: onak.conf.in
        sed -e 's:@BINDIR@:@bindir@:g' \

+               -e 's:@LIBDIR@:@libdir@:g' \

                -e 's:@STATEDIR@:@localstatedir@:g' \
                < onak.conf.in > onak.conf
 
                -e 's:@STATEDIR@:@localstatedir@:g' \
                < onak.conf.in > onak.conf
 

diff --git a/debian/onak.install b/debian/onak.install
index ce81ad53bf06d128697d52dcf782d04b7be7b483..8ea4f3c395706ee9a0e30e49fcefa7fda90e96ec 100644 (file)
--- a/debian/onak.install
+++ b/debian/onak.install
@@ -1,5 +1,6 @@
 onak.conf             etc
 onak splitkeys        usr/bin
 onak-mail.pl          usr/lib/onak
 onak.conf             etc
 onak splitkeys        usr/bin
 onak-mail.pl          usr/lib/onak

+libkeydb_*.so         usr/lib/onak/backends

 add lookup gpgwww     usr/lib/cgi-bin/pks
 onak.1 splitkeys.1    usr/share/man/man1
 add lookup gpgwww     usr/lib/cgi-bin/pks
 onak.1 splitkeys.1    usr/share/man/man1

diff --git a/debian/rules b/debian/rules
index a230cea3ea2bc2d5a2170d18461ba4e5b195ac94..298926fb5b11ea56e5a78c48c76481bfc5aded73 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 

-DEB_CONFIGURE_EXTRA_FLAGS += --enable-backend=db4
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-backend=dynamic

 
 DEB_MAKE_INSTALL_TARGET :=
 
 
 DEB_MAKE_INSTALL_TARGET :=
 

diff --git a/onak.conf.in b/onak.conf.in
index c194142cd9b5a315b5c04be92862aeceb517eac5..d9c307965b871e428258175db4dca31bac780cc6 100644 (file)
--- a/onak.conf.in
+++ b/onak.conf.in
@@ -3,6 +3,8 @@
 #
 
 pks_bin_dir @BINDIR@
 #
 
 pks_bin_dir @BINDIR@

+db_backend db4
+backends_dir @LIBDIR@/onak/backends

 db_dir @STATEDIR@/lib/onak
 logfile @STATEDIR@/log/onak.log
 # Loglevel : 0 is highest debug, default is 3, nothing is 7+
 db_dir @STATEDIR@/lib/onak
 logfile @STATEDIR@/log/onak.log
 # Loglevel : 0 is highest debug, default is 3, nothing is 7+