update handling of inetd and xinetd config files to reflect change to use

of bsdtcp as default auth method.  various other lintian-suggested cleanups.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644 (file)
index 0000000..54725ca
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,14 @@
+amanda (1:3.3.0-1) unstable; urgency=low
+
+  As of version 3.3.0, Amanda now uses bsdtcp as the default auth method, 
+  and the package postinst scripts install a suitable inetd entry.  
+
+  You may need to update existing amanda.conf and amanda-client.conf files
+  to reflect this change, as such configs are often hand-crafted to meet
+  site expectations.
+
+  You may also need to adjust inetd or xinetd configs to include both bsd
+  and bsdtcp auth methods if circumstances mandate keeping auth method bsd
+  active in your environment.
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 13 Sep 2011 12:36:08 -0600

diff --git a/debian/amanda-client.lintian b/debian/amanda-client.lintian
index 1a8106733045db85ed1aa292c1c8c556426e9c32..b33b73af7b861e9dae959840e3dcb6951adf7e02 100644 (file)
--- a/debian/amanda-client.lintian
+++ b/debian/amanda-client.lintian
@@ -6,6 +6,4 @@ amanda-client: setuid-binary usr/lib/amanda/rundump 4754 root/backup
 amanda-client: setuid-binary usr/lib/amanda/runtar 4754 root/backup
 amanda-client: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
 amanda-client: non-standard-dir-perm var/lib/amanda/gnutar-lists/ 0770 != 0755
-amanda-client: maintainer-script-needs-depends-on-update-inetd prerm
-amanda-client: maintainer-script-needs-depends-on-update-inetd postinst
 amanda-client: possible-gpl-code-linked-with-openssl

diff --git a/debian/amanda-client.postinst b/debian/amanda-client.postinst
deleted file mode 100644 (file)
index f8d7f1f..0000000
--- a/debian/amanda-client.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-update-inetd --group "OTHER" --add "amanda dgram udp wait backup /usr/sbin/tcpd /usr/lib/amanda/amandad -auth=bsd amdump amindexd amidxtaped"
-
-#DEBHELPER#

diff --git a/debian/amanda-client.prerm b/debian/amanda-client.prerm
deleted file mode 100644 (file)
index 3645d0f..0000000
--- a/debian/amanda-client.prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-update-inetd --remove "amanda "
-
-#DEBHELPER#

diff --git a/debian/amanda-common.postinst b/debian/amanda-common.postinst
index a85c8fdf525aedfb083443465167799de039ea9f..50f05f300cdab3580261586b0cbaf14d1ed2c4fb 100644 (file)
--- a/debian/amanda-common.postinst
+++ b/debian/amanda-common.postinst
@@ -58,4 +58,6 @@ if [ "$1" = configure ]; then
        chmod 770 /var/log/amanda
 fi
 
+update-inetd --add "amanda stream tcp nowait backup /usr/lib/amanda/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped"
+
 #DEBHELPER#

diff --git a/debian/amanda-common.prerm b/debian/amanda-common.prerm
new file mode 100644 (file)
index 0000000..1ff778a
--- /dev/null
+++ b/debian/amanda-common.prerm
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+update-inetd --remove "amanda"
+
+#DEBHELPER#

diff --git a/debian/amanda-server.lintian b/debian/amanda-server.lintian
index 07d7f99f9070a6b2ef1f87bd612f6513ef544897..794a3a3dfb7646b10cbb58b97081a2d4cc9b01df 100644 (file)
--- a/debian/amanda-server.lintian
+++ b/debian/amanda-server.lintian
@@ -4,6 +4,4 @@ amanda-server: setuid-binary usr/lib/amanda/planner 4754 root/backup
 amanda-server: setuid-binary usr/sbin/amcheck 4754 root/backup
 amanda-server: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
 amanda-server: non-standard-dir-perm var/log/amanda/ 0770 != 0755
-amanda-server: maintainer-script-needs-depends-on-update-inetd prerm
-amanda-server: maintainer-script-needs-depends-on-update-inetd postinst
 amanda-server: possible-gpl-code-linked-with-openssl

diff --git a/debian/amanda-server.postinst b/debian/amanda-server.postinst
deleted file mode 100644 (file)
index 45d8772..0000000
--- a/debian/amanda-server.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-update-inetd --group "OTHER" --add "amandaidx stream tcp nowait backup /usr/sbin/tcpd /usr/lib/amanda/amindexd amindexd -auth=bsd amdump amindexd amidxtaped"
-update-inetd --group "OTHER" --add "amidxtape stream tcp nowait backup /usr/sbin/tcpd /usr/lib/amanda/amidxtaped amidxtaped -auth=bsd amdump amindexd amidxtaped"
-
-#DEBHELPER#

diff --git a/debian/amanda-server.prerm b/debian/amanda-server.prerm
deleted file mode 100644 (file)
index 4288026..0000000
--- a/debian/amanda-server.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-update-inetd --remove amandaidx
-update-inetd --remove amidxtape
-
-#DEBHELPER#

diff --git a/debian/changelog b/debian/changelog
index a36dcfe7a9d39f467877979763f3b2fc5890fc80..2b080d49c3460287e02b324c84b9bc53c0b2f70b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 amanda (1:3.3.0-1) unstable; urgency=low
 
   * new upstream version
+  * consolidate inetd and xinetd config handling in amanda-common package
+  * add a NEWS entry explaining the switch to bsdtcp auth as default
 
- -- Bdale Garbee <bdale@gag.com>  Sun, 07 Aug 2011 02:14:05 -0600
+ -- Bdale Garbee <bdale@gag.com>  Tue, 13 Sep 2011 12:42:40 -0600
 
 amanda (1:3.2.1-1.1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 702d1477c2ad1e4c0c9e11d065dd5b972b2cf94a..50ad55fb7afec3841156a66534336b8df57de9ae 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Bdale Garbee <bdale@gag.com>
 Vcs-Git: git://git.gag.com/debian/amanda
 Vcs-Browser: http://git.gag.com/?p=debian/amanda
 Build-Depends: debhelper (>= 5), dump, gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump, po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: amanda-common
 Architecture: any

diff --git a/debian/rules b/debian/rules
index f3918a45f104bd6a7f8b19c3f00e2016b271f7a1..3238716af248b9d9841328e8bed725d91fc37fbd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules for amanda using debhelper
-# Copyright 1998-2009 by Bdale Garbee.  License GPL v2
+# Copyright 1998-2011 by Bdale Garbee.  License GPL v2
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 r=$(shell pwd)/debian/amanda-common
 s=$(shell pwd)/debian/amanda-server
@@ -48,7 +46,9 @@ configure-stamp:
        touch missing
        touch configure-stamp
 
-build: build-stamp 
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: configure-stamp
        dh_testdir
        MAILER=/usr/bin/mail $(MAKE) CFLAGS="-O2 -g -Wall \
@@ -83,9 +83,7 @@ binary-arch: build
        dh_installdocs -a
        dh_installexamples -a
        cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog
-       cp debian/xinetd.d/amandaidx $(s)/etc/xinetd.d
-       cp debian/xinetd.d/amidxtape $(s)/etc/xinetd.d
-       cp debian/xinetd.d/amanda $(r)/etc/xinetd.d                     
+       cp example/xinetd.amandaserver $(r)/etc/xinetd.d/amanda
        dh_installmenu -a
        dh_installcron -a
        dh_installchangelogs -a
@@ -149,4 +147,4 @@ source diff:
        @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: configure build-indep build-arch build clean binary-indep binary-arch binary

diff --git a/debian/xinetd.d/amanda b/debian/xinetd.d/amanda
deleted file mode 100644 (file)
index 2b351dd..0000000
--- a/debian/xinetd.d/amanda
+++ /dev/null
@@ -1,15 +0,0 @@
-# default: on
-# description: The amanda service
-service amanda
-{
-#      only_from       = <Amanda server>
-       socket_type     = dgram
-       protocol        = udp
-       wait            = yes
-       user            = backup
-       group           = backup
-       groups          = yes
-       server          = /usr/lib/amanda/amandad
-       server_args     = -auth=bsd amdump amindexd amidxtaped
-       disable         = no
-}

diff --git a/debian/xinetd.d/amandaidx b/debian/xinetd.d/amandaidx
deleted file mode 100644 (file)
index 0a967cf..0000000
--- a/debian/xinetd.d/amandaidx
+++ /dev/null
@@ -1,15 +0,0 @@
-#default: on
-# description: The amanda index service
-service amandaidx
-{
-#      only_from       = <Amanda client list>
-       socket_type     = stream
-       protocol        = tcp
-       wait            = no
-       user            = backup
-       group           = backup
-       groups          = yes
-       server          = /usr/lib/amanda/amindexd
-       server_args     = -auth=bsd amdump amindexd amidxtaped
-       disable         = no
-}

diff --git a/debian/xinetd.d/amidxtape b/debian/xinetd.d/amidxtape
deleted file mode 100644 (file)
index 3cb8863..0000000
--- a/debian/xinetd.d/amidxtape
+++ /dev/null
@@ -1,15 +0,0 @@
-#default: on
-# description: The amanda tape service
-service amidxtape
-{
-#      only_from       = <Amanda client list>
-       socket_type     = stream
-       protocol        = tcp
-       wait            = no
-       user            = backup
-       group           = backup
-       groups          = yes
-       server          = /usr/lib/amanda/amidxtaped
-       server_args     = -auth=bsd amdump amindexd amidxtaped
-       disable         = no
-}