Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at 2017-10-23 16:43:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amanda (Old) and /work/SRC/openSUSE:Factory/.amanda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amanda" Mon Oct 23 16:43:54 2017 rev:53 rq:534428 version:3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/amanda/amanda.changes 2017-04-11 09:33:02.655798373 +0200 +++ /work/SRC/openSUSE:Factory/.amanda.new/amanda.changes 2017-10-23 16:44:03.474613671 +0200 @@ -1,0 +2,28 @@ +Fri Oct 13 14:53:33 UTC 2017 - [email protected] + +- update to 3.5 + * see ReleaseNotes for more information + * refresh + amanda-2.6.1p1-shellbang.patch + amanda-2.6.1p1-return_val.patch + amanda-timestamp.patch + * remove (applied upstream) + amanda-automake_add_missing.patch + amanda-3.3.3-noundefbool.patch + amanda-2.6.1p1-fix-perl-format.patch + * remove chg-* scripts from the filelist + * pack new files +- add amanda-3.5-no_return_in_nonvoid_fnc.patch to fix + no-return-in-nonvoid-function rpmlint error +- add url for source +- remove SLE11 specific stuff from specfile +- SuSE -> SUSE + * amanda-SuSE.tar.bz2 is now amanda-SUSE.tar.bz2 + * README.SuSE is now README.SUSE +- tweak description +- run make check +- use %configure macro +- renumber patches +- create a symlink for amoldrecover manpage + +------------------------------------------------------------------- Old: ---- amanda-2.6.1p1-fix-perl-format.patch amanda-3.3.3-noundefbool.patch amanda-3.3.6.tar.gz amanda-SuSE.tar.bz2 amanda-automake_add_missing.patch New: ---- amanda-3.5-no_return_in_nonvoid_fnc.patch amanda-3.5.tar.gz amanda-SUSE.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.gmyRAC/_old 2017-10-23 16:44:04.498565751 +0200 +++ /var/tmp/diff_new_pack.gmyRAC/_new 2017-10-23 16:44:04.498565751 +0200 @@ -16,31 +16,24 @@ # -# -%if 0%{?suse_version} <= 1110 - %define amanda_group disk -%else - %define amanda_group amanda -%endif +%define amanda_group amanda Name: amanda -Version: 3.3.6 +Version: 3.5 Release: 0 Summary: Network Disk Archiver License: GPL-3.0+ Group: Productivity/Archiving/Backup Url: http://www.amanda.org/ -Source: %{name}-%{version}.tar.gz -#amanda-SuSE.tar.bz2 contain init scripts, config examples -Source1: %{name}-SuSE.tar.bz2 +Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz +#amanda-SUSE.tar.bz2 contains init scripts, config examples +Source1: amanda-SUSE.tar.bz2 Source2: amanda-howto-collection.pdf.tar.bz2 -Patch3: amanda-2.6.1p1-shellbang.patch -Patch4: amanda-2.6.1p1-return_val.patch -Patch6: amanda-2.6.1p1-avoid-perl-provides.patch -Patch9: amanda-3.3.2-returnvalues.patch -Patch10: amanda-automake_add_missing.patch -Patch11: amanda-3.3.3-noundefbool.patch -Patch12: amanda-2.6.1p1-fix-perl-format.patch -Patch13: amanda-timestamp.patch +Patch1: amanda-2.6.1p1-shellbang.patch +Patch2: amanda-2.6.1p1-return_val.patch +Patch3: amanda-2.6.1p1-avoid-perl-provides.patch +Patch4: amanda-3.3.2-returnvalues.patch +Patch5: amanda-timestamp.patch +Patch6: amanda-3.5-no_return_in_nonvoid_fnc.patch BuildRequires: automake BuildRequires: cups-client BuildRequires: dump @@ -64,37 +57,39 @@ Requires: %{_bindir}/smbclient Requires: dump Requires: perl = %{perl_version} -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: permissions -PreReq: pwdutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): permissions +Requires(pre): pwdutils %description -This is a release of Amanda, the Advanced Maryland Automatic Network -Disk Archiver. Amanda is a backup system designed to archive many -computers on a network to a single large-capacity tape drive. +AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a backup +solution that allows the IT administrator to set up a single master backup +server to back up multiple hosts over network to tape drives/changers or +disks or optical media. Amanda uses native utilities and formats (e.g. dump +and/or GNU tar) and can back up a large number of servers and workstations +running multiple versions of Linux or Unix. %prep %setup -q -a 1 -a 2 rm -r patches -%patch3 -%patch4 +%patch1 +%patch2 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch6 -p1 -%patch9 -p1 -%patch10 -%patch11 -%patch12 -p1 -%patch13 -p1 %build ./autogen -CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" \ -CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" \ -LDFLAGS="-pie" \ - ./configure --mandir=%{_mandir} \ - --with-bsdtcp-security --with-bsdudp-security \ - --with-ssh-security --with-rsh-security --with-krb5-security \ +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" +export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" +export LDFLAGS="-pie" +%configure --mandir=%{_mandir} \ + --with-bsdtcp-security \ + --with-bsdudp-security \ + --with-ssh-security \ + --with-rsh-security \ + --with-krb5-security \ --prefix=%{_prefix} \ --infodir=%{_infodir} \ --sysconfdir=%{_sysconfdir} \ @@ -114,7 +109,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot}/ install +make install DESTDIR=%{buildroot}/ install -d %{buildroot}/%{_sysconfdir}/amanda \ %{buildroot}%{_localstatedir}/lib/amanda/index \ %{buildroot}%{_localstatedir}/lib/amanda/gnutar-lists \ @@ -123,24 +118,26 @@ %{buildroot}%{_localstatedir}/lib/amanda/lbl-templ \ %{buildroot}/%{_docdir}/%{name} \ %{buildroot}/%{_sysconfdir}/xinetd.d -install NEWS README README.SuSE example/{amanda.conf,chg-multi.conf,disklist} %{buildroot}/%{_docdir}/%{name} -chmod 644 %{buildroot}/%{_docdir}/%{name}/* \ - %{buildroot}/%{_mandir}/*/* -cp -a SuSE/* %{buildroot} -#we must change group name for amanada user in xinit'd scripts for 11.1 and lower -%if 0%{?suse_version} <= 1110 - sed -i 's|amanda|disk|' %{buildroot}%{_sysconfdir}/xinetd.d/am* -%endif +install NEWS README README.SUSE example/{amanda.conf,chg-multi.conf,disklist} %{buildroot}/%{_docdir}/%{name} +install -m 644 %{buildroot}%{_sysconfdir}/amanda/amanda-security.conf %{buildroot}%{_sysconfdir}/amanda-security.conf +chmod 644 %{buildroot}/%{_docdir}/%{name}/* %{buildroot}/%{_mandir}/*/* +cp -a SUSE/* %{buildroot} + # pdf doc cp amanda-howto-collection.pdf %{buildroot}/%{_docdir}/%{name}/ + # label templates cp -a example/*.ps %{buildroot}%{_localstatedir}/lib/amanda/lbl-templ -# contain docs,examples which are already included + +# contain docs, examples which are already included rm -rf %{buildroot}%{_datadir}/amanda + # bnc#412636 touch %{buildroot}/%{_libexecdir}/amanda/exclude.gtar + # delete all static linking remnats find %{buildroot} \( -name "*.a" -o -name "*.la" \) -delete + # create a list of binaries to be checked externally cat << EOF > %{buildroot}%{_libexecdir}/amanda/suidlist %{_sbindir}/amcheck @@ -152,27 +149,24 @@ %{_libexecdir}/amanda/killpgrp EOF +# create a symlink for amoldrecover manpage +ln -s amrecover.8.gz %{buildroot}%{_mandir}/man8/amoldrecover.8 + %pre # since 11.2 we use group "tape" instead of "disk" for tape devices /dev/nst*, # so we must check group for "amanda" user -%if 0%{?suse_version} > 1110 - # create primary group for amanda user - %{_sbindir}/groupadd -r amanda 2>/dev/null || : - # if user already exists and has effective group "disk", we have to change this group - # to "amanda" group and also add supplementary "tape" group see bnc#523006 - # else - move amanda to group amanda unconditionally (ignore failures if amanda doesn't exist) - %{_bindir}/id -n -g amanda 2>&1 | grep "disk" >/dev/null \ +# create primary group for amanda user +%{_sbindir}/groupadd -r amanda 2>/dev/null || : +# if user already exists and has effective group "disk", we have to change this group +# to "amanda" group and also add supplementary "tape" group see bnc#523006 +# else - move amanda to group amanda unconditionally (ignore failures if amanda doesn't exist) +%{_bindir}/id -n -g amanda 2>&1 | grep "disk" >/dev/null \ && %{_sbindir}/usermod -g amanda -G tape amanda \ || %{_sbindir}/usermod -g amanda amanda 2>&1 \ || : - # this is ugly but just simple add user with "tape" and "amanda" groups regardless of existing user - %{_sbindir}/useradd -r -o -g amanda -G tape -u 37 -s /bin/bash \ - -c "Amanda admin" -d %{_localstatedir}/lib/amanda amanda >/dev/null 2>&1 || : -%else - # in <= 11.1 use old disk group for amanda user - %{_sbindir}/useradd -r -o -g disk -u 37 -s /bin/bash \ +# this is ugly but just simple add user with "tape" and "amanda" groups regardless of existing user +%{_sbindir}/useradd -r -o -g amanda -G tape -u 37 -s /bin/bash \ -c "Amanda admin" -d %{_localstatedir}/lib/amanda amanda >/dev/null 2>&1 || : -%endif %post %if 0%{?set_permissions:1} @@ -181,14 +175,11 @@ %run_permissions %endif -%if 0%{?suse_version} >= 1120 %verifyscript %verify_permissions -f %{_libexecdir}/amanda/suidlist -%endif %files -%defattr(-,root,root) -%doc %attr(644,root,root) amanda-howto-collection.pdf ChangeLog NEWS AUTHORS COPYRIGHT README ReleaseNotes README.SuSE +%doc %attr(644,root,root) amanda-howto-collection.pdf ChangeLog NEWS AUTHORS COPYRIGHT README ReleaseNotes README.SUSE %doc %attr(755,root,root) %dir %{_docdir}/%{name} %{_docdir}/%{name} %{_mandir}/man*/* @@ -210,6 +201,10 @@ # bnc#412636 file permissions of .amandahosts should be 600 %config %attr(600,amanda,%{amanda_group}) %{_localstatedir}/lib/amanda/.amandahosts %config %attr(644,amanda,%{amanda_group}) %{_sysconfdir}/amanda/example/amanda.conf +# amanda-security.conf must be installed at %{_sysconfdir} and only root must be able to write it +# an example file should be installed at %{_sysconfdir}/amanda/ +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/amanda-security.conf +%{_sysconfdir}/amanda/amanda-security.conf %config %attr(644,amanda,%{amanda_group}) %{_sysconfdir}/amanda/example/disklist %config(noreplace) %{_sysconfdir}/xinetd.d/* # perl scripts @@ -219,16 +214,22 @@ %dir %{perl_vendorlib}/Amanda/Config %dir %{perl_vendorlib}/Amanda/Curinfo %dir %{perl_vendorlib}/Amanda/DB +%dir %{perl_vendorlib}/Amanda/FetchDump +%dir %{perl_vendorlib}/Amanda/Chunker %dir %{perl_vendorlib}/Amanda/Interactivity %dir %{perl_vendorlib}/Amanda/IPC %dir %{perl_vendorlib}/Amanda/Recovery %dir %{perl_vendorlib}/Amanda/Report +%dir %{perl_vendorlib}/Amanda/Rest +%dir %{perl_vendorlib}/Amanda/Rest/Storages +%dir %{perl_vendorlib}/Amanda/Service %dir %{perl_vendorlib}/Amanda/Taper %dir %{perl_vendorlib}/Amanda/Taper/Scan %dir %{perl_vendorlib}/auto/Amanda/ %dir %{perl_vendorlib}/auto/Amanda/Application %dir %{perl_vendorlib}/auto/Amanda/Archive %dir %{perl_vendorlib}/auto/Amanda/Cmdline +%dir %{perl_vendorlib}/auto/Amanda/Cmdfile %dir %{perl_vendorlib}/auto/Amanda/Config %dir %{perl_vendorlib}/auto/Amanda/Debug %dir %{perl_vendorlib}/auto/Amanda/Device @@ -252,6 +253,10 @@ %{perl_vendorlib}/auto/Amanda/*/*/*.so %defattr(755,amanda,%{amanda_group}) %{_sbindir}/amadmin +%{_sbindir}/ambackup +%{_sbindir}/amreindex +%{_sbindir}/amssl +%{_sbindir}/amanda-rest-server %{_sbindir}/amcheckdb %{_sbindir}/amcleanup %{_sbindir}/amdump @@ -292,16 +297,16 @@ %{_libexecdir}/amanda/amplot.g %{_libexecdir}/amanda/amplot.gp %defattr(755,amanda,%{amanda_group}) +%{_libexecdir}/amanda/ambind %{_libexecdir}/amanda/amandad %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amidxtaped %{_libexecdir}/amanda/amindexd %{_libexecdir}/amanda/amtrmidx -%{_libexecdir}/amanda/chg-disk -%{_libexecdir}/amanda/chg-manual -%{_libexecdir}/amanda/chg-multi -%{_libexecdir}/amanda/chg-zd-mtx %{_libexecdir}/amanda/driver +%{_libexecdir}/amanda/amadmin_perl +%{_libexecdir}/amanda/ambackupd +%{_libexecdir}/amanda/rest-server/ %{_libexecdir}/amanda/amcheck-device %{_sbindir}/amcleanupdisk %{_libexecdir}/amanda/amlogroll @@ -317,7 +322,8 @@ %{_libexecdir}/amanda/ndmjob %{_libexecdir}/amanda/amanda-sh-lib.sh %{_libexecdir}/amanda/teecount -%{_libexecdir}/amanda/chg-lib.sh +%{_libexecdir}/amanda/restore +%{_libexecdir}/amanda/senddiscover %verify(not mode) %attr(0750,root,%{amanda_group})%{_libexecdir}/amanda/calcsize %verify(not mode) %attr(0750,root,%{amanda_group})%{_libexecdir}/amanda/dumper %verify(not mode) %attr(0750,root,%{amanda_group})%{_libexecdir}/amanda/killpgrp @@ -330,4 +336,7 @@ %dir %{_libdir}/amanda/ %{_libdir}/amanda/lib* +%check +make %{?_smp_mflags} check + %changelog ++++++ amanda-2.6.1p1-return_val.patch ++++++ --- /var/tmp/diff_new_pack.gmyRAC/_old 2017-10-23 16:44:04.530564253 +0200 +++ /var/tmp/diff_new_pack.gmyRAC/_new 2017-10-23 16:44:04.530564253 +0200 @@ -1,8 +1,10 @@ ---- perl/Amanda/MainLoop.c +Index: perl/Amanda/MainLoop.c +=================================================================== +--- perl/Amanda/MainLoop.c.orig +++ perl/Amanda/MainLoop.c -@@ -1500,6 +1500,7 @@ +@@ -1581,6 +1581,7 @@ void quit(void) { static void amglue_source_remove(amglue_Source *self); - SWIGINTERN amglue_Source *new_amglue_Source(){ + SWIGINTERN amglue_Source *new_amglue_Source(void){ die("Amanda::MainLoop::Source is an abstract base class"); + return NULL; } ++++++ amanda-2.6.1p1-shellbang.patch ++++++ --- /var/tmp/diff_new_pack.gmyRAC/_old 2017-10-23 16:44:04.542563692 +0200 +++ /var/tmp/diff_new_pack.gmyRAC/_new 2017-10-23 16:44:04.546563505 +0200 @@ -1,11 +1,3 @@ ---- changer-src/chg-lib.sh.in -+++ changer-src/chg-lib.sh.in -@@ -1,3 +1,5 @@ -+#! @SHELL@ -+# - ################################################################################ - # You may want to customize these values - ################################################################################ --- common-src/amanda-sh-lib.sh.in +++ common-src/amanda-sh-lib.sh.in @@ -1,3 +1,4 @@ ++++++ amanda-3.5-no_return_in_nonvoid_fnc.patch ++++++ Index: amanda-3.5/perl/Amanda/Config.c =================================================================== --- amanda-3.5.orig/perl/Amanda/Config.c +++ amanda-3.5/perl/Amanda/Config.c @@ -1845,6 +1845,7 @@ val_t_to_sv(val_t *val, SV **results) { fail: SWIG_croak_null(); + return 0; } @@ -2258,6 +2259,7 @@ val_t_to_print(val_t *val, SV **results) fail: SWIG_croak_null(); + return 0; } ++++++ amanda-3.3.6.tar.gz -> amanda-3.5.tar.gz ++++++ ++++ 415425 lines of diff (skipped) ++++++ amanda-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.gmyRAC/_old 2017-10-23 16:44:06.042493496 +0200 +++ /var/tmp/diff_new_pack.gmyRAC/_new 2017-10-23 16:44:06.042493496 +0200 @@ -3,29 +3,29 @@ common-src/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: amanda-3.3.6/common-src/Makefile.am +Index: amanda-3.5/common-src/Makefile.am =================================================================== ---- amanda-3.3.6.orig/common-src/Makefile.am -+++ amanda-3.3.6/common-src/Makefile.am -@@ -151,7 +151,7 @@ genversion.$(OBJEXT): $(genversion_SOURC - genversion.h: $(top_builddir)/config.status - -rm -f $@ [email protected] - echo '#define CC "$(CC)"' > [email protected] -- echo '#define BUILT_DATE "'`date`'"' >> [email protected] -+ echo '#define BUILT_DATE "today"' >> [email protected] - echo '#define BUILT_MACH "$(target)"' >> [email protected] - mv [email protected] $@ - -Index: amanda-3.3.6/common-src/Makefile.in +--- amanda-3.5.orig/common-src/Makefile.am ++++ amanda-3.5/common-src/Makefile.am +@@ -171,7 +171,7 @@ genversion.$(OBJEXT): $(genversion_SOURC + genversion.h ../perl/Amanda/Constants.pm.in: $(top_builddir)/config.status + -rm -f genversion.h genversion.h.new + echo '#define CC "$(CC)"' > genversion.h.new +- GENDATE=`date`; \ ++ GENDATE="today"; \ + echo '#define BUILT_DATE "'$$GENDATE'"' >> genversion.h.new; \ + echo '#define BUILT_MACH "$(target)"' >> genversion.h.new; \ + mv genversion.h.new genversion.h; \ +Index: amanda-3.5/common-src/Makefile.in =================================================================== ---- amanda-3.3.6.orig/common-src/Makefile.in -+++ amanda-3.3.6/common-src/Makefile.in -@@ -2585,7 +2585,7 @@ genversion.$(OBJEXT): $(genversion_SOURC - genversion.h: $(top_builddir)/config.status - -rm -f $@ [email protected] - echo '#define CC "$(CC)"' > [email protected] -- echo '#define BUILT_DATE "'`date`'"' >> [email protected] -+ echo '#define BUILT_DATE "today"' >> [email protected] - echo '#define BUILT_MACH "$(target)"' >> [email protected] - mv [email protected] $@ - +--- amanda-3.5.orig/common-src/Makefile.in ++++ amanda-3.5/common-src/Makefile.in +@@ -3204,7 +3204,7 @@ genversion.$(OBJEXT): $(genversion_SOURC + genversion.h ../perl/Amanda/Constants.pm.in: $(top_builddir)/config.status + -rm -f genversion.h genversion.h.new + echo '#define CC "$(CC)"' > genversion.h.new +- GENDATE=`date`; \ ++ GENDATE="today"; \ + echo '#define BUILT_DATE "'$$GENDATE'"' >> genversion.h.new; \ + echo '#define BUILT_MACH "$(target)"' >> genversion.h.new; \ + mv genversion.h.new genversion.h; \
