Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-backup/amanda/files
diff options
context:
space:
mode:
Diffstat (limited to 'app-backup/amanda/files')
-rw-r--r--app-backup/amanda/files/amanda-3.3.9-stuck.patch11
-rw-r--r--app-backup/amanda/files/amanda-3.4.1-labelstr.patch164
-rw-r--r--app-backup/amanda/files/amanda-3.4.1-slots.patch16
-rw-r--r--app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch22
-rw-r--r--app-backup/amanda/files/amanda-3.5.1-fno-common.patch13
-rw-r--r--app-backup/amanda/files/amanda-3.5.1-tirpc.patch16
-rw-r--r--app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch32
-rw-r--r--app-backup/amanda/files/amanda.service-r110
8 files changed, 83 insertions, 201 deletions
diff --git a/app-backup/amanda/files/amanda-3.3.9-stuck.patch b/app-backup/amanda/files/amanda-3.3.9-stuck.patch
deleted file mode 100644
index 88892e41be3b..000000000000
--- a/app-backup/amanda/files/amanda-3.3.9-stuck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/amanda/server-src/driver.c
-+++ b/amanda/server-src/driver.c
-@@ -3957,6 +3957,8 @@
- driver_debug(2, _("new_data: %lld\n"), (long long)new_data);
- driver_debug(2, _("data_free: %lld\n"), (long long)data_free);
- ;
-+ tapeq_size -= data_free;
-+ tapeq_size += new_data;
- driver_debug(2, _("tapeq_size: %lld\n"), (long long)tapeq_size);
-
- sched_size = runq_size + tapeq_size + dumpers_size; \ No newline at end of file
diff --git a/app-backup/amanda/files/amanda-3.4.1-labelstr.patch b/app-backup/amanda/files/amanda-3.4.1-labelstr.patch
deleted file mode 100644
index b169c8ae6472..000000000000
--- a/app-backup/amanda/files/amanda-3.4.1-labelstr.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/installcheck/Amanda_Rest_Storages.pl b/installcheck/Amanda_Rest_Storages.pl
-index f3c699b..3e4e889 100644
---- a/installcheck/Amanda_Rest_Storages.pl
-+++ b/installcheck/Amanda_Rest_Storages.pl
-@@ -308,6 +308,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply),
- 'inventory' => [
- {'current' => 1,
- 'label' => "DISKFLAT-001",
-+ 'label_match' => '1',
- 'device_status' => '0',
- 'reserved' => 0,
- 'f_type' => '1',
-@@ -467,6 +468,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply),
- 'label' => 'DISKFLAT-001',
- 'datestamp' => '20140509113436',
- 'write_protected' => '',
-+ 'label_match' => '1',
- 'process' => 'Amanda::Rest::Storages',
- 'running_on' => 'amanda-server',
- 'component' => 'rest-server',
-diff --git a/installcheck/amtape.pl b/installcheck/amtape.pl
-index 1a3527f..700c5a2 100644
---- a/installcheck/amtape.pl
-+++ b/installcheck/amtape.pl
-@@ -177,13 +177,13 @@ like($Installcheck::Run::stderr,
- ok(run('amtape', 'TESTCONF', 'show'),
- "'amtape TESTCONF show'");
- like($Installcheck::Run::stderr,
-- qr/slot +2:.*label MyTape\nslot +3/,
-+ qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/,
- "'amtape TESTCONF show' ..result correct");
-
- ok(run('amtape', 'TESTCONF', 'show', '2'),
- "'amtape TESTCONF show'");
- like($Installcheck::Run::stderr,
-- qr/^slot +2:.*label MyTape$/,
-+ qr/^slot +2:.*label MyTape \(label do not match labelstr\)$/,
- "'amtape TESTCONF show 2' ..result correct");
-
- ok(run('amtape', 'TESTCONF', 'show', '1,3'),
-@@ -252,13 +252,13 @@ like(run_err('amtape', 'TESTCONF', 'update'),
- ok(run('amtape', 'TESTCONF', 'show'),
- "'amtape TESTCONF show'");
- like($Installcheck::Run::stderr,
-- qr/slot +2:.*label MyTape\nslot +3/,
-+ qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/,
- "..result correct");
-
- ok(run('amtape', 'TESTCONF', 'inventory'),
- "'amtape TESTCONF inventory'");
- like($Installcheck::Run::stdout,
-- qr/slot +1: blank\nslot +2: label MyTape \(current\)\nslot +3/,
-+ qr/slot +1: blank\nslot +2: label MyTape \(current\) \(label do not match labelstr\)\nslot +3/,
- "..result correct");
-
- ok(run('amtape', 'TESTCONF', 'taper'),
-diff --git a/perl/Amanda/Changer.pm b/perl/Amanda/Changer.pm
-index 92ed9b6..4b4aad4 100644
---- a/perl/Amanda/Changer.pm
-+++ b/perl/Amanda/Changer.pm
-@@ -60,9 +60,10 @@ sub local_message {
- } elsif ($self->{'code'} == 1100014) {
- return "$self->{'err'}";
- } elsif ($self->{'code'} == 1100015) {
-- return sprintf("slot %3s: date %-14s label %s%s", $self->{'slot'},
-+ return sprintf("slot %3s: date %-14s label %s%s%s", $self->{'slot'},
- $self->{'datestamp'}, $self->{'label'},
-- $self->{'write_protected'}?" (Write protected)":"");
-+ $self->{'write_protected'}?" (Write protected)":"",
-+ $self->{'label_match'}?"":" (label do not match labelstr)");
- } elsif ($self->{'code'} == 1100016) {
- return sprintf("slot %3s: unlabeled volume%s", $self->{'slot'},
- $self->{'write_protected'}?" (Write protected)":"");
-@@ -2014,6 +2015,13 @@ sub show {
- my $st = $dev->read_label();
- my $write_protected = !$dev->check_writable();
- if ($st == $DEVICE_STATUS_SUCCESS) {
-+ my $label_match = match_labelstr(
-+ $self->{'storage'}->{'labelstr'},
-+ $self->{'storage'}->{'autolabel'},
-+ $dev->volume_label(),
-+ $res->{'barcode'},
-+ $res->{'meta'},
-+ $self->{'storage'}->{'storage_name'});
- $params{'user_msg'}->(Amanda::Changer::Message->new(
- source_filename => __FILE__,
- source_line => __LINE__,
-@@ -2022,7 +2030,8 @@ sub show {
- slot => $last_slot,
- datestamp => $dev->volume_time(),
- label => $dev->volume_label(),
-- write_protected => $write_protected));
-+ write_protected => $write_protected,
-+ label_match => $label_match));
- } elsif ($st == $DEVICE_STATUS_VOLUME_UNLABELED) {
- $params{'user_msg'}->(Amanda::Changer::Message->new(
- source_filename => __FILE__,
-diff --git a/perl/Amanda/Rest/Storages.pm b/perl/Amanda/Rest/Storages.pm
-index 680115b..b1b59d2 100644
---- a/perl/Amanda/Rest/Storages.pm
-+++ b/perl/Amanda/Rest/Storages.pm
-@@ -436,6 +436,17 @@ sub inventory {
- $inv->{'retention_type'} = $tl->get_retention_name($retention_type);
- }
- }
-+ for my $inv (@$inventory) {
-+ if ($inv->{label}) {
-+ $inv->{'label_match'} = Amanda::Util::match_labelstr(
-+ $storage->{'labelstr'},
-+ $storage->{'autolabel'},
-+ $inv->{'label'},
-+ $inv->{'barcode'},
-+ $inv->{'metae'},
-+ $storage->{'storage_name'});
-+ }
-+ }
- push @result_messages, Amanda::Changer::Message->new(
- source_filename => __FILE__,
- source_line => __LINE__,
-diff --git a/server-src/amtape.pl b/server-src/amtape.pl
-index b63607e..d06eefe 100644
---- a/server-src/amtape.pl
-+++ b/server-src/amtape.pl
-@@ -30,7 +30,7 @@ use Text::Wrap;
- use Amanda::Device qw( :constants );
- use Amanda::Debug qw( :logging );
- use Amanda::Config qw( :init :getconf config_dir_relative );
--use Amanda::Util qw( :constants );
-+use Amanda::Util qw( :constants match_labelstr );
- use Amanda::Storage;
- use Amanda::Changer;
- use Amanda::Constants;
-@@ -219,6 +219,7 @@ sub {
- for my $sl (@$inv) {
- my $line = "slot $sl->{slot}:";
- my $tle;
-+ my $meta;
- if ($sl->{'state'} == Amanda::Changer::SLOT_EMPTY) {
- $line .= " empty";
- } elsif (!defined($sl->{device_status}) && !defined($sl->{label})) {
-@@ -230,6 +231,7 @@ sub {
- if (defined $tle) {
- if ($tle->{'meta'}) {
- $line .= " ($tle->{'meta'})";
-+ $meta = $tle->{'meta'};
- }
- }
- } elsif ($sl->{'device_status'} == $DEVICE_STATUS_VOLUME_UNLABELED) {
-@@ -263,6 +265,15 @@ sub {
- $line .= " [device error]";
- }
- }
-+ if ($sl->{'label'}) {
-+ if (!match_labelstr($storage->{'labelstr'},
-+ $storage->{'autolabel'},
-+ $sl->{label},
-+ $sl->{'barcode'}, $meta,
-+ $storage->{'storage_name'})) {
-+ $line .= " (label do not match labelstr)";
-+ }
-+ }
- if (defined $tle) {
- my $retention_type = Amanda::Tapelist::get_retention_type($tle->{pool}, $tle->{label});
- $line .= " [" . $tl->get_retention_name($retention_type) . "]";
diff --git a/app-backup/amanda/files/amanda-3.4.1-slots.patch b/app-backup/amanda/files/amanda-3.4.1-slots.patch
deleted file mode 100644
index 1e4e583ecc26..000000000000
--- a/app-backup/amanda/files/amanda-3.4.1-slots.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/perl/Amanda/Changer/aggregate.pm b/perl/Amanda/Changer/aggregate.pm
-index a2bd962..ecf9d28 100644
---- a/perl/Amanda/Changer/aggregate.pm
-+++ b/perl/Amanda/Changer/aggregate.pm
-@@ -391,7 +391,10 @@ sub info_key {
- my $kid = 0;
- for (@$kid_results) {
- my ($err, %kid_info) = @$_;
-- next unless exists($kid_info{'slots'});
-+ if (!exists($kid_info{'slots'})){
-+ $kid++;
-+ next;
-+ }
- my $kid_slots = $kid_info{'slots'};
- push @slots, map "$kid:$_", @{$kid_slots};
- $kid++;
diff --git a/app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch b/app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch
new file mode 100644
index 000000000000..a95c8ed55aed
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.1-configure-clang16.patch
@@ -0,0 +1,22 @@
+https://github.com/zmanda/amanda/pull/220
+
+From 74610ac5522caa779b30323f1c731775083c5bbc Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 14 Apr 2023 15:45:16 +0200
+Subject: [PATCH] configure: Avoid an implicit int in the IPv6 test
+
+Otherwise, the test fails unconditionally with compilers that
+do not support implicit ints (a language feature that was removed with
+the C99 language revision).
+--- a/config/amanda/ipv6.m4
++++ b/config/amanda/ipv6.m4
+@@ -85,7 +85,7 @@ AC_DEFUN([AMANDA_CHECK_IPV6],
+ #include <sys/socket.h>
+ #include <errno.h>
+
+-main()
++int main(void)
+ {
+ int aa;
+ aa = socket(AF_INET6, SOCK_STREAM, 0);
+
diff --git a/app-backup/amanda/files/amanda-3.5.1-fno-common.patch b/app-backup/amanda/files/amanda-3.5.1-fno-common.patch
new file mode 100644
index 000000000000..3f77c3a709c5
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.1-fno-common.patch
@@ -0,0 +1,13 @@
+diff --git a/common-src/testutils.h b/common-src/testutils.h
+index 31f8973..3bb376f 100644
+--- a/common-src/testutils.h
++++ b/common-src/testutils.h
+@@ -75,7 +75,7 @@ typedef struct TestUtilsTest {
+ #define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); }
+
+ /* Is debugging enabled for this test run? (set internally) */
+-int tu_debugging_enabled;
++extern int tu_debugging_enabled;
+
+ /*
+ * Main loop
diff --git a/app-backup/amanda/files/amanda-3.5.1-tirpc.patch b/app-backup/amanda/files/amanda-3.5.1-tirpc.patch
new file mode 100644
index 000000000000..42472b59af3a
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.1-tirpc.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/656340
+--- a/config/amanda/amanda_configure.m4
++++ b/config/amanda/amanda_configure.m4
+@@ -257,6 +257,12 @@ AMANDA_CHECK_READLINE
+ AC_CHECK_LIB(m,modf)
+ AMANDA_CHECK_LIBDL
+ AMANDA_GLIBC_BACKTRACE
++PKG_CHECK_MODULES([TIRPC],[libtirpc],[
++ CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS} -DHAVE_RPC_RPC_H"
++ LIBS="${LIBS} ${TIRPC_LIBS}"
++], [
++ AC_MSG_ERROR([libtirpc requested but library not found])
++])
+ AC_SEARCH_LIBS([shm_open], [rt], [], [
+ AC_MSG_ERROR([unable to find the shm_open() function])
+ ])
diff --git a/app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch b/app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch
new file mode 100644
index 000000000000..71919e8e7877
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch
@@ -0,0 +1,32 @@
+diff -ur amanda-tag-community-3.5.4.orig/perl/Makefile.am amanda-tag-community-3.5.4/perl/Makefile.am
+--- amanda-tag-community-3.5.4.orig/perl/Makefile.am 2024-04-13 03:27:58.245243730 -0400
++++ amanda-tag-community-3.5.4/perl/Makefile.am 2024-04-13 02:57:41.721169046 -0400
+@@ -139,8 +139,10 @@
+ libDevice_la_LIBADD = amglue/libamglue.la \
+ $(top_builddir)/device-src/libamdevice.la \
+ $(top_builddir)/xfer-src/libamxfer.la \
+- $(top_builddir)/ndmp-src/libndmlib.la \
+ $(top_builddir)/common-src/libamanda.la
++if WANT_NDMP
++libDevice_la_LIBADD += $(top_builddir)/ndmp-src/libndmlib.la
++endif
+ Amanda_DATA += Amanda/Device.pm
+ MAINTAINERCLEANFILES += Amanda/Device.c Amanda/Device.pm
+ endif
+diff -ur amanda-tag-community-3.5.4.orig/server-src/Makefile.am amanda-tag-community-3.5.4/server-src/Makefile.am
+--- amanda-tag-community-3.5.4.orig/server-src/Makefile.am 2024-04-13 03:27:58.249243801 -0400
++++ amanda-tag-community-3.5.4/server-src/Makefile.am 2024-04-13 03:28:59.274321715 -0400
+@@ -90,9 +90,12 @@
+ libamserver.la \
+ ../device-src/libamdevice.la \
+ ../xfer-src/libamxfer.la \
+- ../ndmp-src/libndmlib.la \
+ ../common-src/libamanda.la
+
++if WANT_NDMP
++LDADD += ../ndmp-src/libndmlib.la
++endif
++
+ libamserver_la_SOURCES= amindex.c cmdfile.c \
+ diskfile.c driverio.c cmdline.c \
+ holding.c infofile.c logfile.c \
diff --git a/app-backup/amanda/files/amanda.service-r1 b/app-backup/amanda/files/amanda.service-r1
deleted file mode 100644
index a605eb487bf0..000000000000
--- a/app-backup/amanda/files/amanda.service-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Amanda Backup System
-After=local-fs.target
-
-[Service]
-User=amanda
-Group=amanda
-ExecStart=/usr/libexec/amanda/amandad -auth=bsdtcp amdump amindexd amidxtaped
-StandardInput=socket
-StandardOutput=socket