270.patch

@@ -1,45 +0,0 @@
-From bd9ef8e5c004911b529d55b521d18d4d66c4e9b7 Mon Sep 17 00:00:00 2001
-From: Peter Bieringer <pb@bieringer.de>
-Date: Tue, 29 Oct 2024 21:42:32 +0100
-Subject: [PATCH 1/2] fixes https://github.com/zmanda/amanda/issues/262
-
----
- perl/Amanda/Taper/Scribe.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/perl/Amanda/Taper/Scribe.pm b/perl/Amanda/Taper/Scribe.pm
-index 8b21c77c0b..ecfd2a140a 100644
---- a/perl/Amanda/Taper/Scribe.pm
-+++ b/perl/Amanda/Taper/Scribe.pm
-@@ -1116,7 +1116,7 @@ sub _xmsg_no_space {
- 	if ($chg->{'global_space'}) {
- 	    $chg->inventory(inventory_cb => $steps->{'got_inventory'});
- 	} else {
--	    return $finished_cb();
-+	    return $finished_cb->();
- 	}
-     };
- 
-
-From e083df9afaad61fc8772765d132a93ec8bc7ae5e Mon Sep 17 00:00:00 2001
-From: Peter Bieringer <pb@bieringer.de>
-Date: Tue, 29 Oct 2024 21:43:18 +0100
-Subject: [PATCH 2/2] fix for https://github.com/zmanda/amanda/issues/262
-
----
- perl/Amanda/Tapelist.swg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/perl/Amanda/Tapelist.swg b/perl/Amanda/Tapelist.swg
-index 9266961a4e..ba84c68ca0 100644
---- a/perl/Amanda/Tapelist.swg
-+++ b/perl/Amanda/Tapelist.swg
-@@ -36,7 +36,7 @@ use Amanda::Debug qw(:logging);
- use Amanda::Config qw( config_dir_relative );
- use File::Copy;
- use Fcntl qw(:flock); # import LOCK_* constants
--use Amanda::Message qw( :severity );
-+use Amanda::Message;
- 
- ## package functions
- 

273.patch

@@ -1,36 +0,0 @@
-From 403656a684d8c934866721ca0e1674997deb4eeb Mon Sep 17 00:00:00 2001
-From: Orion Poplawski <orion@nwra.com>
-Date: Mon, 11 Nov 2024 21:19:54 -0700
-Subject: [PATCH] Drop non-existant -s option from amflush man page
-
----
- man/xml-source/amflush.8.xml | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/man/xml-source/amflush.8.xml b/man/xml-source/amflush.8.xml
-index e3b1360afd..f09f4a46b6 100644
---- a/man/xml-source/amflush.8.xml
-+++ b/man/xml-source/amflush.8.xml
-@@ -32,7 +32,6 @@
-     <arg choice='opt'>-b</arg>
-     <arg choice='opt'>-f</arg>
-     <arg choice='opt'>--exact-match</arg>
--    <arg choice='opt'>-s</arg>
-     <arg choice='opt'>-D <replaceable>datestamp</replaceable></arg>
-     &configoverride.synopsis;
-     <arg choice='plain'><replaceable>config</replaceable></arg>
-@@ -90,14 +89,6 @@ This is useful if
- <command>amflush</command>
- is run as part of another script that, for example, advances the tape
- after the flush is completed.</para>
--  </listitem>
--  </varlistentry>
--  <varlistentry>
--  <term><option>-s</option></term>
--  <listitem>
--<para>Write log to stdout/stderr instead of the amflush log file. Requires the
--<option>-f</option>
--option.</para>
-   </listitem>
-   </varlistentry>
-   <varlistentry>

amanda.spec

@@ -36,15 +36,12 @@ Patch3:        amanda-3.2.0-config-dir.patch
 Patch4:        amanda-3.4.5-no-xinetd.patch
 # Support tirpc
 Patch5:        patch-tirpc
+
 # Specify the location or the xfs housekeeping directory
 # https://bugzilla.redhat.com/show_bug.cgi?id=1671117
 Patch6:        patch-xfsrestore-housekeeping
 Patch7: amanda-configure-c99.patch
 Patch8: amanda-c99.patch
-# Drop nonexistent -s option from aflush man page (#1943909)
-Patch9:        https://github.com/zmanda/amanda/pull/273.patch
-# Perl 5.40 support (rhbz#2322518)
-Patch10:       https://github.com/zmanda/amanda/pull/270.patch
 
 License:       BSD-3-Clause AND GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only
 URL:           http://www.amanda.org
@@ -128,16 +125,10 @@ server also needs to have the amanda-client package installed.
 %prep
 %autosetup -p1 -n %{name}-tag-community-%{version}
 
-# Create a sysusers.d config file
-cat >amanda.sysusers.conf <<EOF
-u amandabackup 33:%amanda_group 'Amanda user' %{_localstatedir}/lib/amanda /bin/bash
-m amandabackup tape
-EOF
-
 %build
 ./autogen
 
-export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE -std=c17" LDFLAGS="$RPM_LD_FLAGS -pie"
+export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie"
 %configure --enable-shared \
            --enable-manpage-build \
            --disable-rpath \
@@ -208,16 +199,13 @@ popd
 rm -rf $RPM_BUILD_ROOT/usr/share/amanda
 find $RPM_BUILD_ROOT -name \*.la | xargs rm
 
-pushd $RPM_BUILD_ROOT/usr/bin
-rm amandad
-ln -s ../%_lib/amanda/amandad
-popd
-
-install -m0644 -D amanda.sysusers.conf %{buildroot}%{_sysusersdir}/amanda.conf
-
 %check
 make check
 
+%pre
+/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
+        -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
+/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || :
 
 %post
 %{?ldconfig}
@@ -303,7 +291,6 @@ make check
 %attr(600,%amanda_user,%amanda_group)   %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
 %attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda
 %attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda/amandad
-%{_sysusersdir}/amanda.conf
 
 %files libs
 %{_libdir}/libamdevice*.so