diff options
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autogen.sh | 11 | ||||
| -rw-r--r-- | debian/changelog | 123 | ||||
| -rw-r--r-- | debian/control | 37 | ||||
| -rw-r--r-- | debian/libvyatta-cfg-dev.install | 3 | ||||
| -rw-r--r-- | debian/libvyatta-cfg-dev.lintian-overrides | 0 | ||||
| -rw-r--r-- | debian/libvyatta-cfg1.install | 2 | ||||
| -rw-r--r-- | debian/libvyatta-cfg1.lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/linda | 1 | ||||
| -rw-r--r-- | debian/lintian | 6 | ||||
| -rwxr-xr-x | debian/rules | 127 | ||||
| -rw-r--r-- | debian/vyatta-cfg.install | 5 | ||||
| -rw-r--r-- | debian/vyatta-cfg.lintian-overrides | 5 | ||||
| -rw-r--r-- | debian/vyatta-cfg.postinst.in | 21 |
13 files changed, 219 insertions, 124 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/changelog b/debian/changelog index 8d8c4cc..b15b878 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,126 @@ +vyatta-cfg (0.17.5) unstable; urgency=low + + * add function to perl API + * allow Vyatta::Config constructor to set level + + -- An-Cheng Huang <ancheng@vyatta.com> Fri, 13 Aug 2010 18:28:02 -0700 + +vyatta-cfg (0.17.4) unstable; urgency=low + + * change all vector/string size to size_t just to be safe. + * get rid of lintian warning + * add API function for retrieving deleted values of a multi node. + + -- An-Cheng Huang <ancheng@vyatta.com> Fri, 13 Aug 2010 11:19:25 -0700 + +vyatta-cfg (0.17.3) unstable; urgency=low + + * add more functions to shell API + + -- An-Cheng Huang <ancheng@vyatta.com> Thu, 12 Aug 2010 18:40:17 -0700 + +vyatta-cfg (0.17.2) unstable; urgency=low + + * add required special cases for adsl/pppo* interfaces. + + -- An-Cheng Huang <ancheng@vyatta.com> Thu, 12 Aug 2010 15:56:17 -0700 + +vyatta-cfg (0.17.1) unstable; urgency=low + + * remove unneeded env variables + * add util function to Interface.pm + + -- An-Cheng Huang <ancheng@vyatta.com> Thu, 12 Aug 2010 14:58:42 -0700 + +vyatta-cfg (0.17.0) unstable; urgency=low + + * document equivalent perl API functions for shell API. + * add more functions to shell API + + -- An-Cheng Huang <ancheng@vyatta.com> Thu, 12 Aug 2010 12:04:38 -0700 + +vyatta-cfg (0.16.113) unstable; urgency=low + + * add symlink for shell API binary + * add functions to shell API + * add comments to document shell API usage + + -- An-Cheng Huang <ancheng@vyatta.com> Wed, 11 Aug 2010 17:00:42 -0700 + +vyatta-cfg (0.16.112) unstable; urgency=low + + * add functions to shell API + * simplify extension of shell API + * further simplify shell API extension and add more functions. + + -- An-Cheng Huang <ancheng@vyatta.com> Tue, 10 Aug 2010 19:16:20 -0700 + +vyatta-cfg (0.16.111) unstable; urgency=low + + * separate libvyatta-cfg1 package + + -- An-Cheng Huang <ancheng@vyatta.com> Tue, 10 Aug 2010 13:46:24 -0700 + +vyatta-cfg (0.16.110) unstable; urgency=low + + * remove "def" and "node.val" usage from high-level operations. + * commit needs to flush "progress file" + * provide default edit level + * add function to C API + + -- An-Cheng Huang <ancheng@vyatta.com> Mon, 09 Aug 2010 18:52:40 -0700 + +vyatta-cfg (0.16.109) unstable; urgency=low + + * eval "allowed:" script in template + * new API change + + -- An-Cheng Huang <ancheng@vyatta.com> Tue, 03 Aug 2010 17:50:17 -0700 + +vyatta-cfg (0.16.108) unstable; urgency=low + + * handle potential exceptions from filesystem operations. + * make edit do implicit set + + -- An-Cheng Huang <ancheng@vyatta.com> Sat, 31 Jul 2010 15:06:24 -0700 + +vyatta-cfg (0.16.107) unstable; urgency=low + + * add default status observers + * new API changes + * make destructors virtual + + -- An-Cheng Huang <ancheng@vyatta.com> Fri, 30 Jul 2010 16:22:55 -0700 + +vyatta-cfg (0.16.106) unstable; urgency=low + + [ An-Cheng Huang ] + * add cstore-specific header file + + [ Michael Larson ] + * timing syslog entries on commit hooks + + [ An-Cheng Huang ] + * remove dev package dependency on vyatta-cfg + + -- An-Cheng Huang <ancheng@vyatta.com> Thu, 29 Jul 2010 18:56:20 -0700 + +vyatta-cfg (0.16.105) unstable; urgency=low + + [ Michael Larson ] + * first commit to mendocino! + + [ An-Cheng Huang ] + * handle single quotes in comp_help + + [ Stephen Hemminger ] + * Add range and ipv6range as val_help types + + [ An-Cheng Huang ] + * add new cstore library + + -- An-Cheng Huang <ancheng@vyatta.com> Wed, 28 Jul 2010 14:31:31 -0700 + vyatta-cfg (0.16.104) unstable; urgency=low * UNRELEASED diff --git a/debian/control b/debian/control index d467832..2d7e270 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ 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 Architecture: any Depends: sed (>= 4.1.5), - perl (>= 5.8.8), procps (>= 1:3.2.7-3), coreutils (>= 5.97-5.3), vyatta-bash | bash (>= 3.1), @@ -19,14 +19,12 @@ Depends: sed (>= 4.1.5), parted, dhcp3-client | vyatta-dhcp3-client, bsdutils (>=1:2.13), - libc6 (>= 2.7-6), - libsort-versions-perl, - libfile-sync-perl, vlan, ethtool, iproute, - libglib2.0-0, - curl + curl, + libvyatta-cfg1 (=${binary:Version}), + ${perl:Depends}, ${shlibs:Depends} Replaces: vyatta-cfg-firewall, vyatta-cfg-quagga Suggests: util-linux (>= 2.13-5), @@ -34,6 +32,25 @@ Suggests: util-linux (>= 2.13-5), ncurses-bin (>= 5.5-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. + This package provides the Vyatta configuration system, including the base + configuration templates and the config-mode CLI completion mechanism. + +Package: libvyatta-cfg1 +Architecture: any +Depends: libsort-versions-perl, + libfile-sync-perl, + ${perl:Depends}, ${shlibs:Depends} +Replaces: vyatta-cfg +Description: vyatta-cfg back-end library + Vyatta configuration back-end library (libvyatta-cfg). + +Package: libvyatta-cfg-dev +Architecture: any +Priority: optional +Section: libdevel +Depends: libvyatta-cfg1 (=${binary:Version}), + libboost-filesystem1.40-dev +Description: libvyatta-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/libvyatta-cfg-dev.lintian-overrides b/debian/libvyatta-cfg-dev.lintian-overrides new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/debian/libvyatta-cfg-dev.lintian-overrides diff --git a/debian/libvyatta-cfg1.install b/debian/libvyatta-cfg1.install new file mode 100644 index 0000000..29063b5 --- /dev/null +++ b/debian/libvyatta-cfg1.install @@ -0,0 +1,2 @@ +usr/lib/*.so.* +opt/vyatta/share/perl5 diff --git a/debian/libvyatta-cfg1.lintian-overrides b/debian/libvyatta-cfg1.lintian-overrides new file mode 100644 index 0000000..f038351 --- /dev/null +++ b/debian/libvyatta-cfg1.lintian-overrides @@ -0,0 +1,2 @@ +libvyatta-cfg1: dir-or-file-in-opt +libvyatta-cfg1: file-in-unusual-dir 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..59c7712 100755 --- a/debian/rules +++ b/debian/rules @@ -1,108 +1,47 @@ #!/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_perl + dh_perl /opt/vyatta/share/perl5 /opt/vyatta/share/perl5/Vyatta + dh binary --after dh_perl --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..b2385da --- /dev/null +++ b/debian/vyatta-cfg.install @@ -0,0 +1,5 @@ +etc +opt/vyatta/share/enumeration +opt/vyatta/sbin +opt/vyatta/etc +bin diff --git a/debian/vyatta-cfg.lintian-overrides b/debian/vyatta-cfg.lintian-overrides new file mode 100644 index 0000000..2a1096f --- /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: file-in-etc-not-marked-as-conffile +vyatta-cfg: init.d-script-not-marked-as-conffile +vyatta-cfg: binary-without-manpage diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in index 48b889d..c007538 100644 --- a/debian/vyatta-cfg.postinst.in +++ b/debian/vyatta-cfg.postinst.in @@ -1,10 +1,20 @@ #!/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 +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 +26,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 + |