add new cstore library

10 files changed, 85 insertions, 118 deletions

diff --git a/debian/autogen.sh b/debian/autogen.sh
deleted file mode 100755
index e8c94af..0000000
--- a/debian/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-
-rm -rf config
-rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL
-
-autoreconf --force --install
-
-rm -f config.sub config.guess
-ln -s /usr/share/misc/config.sub .
-ln -s /usr/share/misc/config.guess .
diff --git a/debian/control b/debian/control
index d467832..19e2c76 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: vyatta-cfg
 Section: contrib/net
 Priority: extra
 Maintainer: Vyatta Package Maintainers <maintainers@vyatta.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev,
+ libboost-filesystem1.40-dev
 Standards-Version: 3.7.2
 
 Package: vyatta-cfg
@@ -26,7 +27,8 @@ Depends: sed (>= 4.1.5),
  ethtool,
  iproute,
  libglib2.0-0,
- curl
+ curl,
+ libboost-filesystem1.40.0
 Replaces: vyatta-cfg-firewall, 
  vyatta-cfg-quagga
 Suggests: util-linux (>= 2.13-5),
@@ -35,5 +37,15 @@ Suggests: util-linux (>= 2.13-5),
  ntpdate
 Description: Vyatta configuration system
  This package has the Vyatta configuration system, including the configuration
- back-end, the base configuration templates, and the config-mode CLI completion
- mechanism.
+ back-end library, the base configuration templates, and the config-mode CLI
+ completion mechanism.
+
+Package: libvyatta-cfg-dev
+Architecture: any
+Priority: optional
+Section: libdevel
+Depends: vyatta-cfg (=${binary:Version})
+Description: vyatta-cfg development package
+ Development header and library files for the Vyatta configuration back-end
+ library.
+
diff --git a/debian/libvyatta-cfg-dev.install b/debian/libvyatta-cfg-dev.install
new file mode 100644
index 0000000..450792e
--- /dev/null
+++ b/debian/libvyatta-cfg-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*.so
+usr/lib/*.*a
diff --git a/debian/linda b/debian/linda
deleted file mode 100644
index 0381d9d..0000000
--- a/debian/linda
+++ /dev/null
@@ -1 +0,0 @@
-Tag: file-in-opt
diff --git a/debian/lintian b/debian/lintian
deleted file mode 100644
index 70110bf..0000000
--- a/debian/lintian
+++ /dev/null
@@ -1,6 +0,0 @@
-vyatta-cfg: file-in-unusual-dir
-vyatta-cfg: dir-or-file-in-opt
-vyatta-cfg: binary-or-shlib-defines-rpath ./opt/vyatta/sbin/my_set /opt/vyatta/lib
-vyatta-cfg: binary-or-shlib-defines-rpath ./opt/vyatta/sbin/my_commit /opt/vyatta/lib
-vyatta-cfg: binary-or-shlib-defines-rpath ./opt/vyatta/sbin/my_delete /opt/vyatta/lib
-vyatta-cfg: binary-or-shlib-defines-rpath ./opt/vyatta/sbin/check_tmpl /opt/vyatta/lib
diff --git a/debian/rules b/debian/rules
index 6b9bdf7..e5353c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,108 +1,45 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Use hardening options (in future)
+## uncomment to enable hardening
 #export DEB_BUILD_HARDENING=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-PACKAGE=vyatta-cfg
-PKGDIR=$(CURDIR)/debian/$(PACKAGE)
-
-CFLAGS = -Wall -g 
-
-configure	 = ./configure
-configure	+= --host=$(DEB_HOST_GNU_TYPE)
-configure	+= --build=$(DEB_BUILD_GNU_TYPE)
-configure	+= --prefix=/opt/vyatta
-configure	+= --mandir=\$${prefix}/share/man
-configure	+= --infodir=\$${prefix}/share/info
-configure	+= CFLAGS="$(CFLAGS)"
-configure	+= LDFLAGS="-Wl,-z,defs"
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -Os
-endif
-
-configure: configure.ac Makefile.am
-	chmod +x debian/autogen.sh
-	debian/autogen.sh
-
-config.status: configure
-	dh_testdir
-	rm -f config.cache
-	$(configure)
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: clean-patched
+cfg_opts := --prefix=/opt/vyatta
+cfg_opts += --libdir=/usr/lib
+cfg_opts += --includedir=/usr/include
+cfg_opts += --mandir=\$${prefix}/share/man
+cfg_opts += --infodir=\$${prefix}/share/info
+cfg_opts += CFLAGS="$(CFLAGS)"
+cfg_opts += LDFLAGS="-Wl,-z,defs"
+inst_opts := --sourcedir=debian/tmp
 
-# Clean everything up, including everything auto-generated
-# at build time that needs not to be kept around in the Debian diff
-clean-patched:
-	dh_testdir
-	dh_testroot
-	if test -f Makefile ; then $(MAKE) clean distclean ; fi
-	rm -f build-stamp
-	rm -f config.status config.sub config.guess config.log
-	rm -f aclocal.m4 configure Makefile.in Makefile INSTALL
-	rm -rf config
-	dh_clean 
+clean:
+	dh clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) DESTDIR=$(PKGDIR) install
-
-	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
-	install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE)
-
-# Build architecture-independent files here.
-binary-indep: build install
+binary binary-arch binary-indep: install
 	rm -f debian/files
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_install
-	dh_installdebconf	
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
+	dh binary --before dh_gencontrol
+	rm -f debian/*/DEBIAN/conffiles
 	if [ -f "../.VYATTA_DEV_BUILD" ]; then \
 		dh_gencontrol -- -v999.dev; \
 	else \
 		dh_gencontrol; \
 	fi
-	dh_md5sums
-	dh_builddeb
+	dh binary --after dh_gencontrol
 
-# Build architecture-dependent files here.
-binary-arch: build install
-# This is an architecture independent package
-# so; we have nothing to do by default.
+build: Makefile
+build:
+	rm -f debian/*.debhelper*
+	dh build --before configure
+	dh build --after configure --before dh_auto_test
+	dh build --after dh_auto_test
+
+Makefile: Makefile.in
+	./configure $(cfg_opts)
+
+Makefile.in: Makefile.am configure.ac
+	autoreconf -i --force
+
+install: build
+	dh install --before dh_install
+	dh_install $(inst_opts)
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/debian/vyatta-cfg.install b/debian/vyatta-cfg.install
new file mode 100644
index 0000000..a41d29e
--- /dev/null
+++ b/debian/vyatta-cfg.install
@@ -0,0 +1,3 @@
+usr/lib/*.so.*
+opt
+etc
diff --git a/debian/vyatta-cfg.lintian-overrides b/debian/vyatta-cfg.lintian-overrides
new file mode 100644
index 0000000..ee5e9e1
--- /dev/null
+++ b/debian/vyatta-cfg.lintian-overrides
@@ -0,0 +1,5 @@
+vyatta-cfg: file-in-unusual-dir
+vyatta-cfg: dir-or-file-in-opt
+vyatta-cfg: package-name-doesnt-match-sonames
+vyatta-cfg: file-in-etc-not-marked-as-conffile
+vyatta-cfg: init.d-script-not-marked-as-conffile
diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in
index 48b889d..c307803 100644
--- a/debian/vyatta-cfg.postinst.in
+++ b/debian/vyatta-cfg.postinst.in
@@ -1,10 +1,24 @@
 #!/bin/bash
 
 prefix=@prefix@
+exec_prefix=@exec_prefix@
 sysconfdir=@sysconfdir@
+sbindir=@sbindir@
 
-mkdir -m 0775 -p $sysconfdir/config $prefix/config
-chgrp vyattacfg $sysconfdir/config $prefix/config 2>/dev/null
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+for dir in $sysconfdir/config $prefix/config; do
+  if [ -d "$dir" ]; then
+    # already exists
+    chmod 2775 $dir
+  else
+    # create it
+    mkdir -m 2775 -p $dir
+  fi
+  chgrp vyattacfg $dir 2>/dev/null
+done
 
 update-rc.d vyatta-router defaults 90 >/dev/null
 
@@ -16,3 +30,10 @@ if [ "$sysconfdir" != "/etc" ]; then
     touch /etc/$conf
   done
 fi
+
+# capability stuff
+for bin in my_cli_bin my_cli_shell_api; do
+  touch -ac $sbindir/$bin
+  setcap cap_sys_admin=pe $sbindir/$bin
+done
+
diff --git a/debian/vyatta-cfg.postrm.in b/debian/vyatta-cfg.postrm.in
index c211589..2e50b32 100644
--- a/debian/vyatta-cfg.postrm.in
+++ b/debian/vyatta-cfg.postrm.in
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ "$1" = "remove" ]; then
+	ldconfig
+fi
+
 if [ "$1" = "purge" ]; then
   update-rc.d vyatta-router remove >/dev/null || exit $?
 fi