Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package amanda for openSUSE:Factory checked
in at 2022-08-30 14:48:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amanda (Old)
and /work/SRC/openSUSE:Factory/.amanda.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amanda"
Tue Aug 30 14:48:49 2022 rev:4 rq:999888 version:3.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/amanda/amanda.changes 2020-06-15
20:33:14.358954735 +0200
+++ /work/SRC/openSUSE:Factory/.amanda.new.2083/amanda.changes 2022-08-30
14:49:00.164047353 +0200
@@ -1,0 +2,26 @@
+Thu Aug 25 20:17:24 UTC 2022 - Antoine Belvire <antoine.belv...@opensuse.org>
+
+- 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.
+
+-------------------------------------------------------------------
Old:
----
amanda-3.5.1.tar.gz
amanda-timestamp.patch
New:
----
amanda-3.5.2-fix-tests.patch
amanda-3.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amanda.spec ++++++
--- /var/tmp/diff_new_pack.iQ9vrn/_old 2022-08-30 14:49:00.916049272 +0200
+++ /var/tmp/diff_new_pack.iQ9vrn/_new 2022-08-30 14:49:00.920049283 +0200
@@ -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 @@
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: 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 @@
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 @@
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 \
++++++ amanda-2.6.1p1-return_val.patch ++++++
--- /var/tmp/diff_new_pack.iQ9vrn/_old 2022-08-30 14:49:00.952049364 +0200
+++ /var/tmp/diff_new_pack.iQ9vrn/_new 2022-08-30 14:49:00.956049375 +0200
@@ -1,13 +1,13 @@
-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 */
++++++ amanda-3.5-no_return_in_nonvoid_fnc.patch ++++++
--- /var/tmp/diff_new_pack.iQ9vrn/_old 2022-08-30 14:49:00.972049415 +0200
+++ /var/tmp/diff_new_pack.iQ9vrn/_new 2022-08-30 14:49:00.976049426 +0200
@@ -1,21 +1,21 @@
-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;
}
-
+ %}
++++++ amanda-3.5.2-fix-tests.patch ++++++
>From 262c05b20c7de243542e7502e00152cdafb573d4 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <p...@bieringer.de>
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;
}
}
++++++ amanda-3.5.1.tar.gz -> amanda-3.5.2.tar.gz ++++++
++++ 279157 lines of diff (skipped)
