app-backup/amanda: Misc fixes

Fix GCC 14 compilation (-Wincompatible-pointer-types)
Fix Perl warnings (removed unneeded use statements)
Fix Perl 5.40 invocation of finished_cb (Tim Buchheim)
Fix QA warning about using NULL variable
Fix ndmp requires rpcgen

Signed-off-by: Doug Nazar <nazard@nazar.ca>
Closes: https://bugs.gentoo.org/933742
Closes: https://bugs.gentoo.org/939202
Closes: https://bugs.gentoo.org/933756
Closes: https://github.com/gentoo/gentoo/pull/39104
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 67 insertions, 0 deletions

diff --git a/app-backup/amanda/files/amanda-3.5.4-const-whitelist-var.patch b/app-backup/amanda/files/amanda-3.5.4-const-whitelist-var.patch
new file mode 100644
index 000000000000..3df48c9e7129
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-const-whitelist-var.patch
@@ -0,0 +1,21 @@
+diff '--color=auto' -ur orig/client-src/runtar.c amanda-tag-community-3.5.4/client-src/runtar.c
+--- orig/client-src/runtar.c	2023-07-26 06:27:30.000000000 -0400
++++ amanda-tag-community-3.5.4/client-src/runtar.c	2024-10-16 20:08:01.653602008 -0400
+@@ -54,7 +54,7 @@
+ {
+ #ifdef GNUTAR
+     int i;
+-    char **j;
++    const char **j;
+     char *e;
+     char *dbf;
+     char *cmdline;
+@@ -255,7 +255,7 @@
+     gchar* option)
+ {
+     bool result = TRUE;
+-    char** i;
++    const char** i;
+ 
+     for(i=whitelisted_args; *i; i++) {
+         if (g_str_has_prefix(option, *i)) {
diff --git a/app-backup/amanda/files/amanda-3.5.4-fix-finished_cb-invocation.patch b/app-backup/amanda/files/amanda-3.5.4-fix-finished_cb-invocation.patch
new file mode 100644
index 000000000000..7df4c970bd8a
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-fix-finished_cb-invocation.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ur amanda-tag-community-3.5.4.orig/perl/Amanda/Taper/Scribe.pm amanda-tag-community-3.5.4/perl/Amanda/Taper/Scribe.pm
+--- amanda-tag-community-3.5.4.orig/perl/Amanda/Taper/Scribe.pm	2023-07-26 06:27:30.000000000 -0400
++++ amanda-tag-community-3.5.4/perl/Amanda/Taper/Scribe.pm	2024-10-25 06:09:33.265064134 -0400
+@@ -1084,7 +1084,7 @@
+ 	if ($chg->{'global_space'}) {
+ 	    $chg->inventory(inventory_cb => $steps->{'got_inventory'});
+ 	} else {
+-	    return $finished_cb();
++	    return $finished_cb->();
+ 	}
+     };
+ 
diff --git a/app-backup/amanda/files/amanda-3.5.4-fix-tapelist-null-usage.patch b/app-backup/amanda/files/amanda-3.5.4-fix-tapelist-null-usage.patch
new file mode 100644
index 000000000000..6f25753adab5
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-fix-tapelist-null-usage.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ur amanda-tag-community-3.5.4.orig/common-src/tapelist.c amanda-tag-community-3.5.4/common-src/tapelist.c
+--- amanda-tag-community-3.5.4.orig/common-src/tapelist.c	2023-07-26 06:27:30.000000000 -0400
++++ amanda-tag-community-3.5.4/common-src/tapelist.c	2024-10-24 23:53:34.782171543 -0400
+@@ -106,7 +106,7 @@
+ 
+     /* see if we have this tape already, and if so just add to its file list */
+     for(cur_tape = tapelist; cur_tape; cur_tape = cur_tape->next) {
+-	if ((!storage || cur_tape->storage ||
++	if ((!storage || !cur_tape->storage ||
+ 	     g_str_equal(storage, cur_tape->storage)) &&
+ 	    g_str_equal(label, cur_tape->label)) {
+ 	    int d_idx = 0;
diff --git a/app-backup/amanda/files/amanda-3.5.4-remove-amanda-message-severity-use.patch b/app-backup/amanda/files/amanda-3.5.4-remove-amanda-message-severity-use.patch
new file mode 100644
index 000000000000..7ec9718ee8b8
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-remove-amanda-message-severity-use.patch
@@ -0,0 +1,22 @@
+diff '--color=auto' -ur amanda-tag-community-3.5.4.orig/perl/Amanda/Tapelist.swg amanda-tag-community-3.5.4/perl/Amanda/Tapelist.swg
+--- amanda-tag-community-3.5.4.orig/perl/Amanda/Tapelist.swg	2023-07-26 06:27:30.000000000 -0400
++++ amanda-tag-community-3.5.4/perl/Amanda/Tapelist.swg	2024-10-24 23:48:21.920655197 -0400
+@@ -52,7 +52,6 @@
+ use Amanda::Config qw( config_dir_relative );
+ use File::Copy;
+ use Fcntl qw(:flock); # import LOCK_* constants
+-use Amanda::Message qw( :severity );
+ 
+ ## package functions
+ 
+diff '--color=auto' -ur amanda-tag-community-3.5.4.orig/server-src/amtape.pl amanda-tag-community-3.5.4/server-src/amtape.pl
+--- amanda-tag-community-3.5.4.orig/server-src/amtape.pl	2023-07-26 06:27:30.000000000 -0400
++++ amanda-tag-community-3.5.4/server-src/amtape.pl	2024-10-24 23:49:22.789728432 -0400
+@@ -39,7 +39,6 @@
+ use Amanda::Recovery::Scan;
+ use Amanda::Interactivity;
+ use Amanda::Tapelist;
+-use Amanda::Message qw( :severity );
+ 
+ my $exit_status = 0;
+ my $tl;