diff --git a/amanda-2.6.1p1-return_val.patch b/amanda-2.6.1p1-return_val.patch index b36051d..642c8fc 100644 --- a/amanda-2.6.1p1-return_val.patch +++ b/amanda-2.6.1p1-return_val.patch @@ -1,12 +1,12 @@ -Index: perl/Amanda/MainLoop.c +Index: perl/Amanda/MainLoop.swg =================================================================== ---- perl/Amanda/MainLoop.c.orig -+++ perl/Amanda/MainLoop.c -@@ -1581,6 +1581,7 @@ void quit(void) { - static void amglue_source_remove(amglue_Source *self); - SWIGINTERN amglue_Source *new_amglue_Source(void){ +--- perl/Amanda/MainLoop.swg.orig ++++ perl/Amanda/MainLoop.swg +@@ -362,6 +362,7 @@ typedef struct { + /* Constructor: use one of the package-level functions, below */ + amglue_Source() { die("Amanda::MainLoop::Source is an abstract base class"); + return NULL; } - SWIGINTERN void delete_amglue_Source(amglue_Source *self){ - amglue_source_unref(self); + + /* Destructor: just unref the object */ diff --git a/amanda-3.5-no_return_in_nonvoid_fnc.patch b/amanda-3.5-no_return_in_nonvoid_fnc.patch index 2484d81..efe0ac4 100644 --- a/amanda-3.5-no_return_in_nonvoid_fnc.patch +++ b/amanda-3.5-no_return_in_nonvoid_fnc.patch @@ -1,20 +1,20 @@ -Index: amanda-3.5/perl/Amanda/Config.c +Index: amanda-3.5/perl/Amanda/Config.swg =================================================================== ---- amanda-3.5.orig/perl/Amanda/Config.c -+++ amanda-3.5/perl/Amanda/Config.c -@@ -1845,6 +1845,7 @@ val_t_to_sv(val_t *val, SV **results) { +--- amanda-3.5.orig/perl/Amanda/Config.swg ++++ amanda-3.5/perl/Amanda/Config.swg +@@ -922,6 +922,7 @@ val_t_to_sv(val_t *val, SV **results) { fail: SWIG_croak_null(); + return 0; } + %} - -@@ -2258,6 +2259,7 @@ val_t_to_print(val_t *val, SV **results) +@@ -1362,6 +1363,7 @@ val_t_to_print(val_t *val, SV **results) fail: SWIG_croak_null(); + return 0; } - + %} diff --git a/amanda-3.5.1.tar.gz b/amanda-3.5.1.tar.gz deleted file mode 100644 index 7038c4a..0000000 --- a/amanda-3.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88ce1ac62f8c30b8d607786a3ca335444a4249ae976baf083956e943b3b409f1 -size 5402093 diff --git a/amanda-3.5.2-fix-tests.patch b/amanda-3.5.2-fix-tests.patch new file mode 100644 index 0000000..de710e4 --- /dev/null +++ b/amanda-3.5.2-fix-tests.patch @@ -0,0 +1,26 @@ +From 262c05b20c7de243542e7502e00152cdafb573d4 Mon Sep 17 00:00:00 2001 +From: Peter Bieringer +Date: Wed, 6 Jul 2022 22:53:12 +0200 +Subject: [PATCH] fix for https://github.com/zmanda/amanda/issues/167 + +--- + common-src/amutil.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common-src/amutil.c b/common-src/amutil.c +index 20454ab73c..371d38e433 100644 +--- a/common-src/amutil.c ++++ b/common-src/amutil.c +@@ -1132,6 +1132,12 @@ char *hexdecode_string(const char *str, GError **err) + new_len = orig_len = strlen(str); + for (i = 0; i < orig_len; i++) { + if (str[i] == '%') { ++ if (new_len < 2) { ++ g_set_error(err, am_util_error_quark(), AM_UTIL_ERROR_HEXDECODEINVAL, ++ "Invalid hexcode string: %s", str); ++ s = g_string_sized_new(0); ++ goto cleanup; ++ } + new_len -= 2; + } + } diff --git a/amanda-3.5.2.tar.gz b/amanda-3.5.2.tar.gz new file mode 100644 index 0000000..0ebdadc --- /dev/null +++ b/amanda-3.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:812aea37d5e5ae852ab4147e989f090fb60ef66e7b7fe49ef58e2d139fe3e99f +size 3949431 diff --git a/amanda-timestamp.patch b/amanda-timestamp.patch deleted file mode 100644 index 51497b5..0000000 --- a/amanda-timestamp.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- - common-src/Makefile.am | 2 +- - common-src/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: amanda-3.5/common-src/Makefile.am -=================================================================== ---- amanda-3.5.orig/common-src/Makefile.am -+++ amanda-3.5/common-src/Makefile.am -@@ -171,7 +171,7 @@ genversion.$(OBJEXT): $(genversion_SOURC - genversion.h ../perl/Amanda/Constants.pm.in: $(top_builddir)/config.status - -rm -f genversion.h genversion.h.new - echo '#define CC "$(CC)"' > genversion.h.new -- GENDATE=`date`; \ -+ GENDATE="today"; \ - echo '#define BUILT_DATE "'$$GENDATE'"' >> genversion.h.new; \ - echo '#define BUILT_MACH "$(target)"' >> genversion.h.new; \ - mv genversion.h.new genversion.h; \ -Index: amanda-3.5/common-src/Makefile.in -=================================================================== ---- amanda-3.5.orig/common-src/Makefile.in -+++ amanda-3.5/common-src/Makefile.in -@@ -3204,7 +3204,7 @@ genversion.$(OBJEXT): $(genversion_SOURC - genversion.h ../perl/Amanda/Constants.pm.in: $(top_builddir)/config.status - -rm -f genversion.h genversion.h.new - echo '#define CC "$(CC)"' > genversion.h.new -- GENDATE=`date`; \ -+ GENDATE="today"; \ - echo '#define BUILT_DATE "'$$GENDATE'"' >> genversion.h.new; \ - echo '#define BUILT_MACH "$(target)"' >> genversion.h.new; \ - mv genversion.h.new genversion.h; \ diff --git a/amanda.changes b/amanda.changes index 5c24f6c..d75ba6d 100644 --- a/amanda.changes +++ b/amanda.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Aug 25 20:17:24 UTC 2022 - Antoine Belvire + +- Update to version 3.5.2: + * amstatus + + new --[no]taped argument, useful when running + 'watch amstatus CONF --summary --notaped' if the run have + many tapes + * amvault + + new --uniq, --no-uniq argument + + Behavior change: The default is --uniq + + new --delayed argument + + new --run-delayed argument +- Switch sources from Sourceforge to Github. +- Drop amanda-timestamp.patch: Makefile now handles + SOURCE_DATE_EPOCH. +- Refresh patches on Perl bindings so that they apply on swig files + since generated C files are not included in sources anymore: + * amanda-2.6.1p1-return_val.patch + * amanda-3.5-no_return_in_nonvoid_fnc.patch +- Add amanda-3.5.2-fix-tests.patch: Fix tests on Tumbleweed + (gh#zmanda/amanda#167). +- Add build dependencies on swig and rpcgen: Generated files are + not included in sources anymore. +- Remove redundant %configure options. + ------------------------------------------------------------------- Mon Jun 8 13:04:22 UTC 2020 - Kristyna Streitova diff --git a/amanda.spec b/amanda.spec index f489010..4f6963c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,7 +1,7 @@ # # spec file for package amanda # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ %define amanda_group amanda +%define upstreamver tag-community-%{version} Name: amanda -Version: 3.5.1 +Version: 3.5.2 Release: 0 Summary: Network Disk Archiver License: GPL-3.0-or-later URL: http://www.amanda.org/ -Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz +Source: https://github.com/zmanda/amanda/archive/%{upstreamver}/%{name}-%{version}.tar.gz #amanda-SUSE.tar.bz2 contains init scripts, config examples Source1: amanda-SUSE.tar.bz2 Source2: amanda-howto-collection.pdf.tar.bz2 @@ -31,10 +32,11 @@ Patch1: amanda-2.6.1p1-shellbang.patch Patch2: amanda-2.6.1p1-return_val.patch Patch3: amanda-2.6.1p1-avoid-perl-provides.patch Patch4: amanda-3.3.2-returnvalues.patch -Patch5: amanda-timestamp.patch Patch6: amanda-3.5-no_return_in_nonvoid_fnc.patch Patch7: amanda-libnsl.patch Patch8: amanda-3.5.1-GCC10_extern.patch +# PATCH-FIX-UPSTREAM amanda-3.5.2-fix-tests.patch -- gh#zmanda/amanda#167 +Patch9: amanda-3.5.2-fix-tests.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -57,8 +59,10 @@ BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: procps BuildRequires: readline-devel +BuildRequires: rpcgen BuildRequires: samba-client BuildRequires: sendmail +BuildRequires: swig BuildRequires: perl(ExtUtils::Embed) BuildRequires: perl(Test::Simple) BuildRequires: pkgconfig(libcrypto) @@ -82,16 +86,15 @@ and/or GNU tar) and can back up a large number of servers and workstations running multiple versions of Linux or Unix. %prep -%setup -q -a 1 -a 2 -rm -r patches +%setup -q -n %{name}-%{upstreamver} -a 1 -a 2 %patch1 %patch2 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build ./autogen @@ -99,18 +102,11 @@ rm -r patches export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" export LDFLAGS="-pie" -%configure --mandir=%{_mandir} \ - --with-bsdtcp-security \ +%configure --with-bsdtcp-security \ --with-bsdudp-security \ --with-ssh-security \ --with-rsh-security \ --with-krb5-security \ - --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ - --localstatedir=%{_localstatedir}/lib \ --with-index-server=localhost \ --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \ --with-smbclient=%{_bindir}/smbclient \