diff --git a/amanda-3.3.0-match_fixed.patch b/amanda-3.3.0-match_fixed.patch new file mode 100644 index 0000000..b85441d --- /dev/null +++ b/amanda-3.3.0-match_fixed.patch @@ -0,0 +1,21 @@ +diff --git a/perl/Amanda/Util.pm b/perl/Amanda/Util.pm +index 6ea9ece..7703708 100644 +--- a/perl/Amanda/Util.pm ++++ b/perl/Amanda/Util.pm +@@ -911,6 +911,7 @@ sub is_pid_alive { + push @EXPORT_OK, qw(weaken_ref); + + push @EXPORT_OK, qw(stream_server stream_accept check_security); ++push @EXPORT_OK, qw(match_host match_disk match_datestamp match_level); + + push @EXPORT_OK, qw($AF_INET $STREAM_BUFSIZE); + push @{$EXPORT_TAGS{"constants"}}, qw($AF_INET $STREAM_BUFSIZE); +@@ -969,8 +970,6 @@ sub unmarshal_tapespec { + } + + +-push @EXPORT_OK, qw(match_host match_disk match_datestamp match_level); +- + sub check_std_fds { + fcntl(STDIN, F_GETFD, 0) or critical("Standard input is not open"); + fcntl(STDOUT, F_GETFD, 0) or critical("Standard output is not open"); diff --git a/amanda.spec b/amanda.spec index 5158f6a..bcb86fb 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -21,6 +21,7 @@ Patch7: amanda-3.3.0-qw.patch Patch8: amanda-3.3.0-match_disk.patch Patch9: amanda-3.3.0-glib.patch Patch10: amanda-3.3.0-match.patch +Patch11: amanda-3.3.0-match_fixed.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -88,6 +89,7 @@ server also needs to have the amanda-client package installed. %patch8 -p3 -b .match_disk %patch9 -p2 -b .glib %patch10 -p1 -b .match +%patch11 -p1 -b .match_fixed ./autogen # file_lock is typedef to struct file_lock sed -e 's/struct \(file_lock\)\b/\1/' -i perl/Amanda/Util.c @@ -439,6 +441,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jan 21 2013 Petr Hracek - 3.3.0-8 +- Fixed problem with importing match_* (#895706) + * Tue Oct 16 2012 Lukáš Nykrýn - 3.3.0-7 - fix location of match_* functions (#861649)