diff --git a/amanda-3.4.5-no-xinetd.patch b/amanda-3.4.5-no-xinetd.patch new file mode 100644 index 0000000..bc42047 --- /dev/null +++ b/amanda-3.4.5-no-xinetd.patch @@ -0,0 +1,12 @@ +diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl +index 5748dfc..18f59f0 100755 +--- a/server-src/amserverconfig.pl ++++ b/server-src/amserverconfig.pl +@@ -656,7 +656,6 @@ if ( defined $template ) { + &create_customconf; + } + +-&check_xinetd; + &build_amanda_ssh_key; + + if ( $vtape_err ) { diff --git a/amanda.spec b/amanda.spec index 1f3d1fd..52282b1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,6 +28,8 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch # Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch +# Don't mention xinetd files in amserverconfig (#1460763) +Patch5: amanda-3.4.5-no-xinetd.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -437,6 +439,9 @@ make check %changelog +* Tue Jun 13 2017 Jason L Tibbitts III - 3.4.5-2 +- Modify amserverconfig to not mention xinetd (#1460763) + * Thu Jun 08 2017 Jason L Tibbitts III - 3.4.5-1 - New upstream release 3.4.5. @@ -605,7 +610,7 @@ make check * Thu Jan 31 2013 Petr Hracek - 3.3.2-4 - fix (#858703) add killpgrp(8) man page to the amanda-client package (killpgrp will be removed from man-pages package) -- Fix autogen for parallel tests. +- Fix autogen for parallel tests. * Thu Dec 06 2012 Lukáš Nykrýn - 3.3.2-3 - Fix group ownership @@ -714,7 +719,7 @@ make check - Mass rebuild with perl-5.12.0 * Thu Apr 22 2010 Daniel Novotny 2.6.1p2-3 -- fix #584774 - PIE patch disabled in amanda 2.6.1p2-2 +- fix #584774 - PIE patch disabled in amanda 2.6.1p2-2 * Tue Feb 16 2010 Daniel Novotny 2.6.1p2-2 - fix #564935 - FTBFS amanda-2.6.1p2-1.fc13 @@ -732,7 +737,7 @@ make check - rebuilt with new openssl * Tue Aug 04 2009 Daniel Novotny 2.6.0p2-12 --fix #512534 - amstatus outputs "Insecure dependency in printf ..." +-fix #512534 - amstatus outputs "Insecure dependency in printf ..." * Fri Jul 24 2009 Fedora Release Engineering - 2.6.0p2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -745,7 +750,7 @@ make check not also release * Tue Apr 14 2009 Daniel Novotny 2.6.0p2-8 -- fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") +- fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") * Wed Apr 08 2009 Daniel Novotny 2.6.0p2-7 - the tcpport patch was lost after rebase, adding again @@ -939,7 +944,7 @@ make check rebuilding the rpms via something like 'rpmbuild -ba --define "indexserver foo.fqdn.com" amanda.spec' This change suggested by Matt Hyclak . - + * Tue Apr 5 2005 Jay Fenlason 2.4.4p4-4 - Add -bug144052 patch to close bz#144052 amverifyrun sometimes verifies the wrong tapes @@ -1017,7 +1022,7 @@ make check * Fri Jul 13 2001 Trond Eivind Glomsrød - Build and install the "tapetype" utility program, for - tape size identification (#48745) + tape size identification (#48745) * Tue Jun 19 2001 Trond Eivind Glomsrød - don't use %%configure, to make it build @@ -1036,7 +1041,7 @@ make check avoid samba being built without such support * Thu Feb 22 2001 Trond Eivind Glomsrød -- Use %%{version} in source URL, and thus actually use +- Use %%{version} in source URL, and thus actually use 2.4.2p1 instead of 2.4.2 (doh! # 28759) - add patch to handle bogus /dev/root entries (#28759) @@ -1154,7 +1159,7 @@ make check * Wed Feb 11 1998 Otto Hammersmith - updated to 2.4.0b6, fixes security hole among other things (as well as finally got the glibc patch in the main source.) - + * Tue Jan 27 1998 Otto Hammersmith - moved versionsuffix to client package to remove dependency of amanda on amanda-client