Hello community,
here is the log from the commit of package amanda
checked in at Tue Jul 11 20:24:25 CEST 2006.
--------
--- amanda/amanda.changes 2006-04-07 15:59:37.000000000 +0200
+++ amanda/amanda.changes 2006-07-11 12:35:35.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jul 7 16:27:13 CEST 2006 - pnemec@suse.cz
+
+- updated to 2.5.0p2
+ added many new features in 2.5.0 (Auto tape labelling,
+ security comunication ...)
+ fixed many minors bug (in p1) and major bug (in p2)
+- added pdf document with actualized howtos
+
+-------------------------------------------------------------------
Old:
----
amanda-2.4.5-mtx.diff
amanda-2.4.5-pie.diff
amanda-2.4.5-srv.patch
amanda-2.4.5.diff
amanda-2.4.5.tar.bz2
New:
----
AMANDA-HOWTO-Collection.pdf.tar.bz2
amanda-2.5.0-mtx.diff
amanda-2.5.0-pie.diff
amanda-2.5.0.diff
amanda-2.5.0p2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amanda.spec ++++++
--- /var/tmp/diff_new_pack.DAphRh/_old 2006-07-11 20:23:18.000000000 +0200
+++ /var/tmp/diff_new_pack.DAphRh/_new 2006-07-11 20:23:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package amanda (Version 2.4.5)
+# spec file for package amanda (Version 2.5.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,8 +11,9 @@
Name: amanda
BuildRequires: cups-libs dump gawk gnuplot krb5-devel libsmbclient libsmbclient-devel lprng mailx mtx popt-devel readline-devel samba-client sendmail
-Version: 2.4.5
-Release: 10
+%define package_version 2.5.0p2
+Version: 2.5.0
+Release: 1
Prereq: /usr/sbin/useradd permissions
Requires: glibc-devel
Requires: ncurses-devel
@@ -22,12 +23,12 @@
License: Other License(s), see package, BSD
URL: http://www.amanda.org/
Summary: Network Disk Archiver
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{package_version}.tar.bz2
Source1: %{name}-SuSE.tar.bz2
+Source2: AMANDA-HOWTO-Collection.pdf.tar.bz2
Patch: %{name}-%{version}.diff
Patch1: %{name}-%{version}-mtx.diff
Patch2: %{name}-%{version}-pie.diff
-Patch3: %{name}-%{version}-srv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -52,11 +53,11 @@
Jean-Louis Martineau
%prep
-%setup -q -a 1
+%setup -q -a 1 -n %{name}-%{package_version}
+%setup -q -T -D -a 2 -n %{name}-%{package_version}
%patch
%patch1
%patch2
-%patch3
%build
%{suse_update_config ./ config}
@@ -75,6 +76,7 @@
--with-index-server=localhost \
--with-gnutar-listdir=/var/lib/amanda/gnutar-lists \
--with-smbclient=%{_prefix}/bin/smbclient \
+ --with-dumperdir=/usr/lib/dumper \
--with-amandahosts \
--with-user=amanda \
--with-group=disk \
@@ -101,8 +103,13 @@
chmod 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/* \
$RPM_BUILD_ROOT/%{_mandir}/*/*
cp -a SuSE/* $RPM_BUILD_ROOT
+#
+# pdf doc
+cp AMANDA-HOWTO-Collection.pdf $RPM_BUILD_ROOT/%{_docdir}/%{name}/
+#
# label templates
cp -a example/*.ps $RPM_BUILD_ROOT/var/lib/amanda/lbl-templ
+#
# create a list of binaries to be checked externally
cat << EOF > $RPM_BUILD_ROOT/usr/lib/amanda/suidlist
/usr/sbin/amcheck
@@ -112,7 +119,6 @@
/usr/lib/amanda/runtar
/usr/lib/amanda/dumper
/usr/lib/amanda/killpgrp
-/usr/lib/amanda/amqde
EOF
#cd amplot
# install -t $RPM_BUILD_ROOT/usr/lib/amanda amcat.awk amplot.awk amplot.g amplot.gp
@@ -211,7 +217,6 @@
%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/planner
%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/rundump
%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/runtar
-%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/amqde
/usr/lib/amanda/patch-system
/usr/lib/amanda/selfcheck
/usr/lib/amanda/sendbackup
@@ -219,9 +224,24 @@
/usr/lib/amanda/taper
/usr/lib/amanda/versionsuffix
/usr/lib/amanda/suidlist
+%attr(755,amanda,disk) %dir /usr/lib/dumper
+/usr/lib/dumper/generic-dumper
+/usr/lib/dumper/gnutar
+/usr/lib/amanda/chunker
+/usr/lib/amanda/noop
+/usr/sbin/amaespipe
+/usr/sbin/amcrypt
+/usr/sbin/amfetchdump
+/usr/share/man/man5/amanda.conf.5.gz
%{_libdir}/lib*
%changelog -n amanda
+* Fri Jul 07 2006 - pnemec@suse.cz
+- updated to 2.5.0p2
+ added many new features in 2.5.0 (Auto tape labelling,
+ security comunication ...)
+ fixed many minors bug (in p1) and major bug (in p2)
+- added pdf document with actualized howtos
* Thu Apr 06 2006 - pnemec@suse.cz
- some other fix for bug #137128 SIGSEGV in amadmin
* Fri Feb 10 2006 - pnemec@suse.cz
++++++ amanda-2.4.5-mtx.diff -> amanda-2.5.0-mtx.diff ++++++
++++++ amanda-2.4.5-pie.diff -> amanda-2.5.0-pie.diff ++++++
--- amanda/amanda-2.4.5-pie.diff 2005-08-01 20:21:11.000000000 +0200
+++ amanda/amanda-2.5.0-pie.diff 2006-05-10 11:44:21.000000000 +0200
@@ -1,8 +1,8 @@
--- client-src/Makefile.am
+++ client-src/Makefile.am
-@@ -7,6 +7,19 @@
+@@ -8,6 +8,17 @@
- libexec_PROGRAMS = amandad calcsize killpgrp rundump runtar amqde selfcheck sendbackup sendsize versionsuffix
+ libexec_PROGRAMS = amandad noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
+calcsize_CFLAGS = -fPIE $(AM_CFLAGS)
+calcsize_LDFLAGS = -pie $(AM_LDFLAGS)
@@ -14,13 +14,11 @@
+runtar_LDFLAGS = -pie $(AM_LDFLAGS)
+amandad_CFLAGS = -fPIE $(AM_CFLAGS)
+amandad_LDFLAGS = -pie $(AM_LDFLAGS)
-+amqde_CFLAGS = -fpie $(AM_CFLAGS)
-+amqde_LDFLAGS = -pie $(AM_LDFLAGS)
+
sbin_SCRIPTS = @CLIENT_SCRIPTS_OPT@
libexec_SCRIPTS = patch-system
-@@ -23,6 +36,7 @@
+@@ -24,6 +35,7 @@
unctime.c client_util.c \
$(samba_sources)
@@ -30,15 +28,15 @@
###
--- common-src/Makefile.am
+++ common-src/Makefile.am
-@@ -16,6 +16,7 @@
- token.c util.c versuff.c version.c \
- pipespawn.c sl.c
+@@ -26,6 +26,7 @@
+ util.c \
+ versuff.c version.c
+libamanda_la_CFLAGS = -fPIC $(AM_CFLAGS)
libamanda_la_LIBADD = @LTLIBOBJS@ @LTALLOCA@
libamanda_la_LDFLAGS = -release $(VERSION)
-@@ -63,10 +64,10 @@
+@@ -66,10 +67,10 @@
./genversion > version.c
match.@OBJEXT@ match.lo: regex.h
@@ -59,9 +57,9 @@
+# Dummy compile for configure
--- configure.in
+++ configure.in
-@@ -2527,6 +2527,52 @@
- AC_MSG_WARN([--with-qde and no fnmatch -- gnutar exclude files will not work])
- fi
+@@ -2697,6 +2697,52 @@
+
+ AC_SYS_LARGEFILE
+AC_MSG_CHECKING([for Position Independent Executable support])
+save_CFLAGS="$CFLAGS"
@@ -112,20 +110,9 @@
dnl disk device prefixes
AC_MSG_CHECKING(disk device prefixes)
dnl Use df to find the mount point for the root filesystem. Use
---- restore-src/Makefile.am
-+++ restore-src/Makefile.am
-@@ -24,6 +24,8 @@
- ../server-src/libamserver.$(LIB_EXTENSION) \
- ../tape-src/libamtape.$(LIB_EXTENSION) \
- ../common-src/libamanda.$(LIB_EXTENSION)
-+amidxtaped_CFLAGS = -fPIE $(AM_CFLAGS)
-+amidxtaped_LDFLAGS = -pie $(AM_LDFLAGS)
-
- install-exec-hook:
- @list="$(sbin_PROGRAMS)"; \
--- server-src/Makefile.am
+++ server-src/Makefile.am
-@@ -16,14 +16,25 @@
+@@ -12,16 +12,28 @@
amgetconf amlabel amtape \
amreport
@@ -134,26 +121,29 @@
+
libexec_PROGRAMS = amindexd amlogroll amtrmidx \
amtrmlog driver dumper \
- planner taper amcleanupdisk
-
+ planner taper amcleanupdisk \
+ chunker
++
+amindexd_CFLAGS = -fPIE $(AM_CFLAGS)
+amindexd_LDFLAGS = -pie $(AM_LDFLAGS)
+dumper_CFLAGS = -fPIE $(AM_CFLAGS)
+dumper_LDFLAGS = -pie $(AM_LDFLAGS)
+planner_CFLAGS = -fPIE $(AM_CFLAGS)
+planner_LDFLAGS = -pie $(AM_LDFLAGS)
-+
+
sbin_SCRIPTS = amcheckdb amcleanup amdump \
amoverview amrmtape amtoc \
- amverify amverifyrun amstatus
+ amverify amverifyrun amstatus \
+ amcrypt amaespipe
+libamserver_la_CFLAGS = -fPIC $(AM_CFLAGS)
++
libamserver_la_SOURCES= amindex.c changer.c \
conffile.c diskfile.c driverio.c \
holding.c infofile.c logfile.c \
--- tape-src/Makefile.am
+++ tape-src/Makefile.am
-@@ -7,6 +7,10 @@
+@@ -8,6 +8,10 @@
sbin_PROGRAMS= ammt amdd amtapetype
++++++ amanda-2.4.5-mtx.diff -> amanda-2.5.0.diff ++++++
--- amanda/amanda-2.4.5-mtx.diff 2005-08-01 20:21:11.000000000 +0200
+++ amanda/amanda-2.5.0.diff 2006-05-10 10:09:14.000000000 +0200
@@ -1,263 +1,249 @@
---- changer-src/chg-zd-mtx.sh.in
-+++ changer-src/chg-zd-mtx.sh.in
-@@ -185,14 +185,15 @@
- # # generate as many accesses as slots you have, plus 1.
- # # ALSO NOTE - many modern tape loaders handle this automatically.
+--- acinclude.m4
++++ acinclude.m4
+@@ -7257,6 +7257,9 @@
+ # This is just to silence aclocal about the macro not being used
+ ifelse([AC_DISABLE_FAST_INSTALL])
+
++# Do not complain about couple of #define xxx symbols
++m4_pattern_allow([^AM_HAVE_MT_[A-Z]+$])
++
+ AC_DEFUN([LT_AC_PROG_GCJ],
+ [AC_CHECK_TOOL(GCJ, gcj, no)
+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+--- configure.in
++++ configure.in
+@@ -1292,15 +1292,7 @@
+ ;;
+ *-pc-bsdi*)
+ ;;
+- *-pc-linux-*)
+- ;;
+- x86_64-*-linux-*)
+- ;;
+- alpha*-*-linux-*)
+- ;;
+- sparc*-*-linux-*)
+- ;;
+- powerpc-*-linux-*)
++ *-*-linux*)
+ ;;
+ *-sgi-irix3*)
+ dnl The old cc won't work!
+--- example/amanda.conf.in
++++ example/amanda.conf.in
+@@ -20,7 +20,7 @@
+ mailto "@CLIENT_LOGIN@" # space separated list of operators at your site
+ dumpuser "@CLIENT_LOGIN@" # the user to run dumps under
+
+-inparallel 4 # maximum dumpers that will run in parallel (max 63)
++inparallel 2 # maximum dumpers that will run in parallel (max 63)
+ # this maximum can be increased at compile-time,
+ # modifying MAX_DUMPERS in server-src/driverio.h
+ dumporder "sssS" # specify the priority order of each dumper
+@@ -51,7 +51,7 @@
+ # The unit used to print many numbers.
+ # k=kilo, m=mega, g=giga, t=tera
+
+-netusage 600 Kbps # maximum net bandwidth for Amanda, in KB per sec
++netusage 800 Kbps # maximum net bandwidth for Amanda, in KB per sec
+
+ dumpcycle 4 weeks # the number of days in the normal dump cycle
+ runspercycle 20 # the number of amdump runs in dumpcycle days
+@@ -109,8 +109,8 @@
+ rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only)
+ #changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer"
+ #changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status"
+-changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf"
+-changerdev "@DEFAULT_CHANGER_DEVICE@"
++#changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf"
++#changerdev "@DEFAULT_CHANGER_DEVICE@"
+
+ # If you want Amanda to automatically label any non-Amanda tapes it
+ # encounters, uncomment the line below. Note that this will ERASE any
+@@ -665,9 +665,9 @@
+ use 1000 kbps
+ }
+
+-define interface le0 {
++define interface eth0 {
+ comment "10 Mbps ethernet"
+- use 400 kbps
++ use 800 kbps
+ }
+
+ # You may include other amanda configuration files, so you can share
+--- example/disklist
++++ example/disklist
+@@ -15,23 +15,23 @@
+ # last or skipped.
+
+ # A SPARCstation 1+
+-salty sd0a comp-root
+-salty sd0g comp-user
+-salty sd1g comp-user
+-salty sd2a comp-root
+-salty sd2g comp-user
+-salty sd3c comp-user
++# salty sd0a comp-root
++# salty sd0g comp-user
++# salty sd1g comp-user
++# salty sd2a comp-root
++# salty sd2g comp-user
++# salty sd3c comp-user
+
+ # A DECstation 3100
+-slithy rz1a comp-root
+-slithy rz1g comp-user
+-slithy rz3a comp-root
+-slithy rz3g comp-user
++# slithy rz1a comp-root
++# slithy rz1g comp-user
++# slithy rz3a comp-root
++# slithy rz3g comp-user
+
+ # We don't run compression on the master host since it is going to be
+ # busy enough running amanda.
+-master sd0a nocomp-root -1 local
+-master sd0g nocomp-user -1 local
++# master sd0a nocomp-root -1 local
++# master sd0g nocomp-user -1 local
+ # note: -1 is a placeholder for the spindle number
+ # the holding disk can't be dumped to itself, it uses a disktype that
+ # specifies the "no-hold" option (see amanda.conf).
+@@ -50,30 +50,30 @@
+ } 2 le0 # no line break before spindle and interface
+
+ # The chairman's disk is high priority to make sure it gets done.
+-bigwig sd0a comp-root
+-bigwig sd0g comp-high
++# bigwig sd0a comp-root
++# bigwig sd0g comp-high
+ # Likewise the named databases in the root partition on our primary
+ # nameserver. Also, compression is turned off because we don't want
+ # to create any unnecessary load on this baby (it's only a Sun3).
+-bozo sd0a nocomp-high
+-bozo sd0g nocomp-user
+-bozo sd4c nocomp-user
++# bozo sd0a nocomp-high
++# bozo sd0g nocomp-user
++# bozo sd4c nocomp-user
+
+ # Dump Joe's NetBSD machine, with the mounted MS-DOS partition dumped
+ # using tar.
+-joespc wd0a comp-root
+-joespc wd0e comp-user
+-joespc /msdos comp-user-tar
++# joespc wd0a comp-root
++# joespc wd0e comp-user
++# joespc /msdos comp-user-tar
+
+ # Some really slow machines, like Sun2's and some Vaxstations, take
+ # forever to compress their dumps: it's just not worth it.
+
+ # A Sun2
+-cleo sd0a nocomp-root
+-cleo sd0g nocomp-user
++# cleo sd0a nocomp-root
++# cleo sd0g nocomp-user
+ # A VaxStation
+-susie rz8a nocomp-root
+-susie rz8g nocomp-user
++# susie rz8a nocomp-root
++# susie rz8g nocomp-user
+
+ # An example of how to separate a big disk (/diskA) in multiple smaller entry
+ # using GNUTAR.
+--- server-src/amcheckdb.sh.in
++++ server-src/amcheckdb.sh.in
+@@ -10,7 +10,7 @@
+
+ ConfigDir=@CONFIG_DIR@
+
+-PATH=$sbindir:$libexecdir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
++PATH=$libexecdir:$sbindir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
+ export PATH
+
+ USE_VERSION_SUFFIXES="@USE_VERSION_SUFFIXES@"
+--- server-src/amcleanup.sh.in
++++ server-src/amcleanup.sh.in
+@@ -37,7 +37,7 @@
+
+ confdir=@CONFIG_DIR@
+
+-PATH=$sbindir:$libexecdir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
++PATH=$libexecdir:$sbindir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
+ export PATH
+
+ USE_VERSION_SUFFIXES="@USE_VERSION_SUFFIXES@"
+--- server-src/amfreetapes.sh.in
++++ server-src/amfreetapes.sh.in
+@@ -10,7 +10,7 @@
+
+ ConfigDir=@CONFIG_DIR@
+
+-PATH=$sbindir:$libexecdir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
++PATH=$libexecdir:$sbindir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
+ export PATH
+
+ Program=`basename $0`
+--- server-src/amrmtape.sh.in
++++ server-src/amrmtape.sh.in
+@@ -1,7 +1,7 @@
+ #!/bin/sh
#
--# autoclean=0 #### Set to '1' or greater to enable
-+# autoclean=0 #### Set to '1' or greater to enable autocleaning
+ # amrmtape.sh
+-# Time-stamp: <96/10/23 12:07:21 adrian>
++# Time-stamp: <2001-08-20 14:26:24 dan>
+ # Copyright 1996, Adrian Filipi-Martin
#
- # autocleancount=99 #### Number of access before a clean.
- #
- # havereader=0 #### If you have a barcode reader, set to 1.
- #
--# offline_before_unload=0 #### Does your robot require an
--# #### 'mt offline' before mtx unload?
-+# offline_before_unload=0 #### Set to 1 or greater if your tape driver
-+# #### require a 'mt offline' before mtx can
-+# #### unload. Otherwise use 0.
- #
- # poll_drive_ready=NN #### Time (seconds) between tests to see if
- # #### the tape drive has gone ready (default: 3).
-@@ -303,14 +304,6 @@
- ################################################################################
-
- ################################################################################
--# You may need to customize these things
--################################################################################
--
--MT=@MT@
--MTF=@MT_FILE_FLAG@
--MTX=@MTX@
--
--################################################################################
- # No user-level customization should be required beyond this point.
- ################################################################################
-
-@@ -446,12 +439,12 @@
- test -n "$DEBUG" && set -x
- get_mtx_status
-
-- set x `sed -n '
-+ set -- `sed -n "
- /^Data Transfer Element:Empty/ {
- s/.*/-1/p
- q
- }
--/^Data Transfer Element '$driveslot':Empty/ {
-+/^Data Transfer Element $driveslot:Empty/ {
- s/.*/-1/p
- q
- }
-@@ -459,11 +452,11 @@
- s/.*(Storage Element \([0-9][0-9]*\) Loaded):VolumeTag *= *\([^ ]*\)/\1 \2/p
- q
- }
--/^Data Transfer Element '$driveslot':Full (Storage Element \([0-9][0-9]*\) Loaded):VolumeTag *= *\([^ ]*\)/ {
-+/^Data Transfer Element $driveslot:Full (Storage Element \([0-9][0-9]*\) Loaded):VolumeTag *= *\([^ ]*\)/ {
- s/.*(Storage Element \([0-9][0-9]*\) Loaded):VolumeTag *= *\([^ ]*\)/\1 \2/p
- q
- }
--/^Data Transfer Element '$driveslot':Full (Unknown Storage Element Loaded):VolumeTag *= *\([^ ]*\)/ {
-+/^Data Transfer Element $driveslot:Full (Unknown Storage Element Loaded):VolumeTag *= *\([^ ]*\)/ {
- s/.*:VolumeTag *= *\([^ ]*\)/-2 \1/p
- q
- }
-@@ -471,16 +464,15 @@
- s/.*(Storage Element \([0-9][0-9]*\) Loaded).*/\1/p
- q
- }
--/^Data Transfer Element '$driveslot':Full (Storage Element \([0-9][0-9]*\) Loaded)/ {
-+/^Data Transfer Element $driveslot:Full (Storage Element \([0-9][0-9]*\) Loaded)/ {
- s/.*Storage Element \([0-9][0-9]*\) Loaded.*/\1/p
- q
- }
--/^Data Transfer Element '$driveslot':Full (Unknown Storage Element Loaded)/ {
-+/^Data Transfer Element $driveslot:Full (Unknown Storage Element Loaded)/ {
- s/.*/-2/p
- q
- }
--' < $mtx_status 2>&1`
-- shift # get rid of the "x"
-+" < $mtx_status 2>&1`
- loadedslot=$1
- loadedbarcode=$2
- if [ -z "$loadedslot" ]; then
-@@ -548,14 +540,14 @@
- return
- fi
- get_mtx_status
-- slot_list=`sed -n '
-+ slot_list=`sed -n "
- /^Data Transfer Element:Full (Storage Element \([0-9][0-9]*\) Loaded)/ {
- s/.*(Storage Element \([0-9][0-9]*\) Loaded).*/\1/p
- }
--/^Data Transfer Element '$driveslot':Full (Storage Element \([0-9][0-9]*\) Loaded)/ {
-+/^Data Transfer Element $driveslot:Full (Storage Element \([0-9][0-9]*\) Loaded)/ {
- s/.*Storage Element \([0-9][0-9]*\) Loaded.*/\1/p
- }
--/^Data Transfer Element '$driveslot':Full (Unknown Storage Element Loaded)/ {
-+/^Data Transfer Element $driveslot:Full (Unknown Storage Element Loaded)/ {
- : loop
- n
- /^.*Storage Element \([0-9][0-9]*\):Full/ {
-@@ -569,7 +561,7 @@
- /^.*Storage Element \([0-9][0-9]*\):Full/ {
- s/.*Storage Element \([0-9][0-9]*\):Full.*/\1/p
- }
--' < $mtx_status 2>&1 | grep -v "^${cleanslot}\$" | sort -n`
-+" < $mtx_status 2>&1 | grep -v "^${cleanslot}\$" | sort -n`
- slot_list=`echo $slot_list` # remove the newlines
- if [ $firstslot -lt 0 -o $lastslot -lt 0 ]; then
- last=$lastslot
-@@ -636,6 +628,22 @@
- DBGFILE=/dev/null # will try this again below
- fi
-
-+################################################################################
-+# You may need to customize these things
-+################################################################################
-+
-+MT=@MT@
-+MTF=@MT_FILE_FLAG@
-+
-+for MTX in @MTX@ /usr/bin/mtx "NO_FOUND"
-+do
-+ [ -x "${MTX}" ] && break
-+done
-+if [ "${MTX}" = "NO_FOUND" ]
-+then
-+ Exit 2 "<none>" "No \`mtx' program found -- Perhaps you need to install it, or customize this script."
-+fi
-+
- changerfile=`amgetconf$SUF changerfile 2>/dev/null | grep -v BUGGY`
- if [ -z "$changerfile" ]; then
- Exit 2 \
-@@ -681,8 +689,7 @@
-
- #### Dig out of the config file what is needed
-
--varlist=
--varlist="$varlist firstslot"
-+varlist="firstslot"
- varlist="$varlist lastslot"
- varlist="$varlist cleanslot"
- varlist="$varlist cleancycle"
-@@ -698,25 +705,29 @@
- varlist="$varlist initial_poll_delay"
- varlist="$varlist max_drive_wait"
-
--for var in $varlist
--do
-- val="`cat $configfile 2>/dev/null | sed -n '
--# Ignore comment lines (anything starting with a #).
--/^[ ]*#/d
--# Find the first var=val line in the file, print the value and quit.
--/^[ ]*'$var'[ ]*=[ ]*\([^ ][^ ]*\).*/ {
-- s/^[ ]*'$var'[ ]*=[ ]*\([^ ][^ ]*\).*/\1/p
-- q
--}
--'`"
-- eval $var=\"$val\"
--done
-+_VARS="`sed -n \
-+ -e "s/^[[:blank:]]*\(${varlist// /\\|}\)[[:blank:]]*=[[:blank:]]*\([0-9]*\).*/\\1=\\"\\2\\";/p" \
-+ ${configfile}`"
-+
-+eval ${_VARS}
+ # amrmtape
+@@ -38,7 +38,7 @@
- # Deal with driveslot first so we can get DBGFILE set if we are still
- # using the old amgetconf.
+ ConfigDir=@CONFIG_DIR@
- if [ -z "$driveslot" ]; then
-- driveslot=0;
-+
-+ # Some $MTX programs does not accept drive numbers in [un]load commands!
-+ # What do we have?
-+
-+ result="`$MTX --help 2>&1 | grep 'drive#'`"
-+ if [ -n "${result}" ]; then
-+
-+ # Only if the $MTX command accepts drive numbers!
-+
-+ driveslot=`echo $tape \
-+ | sed -n "s/\/dev\/\(.*\)\([0-9][0-9]*\)\(.*\)/\2/p"`
-+
-+ fi
- fi
-
- # Get DBGFILE set if it is not already.
-@@ -957,8 +968,7 @@
- # off the end. Putting $cleanslot at the end allows us to find
- # that slot since it is not in $slot_list.
- get_slot_list
-- set x $slot_list $slot_list $slot_list $cleanslot
-- shift # get rid of the "x"
-+ set -- $slot_list $slot_list $slot_list $cleanslot
- prev_slot=$1
- shift
- while [ $# -gt 0 ]; do
-@@ -992,13 +1002,25 @@
- # If the desired slot is already loaded, we are done. Only update
- # current slot if this is not the cleaning slot.
- get_loaded_info
-- if [ $loadslot = $loadedslot ]; then
-+ if [ $loadslot -eq $loadedslot ]; then
- if [ $loadslot -ne $cleanslot ]; then
- rm -f $slotfile
- echo $loadslot > $slotfile
-+ Exit 0 "$loadedslot" "$tape"
-+ return $? # in case we are internal
- fi
-- Exit 0 "$loadedslot" "$tape"
-- return $? # in case we are internal
-+
-+ # Trying to force clean the tape drive -- What is the status of the drive?
-+ status=`$MT $MTF $tape status 2>&1 | grep "DR_OPEN"`
-+ if [ -z "${status}" ]
-+ then
-+ result="Tape in slot clean (slot #${loadslot}) is not a cleaning tape"
-+ Log " -> result '$result'"
-+ Exit 0 "${result}"
-+ return $?
-+ fi
-+ # Continue as the tape will be force unload below, and
-+ # then reloaded to do the cleaning!
- fi
- if [ $loadedslot -eq -2 ]; then
- Exit 0 "$loadedslot" "$tape"
-@@ -1008,7 +1030,7 @@
- # If we are loading the cleaning tape, bump the cleaning count
- # and reset the access count. Otherwise, bump the access count
- # and see if it is time to do a cleaning.
-- if [ $loadslot = $cleanslot ]; then
-+ if [ $loadslot -eq $cleanslot ]; then
- rm -f $cleanfile $accessfile
- expr $cleancount + 1 > $cleanfile
- echo 0 > $accessfile
-@@ -1139,8 +1161,7 @@
- if [ $currentslot -lt $firstslot -o $currentslot -gt $lastslot ]; then
- currentslot=$firstslot # what "current" will get
- fi
-- set x $slot_list
-- shift # get rid of the "x"
-+ set -- $slot_list
- numslots=$#
- Exit 0 "$currentslot" "$numslots 1 $reader"
- return $? # in case we are internal
-@@ -1286,12 +1307,12 @@
- fi
- LogAppend " -> barcode is \"$labelfile_barcode\""
- get_mtx_status
-- foundslot=`sed -n '
--/VolumeTag *= *'$labelfile_barcode' *$/ {
-+ foundslot=`sed -n "
-+/VolumeTag *= *$labelfile_barcode *$/ {
- s/.*Storage Element \([0-9][0-9]*\).*/\1/p
- q
- }
--' < $mtx_status`
-+" < $mtx_status`
- LogAppend " -> foundslot is $foundslot"
- if [ -z "$foundslot" ]; then
- LogAppend "ERROR -> !!! Could not find slot" \
+-PATH=$sbindir:$libexecdir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
++PATH=$libexecdir:$sbindir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
+ export PATH
+
+ USE_VERSION_SUFFIXES="@USE_VERSION_SUFFIXES@"
+--- server-src/amverify.sh.in
++++ server-src/amverify.sh.in
+@@ -13,7 +13,7 @@
+ sbindir=@sbindir@
+ libexecdir=@libexecdir@
+
+-PATH=$sbindir:$libexecdir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
++PATH=$libexecdir:$sbindir:/usr/bin:/bin:/usr/sbin:/sbin:/usr/ucb
+ export PATH
+
+ USE_VERSION_SUFFIXES="@USE_VERSION_SUFFIXES@"
+--- server-src/conffile.c
++++ server-src/conffile.c
+@@ -726,15 +726,15 @@
+ #endif
+ conf_chngrdev.s = stralloc(s);
+ malloc_mark(conf_chngrdev.s);
+- conf_chngrfile.s = stralloc("/usr/adm/amanda/changer-status");
++ conf_chngrfile.s = stralloc("/var/lib/amanda/changer-status");
+ malloc_mark(conf_chngrfile.s);
+ conf_labelstr.s = stralloc(".*");
+ malloc_mark(conf_labelstr.s);
+ conf_tapelist.s = stralloc("tapelist");
+ malloc_mark(conf_tapelist.s);
+- conf_infofile.s = stralloc("/usr/adm/amanda/curinfo");
++ conf_infofile.s = stralloc("/var/lib/amanda/curinfo");
+ malloc_mark(conf_infofile.s);
+- conf_logdir.s = stralloc("/usr/adm/amanda");
++ conf_logdir.s = stralloc("/var/lib/amanda");
+ malloc_mark(conf_logdir.s);
+ conf_diskfile.s = stralloc("disklist");
+ malloc_mark(conf_diskfile.s);
+@@ -742,7 +742,7 @@
+ malloc_mark(conf_diskdir.s);
+ conf_tapetype.s = stralloc("EXABYTE");
+ malloc_mark(conf_tapetype.s);
+- conf_indexdir.s = stralloc("/usr/adm/amanda/index");
++ conf_indexdir.s = stralloc("/var/lib/amanda/index");
+ malloc_mark(conf_indexdir.s);
+ conf_columnspec.s = stralloc("");
+ malloc_mark(conf_columnspec.s);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org