[packages/amanda] - up to 3.3.4 - BR /usr/bin/smbclient to make it possible to build with samba3 or samba4

[baggins]

commit 67942b4cceb9a19f7fce5a737780c72295098c10
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Aug 28 19:33:51 2013 +0200

    - up to 3.3.4
    - BR /usr/bin/smbclient to make it possible to build with samba3 or samba4

 amanda-krb5-auth.patch |  4 ++--
 amanda-stdio.patch     | 15 ---------------
 amanda.spec            | 13 ++++++-------
 3 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/amanda.spec b/amanda.spec
index eb383fa..8ce0ebc 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -9,12 +9,12 @@
 Summary:	A network-capable tape backup solution
 Summary(pl.UTF-8):	Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:		amanda
-Version:	3.3.2
-Release:	5
+Version:	3.3.4
+Release:	1
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz
-# Source0-md5:	1a6cfe47eaee121f22540ac5fa58c366
+# Source0-md5:	ba59b170d554789bfc59d5a27ec7307e
 Source1:	%{name}-srv.crontab
 Source2:	%{name}.inetd
 Source3:	%{name}idx.inetd
@@ -39,8 +39,7 @@ Patch8:		%{name}-heimdal.patch
 Patch9:		%{name}-ac.patch
 Patch11:	%{name}-amstar-exclude-fix.patch
 Patch12:	%{name}-krb5-auth.patch
-Patch13:	%{name}-stdio.patch
-Patch14:	%{name}-amstar-device.patch
+Patch13:	%{name}-amstar-device.patch
 URL:		http://www.amanda.org/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -63,7 +62,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.654
-%{?with_samba:BuildRequires:	samba-client}
+%{?with_samba:BuildRequires:	/usr/bin/smbclient}
 BuildRequires:	swig
 %{?with_xfs:BuildRequires:	xfsdump}
 Conflicts:	pwdutils < 3.1.2-2
@@ -214,7 +213,6 @@ typu streamer).
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 cp -a %{SOURCE10} .
 
 %build
@@ -613,6 +611,7 @@ EOF
 %dir %{perl_vendorarch}/Amanda/DB
 %{perl_vendorarch}/Amanda/DB/*.pm
 %{perl_vendorarch}/Amanda/Device.pm
+%{perl_vendorarch}/Amanda/Extract.pm
 %{perl_vendorarch}/Amanda/Disklist.pm
 %{perl_vendorarch}/Amanda/Holding.pm
 %{perl_vendorarch}/Amanda/Interactivity.pm
diff --git a/amanda-krb5-auth.patch b/amanda-krb5-auth.patch
index ea2cd06..040d06d 100644
--- a/amanda-krb5-auth.patch
+++ b/amanda-krb5-auth.patch
@@ -6,7 +6,7 @@
  
 +    /* krb5 require the euid to be 0 */
 +    if (strcasecmp(auth, "krb5") == 0) {
-+	seteuid((uid_t)0);
++	if(seteuid((uid_t)0) != 0) { error("Can't set euid to 0"); };
 +    }
 +
  #ifndef SINGLE_USERID
@@ -18,7 +18,7 @@
  
 -    /* krb5 require the euid to be 0 */
 -    if (strcasecmp(auth, "krb5") == 0) {
--	seteuid((uid_t)0);
+-	if(seteuid((uid_t)0) != 0) { error("Can't set euid to 0"); };
 -    }
 -
      /*
diff --git a/amanda-stdio.patch b/amanda-stdio.patch
deleted file mode 100644
index 5b5cf75..0000000
--- a/amanda-stdio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/amanda.git/commitdiff/67942b4cceb9a19f7fce5a737780c72295098c10