From 768a18adc28561a0c177a164580b237df04b55b6 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 13 Sep 2011 13:18:40 -0600 Subject: [PATCH] update handling of inetd and xinetd config files to reflect change to use of bsdtcp as default auth method. various other lintian-suggested cleanups. --- debian/NEWS | 14 ++++++++++++++ debian/amanda-client.lintian | 2 -- debian/amanda-client.postinst | 5 ----- debian/amanda-client.prerm | 5 ----- debian/amanda-common.postinst | 2 ++ debian/amanda-common.prerm | 5 +++++ debian/amanda-server.lintian | 2 -- debian/amanda-server.postinst | 6 ------ debian/amanda-server.prerm | 6 ------ debian/changelog | 4 +++- debian/control | 2 +- debian/rules | 16 +++++++--------- debian/xinetd.d/amanda | 15 --------------- debian/xinetd.d/amandaidx | 15 --------------- debian/xinetd.d/amidxtape | 15 --------------- 15 files changed, 32 insertions(+), 82 deletions(-) create mode 100644 debian/NEWS delete mode 100644 debian/amanda-client.postinst delete mode 100644 debian/amanda-client.prerm create mode 100644 debian/amanda-common.prerm delete mode 100644 debian/amanda-server.postinst delete mode 100644 debian/amanda-server.prerm delete mode 100644 debian/xinetd.d/amanda delete mode 100644 debian/xinetd.d/amandaidx delete mode 100644 debian/xinetd.d/amidxtape diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 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 Tue, 13 Sep 2011 12:36:08 -0600 diff --git a/debian/amanda-client.lintian b/debian/amanda-client.lintian index 1a81067..b33b73a 100644 --- 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 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 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 a85c8fd..50f05f3 100644 --- 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 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 07d7f99..794a3a3 100644 --- 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 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 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 a36dcfe..2b080d4 100644 --- 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 Sun, 07 Aug 2011 02:14:05 -0600 + -- Bdale Garbee 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 702d147..50ad55f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Bdale Garbee 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 f3918a4..3238716 100755 --- 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 index 2b351dd..0000000 --- a/debian/xinetd.d/amanda +++ /dev/null @@ -1,15 +0,0 @@ -# default: on -# description: The amanda service -service amanda -{ -# only_from = - 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 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 = - 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 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 = - 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 -} -- 2.30.2