From 433ed330db63d8c4e06e046d2e3e820ceb7947a2 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 16 Apr 2008 00:02:13 -0600 Subject: [PATCH] Imported Debian patch 2.5.2p1-3 --- debian/amanda-client.files | 5 +++ debian/amanda-common.dirs | 1 + debian/amanda-common.examples | 1 + debian/amanda-server.README.Debian | 61 +++++++++++++++++++++-------- debian/amanda-server.dirs | 8 ++-- debian/amanda-server.examples | 3 ++ debian/amanda-server.files | 8 ++++ debian/amanda-server.lintian | 7 ---- debian/changelog | 12 ++++++ debian/po/ar.po | 2 +- debian/po/cs.po | 2 +- debian/po/da.po | 2 +- debian/po/de.po | 2 +- debian/po/es.po | 2 +- debian/po/fr.po | 2 +- debian/po/gl.po | 2 +- debian/po/it.po | 2 +- debian/po/ja.po | 2 +- debian/po/nl.po | 2 +- debian/po/pt.po | 2 +- debian/po/pt_BR.po | 2 +- debian/po/ru.po | 32 +++++++-------- debian/po/sv.po | 2 +- debian/po/templates.pot | 2 +- debian/po/vi.po | 2 +- debian/rules | 62 ++++++++++++++---------------- server-src/amcleanup.sh.in | 12 +++--- server-src/amverify.sh.in | 4 +- 28 files changed, 147 insertions(+), 99 deletions(-) create mode 100644 debian/amanda-common.examples create mode 100644 debian/amanda-server.examples diff --git a/debian/amanda-client.files b/debian/amanda-client.files index 6ffcd58..e5ea96e 100644 --- a/debian/amanda-client.files +++ b/debian/amanda-client.files @@ -8,5 +8,10 @@ usr/lib/amanda/selfcheck usr/lib/amanda/sendbackup usr/lib/amanda/sendsize usr/lib/amanda/versionsuffix +usr/share/man/man8/amfetchdump.8.gz usr/share/man/man8/amrecover.8.gz +usr/share/man/man8/amrestore.8.gz +usr/sbin/amfetchdump +usr/sbin/amoldrecover usr/sbin/amrecover +usr/sbin/amrestore diff --git a/debian/amanda-common.dirs b/debian/amanda-common.dirs index c5b03cb..3605183 100644 --- a/debian/amanda-common.dirs +++ b/debian/amanda-common.dirs @@ -1,3 +1,4 @@ etc/xinetd.d usr/lib +usr/share/doc/amanda-common/examples usr/share/lintian/overrides diff --git a/debian/amanda-common.examples b/debian/amanda-common.examples new file mode 100644 index 0000000..0bbe99e --- /dev/null +++ b/debian/amanda-common.examples @@ -0,0 +1 @@ +example/* diff --git a/debian/amanda-server.README.Debian b/debian/amanda-server.README.Debian index 652ace4..809b966 100644 --- a/debian/amanda-server.README.Debian +++ b/debian/amanda-server.README.Debian @@ -1,21 +1,47 @@ amanda for DEBIAN ----------------- -To configure your server, as root do: +Since every Amanda installation is different, there is some work you need to +do to configure your server. For a simple setup, as root you need to: -1. for a simple setup edit the files (see explanations there) - /etc/amanda/DailySet1/amanda.conf - /etc/amanda/DailySet1/disklist - /etc/amanda/crontab +1. Create a directory under /etc/amanda for your backup config, we'll assume + a name 'DailySet1' as our example. + + mkdir /etc/amanda/DailySet1 + + Make sure that /etc/amanda and all the files under it are owner and group + backup with directory permissions of 770 and file permissions of 660. + +2. populate this directory with config files. At a minimum, you need + amanda.conf and disklist. + + cp /usr/share/doc/amanda-server/examples/amanda.conf \ + /etc/amanda/DailySet1/amanda.conf* + cp /usr/share/doc/amanda-server/examples/disklist \ + /etc/amanda/DailySet1/disklist + + Edit these files as needed, following the instructions in each file. + +3. Make sure that /etc/amanda and all the files under it are owner and group + backup with directory permissions of 770 and file permissions of 660. + + chown -R backup:backup /etc/amanda + +3. Prepare the "holding disk" if you plan to use one (highly recommended!) by + ensuring user backup can access it. See the note below indicating that it + may be better to use a subdirectory and not a mount point to avoid having + system artifacts like the lost+found directory confuse things. -2. prepare the holding disk if you use one by chown -R backup:backup -3. do - crontab -u backup /etc/amanda/crontab.amanda +4. Install a suitable crontab for user backup. If you used DailySet1 as your + configuration name, you can just install the provided example. If you + picked some other name, you will obviously need to edit a copy of the + example before installing it. + crontab -u backup /usr/share/doc/amanda-server/examples/crontab.amanda -To use all of Amanda's features, you may find it necessary to put each client +To use all of Amanda's features, you probably also want to put each client machine's root user in the .rhosts or .amandahosts for ~backup on the server machine. On Debian systems, this is usually linked to /etc/amandahosts, but if you have clients running other operating systems you'll have to find the @@ -31,8 +57,8 @@ For more complex setups, consult the manpages and the extra documents and example files in /usr/share/doc/amanda-common, or look at www.amanda.org on the web. -Another Note: if you use floppy tapes you have to use the sftape -interface for use with ftape(>=3.03). +Another Note: if you use floppy tapes you have to use the sftape interface +for use with ftape(>=3.03). Jean Pierre LeJacq reports the following about his experience using ftape: @@ -55,16 +81,19 @@ bastille was used with the "restrict system resources" option. See bug 118616 in the Debian bug tracking system for more information. If you choose to use the SSH authentication method and associated transport, -please be aware that there may be problems if /usr/libamanda/dumper is suid. +please be aware that there may be problems if /usr/lib/amanda/dumper is suid. You can fix this on your server with chmod u-s /usr/lib/amanda/dumper, or investigate dpkg-statoverride. Concerns have been expressed about the reliability of 'dump' as a backup tool on live Linux systems. Nothing can guarantee a consistent and meaningful -backup of a live filesystem under all circumstances. The tar utility is -'essential' in Debian and so will always be around, is not tied to any specific -filesystem type, and there are entries in the default amanda.conf file -defining dump types using tar. +backup of a live filesystem under all circumstances, and the maintainer of +these packages uses dump with good results. + +The tar utility is 'essential' in Debian and so will always be around, is not +tied to any specific filesystem type, and there are entries in the default +amanda.conf file defining dump types using tar. This may therefore be a good +option to consider. Note that if you are using tar with amanda, and getting errors about missing exclude files (particularly on upgrades from older versions), then you may diff --git a/debian/amanda-server.dirs b/debian/amanda-server.dirs index 162ec8c..1e626ae 100644 --- a/debian/amanda-server.dirs +++ b/debian/amanda-server.dirs @@ -1,7 +1,7 @@ +etc/amanda etc/xinetd.d -etc/amanda/DailySet1 usr/sbin -usr/share/doc/amanda-server +usr/share/doc/amanda-server/examples usr/share/lintian/overrides -var/lib/amanda/DailySet1/index -var/log/amanda/DailySet1 +var/lib/amanda +var/log/amanda diff --git a/debian/amanda-server.examples b/debian/amanda-server.examples new file mode 100644 index 0000000..739d64e --- /dev/null +++ b/debian/amanda-server.examples @@ -0,0 +1,3 @@ +debian/amanda.conf.in +debian/crontab.amanda +debian/disklist diff --git a/debian/amanda-server.files b/debian/amanda-server.files index 3f5ba44..69bdb41 100644 --- a/debian/amanda-server.files +++ b/debian/amanda-server.files @@ -15,32 +15,40 @@ usr/sbin/amadmin usr/sbin/amcheck usr/sbin/amcheckdb usr/sbin/amcleanup +usr/sbin/amdd usr/sbin/amdump usr/sbin/amflush usr/sbin/amgetconf usr/sbin/amlabel +usr/sbin/ammt usr/sbin/amoverview usr/sbin/amplot usr/sbin/amreport usr/sbin/amrmtape +usr/sbin/amstatus usr/sbin/amtape usr/sbin/amtapetype usr/sbin/amtoc usr/sbin/amverify +usr/sbin/amverifyrun usr/share/man/man8/amadmin.8.gz usr/share/man/man8/amanda.8.gz usr/share/man/man8/amcheck.8.gz usr/share/man/man8/amcheckdb.8.gz usr/share/man/man8/amcleanup.8.gz +usr/share/man/man8/amdd.8.gz usr/share/man/man8/amdump.8.gz usr/share/man/man8/amflush.8.gz usr/share/man/man8/amgetconf.8.gz usr/share/man/man8/amlabel.8.gz +usr/share/man/man8/ammt.8.gz usr/share/man/man8/amoverview.8.gz usr/share/man/man8/amplot.8.gz usr/share/man/man8/amreport.8.gz usr/share/man/man8/amrmtape.8.gz +usr/share/man/man8/amstatus.8.gz usr/share/man/man8/amtape.8.gz usr/share/man/man8/amtapetype.8.gz usr/share/man/man8/amtoc.8.gz usr/share/man/man8/amverify.8.gz +usr/share/man/man8/amverifyrun.8.gz diff --git a/debian/amanda-server.lintian b/debian/amanda-server.lintian index fe25afe..ef0e040 100644 --- a/debian/amanda-server.lintian +++ b/debian/amanda-server.lintian @@ -1,16 +1,9 @@ amanda-server: non-standard-dir-perm etc/amanda/ 0770 != 0755 -amanda-server: non-standard-dir-perm etc/amanda/DailySet1/ 0770 != 0755 -amanda-server: non-standard-file-perm etc/amanda/DailySet1/amanda.conf 0660 != 0644 -amanda-server: non-standard-file-perm etc/amanda/DailySet1/disklist 0660 != 0644 -amanda-server: non-standard-file-perm etc/amanda/crontab.amanda 0660 != 0644 amanda-server: setuid-binary usr/sbin/amcheck 4754 root/backup amanda-server: setuid-binary usr/lib/amanda/dumper 4754 root/backup amanda-server: setuid-binary usr/lib/amanda/planner 4754 root/backup amanda-server: non-standard-dir-perm var/lib/amanda/ 0770 != 0755 -amanda-server: non-standard-dir-perm var/lib/amanda/DailySet1/ 0770 != 0755 -amanda-server: non-standard-dir-perm var/lib/amanda/DailySet1/index/ 0770 != 0755 amanda-server: non-standard-dir-perm var/log/amanda/ 0770 != 0755 -amanda-server: non-standard-dir-perm var/log/amanda/DailySet1/ 0770 != 0755 amanda-server: executable-not-elf-or-script ./usr/lib/amanda/chg-lib.sh amanda-server: maintainer-script-needs-depends-on-update-inetd postinst amanda-server: maintainer-script-needs-depends-on-update-inetd prerm diff --git a/debian/changelog b/debian/changelog index 7af4eb6..f22eed7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +amanda (1:2.5.2p1-3) unstable; urgency=low + + * fix "bashisms" in the amcleanup and amverify scripts. closes: #464489 + * merge updated Russian translation, closes: #471030 + * move example configuration 'DailySet1' from /etc/amanda to + /usr/share/doc/amanda-server/examples to reduce confusion, update + the amanda-server README.Debian with fresh install notes. closes: #420023 + * move some binaries out of amanda-common into -server and -client + * harden forcing of /usr/bin/mail instead of /usr/bin/Mail, closes: #475771 + + -- Bdale Garbee Wed, 16 Apr 2008 00:02:13 -0600 + amanda (1:2.5.2p1-2) unstable; urgency=low * document holding disk constraint in amanda-server README.Debian file, diff --git a/debian/po/ar.po b/debian/po/ar.po index 760f4f8..c0b947c 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda_1:2.4.5-1\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2005-07-19 18:48+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" diff --git a/debian/po/cs.po b/debian/po/cs.po index fb4027c..d8b6636 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-06-04 17:06+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/debian/po/da.po b/debian/po/da.po index 0492cb5..f6986c8 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/de.po b/debian/po/de.po index 2249965..8453b9d 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-10-29 15:05+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" diff --git a/debian/po/es.po b/debian/po/es.po index 40a75c6..1fa2fea 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2007-01-29 14:29+0100\n" "Last-Translator: Manuel Porras Peralta «Venturi» \n" "Language-Team: Debian Spanish \n" diff --git a/debian/po/fr.po b/debian/po/fr.po index 2992c55..93ee324 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-05-28 17:13+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff --git a/debian/po/gl.po b/debian/po/gl.po index 9af66e6..c6d3a51 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2007-03-09 09:24+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" diff --git a/debian/po/it.po b/debian/po/it.po index 976dbdb..b4042fc 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1:2.5.0p2 italian debconf templates\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-05-30 10:30+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" diff --git a/debian/po/ja.po b/debian/po/ja.po index 1c5b91b..d07e908 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 2.5.0p2-2.1\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-10-11 00:08+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" diff --git a/debian/po/nl.po b/debian/po/nl.po index 032bd58..bad639d 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1:2.5.0p2-1\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-06-18 20:45+0100\n" "Last-Translator: Kurt De Bree \n" "Language-Team: Debian l10n Dutch \n" diff --git a/debian/po/pt.po b/debian/po/pt.po index 56df7d9..dc86052 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2007-02-04 12:24+0000\n" "Last-Translator: Carlos Lisboa \n" "Language-Team: Portuguese \n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 538efc1..6e58cac 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/ru.po b/debian/po/ru.po index 9b55820..fcc49ee 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,35 +1,37 @@ +# translation of amanda_1:2.5.2p1-1_ru.po to Russian # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to # this format, e.g. by running: # info -n '(gettext)PO Files' # info -n '(gettext)Header Entry' -# # Some information specific to po-debconf are available at # /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# # Developers do not need to manually edit POT or PO files. # -#, fuzzy +# Yuri Kozlov , 2008. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: amanda 1:2.5.2p1-1\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2008-03-15 13:30+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=KOI8-R\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: error #. Description #: ../templates:1001 -#, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" -msgstr "ðÏÖÁÌÕÊÓÔÁ, ÓÏÅÄÉÎÉÔÅ /var/lib/amandates É /var/lib/amanda/amandates." +msgstr "" +"Объедините настройки из /var/lib/amandates и /var/lib/amanda/amandates." #. Type: error #. Description @@ -39,6 +41,6 @@ msgid "" "review the files, and merge the contents you care about to the /var/lib/" "amanda/amandates location, and remove the old file /var/lib/amandates." msgstr "" -"õ ×ÁÓ ÅÓÔØ É /var/lib/amandates, É /var/lib/amanda/amandates ÆÁÊÌÙ. " -"ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÓÍÏÔÒÉÔÅ ÆÁÊÌÙ, ÓÏÅÄÉÎÉÔÅ ÉÈ ÓÏÄÅÒÖÉÍÏÅ × ÆÁÊÌÅ /var/" -"lib/amanda/amandates, É ÕÄÁÌÉÔÅ ÓÔÁÒÙÊ ÆÁÊÌ /var/lib/amandates." +"В системе найдены файлы: /var/lib/amandates и /var/lib/amanda/amandates. " +"Просмотрите эти файлы, объедините их настройки в файле /var/lib/amanda/" +"amandates и удалите старый файл /var/lib/amandates." diff --git a/debian/po/sv.po b/debian/po/sv.po index 106451a..f00f0d4 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1:2.5.0p2-1\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2006-06-27 23:05+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index dea51d9..a4f22cf 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/vi.po b/debian/po/vi.po index f93c680..1047221 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1/2.4.4p3-2\n" "Report-Msgid-Bugs-To: amanda@packages.debian.org\n" -"POT-Creation-Date: 2008-03-20 18:11-0600\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" "PO-Revision-Date: 2005-05-05 13:29+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/debian/rules b/debian/rules index 8055cf6..8d4592b 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,8 @@ #export DH_VERBOSE=1 r=$(shell pwd)/debian/amanda-common -server=$(shell pwd)/debian/amanda-server -client=$(shell pwd)/debian/amanda-client -common=$(shell pwd)/debian/amanda-common +s=$(shell pwd)/debian/amanda-server +c=$(shell pwd)/debian/amanda-client build: build-stamp build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot @@ -34,7 +33,7 @@ build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot --with-ssh-security \ --with-bsdtcp-security --with-bsdudp-security touch missing - make CFLAGS="-O2 -g -Wall \ + MAILER=/usr/bin/mail make CFLAGS="-O2 -g -Wall \ -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \ -DIGNORE_TAR_ERRORS " touch build-stamp @@ -66,17 +65,12 @@ binary-arch: build dh_clean -k dh_installdirs -a make install DESTDIR=$(r) - install -m 644 debian/amanda.conf.in \ - $(server)/etc/amanda/DailySet1/amanda.conf - install -m 644 debian/disklist $(server)/etc/amanda/DailySet1/disklist - install -m 644 debian/crontab.amanda $(server)/etc/amanda install -m 644 debian/amandahosts $(r)/etc/amandahosts dh_installdocs -a - install -d $(r)/usr/share/doc/amanda-common/examples - cp -a example/* $(r)/usr/share/doc/amanda-common/examples + dh_installexamples -a cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog - cp debian/xinetd.d/amandaidx $(server)/etc/xinetd.d - cp debian/xinetd.d/amidxtape $(server)/etc/xinetd.d + 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 dh_installmenu -a dh_installcron -a @@ -85,38 +79,38 @@ binary-arch: build dh_strip -a dh_compress -a dh_movefiles -a --sourcedir=debian/amanda-common - rm $(server)/usr/lib/amanda/chg-mtx + rm $(s)/usr/lib/amanda/chg-mtx dh_fixperms -av # fix perms manually chown -R backup:backup debian/*/var/lib/* chmod -R u=rwX,g=rwX,o-rwx debian/*/var/lib/* - chown -R backup:backup $(server)/var/log/amanda - chmod -R u=rwX,g=rwX,o-rwx $(server)/var/log/amanda - chown -R backup:backup $(server)/etc/amanda - chmod -R u=rwX,g=rwX,o-rwx $(server)/etc/amanda - chown -R backup:backup $(client)/var/lib/amanda/gnutar-lists - chmod -R u=rwX,g=rwX,o-rwx $(client)/var/lib/amanda/gnutar-lists + chown -R backup:backup $(s)/var/log/amanda + chmod -R u=rwX,g=rwX,o-rwx $(s)/var/log/amanda + chown -R backup:backup $(s)/etc/amanda + chmod -R u=rwX,g=rwX,o-rwx $(s)/etc/amanda + chown -R backup:backup $(c)/var/lib/amanda/gnutar-lists + chmod -R u=rwX,g=rwX,o-rwx $(c)/var/lib/amanda/gnutar-lists # .. setuid chown root:backup \ - $(client)/usr/lib/amanda/killpgrp \ - $(client)/usr/lib/amanda/rundump \ - $(client)/usr/lib/amanda/runtar \ - $(server)/usr/lib/amanda/dumper \ - $(server)/usr/lib/amanda/planner \ - $(server)/usr/sbin/amcheck + $(c)/usr/lib/amanda/killpgrp \ + $(c)/usr/lib/amanda/rundump \ + $(c)/usr/lib/amanda/runtar \ + $(s)/usr/lib/amanda/dumper \ + $(s)/usr/lib/amanda/planner \ + $(s)/usr/sbin/amcheck chmod u=srwx,g=rx,o=r \ - $(client)/usr/lib/amanda/killpgrp \ - $(client)/usr/lib/amanda/rundump \ - $(client)/usr/lib/amanda/runtar \ - $(server)/usr/lib/amanda/dumper \ - $(server)/usr/lib/amanda/planner \ - $(server)/usr/sbin/amcheck + $(c)/usr/lib/amanda/killpgrp \ + $(c)/usr/lib/amanda/rundump \ + $(c)/usr/lib/amanda/runtar \ + $(s)/usr/lib/amanda/dumper \ + $(s)/usr/lib/amanda/planner \ + $(s)/usr/sbin/amcheck install -o root -g root -m 0644 debian/amanda-client.lintian \ - $(client)/usr/share/lintian/overrides/amanda-client + $(c)/usr/share/lintian/overrides/amanda-client install -o root -g root -m 0644 debian/amanda-common.lintian \ - $(common)/usr/share/lintian/overrides/amanda-common + $(r)/usr/share/lintian/overrides/amanda-common install -o root -g root -m 0644 debian/amanda-server.lintian \ - $(server)/usr/share/lintian/overrides/amanda-server + $(s)/usr/share/lintian/overrides/amanda-server dh_makeshlibs -a dh_installdeb -a dh_shlibdeps -a -l"debian/amanda-common/usr/lib:debian/amanda-client/usr/lib:debian/amanda-server/usr/lib" diff --git a/server-src/amcleanup.sh.in b/server-src/amcleanup.sh.in index f301c5c..cd60001 100644 --- a/server-src/amcleanup.sh.in +++ b/server-src/amcleanup.sh.in @@ -48,7 +48,7 @@ else fi if test -h /proc/1/exe ; then - if test $# -ge 2 && test "$1" == "-k" ; then + if test $# -ge 2 && test "$1" = "-k" ; then KILL_ENABLE=1 conf=$2 shift @@ -183,9 +183,9 @@ if test ${KILL_ENABLE} -eq 1 ; then while test ${KEEP_CHECKING} -ne 0 ; do PIDS_THIS_PASS=0 for search_user in ${dumpuser} root ; do - if test "${search_user}" == "${dumpuser}" ; then + if test "${search_user}" = "${dumpuser}" ; then PROCESS_NAMES=${USER_PROCESS_NAMES} - elif test "${search_user}" == "root" ; then + elif test "${search_user}" = "root" ; then PROCESS_NAMES=${ROOT_PROCESS_NAMES} fi for search_pid in [0-9]* ; do @@ -193,7 +193,7 @@ if test ${KILL_ENABLE} -eq 1 ; then ls -l /proc/${search_pid}/exe 2>/dev/null | grep ${search_name} >/dev/null match_name=$? pid_uid="`cat /proc/${search_pid}/status 2>/dev/null | grep Uid | awk '//{split($_,i); print i[2]}'`" - if test ${match_name} -eq 0 && test "${pid_uid}" == "${search_user}" ; then + if test ${match_name} -eq 0 && test "${pid_uid}" = "${search_user}" ; then echo "amcleanup: Process ${search_name} found running at pid #${search_pid}." kill_pid=${search_pid} kill_name=${search_name} @@ -208,11 +208,11 @@ if test ${KILL_ENABLE} -eq 1 ; then if test ! -z "${kill_pid}" ; then if test -d /proc/${kill_pid} ; then echo "amcleanup: Sending process ${kill_pid} the TERM signal." - kill -15 -- ${kill_pid} + kill TERM -- ${kill_pid} sleep 5 if test -d /proc/${kill_pid} ; then echo "amcleanup: Sending process ${kill_pid} the KILL signal." - kill -9 -- ${kill_pid} + kill KILL -- ${kill_pid} fi sleep 5 if test -d /proc/${kill_pid} ; then diff --git a/server-src/amverify.sh.in b/server-src/amverify.sh.in index 21e111d..d146043 100644 --- a/server-src/amverify.sh.in +++ b/server-src/amverify.sh.in @@ -331,7 +331,7 @@ fi cd @AMANDA_TMPDIR@ || exit 1 TEMP=@AMANDA_TMPDIR@/amverify.$$ -trap 'rm -fr $TEMP' 0 +trap 'rm -fr $TEMP' EXIT if ( umask 077 ; mkdir $TEMP ) ; then : else @@ -343,7 +343,7 @@ REPORT=$TEMP/report; rm -f $REPORT TAPELIST= EXITSTAT=$TEMP/amrecover.exit; rm -rf $EXITSTAT -trap 'report "aborted!"; echo "aborted!" >> $DEFECTS; sendreport; rm -fr $TEMP; exit 1' 1 2 3 4 5 6 7 8 10 12 13 14 15 +trap 'report "aborted!"; echo "aborted!" >> $DEFECTS; sendreport; rm -fr $TEMP; exit 1' EXIT $Echoe "Defects file is $DEFECTS" report "amverify $CONFIG" -- 2.30.2