[amanda] amanda-3.3.1

[Lukáš Nykrýn]

commit c9faf05a1b33cf4db729f68c501d2ede1cb2cde7
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Jun 20 12:27:16 2012 +0200

    amanda-3.3.1

 .gitignore                    |    1 +
 amanda-3.3.0-match_disk.patch |  189 -----------------------------------------
 amanda-3.3.0-qw.patch         |  106 -----------------------
 amanda-3.3.1-stdio.patch      |   15 +++
 amanda.spec                   |   17 ++--
 sources                       |    2 +-
 6 files changed, 27 insertions(+), 303 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c32f3d3..10f667f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ amanda-3.1.1.tar.gz
 /amanda-3.2.2.tar.gz
 /amanda-3.3.0beta1.tar.gz
 /amanda-3.3.0.tar.gz
+/amanda-3.3.1.tar.gz
diff --git a/amanda-3.3.1-stdio.patch b/amanda-3.3.1-stdio.patch
new file mode 100644
index 0000000..5b5cf75
--- /dev/null
+++ b/amanda-3.3.1-stdio.patch
@@ -0,0 +1,15 @@
+diff --git a/gnulib/stdio.in.h b/gnulib/stdio.in.h
+index 80b9dbf..dc2dc9a 100644
+--- a/gnulib/stdio.in.h
++++ b/gnulib/stdio.in.h
+@@ -140,8 +140,8 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++//#undef gets
++//_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/amanda.spec b/amanda.spec
index 2f12a1b..15604d9 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -7,8 +7,8 @@
 
 Summary: A network-capable tape backup solution
 Name: amanda
-Version: 3.3.0
-Release: 6%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -17,9 +17,9 @@ Source8: amandahosts
 Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch6: amanda-3.2.0-config-dir.patch
-Patch7: amanda-3.3.0-qw.patch
-Patch8: amanda-3.3.0-match_disk.patch
 Patch9: amanda-3.3.0-glib.patch
+Patch10: amanda-3.3.1-stdio.patch
+
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
 URL: http://www.amanda.org
@@ -83,9 +83,8 @@ server also needs to have the amanda-client package installed.
 %patch2 -p1 -b .xattrs
 %patch3 -p1 -b .tcpport
 %patch6 -p1 -b .config
-%patch7 -p3 -b .qw
-%patch8 -p3 -b .match_disk
 %patch9 -p2 -b .glib
+%patch10 -p1 -b .stdio
 ./autogen
 
 %build
@@ -260,6 +259,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/amcrypt.8*
 %{_mandir}/man8/amgpgcrypt.8*
 %{_mandir}/man8/amgetconf.8*
+%{_mandir}/man8/amcleanupdisk.8*
 
 %dir %{_sysconfdir}/amanda/
 %dir %{_sysconfdir}/amanda/%defconfig
@@ -272,7 +272,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_libdir}/libamdevice*.so
 %{_libdir}/libamserver*.so
-%{_libexecdir}/amanda/amcleanupdisk
 %{_libexecdir}/amanda/amdumpd
 %{_libexecdir}/amanda/amcheck-device
 %{_libexecdir}/amanda/amidxtaped
@@ -294,6 +293,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/amaddclient
 %{_sbindir}/amadmin
 %{_sbindir}/amcleanup
+%{_sbindir}/amcleanupdisk
 %{_sbindir}/amdevcheck
 %{_sbindir}/amdump
 %{_sbindir}/amfetchdump
@@ -435,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Jun 20 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 3.3.1-1
+- upgrade to new upstream release
+
 * Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 3.3.0-6
 - Perl 5.16 rebuild
 
diff --git a/sources b/sources
index d173bd7..ecccdb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e206f42fb523c6bfe728b03665d4e277  amanda-3.3.0.tar.gz
+dae7631b4abcf7eac874df6e3740e75b  amanda-3.3.1.tar.gz