packages: amanda/amanda-common.patch, amanda/amanda.spec - up to 3.3.1

baggins baggins at pld-linux.org
Sat May 12 13:25:47 CEST 2012 

Author: baggins                      Date: Sat May 12 11:25:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.3.1

---- Files affected:
packages/amanda:
   amanda-common.patch (1.1 -> 1.2) , amanda.spec (1.224 -> 1.225) 

---- Diffs:

================================================================
Index: packages/amanda/amanda-common.patch
diff -u packages/amanda/amanda-common.patch:1.1 packages/amanda/amanda-common.patch:1.2
--- packages/amanda/amanda-common.patch:1.1	Thu Nov 25 14:26:18 2010
+++ packages/amanda/amanda-common.patch	Sat May 12 13:25:41 2012
@@ -11,10 +11,10 @@
 +		    amcryptsimple.8  \
 +		    amgetconf.8 \
 +		    amgpgcrypt.8 \
+		    amservice.8 \
  		    script-email.8
  
- CLIENT_MAN_PAGES = \
-@@ -34,20 +40,13 @@
+@@ -34,21 +40,14 @@
      amanda-taperscan.7 \
      amaddclient.8    \
      amadmin.8 \
@@ -23,6 +23,7 @@
      amcheckdb.8 \
      amcheckdump.8 \
      amcleanup.8 \
+     amcleanupdisk.8 \
 -    amcrypt-ossl-asym.8 \
 -    amcrypt-ossl.8   \
 -    amcrypt.8 \

================================================================
Index: packages/amanda/amanda.spec
diff -u packages/amanda/amanda.spec:1.224 packages/amanda/amanda.spec:1.225
--- packages/amanda/amanda.spec:1.224	Sat May 12 12:24:41 2012
+++ packages/amanda/amanda.spec	Sat May 12 13:25:41 2012
@@ -10,12 +10,12 @@
 Summary:	A network-capable tape backup solution
 Summary(pl.UTF-8):	Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:		amanda
-Version:	3.2.3
-Release:	6
+Version:	3.3.1
+Release:	0.1
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz
-# Source0-md5:	d01944e068f3446ef0078ec208a43cd6
+# Source0-md5:	dae7631b4abcf7eac874df6e3740e75b
 Source1:	%{name}-srv.crontab
 Source2:	%{name}.inetd
 Source3:	%{name}idx.inetd
@@ -38,7 +38,6 @@
 Patch7:		%{name}-no-buildtime-ipv6.patch
 Patch8:		%{name}-heimdal.patch
 Patch9:		%{name}-ac.patch
-Patch10:	%{name}-amstar-exclude.patch
 Patch11:	%{name}-amstar-exclude-fix.patch
 Patch12:	%{name}-krb5-auth.patch
 Patch13:	%{name}-glib2.32.patch
@@ -212,7 +211,6 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p2
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -289,8 +287,13 @@
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amdump{,.pub}
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amrecover{,.pub}
 
+%if %{with server}
 install -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/amanda/lvm-snapshot.conf
+%endif
+
+%if %{with client}
 sed -e 's|@@PERL_VENDORARCH@@|%{perl_vendorarch}|' %{SOURCE9} >$RPM_BUILD_ROOT%{_libdir}/amanda/application/amlvm-snapshot
+%endif
 
 > $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/amandates
 
@@ -320,6 +323,18 @@
 	chmod 600 %{_sharedstatedir}/amanda/.amandahosts
 fi
 
+%triggerpostun common -- amanda-common < 3.3
+%banner %{name}-common -e << EOF
+In amanda 3.3 the default auth has changed to "bsdtcp",
+if you are using the default "bsd" then you must add it
+to your configuration:
+
+ *   in amanda.conf
+ *   in amanda-client.conf
+ *   in dumptype/disklist
+ *   in inetd (if no '-auth' argument to amandad)
+EOF
+		
 %pre common
 %groupadd -P %{name}-common -g 80 amanda
 %useradd -P %{name}-common -u 80 -G disk,tape -d /var/lib/amanda -s /bin/sh -c "Amanda Backup user" -g amanda amanda
@@ -508,8 +523,8 @@
 %attr(755,root,root) %{_libdir}/amanda/libamserver*.so
 
 %attr(755,root,root) %{_libdir}/amanda/amcat.awk
-%attr(755,root,root) %{_libdir}/amanda/amcleanupdisk
 %attr(755,root,root) %{_libdir}/amanda/amcheck-device
+%attr(755,root,root) %{_libdir}/amanda/amdumpd
 %attr(755,root,root) %{_libdir}/amanda/amidxtaped
 %attr(755,root,root) %{_libdir}/amanda/amindexd
 %attr(755,root,root) %{_libdir}/amanda/amlogroll
@@ -536,6 +551,7 @@
 %attr(755,root,root) %{_sbindir}/amcheckdb
 %attr(755,root,root) %{_sbindir}/amcheckdump
 %attr(755,root,root) %{_sbindir}/amcleanup
+%attr(755,root,root) %{_sbindir}/amcleanupdisk
 %attr(755,root,root) %{_sbindir}/amconvert-zd-mtx-to-robot.sh
 %attr(755,root,root) %{_sbindir}/amdevcheck
 %attr(755,root,root) %{_sbindir}/amdump
@@ -560,6 +576,7 @@
 %{_mandir}/man7/amanda-changers.7*
 %{_mandir}/man7/amanda-compatibility.7*
 %{_mandir}/man7/amanda-devices.7*
+%{_mandir}/man7/amanda-interactivity.7*
 %{_mandir}/man7/amanda-taperscan.7*
 %{_mandir}/man8/amaddclient.8*
 %{_mandir}/man8/amadmin.8*
@@ -567,6 +584,7 @@
 %{_mandir}/man8/amcheckdb.8*
 %{_mandir}/man8/amcheckdump.8*
 %{_mandir}/man8/amcleanup.8*
+%{_mandir}/man8/amcleanupdisk.8*
 %{_mandir}/man8/amdevcheck.8*
 %{_mandir}/man8/amdump.8*
 %{_mandir}/man8/amfetchdump.8*
@@ -597,15 +615,16 @@
 %{perl_vendorarch}/Amanda/Device.pm
 %{perl_vendorarch}/Amanda/Disklist.pm
 %{perl_vendorarch}/Amanda/Holding.pm
-%{perl_vendorarch}/Amanda/Interactive.pm
-%dir %{perl_vendorarch}/Amanda/Interactive
-%{perl_vendorarch}/Amanda/Interactive/*.pm
+%{perl_vendorarch}/Amanda/Interactivity.pm
+%dir %{perl_vendorarch}/Amanda/Interactivity
+%{perl_vendorarch}/Amanda/Interactivity/*.pm
 %{perl_vendorarch}/Amanda/Logfile.pm
 %dir %{perl_vendorarch}/Amanda/Recovery
 %{perl_vendorarch}/Amanda/Recovery/*.pm
 %{perl_vendorarch}/Amanda/Report.pm
 %dir %{perl_vendorarch}/Amanda/Report
 %{perl_vendorarch}/Amanda/Report/*.pm
+%{perl_vendorarch}/Amanda/ScanInventory.pm
 %{perl_vendorarch}/Amanda/Tapelist.pm
 %dir %{perl_vendorarch}/Amanda/Taper
 %{perl_vendorarch}/Amanda/Taper/*.pm
@@ -660,12 +679,14 @@
 %attr(4750,root,amanda) %{_libdir}/amanda/rundump
 %attr(4750,root,amanda) %{_libdir}/amanda/runtar
 %attr(755,root,root) %{_libdir}/amanda/selfcheck
+%attr(755,root,root) %{_sbindir}/amdump_client
 %attr(755,root,root) %{_sbindir}/amoldrecover
 %attr(755,root,root) %{_sbindir}/amrecover
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/gnutar-lists
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug/client
 %{_mandir}/man7/amanda-applications.7*
 %{_mandir}/man5/amanda-client.conf.5*
+%{_mandir}/man8/amdump_client.8*
 %{_mandir}/man8/amgtar.8*
 %{_mandir}/man8/ampgsql.8*
 %{_mandir}/man8/amrecover.8*
@@ -688,6 +709,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.225  2012/05/12 11:25:41  baggins
+- up to 3.3.1
+
 Revision 1.224  2012/05/12 10:24:41  baggins
 - rel 6
 - added script to backup lvm snapshots
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/amanda/amanda-common.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/amanda/amanda.spec?r1=1.224&r2=1.225

More information about the pld-cvs-commit mailing list