From c2fd8f98642675cdb365da18c87f061e5619737c Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Jun 22 2015 09:59:11 +0000 Subject: Update to 3.3.7p1 version - fixed bug (#1225841) Signed-off-by: Petr Hracek --- diff --git a/.gitignore b/.gitignore index 7410137..fcb2593 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.3.tar.gz /amanda-3.3.5.tar.gz /amanda-3.3.6.tar.gz +/amanda-3.3.7p1.tar.gz diff --git a/amanda-3.3.2-autogen.patch b/amanda-3.3.2-autogen.patch deleted file mode 100644 index e12af16..0000000 --- a/amanda-3.3.2-autogen.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/autogen b/autogen -index 1d593d8..7cb7343 100755 ---- a/autogen -+++ b/autogen -@@ -57,4 +57,4 @@ autoheader || die "autoheader failed" - 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 --git a/amanda-krb5.patch b/amanda-krb5.patch deleted file mode 100644 index f3e237a..0000000 --- a/amanda-krb5.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/amandad-src/amandad.c b/amandad-src/amandad.c -index d864c3f..4a899fb 100644 ---- a/amandad-src/amandad.c -+++ b/amandad-src/amandad.c -@@ -456,7 +456,7 @@ main( - } - - #ifndef SINGLE_USERID -- if (geteuid() == 0) { -+ if (getuid() == 0) { - if (strcasecmp(auth, "krb5") != 0) { - struct passwd *pwd; - /* lookup our local user name */ -diff --git a/common-src/krb5-security.c b/common-src/krb5-security.c -index c3075fa..8d3b18a 100644 ---- a/common-src/krb5-security.c -+++ b/common-src/krb5-security.c -@@ -334,6 +334,7 @@ krb5_accept( - char hostname[NI_MAXHOST]; - int result; - char *errmsg = NULL; -+ struct passwd *pw; - - krb5_init(); - -@@ -372,6 +373,12 @@ krb5_accept( - error("gss_server failed: %s\n", rc->errmsg); - rc->accept_fn = fn; - sec_tcp_conn_read(rc); -+ -+ /* totally drop privileges at this point -+ *(making the userid equal to the dumpuser) -+ */ -+ pw = getpwnam(CLIENT_LOGIN); -+ setreuid(pw->pw_uid, pw->pw_uid); - } - - /* -@@ -712,7 +719,7 @@ krb5_init(void) - beenhere = 1; - - #ifndef BROKEN_MEMORY_CCACHE -- putenv(stralloc("KRB5_ENV_CCNAME=MEMORY:amanda_ccache")); -+ putenv(stralloc(KRB5_ENV_CCNAME"=MEMORY:amanda_ccache")); - #else - /* - * MEMORY ccaches seem buggy and cause a lot of internal heap -@@ -727,7 +734,7 @@ krb5_init(void) - char *ccache; - ccache = malloc(128); - g_snprintf(ccache, SIZEOF(ccache), -- "KRB5_ENV_CCNAME=FILE:/tmp/amanda_ccache.%ld.%ld", -+ KRB5_ENV_CCNAME"=FILE:/tmp/amanda_ccache.%ld.%ld", - (long)geteuid(), (long)getpid()); - putenv(ccache); - } diff --git a/amanda-swig-3.0.5.patch b/amanda-swig-3.0.5.patch deleted file mode 100644 index cffefdd..0000000 --- a/amanda-swig-3.0.5.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/perl/Amanda/Xfer.swg b/perl/Amanda/Xfer.swg -index 522d61f..352c5e9 100644 ---- a/perl/Amanda/Xfer.swg -+++ b/perl/Amanda/Xfer.swg -@@ -513,16 +513,16 @@ xfer_get_amglue_source( - /* First, a few macros to generate decent Perl */ - - %define PACKAGE(PKG) --%perlcode { -+%perlcode %{ - package PKG; --} -+%} - %enddef - - %define XFER_ELEMENT_SUBCLASS_OF(PARENT) --%perlcode { -+%perlcode %{ - use vars qw(@ISA); - @ISA = qw( PARENT ); --} -+%} - %enddef - - %define XFER_ELEMENT_SUBCLASS() -@@ -530,28 +530,28 @@ XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::Element) - %enddef - - %define DECLARE_CONSTRUCTOR(C_CONSTRUCTOR) --%perlcode { -+%perlcode %{ - sub new { - my $pkg = shift; - # The C function adds the proper blessing -- this function - # just gets $pkg out of the way. - C_CONSTRUCTOR(@_); - } --} -+%} - %enddef - - %define OVERLOAD_REPR() --%perlcode { -+%perlcode %{ - use overload '""' => sub { $_[0]->repr(); }; - # overload comparison, so users can ask if one obj == another - use overload '==' => sub { Amanda::Xfer::same_elements($_[0], $_[1]); }; - use overload '!=' => sub { not Amanda::Xfer::same_elements($_[0], $_[1]); }; --} -+%} - %enddef - - %define DECLARE_METHOD(METHOD_NAME, C_FUNCTION) --%perlcode {*METHOD_NAME = *C_FUNCTION; --} -+%perlcode %{*METHOD_NAME = *C_FUNCTION; -+%} - %enddef - - /* And now define the required perl classes */ diff --git a/amanda.spec b/amanda.spec index 3ab1b5a..4d0f0b1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.6 -Release: 12%{?dist} +Version: 3.3.7p1 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -26,9 +26,6 @@ Source16: kamanda@.service Patch1: amanda-3.1.1-xattrs.patch Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch -Patch4: amanda-3.3.2-autogen.patch -Patch5: amanda-krb5.patch -Patch6: amanda-swig-3.0.5.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -109,9 +106,6 @@ server also needs to have the amanda-client package installed. %patch1 -p1 -b .xattrs %patch2 -p1 -b .tcpport %patch3 -p1 -b .config -%patch4 -p1 -b .autogen -%patch5 -p1 -b .krb5 -%patch6 -p1 -b .swig-3.0.5 ./autogen %build @@ -270,6 +264,7 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Tests.pm %{perl_vendorarch}/Amanda/Util.pm %{perl_vendorarch}/Amanda/Xfer.pm +%{perl_vendorarch}/Amanda/Message.pm %{_mandir}/man5/amanda-archive-format.5* %{_mandir}/man7/amanda-compatibility.7* @@ -487,6 +482,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jun 22 2015 Petr Hracek - 3.3.7p1-1 +- Update to 3.3.7p1 version +- fixed bug (#1225841) + * Tue Jun 16 2015 Fedora Release Engineering - 3.3.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 0e015ca..cc47cd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99559bd84b358701cf943fcc347d8914 amanda-3.3.6.tar.gz +621d39b5a328f465fece4653c170cf7f amanda-3.3.7p1.tar.gz