Your message dated Sun, 16 Nov 2014 21:35:52 +0000 with message-id <20141116213552.GI6216@lupin.home.powdarrmonkey.net> and subject line Re: Bug#768082: unblock: amanda/1:3.3.6-3 has caused the Debian Bug report #768082, regarding unblock: amanda/1:3.3.6-3 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 768082: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768082 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: amanda/1:3.3.6-3
- From: Felipe Augusto van de Wiel <faw@debian.org>
- Date: Tue, 04 Nov 2014 12:41:31 -0800
- Message-id: <[🔎] 20141104204131.8395.54050.reportbug@faw-t440p.corpnet.samba.tv>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package amanda, or allow it to migrate after the full freeze begins. amanda was in testing until 2014-10-22, the version was 1:3.3.6-1. The most recent package is part of an adoption process, that also acknowledges previous NMUs and fix multiple bugs. The current version in unstable is 1:3.3.6-3 but we will likely have one last upload for 1:3.3.6-4. There is one bug still open http://bugs.debian.org/760846 that the new maintainer will address and should be a very small and safe diff to apply (documented on the bug). debdiff between -1 and -3 is attached. unblock amanda/1:3.3.6-3 PS: I can take care of the unblock, just want to be transparent about the reasoning and get peer review before adding any britney rules. -- System Information: Debian Release: jessie/sid APT prefers testing-updates APT policy: (500, 'testing-updates'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16-3-amd64 (SMP w/8 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dashdiff -Nru amanda-3.3.6/debian/TODO amanda-3.3.6/debian/TODO --- amanda-3.3.6/debian/TODO 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/TODO 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,20 @@ +* Fix bug 551564 and submit patch to the upstream. +* Bug 724075: submit extended patch file fix-misc-typos to the + upstream. + Upstream accepted parcially the patch. The man pages need to be + updated on the source that is located in man/xml-source/*.xml + Check for next version or upstream repo before closing bug. +* Bug 732017: Just add a Depends to amanda-client. +* Bug 709639: All my servers have backup alias. Is this an user + error? Should I close the Bug? Pinged user. +* Bug 700594: Not a bug? User error? + Need to check on zilda. +* Bug 688466: Implicit patch, apply it and submit to upstream. + Sent to upstream. +* Bug 687312: Ping user to see if is still relevant. + Pinged user at 2008-08-28 +* Bug 208977: Ping user to see if is still relevant. + Pinged user at 2008-08-28. +* Bug: doesn't build two times in a row. + +* Rever bug reports e tentar fechar-los. diff -Nru amanda-3.3.6/debian/amanda-client.links amanda-3.3.6/debian/amanda-client.links --- amanda-3.3.6/debian/amanda-client.links 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/amanda-client.links 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1 @@ +/usr/share/doc/amanda-common/changelog.gz /usr/share/doc/amanda-client/changelog.gz diff -Nru amanda-3.3.6/debian/amanda-common.dirs amanda-3.3.6/debian/amanda-common.dirs --- amanda-3.3.6/debian/amanda-common.dirs 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/amanda-common.dirs 2014-10-29 03:42:09.000000000 -0700 @@ -1,4 +1,5 @@ etc/xinetd.d usr/lib +usr/share/amanda-common/template.d usr/share/doc/amanda-common/examples usr/share/lintian/overrides diff -Nru amanda-3.3.6/debian/amanda-common.install amanda-3.3.6/debian/amanda-common.install --- amanda-3.3.6/debian/amanda-common.install 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/amanda-common.install 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1 @@ +example/template.d/* usr/share/amanda-common/template.d/ diff -Nru amanda-3.3.6/debian/amanda-common.links amanda-3.3.6/debian/amanda-common.links --- amanda-3.3.6/debian/amanda-common.links 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/amanda-common.links 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1 @@ +/usr/share/amanda-common/template.d /usr/share/doc/amanda-common/examples/template.d diff -Nru amanda-3.3.6/debian/amanda-server.examples amanda-3.3.6/debian/amanda-server.examples --- amanda-3.3.6/debian/amanda-server.examples 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/amanda-server.examples 2014-10-29 03:42:09.000000000 -0700 @@ -5,12 +5,3 @@ example/amanda.conf example/inetd.conf.amandaserver example/xinetd.amandaserver -example/template.d/dumptypes -example/template.d/tapetypes -example/template.d/README -example/template.d/chg-manual.conf -example/template.d/advanced.conf -example/template.d/amanda-harddisk.conf -example/template.d/amanda-single-tape.conf -example/template.d/amanda-tape-changer.conf -example/template.d/amanda-S3.conf diff -Nru amanda-3.3.6/debian/amanda-server.links amanda-3.3.6/debian/amanda-server.links --- amanda-3.3.6/debian/amanda-server.links 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/amanda-server.links 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1 @@ +/usr/share/doc/amanda-common/changelog.gz /usr/share/doc/amanda-server/changelog.gz diff -Nru amanda-3.3.6/debian/changelog amanda-3.3.6/debian/changelog --- amanda-3.3.6/debian/changelog 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/changelog 2014-10-29 03:42:09.000000000 -0700 @@ -1,3 +1,43 @@ +amanda (1:3.3.6-3) unstable; urgency=low + + * Adopting package (Closes: 700484). + * Merge work done by William Blough/Bill Blough: + * fix-amserverconfig-template-path: fix directory hierarchy for + amserverconfig template files. + * fix-misc-typos: fix typo errors in various source files, (Closes: + 724075) + * fix-lintian-manpage-warnings: + * Fix line breaks in man page. + * Fix FHS deviations in the man page. + * Update default directories to not use /usr/adm. + * automake-add-missing: let automake install missing files. + * Link upstream changelogs from -common package to -client and + -server packages. + * Add additional hardening flags. + * Fix bug "amanda-server: amcheck -M <email> does not work", (Closes: + #726798). + * Add PL translation (Closes: 731383). + * Create a TODO. + * fix-device-src_rait-device.c: Fix bug "Wrong use of unconverted + op->result instead of result", (Closes: 688466) + * Remove obsolete emacs variables. + * amanda-client: Add depends on libxml-simple-perl, (Closes: 732017). + + -- Jose M Calhariz <jose.calhariz@netvisao.pt> Sat, 30 Aug 2014 00:17:47 +0100 + +amanda (1:3.3.6-2) UNRELEASED; urgency=low + + * QA upload. + * debian/{control, rules, patches/missing-libs-ftbfs.patch}: + - Switch to dh-autoreconf to update libtool macros for ppc64el. + - Add missing libs to link. Needed for dh-autoreconf. + (Closes: #758261) + * debian/control: + - Bump to debhelper 9. + * wrap-and-sort. + + -- Artur Rona <ari-tczew@ubuntu.com> Sat, 23 Aug 2014 22:34:36 +0200 + amanda (1:3.3.6-1) unstable; urgency=low * QA upload. @@ -868,6 +908,3 @@ -- Christian Meder <meder@control.toronto.edu> Wed, 14 May 1997 13:08:34 -0500 -Local variables: -mode: debian-changelog -End: diff -Nru amanda-3.3.6/debian/control amanda-3.3.6/debian/control --- amanda-3.3.6/debian/control 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/control 2014-10-29 03:42:09.000000000 -0700 @@ -1,33 +1,70 @@ Source: amanda Section: utils Priority: optional -Maintainer: Debian QA Group <packages@qa.debian.org> -Build-Depends: debhelper (>= 5), dump [linux-any], gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump [linux-any], po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev, libssl-dev +Maintainer: Jose M Calhariz <jose.calhariz@netvisao.pt> +Build-Depends: autotools-dev, + bsd-mailx | mailx, + curl, + debhelper (>= 9), + dh-autoreconf, + dump [linux-any], + flex, + gnuplot, + libcurl4-openssl-dev, + libglib2.0-dev, + libncurses5-dev, + libreadline-dev, + libssl-dev, + libtool, + lpr, + mtx, + perl, + po-debconf, + procps, + smbclient, + xfsdump [linux-any] Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/collab-maint/amanda.git Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/amanda.git;a=summary Package: amanda-common Architecture: any -Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, update-inetd, tar (>=1.12), perl5, bsd-mailx | mailx, debconf | debconf-2.0, adduser, openbsd-inetd | inet-superserver +Depends: adduser, + bsd-mailx | mailx, + debconf | debconf-2.0, + openbsd-inetd | inet-superserver, + perl5, + tar (>=1.12), + update-inetd, + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} Suggests: amanda-server (= ${binary:Version}) | amanda-client (= ${binary:Version}) Conflicts: amanda -Replaces: amanda, amanda-client +Replaces: amanda, + amanda-client Description: Advanced Maryland Automatic Network Disk Archiver (Libs) This package contains libraries required by the amanda client and server packages. Package: amanda-server Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version}), bsd-mailx | mailx -Suggests: perl5, gnuplot, amanda-client (= ${binary:Version}), cpio | mt-st -Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3) +Depends: amanda-common (= ${binary:Version}), + bsd-mailx | mailx, + ${misc:Depends}, + ${shlibs:Depends} +Suggests: amanda-client (= ${binary:Version}), + cpio | mt-st, + gnuplot, + perl5 +Conflicts: amanda, + amanda-common (<< 1:2.5.2p1-3) Replaces: amanda-common (<< 1:2.5.2p1-3) Description: Advanced Maryland Automatic Network Disk Archiver (Server) Amanda is a backup system designed to archive many computers on a network to a single large-capacity tape drive. This package is suitable for large amounts of data to backup. For smaller solutions - take a look at afbackup, tob, ... + take a look at afbackup, tob, ... . Features: * will back up multiple machines in parallel to a holding disk, blasting @@ -37,14 +74,14 @@ * built on top of standard backup software: Unix dump/restore, and later GNU Tar and others. * does simple tape management: will not overwrite the wrong tape. - * supports tape changers via a generic interface. Easily customizable - to any type of tape carousel, robot, or stacker that can be controlled + * supports tape changers via a generic interface. Easily customizable + to any type of tape carousel, robot, or stacker that can be controlled via the unix command line. * for a restore, tells you what tapes you need, and finds the proper backup image on the tape for you. * recovers gracefully from errors, including down or hung machines. * reports results, including all errors in detail, in email to operators. - * will dynamically adjust backup schedule to keep within constraints: + * will dynamically adjust backup schedule to keep within constraints: no more juggling by hand when adding disks and computers to network. * includes a pre-run checker program, that conducts sanity checks on both the tape server host and all the client hosts (in parallel), and will @@ -63,19 +100,25 @@ Explanation of suggested programs: - perl is needed for some non essential server utilities - gnuplot is needed for plotting statistics of backups - - to backup the tape server, you need to install the client too + - to backup the tape server, you need to install the client too Package: amanda-client Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version}) -Suggests: gnuplot, dump, smbclient -Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3) +Depends: amanda-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + libxml-simple-perl +Suggests: dump, + gnuplot, + smbclient +Conflicts: amanda, + amanda-common (<< 1:2.5.2p1-3) Replaces: amanda-common (<< 1:2.5.2p1-3) Description: Advanced Maryland Automatic Network Disk Archiver (Client) Amanda is a backup system designed to archive many computers on a network to a single large-capacity tape drive. This package is suitable for large amounts of data to backup. For smaller solutions - take a look at afbackup, tob, ... + take a look at afbackup, tob, ... . Features: * will back up multiple machines in parallel to a holding disk, blasting @@ -85,14 +128,14 @@ * built on top of standard backup software: Unix dump/restore, and later GNU Tar and others. * does simple tape management: will not overwrite the wrong tape. - * supports tape changers via a generic interface. Easily customizable - to any type of tape carousel, robot, or stacker that can be controlled + * supports tape changers via a generic interface. Easily customizable + to any type of tape carousel, robot, or stacker that can be controlled via the unix command line. * for a restore, tells you what tapes you need, and finds the proper backup image on the tape for you. * recovers gracefully from errors, including down or hung machines. * reports results, including all errors in detail, in email to operators. - * will dynamically adjust backup schedule to keep within constraints: + * will dynamically adjust backup schedule to keep within constraints: no more juggling by hand when adding disks and computers to network. * includes a pre-run checker program, that conducts sanity checks on both the tape server host and all the client hosts (in parallel), and will @@ -112,4 +155,3 @@ . Explanation of suggested programs: - gnuplot is needed for plotting statistics of backups - diff -Nru amanda-3.3.6/debian/copyright amanda-3.3.6/debian/copyright --- amanda-3.3.6/debian/copyright 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/copyright 2014-10-29 03:42:09.000000000 -0700 @@ -1,5 +1,5 @@ This package was built by Bdale Garbee <bdale@gag.com> using sources downloaded -from +from ftp://ftp.amanda.org/pub/amanda/ @@ -38,4 +38,3 @@ On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. - diff -Nru amanda-3.3.6/debian/patches/automake-add-missing amanda-3.3.6/debian/patches/automake-add-missing --- amanda-3.3.6/debian/patches/automake-add-missing 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/automake-add-missing 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,10 @@ +Description: let automake install missing files +Author: Bill Blough <devel@blough.us> +--- a/autogen.dist 2013-07-18 19:24:55.215425417 -0400 ++++ b/autogen 2013-07-18 19:25:31.483425692 -0400 +@@ -57,4 +57,4 @@ + touch config/config.h.in + + echo "..automake" +-automake --force --copy --warnings=none || die "automake failed" ++automake --add-missing --force --copy --warnings=none || die "automake failed" diff -Nru amanda-3.3.6/debian/patches/fix-amcheck-M.patch amanda-3.3.6/debian/patches/fix-amcheck-M.patch --- amanda-3.3.6/debian/patches/fix-amcheck-M.patch 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/fix-amcheck-M.patch 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,17 @@ +Description: Fix amcheck -M + +Index: amanda-3.3.6/server-src/amcheck.c +=================================================================== +--- amanda-3.3.6.orig/server-src/amcheck.c 2014-08-25 06:47:02.000000000 +0100 ++++ amanda-3.3.6/server-src/amcheck.c 2014-08-25 06:47:06.000000000 +0100 +@@ -453,8 +453,8 @@ main( + } + if(mailto) { + a = (char **) g_new0(char *, 2); +- a[1] = stralloc(mailto); +- a[2] = NULL; ++ a[0] = stralloc(mailto); ++ a[1] = NULL; + } else { + /* (note that validate_mailto doesn't allow any quotes, so this + * is really just splitting regular old strings) */ diff -Nru amanda-3.3.6/debian/patches/fix-amserverconfig-template-path amanda-3.3.6/debian/patches/fix-amserverconfig-template-path --- amanda-3.3.6/debian/patches/fix-amserverconfig-template-path 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/fix-amserverconfig-template-path 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,24 @@ +Description: adjust template path to work with Debian +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=551564 +Author: Bill Blough <devel@blough.us> + +--- a/server-src/amserverconfig.pl ++++ b/server-src/amserverconfig.pl +@@ -33,7 +33,7 @@ use Amanda::Constants; + my $confdir="$CONFIG_DIR"; + my $tmpdir="$AMANDA_DBGDIR"; + my $amandahomedir="$localstatedir/amanda"; +-my $templatedir="$amdatadir/template.d"; #rpm install template files here ++my $templatedir="${amdatadir}-common/template.d"; #rpm install template files here + my $def_tapedev="file:$amandahomedir/vtapes"; + + my $amanda_user="$Amanda::Constants::CLIENT_LOGIN"; +@@ -395,7 +395,7 @@ sub create_customconf{ + + + sub check_xinetd{ +- &mprint ("/var/lib/amanda/example/xinetd.amandaserver contains the latest Amanda server daemon configuration.\n"); ++ &mprint ("/usr/share/doc/amanda-server/examples/xinetd.amandaserver contains the latest Amanda server daemon configuration.\n"); + &mprint ("Please merge it to /etc/xinetd.d/amandaserver.\n"); + } + diff -Nru amanda-3.3.6/debian/patches/fix-device-src_rait-device.c amanda-3.3.6/debian/patches/fix-device-src_rait-device.c --- amanda-3.3.6/debian/patches/fix-device-src_rait-device.c 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/fix-device-src_rait-device.c 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,13 @@ +Index: amanda.git/device-src/rait-device.c +=================================================================== +--- amanda.git.orig/device-src/rait-device.c 2014-08-27 01:44:46.000000000 +0100 ++++ amanda.git/device-src/rait-device.c 2014-08-28 20:27:34.000000000 +0100 +@@ -1096,7 +1096,7 @@ static DeviceStatusFlags rait_device_rea + for (i = 0; i < ops->len; i ++) { + GenericOp * op = g_ptr_array_index(ops, i); + DeviceStatusFlags result = GPOINTER_TO_INT(op->result); +- if (op->result == DEVICE_STATUS_SUCCESS) { ++ if (result == DEVICE_STATUS_SUCCESS) { + if (first_success == NULL) { + /* This is the first successful device. */ + first_success = op->child; diff -Nru amanda-3.3.6/debian/patches/fix-lintian-manpage-warnings amanda-3.3.6/debian/patches/fix-lintian-manpage-warnings --- amanda-3.3.6/debian/patches/fix-lintian-manpage-warnings 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/fix-lintian-manpage-warnings 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,93 @@ +Description: Fix various linitan errors relating to man pages, including line breaks, non-standard FHS paths, etc. +Author: Bill Blough <devel@blough.us> + +Index: amanda-3.3.6/common-src/conffile.c +=================================================================== +--- amanda-3.3.6.orig/common-src/conffile.c 2014-07-09 15:22:00.000000000 +0100 ++++ amanda-3.3.6/common-src/conffile.c 2014-08-25 04:55:16.000000000 +0100 +@@ -5289,9 +5289,9 @@ init_defaults( + conf_init_str (&conf_data[CNF_LABELSTR] , ".*"); + conf_init_str (&conf_data[CNF_TAPELIST] , "tapelist"); + conf_init_str (&conf_data[CNF_DISKFILE] , "disklist"); +- conf_init_str (&conf_data[CNF_INFOFILE] , "/usr/adm/amanda/curinfo"); +- conf_init_str (&conf_data[CNF_LOGDIR] , "/usr/adm/amanda"); +- conf_init_str (&conf_data[CNF_INDEXDIR] , "/usr/adm/amanda/index"); ++ conf_init_str (&conf_data[CNF_INFOFILE] , CONFIG_DIR "/curinfo"); ++ conf_init_str (&conf_data[CNF_LOGDIR] , CONFIG_DIR); ++ conf_init_str (&conf_data[CNF_INDEXDIR] , CONFIG_DIR "/index"); + conf_init_ident (&conf_data[CNF_TAPETYPE] , "DEFAULT_TAPE"); + conf_init_identlist(&conf_data[CNF_HOLDINGDISK] , NULL); + conf_init_int (&conf_data[CNF_DUMPCYCLE] , CONF_UNIT_NONE, 10); +Index: amanda-3.3.6/man/amanda.conf.5 +=================================================================== +--- amanda-3.3.6.orig/man/amanda.conf.5 2014-08-25 04:54:57.000000000 +0100 ++++ amanda-3.3.6/man/amanda.conf.5 2014-08-25 04:55:16.000000000 +0100 +@@ -569,7 +569,7 @@ option\&. + \fBchangerfile\fR \fIstring\fR + .RS 4 + Default: +-\fI"/usr/adm/amanda/log/changer\-status"\fR\&. A tape changer configuration parameter\&. Usage depends on the particular changer defined with the ++\fI"<CONFIG_DIR>/<config>/changer\-status"\fR\&. A tape changer configuration parameter\&. Usage depends on the particular changer defined with the + \fBtpchanger\fR + option\&. + .RE +@@ -828,13 +828,13 @@ file holding client hosts, disks and oth + \fBinfofile\fR \fIstring\fR + .RS 4 + Default: +-\fI"/usr/adm/amanda/curinfo"\fR\&. The file or directory name for the historical information database\&. If Amanda was configured to use DBM databases, this is the base file name for them\&. If it was configured to use text formated databases (the default), this is the base directory and within here will be a directory per client, then a directory per disk, then a text file of data\&. ++\fI"<CONFIG_DIR>/curinfo"\fR\&. The file or directory name for the historical information database\&. If Amanda was configured to use DBM databases, this is the base file name for them\&. If it was configured to use text formated databases (the default), this is the base directory and within here will be a directory per client, then a directory per disk, then a text file of data\&. + .RE + .PP + \fBlogdir\fR \fIstring\fR + .RS 4 + Default: +-\fI"/usr/adm/amanda"\fR\&. The directory for the ++\fI"<CONFIG_DIR>/"\fR\&. The directory for the + \fBamdump\fR + and + \fBlog\fR +@@ -844,7 +844,7 @@ files\&. + \fBindexdir\fR \fIstring\fR + .RS 4 + Default +-\fI"/usr/adm/amanda/index"\fR\&. The directory where index files (backup image catalogues) are stored\&. Index files are only generated for filesystems whose ++\fI"<CONFIG_DIR>/index"\fR\&. The directory where index files (backup image catalogues) are stored\&. Index files are only generated for filesystems whose + \fBdumptype\fR + has the + \fBindex\fR +@@ -915,7 +915,7 @@ setting\&. + .PP + \fBcolumnspec\fR \fIstring\fR + .RS 4 +-default: "HostName=0:\-12:12,Disk=1:\-11:11,Level=1:\-1:1,OrigKB=1:\-7:0,OutKB=1:\-7:0,Compress=1:\-6:1,DumpTime=1:\-7:7,Dumprate=1:\-6:1,TapeTime=1:\-6:6,TapeRate=1:\-6:1" ++Default: "HostName=0:\-12:12,Disk=1:\-11:11,Level=1:\-1:1,OrigKB=1:\-7:0, OutKB=1:\-7:0,Compress=1:\-6:1,DumpTime=1:\-7:7,Dumprate=1:\-6:1, TapeTime=1:\-6:6,TapeRate=1:\-6:1" + .sp + Defines the width of columns + \fBamreport\fR +Index: amanda-3.3.6/man/amfetchdump.8 +=================================================================== +--- amanda-3.3.6.orig/man/amfetchdump.8 2014-07-11 12:56:26.000000000 +0100 ++++ amanda-3.3.6/man/amfetchdump.8 2014-08-25 04:55:16.000000000 +0100 +@@ -31,7 +31,7 @@ + amfetchdump \- extract backup images from multiple Amanda tapes\&. + .SH "SYNOPSIS" + .HP \w'\fBamfetchdump\fR\ 'u +-\fBamfetchdump\fR [\-c | \-C | \-l] [\-p | \-n] [\-a] [\-O\ \fIdirectory\fR] [\-d\ \fIdevice\fR] [\-h | \-\-header\-file\ \fIfilename\fR | \-\-header\-fd\ \fIfd\fR] [\-\-decompress | \-\-no\-decompress | \-\-server\-decompress | \-\-client\-decompress] [\-\-extract\ \-\-directory\fI\ directory\fR\ [\-\-data\-path\fI\ amanda|directtcp\fR]\ [\-\-application\-property\ \fINAME=VALUE\fR]*] [\-\-decrypt | \-\-no\-decrypt | \-\-server\-decrypt | \-\-client\-decrypt] [\-\-exact_match] [\fB\-o\fR\ \fIconfigoption\fR...] \fIconfig\fR \fIhostname\fR [\fIdisk\fR\ [\ \fIdate\fR\ [\ \fIlevel\fR\ [\ \fIhostname\fR\ [\&.\&.\&.]\ ]\ ]\ ]] ++\fBamfetchdump\fR [\-c | \-C | \-l] [\-p | \-n] [\-a] [\-O\ \fIdirectory\fR] [\-d\ \fIdevice\fR] [\-h | \-\-header\-file\ \fIfilename\fR | \-\-header\-fd\ \fIfd\fR] [\-\-decompress | \-\-no\-decompress | \-\-server\-decompress | \-\-client\-decompress] [\-\-extract\ \-\-directory\fI\ directory\fR\ [\-\-data\-path\fI\ amanda\fR | \fIdirecttcp\fR]\ [\-\-application\-property\ \fINAME=VALUE\fR]*] [\-\-decrypt | \-\-no\-decrypt | \-\-server\-decrypt | \-\-client\-decrypt] [\-\-exact_match] [\fB\-o\fR\ \fIconfigoption\fR...] \fIconfig\fR \fIhostname\fR [\fIdisk\fR\ [\ \fIdate\fR\ [\ \fIlevel\fR\ [\ \fIhostname\fR\ [\&.\&.\&.]\ ]\ ]\ ]] + .SH "DESCRIPTION" + .PP + \fBAmfetchdump\fR +Index: amanda-3.3.6/man/amrestore.8 +=================================================================== +--- amanda-3.3.6.orig/man/amrestore.8 2014-07-11 12:56:26.000000000 +0100 ++++ amanda-3.3.6/man/amrestore.8 2014-08-25 04:55:16.000000000 +0100 +@@ -31,7 +31,7 @@ + amrestore \- low\-level data\-extraction from Amanda volumes + .SH "SYNOPSIS" + .HP \w'\fBamrestore\fR\ 'u +-\fBamrestore\fR [\-\-config\ \fIconfig\fR] [\-r | \-c | \-C] [\-b\ \fIblocksize\fR] [\-f\ \fIfilenum\fR] [\-l\ \fIlabel\fR] [\-p] [\-h] [\-\-exact\-match] [\fB\-o\fR\ \fIconfigoption\fR...] [{\fIchangerspec\fR} | {[\-\-holding]\ \fIholdingfile\fR}] [\fIhostname\fR\ [\ \fIdiskname\fR\ [\ \fIdatestamp\fR\ [\ \fIhostname\fR\ [\ \fIdiskname\fR\ [\ \fIdatestamp\fR\ \&.\&.\&.\ ]\ ]\ ]\ ]\ ]] ++\fBamrestore\fR [\-\-config\ \fIconfig\fR] [\-r | \-c | \-C] [\-b\ \fIblocksize\fR] [\-f\ \fIfilenum\fR] [\-l\ \fIlabel\fR] [\-p] [\-h] [\-\-exact\-match] [\fB\-o\fR\ \fIconfigoption\fR...] [{\fIchangerspec\fR} | {[\-\-holding]\ \fIholdingfile\fR}] [\fIhostname\fR\ [\ \fIdiskname\fR\ [\ \fIdatestamp\fR \ [\ \fIhostname\fR\ [\ \fIdiskname\fR\ [\ \fIdatestamp\fR\ \&.\&.\&.\ ]\ ]\ ]\ ]\ ]] + .PP + Note that this is the only Amanda command which does not take a configuration name as its first argument\&. + .SH "DESCRIPTION" diff -Nru amanda-3.3.6/debian/patches/fix-misc-typos amanda-3.3.6/debian/patches/fix-misc-typos --- amanda-3.3.6/debian/patches/fix-misc-typos 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/fix-misc-typos 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,126 @@ +Description: Fix various typos +Author: Bill Blough <devel@blough.us> +Forwarded: no + +Index: amanda-3.3.6/ndmp-src/ndmjob_args.c +=================================================================== +--- amanda-3.3.6.orig/ndmp-src/ndmjob_args.c 2014-07-09 15:21:55.000000000 +0100 ++++ amanda-3.3.6/ndmp-src/ndmjob_args.c 2014-08-25 04:54:57.000000000 +0100 +@@ -54,8 +54,8 @@ char *help_text[] = { + " -o init-labels -- init media labels", + #endif /* !NDMOS_OPTION_NO_CONTROL_AGENT */ + #ifndef NDMOS_EFFECT_NO_SERVER_AGENTS +- " -o daemon -- launch session for incomming connections", +- " -o test-daemon -- launch session for incomming connections, exit when stdin is closed", ++ " -o daemon -- launch session for incoming connections", ++ " -o test-daemon -- launch session for incoming connections, exit when stdin is closed", + " -o tape-size=SIZE -- specify the length, in bytes of the simulated tape", + #endif /* !NDMOS_EFFECT_NO_SERVER_AGENTS */ + #ifndef NDMOS_OPTION_NO_CONTROL_AGENT +Index: amanda-3.3.6/common-src/util.c +=================================================================== +--- amanda-3.3.6.orig/common-src/util.c 2014-07-09 15:22:00.000000000 +0100 ++++ amanda-3.3.6/common-src/util.c 2014-08-25 04:54:57.000000000 +0100 +@@ -1076,7 +1076,7 @@ int copy_file( + if ((outfd = open(dst, O_WRONLY|O_CREAT, 0600)) == -1) { + save_errno = errno; + quoted = quote_string(dst); +- *errmsg = vstrallocf(_("Can't open file '%s' for writting: %s"), ++ *errmsg = vstrallocf(_("Can't open file '%s' for writing: %s"), + quoted, strerror(save_errno)); + amfree(quoted); + close(infd); +Index: amanda-3.3.6/server-src/amindexd.c +=================================================================== +--- amanda-3.3.6.orig/server-src/amindexd.c 2014-07-09 15:21:57.000000000 +0100 ++++ amanda-3.3.6/server-src/amindexd.c 2014-08-25 04:54:57.000000000 +0100 +@@ -249,7 +249,7 @@ uncompress_file( + + indexfd = open(filename,O_WRONLY|O_CREAT, 0600); + if (indexfd == -1) { +- msg = vstrallocf(_("Can't open '%s' for writting: %s"), ++ msg = vstrallocf(_("Can't open '%s' for writing: %s"), + filename, strerror(errno)); + dbprintf("%s\n", msg); + g_ptr_array_add(*emsg, msg); +Index: amanda-3.3.6/device-src/tape-device.c +=================================================================== +--- amanda-3.3.6.orig/device-src/tape-device.c 2014-07-09 15:21:56.000000000 +0100 ++++ amanda-3.3.6/device-src/tape-device.c 2014-08-25 04:54:57.000000000 +0100 +@@ -581,7 +581,7 @@ tape_device_set_compression_fn(Device *p + device_clear_volume_details(p_self); + } else { + device_set_error(p_self, +- g_strdup("Error setting COMPRESION property"), ++ g_strdup("Error setting COMPRESSION property"), + DEVICE_STATUS_DEVICE_ERROR); + return FALSE; + } +Index: amanda-3.3.6/man/amanda-auth.7 +=================================================================== +--- amanda-3.3.6.orig/man/amanda-auth.7 2014-08-25 04:54:37.000000000 +0100 ++++ amanda-3.3.6/man/amanda-auth.7 2014-08-25 04:54:57.000000000 +0100 +@@ -168,7 +168,7 @@ Each authorization is on its own line in + .PP + If + \fIusername\fR +-is ommitted, it defaults to the user running ++is omitted, it defaults to the user running + \fBamandad\fR, i\&.e\&. the user listed in the + \fBinetd\fR + or +Index: amanda-3.3.6/man/amanda-changers.7 +=================================================================== +--- amanda-3.3.6.orig/man/amanda-changers.7 2014-07-11 12:56:26.000000000 +0100 ++++ amanda-3.3.6/man/amanda-changers.7 2014-08-25 04:54:57.000000000 +0100 +@@ -676,7 +676,7 @@ not found in these slots, except for imp + .RE + .SS "Timing" + .PP +-Tape libraries are fickle, and in many cases will report that an operation is complete when it is still in progress\&. Chg\-robot takes several timing\-related properties to accomodate such behavior\&. ++Tape libraries are fickle, and in many cases will report that an operation is complete when it is still in progress\&. Chg\-robot takes several timing\-related properties to accommodate such behavior\&. + .PP + A typical sequence of operations performed during a load are: get library status, eject a tape, unload the tape back to a storage slot, load a new tape, and read the label on that tape to ensure the drive is ready\&. + .PP +Index: amanda-3.3.6/man/amanda.conf.5 +=================================================================== +--- amanda-3.3.6.orig/man/amanda.conf.5 2014-08-25 04:54:34.000000000 +0100 ++++ amanda-3.3.6/man/amanda.conf.5 2014-08-25 04:54:57.000000000 +0100 +@@ -2496,7 +2496,7 @@ for more information on configuring tape + .PP + Amanda can "split" dumps into parts while writing them to storage media\&. This allows Amanda to recover gracefully from a failure while writing a part to a volume, by simply selecting a new volume and re\-writing the dump from the beginning of the failed part\&. Parts also allow Amanda to seek directly to the required data, although this functionality is not yet used\&. + .PP +-In order to support re\-writing from the beginning of a failed part, Amanda must have access to the contents of the part after it has been partially written\&. If the dump is being read from holding disk, then the part contents are availble there\&. Otherwise, the part must be cached, and this can be done memory or on disk\&. In either of the latter cases, the cache must have enough space to hold an entire part\&. ++In order to support re\-writing from the beginning of a failed part, Amanda must have access to the contents of the part after it has been partially written\&. If the dump is being read from holding disk, then the part contents are available there\&. Otherwise, the part must be cached, and this can be done memory or on disk\&. In either of the latter cases, the cache must have enough space to hold an entire part\&. + .PP + Because it is common for a single Amanda configuration to use both holding\-disk (FILE\-WRITE) and direct (known as PORT\-WRITE) dumps, Amanda allows the configuration of different split sizes for the two cases\&. This allows, for example, for a part size appropriate to large tapes when performing FILE\-WRITE dumps, with a part size limited by available disk or memory when performing PORT\-WRITE dumps\&. + .PP +Index: amanda-3.3.6/man/amzfs-sendrecv.8 +=================================================================== +--- amanda-3.3.6.orig/man/amzfs-sendrecv.8 2014-07-11 12:56:25.000000000 +0100 ++++ amanda-3.3.6/man/amzfs-sendrecv.8 2014-08-25 04:54:57.000000000 +0100 +@@ -31,9 +31,9 @@ + amzfs-sendrecv \- Amanda script to create zfs sendrecv + .SH "DESCRIPTION" + .PP +-amzfs\-sendrecv is an Amanda application implementing the Application API\&. It should not be run by users directly\&. It create a zfs snapshot of the filesystem and backup the snapshot with \*(Aqzfs send\*(Aq\&. Snapshot are kept after the backup is done, this increase the disk space use on the client but it is neccesary to be able do to incremental backup\&. If you want only full backup, you can disable this feature by setting the KEEP\-SNAPSHOT property to \*(AqNO\*(Aq\&. Only the restoration of the complete backup is allowed, it is impossible to restore a single file\&. ++amzfs\-sendrecv is an Amanda application implementing the Application API\&. It should not be run by users directly\&. It create a zfs snapshot of the filesystem and backup the snapshot with \*(Aqzfs send\*(Aq\&. Snapshot are kept after the backup is done, this increase the disk space use on the client but it is necessary to be able do to incremental backup\&. If you want only full backup, you can disable this feature by setting the KEEP\-SNAPSHOT property to \*(AqNO\*(Aq\&. Only the restoration of the complete backup is allowed, it is impossible to restore a single file\&. + .PP +-The application is run as the amanda user, it must have many zfs priviledge: ++The application is run as the amanda user, it must have many zfs privilege: + .sp + .nf + zfs allow \-ldu AMANDA_USER mount,create,rename,snapshot,destroy,send,receive FILESYSTEM +Index: amanda-3.3.6/man/amzfs-snapshot.8 +=================================================================== +--- amanda-3.3.6.orig/man/amzfs-snapshot.8 2014-07-11 12:56:25.000000000 +0100 ++++ amanda-3.3.6/man/amzfs-snapshot.8 2014-08-25 04:54:57.000000000 +0100 +@@ -42,7 +42,7 @@ PRE\-DLE\-* create a snapshot and the PO + .PP + The PRE_DLE_* script output a DIRECTORY property telling where the directory is located in the snapshot\&. The application must be able to use the DIRECTORY property, amgtar can do it\&. + .PP +-The script is run as the amanda user, it must have the priviledge to create and destroy snapshot: ++The script is run as the amanda user, it must have the privilege to create and destroy snapshot: + .sp + .nf + zfs allow \-ldu AMANDA_USER mount,snapshot,destroy FILESYSTEM diff -Nru amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch --- amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,56 @@ +From: Artur Rona <ari-tczew@ubuntu.com> +Description: Add missing libs to link. +Author: Daniel T Chen <crimsun@ubuntu.com> +Last-Update: 2014-08-16 + +diff -pruN -x '*~' amanda-3.3.6.orig/amar-src/Makefile.am amanda-3.3.6/amar-src/Makefile.am +--- amanda-3.3.6.orig/amar-src/Makefile.am 2014-07-09 16:21:59.000000000 +0200 ++++ amanda-3.3.6/amar-src/Makefile.am 2014-08-15 23:59:49.148827283 +0200 +@@ -26,7 +26,8 @@ noinst_HEADERS = \ + sbin_PROGRAMS = amarchiver + + amarchiver_SOURCES = amarchiver.c +-amarchiver_LDADD = libamar.la ++amarchiver_LDADD = libamar.la \ ++ ../common-src/libamanda.la + + # automake-style tests + +@@ -35,4 +36,5 @@ noinst_PROGRAMS = $(TESTS) + + amar_test_SOURCES = amar-test.c + amar_test_LDADD = libamar.la \ +- ../common-src/libtestutils.la ++ ../common-src/libtestutils.la \ ++ ../common-src/libamanda.la +diff -pruN -x '*~' amanda-3.3.6.orig/ndmp-src/Makefile.am amanda-3.3.6/ndmp-src/Makefile.am +--- amanda-3.3.6.orig/ndmp-src/Makefile.am 2014-07-09 16:21:55.000000000 +0200 ++++ amanda-3.3.6/ndmp-src/Makefile.am 2014-08-15 23:57:11.100043499 +0200 +@@ -204,10 +204,12 @@ amndmjob_SOURCES = amndmjob_main.c \ + amndma_tape_simulator.c + + ndmjob_LDADD = libndmjob.la \ +- ../common-src/libamanda.la ++ ../common-src/libamanda.la \ ++ libndmlib.la + + amndmjob_LDADD = libndmjob.la \ +- ../common-src/libamanda.la ++ ../common-src/libamanda.la \ ++ libndmlib.la + + ndmp0_xdr.c : ndmp0.x + $(RPCGEN) ndmp0.x +diff -pruN -x '*~' amanda-3.3.6.orig/xfer-src/Makefile.am amanda-3.3.6/xfer-src/Makefile.am +--- amanda-3.3.6.orig/xfer-src/Makefile.am 2014-07-09 16:21:56.000000000 +0200 ++++ amanda-3.3.6/xfer-src/Makefile.am 2014-08-15 23:58:27.700423345 +0200 +@@ -53,7 +53,8 @@ noinst_PROGRAMS = $(TESTS) + xfer_test_SOURCES = xfer-test.c + xfer_test_LDADD = \ + ../common-src/libtestutils.la \ +- libamxfer.la ++ libamxfer.la \ ++ ../common-src/libamanda.la + + # lint support + diff -Nru amanda-3.3.6/debian/patches/series amanda-3.3.6/debian/patches/series --- amanda-3.3.6/debian/patches/series 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/patches/series 2014-10-29 03:42:09.000000000 -0700 @@ -1,3 +1,10 @@ dumpdates-path fix-amserverconfig-path amandabackup-hard-coded +missing-libs-ftbfs.patch +fix-amserverconfig-template-path +fix-misc-typos +fix-lintian-manpage-warnings +automake-add-missing +fix-amcheck-M.patch +fix-device-src_rait-device.c diff -Nru amanda-3.3.6/debian/po/pl.po amanda-3.3.6/debian/po/pl.po --- amanda-3.3.6/debian/po/pl.po 1969-12-31 16:00:00.000000000 -0800 +++ amanda-3.3.6/debian/po/pl.po 2014-10-29 03:42:09.000000000 -0700 @@ -0,0 +1,31 @@ +# Translation of amanda debconf templates to Polish +# Copyright (C) 1991-1998 +# This file is distributed under the same license as the amanda package. +# +# Magdalena Z. Kubot <magdalena.kubot@gmail.com>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2013-12-04 13:32+0100\n" +"Last-Translator: Magdalena Z. Kubot <magdalena.kubot@gmail.com>\n" +"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Proszę scalić /var/lib/amandates i /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please 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 "Znaleziono /var/lib/amandates i /var/lib/amanda/amandates. Proszę przejrzeć pliki i scalić ważną zawartość do pliku /var/lib/amanda/amandates a następnie usunąć stary plik /var/lib/amandates." + diff -Nru amanda-3.3.6/debian/rules amanda-3.3.6/debian/rules --- amanda-3.3.6/debian/rules 2014-08-05 07:16:41.000000000 -0700 +++ amanda-3.3.6/debian/rules 2014-10-29 03:42:09.000000000 -0700 @@ -3,6 +3,8 @@ export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk @@ -16,6 +18,7 @@ # pick up latest config files provided by autotools-dev cp -f /usr/share/misc/config.sub config/config.sub cp -f /usr/share/misc/config.guess config/config.guess + dh_autoreconf # do we need --{htmldir,dvidir,pdfdir,psdir} to force subdirectories? # should we re-craft this to use --without-server and --without-client, # and lose the amanda-common package? @@ -66,13 +69,14 @@ [ ! -f Makefile ] || make distclean -rm -f build-stamp configure-stamp missing config/config.h common-src/genversion -find . -type d -name .deps -exec rm -rf {} \; + dh_autoreconf_clean dh_clean # call this before packaging for upload when updating template English text updatepo: -rm -f debian/po/templates.pot debconf-updatepo - + binary-indep: build binary-arch: build @@ -95,6 +99,8 @@ dh_strip -a dh_compress -a dh_movefiles -a --sourcedir=debian/amanda-common + dh_install -a -X.in + dh_link -a rm -r $(r)/usr/share/amanda dh_fixperms -av # fix perms manually
--- End Message ---
--- Begin Message ---
- To: Felipe Augusto van de Wiel <faw@debian.org>, 768082-done@bugs.debian.org
- Subject: Re: Bug#768082: unblock: amanda/1:3.3.6-3
- From: Jonathan Wiltshire <jmw@debian.org>
- Date: Sun, 16 Nov 2014 21:35:52 +0000
- Message-id: <20141116213552.GI6216@lupin.home.powdarrmonkey.net>
- In-reply-to: <[🔎] 20141104204131.8395.54050.reportbug@faw-t440p.corpnet.samba.tv>
- References: <[🔎] 20141104204131.8395.54050.reportbug@faw-t440p.corpnet.samba.tv>
On Tue, Nov 04, 2014 at 12:41:31PM -0800, Felipe Augusto van de Wiel wrote: > Please unblock package amanda, or allow it to migrate after the > full freeze begins. > > amanda was in testing until 2014-10-22, the version was 1:3.3.6-1. > The most recent package is part of an adoption process, that also > acknowledges previous NMUs and fix multiple bugs. The current > version in unstable is 1:3.3.6-3 but we will likely have one last > upload for 1:3.3.6-4. > > There is one bug still open http://bugs.debian.org/760846 that the > new maintainer will address and should be a very small and safe > diff to apply (documented on the bug). Unblocked; not ideal, but it was only out for a few days. -- Jonathan Wiltshire jmw@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51Attachment: signature.asc
Description: Digital signature
--- End Message ---