Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at 2014-11-29 08:39:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amanda (Old) and /work/SRC/openSUSE:Factory/.amanda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amanda" Changes: -------- --- /work/SRC/openSUSE:Factory/amanda/amanda.changes 2014-09-17 21:25:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amanda.new/amanda.changes 2014-11-29 08:39:56.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 27 08:20:00 UTC 2014 - mpluskal@suse.com + +- Fix for boo#907361 -- amanda-2.6.1p1-fix-perl-format.patch +- Clean spec file with spec-cleaner + +------------------------------------------------------------------- New: ---- amanda-2.6.1p1-fix-perl-format.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.sb2zNx/_old 2014-11-29 08:39:57.000000000 +0100 +++ /var/tmp/diff_new_pack.sb2zNx/_new 2014-11-29 08:39:57.000000000 +0100 @@ -22,13 +22,24 @@ %else %define amanda_group amanda %endif - Name: amanda Version: 3.3.6 Release: 0 - -PreReq: pwdutils permissions - +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 +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 BuildRequires: automake BuildRequires: cups-client BuildRequires: dump @@ -48,26 +59,12 @@ BuildRequires: readline-devel BuildRequires: samba-client BuildRequires: sendmail - -Requires: /usr/bin/smbclient +Requires: %{_bindir}/smbclient Requires: dump Requires: perl = %{perl_version} -Url: http://www.amanda.org/ -Summary: Network Disk Archiver -License: GPL-3.0+ -Group: Productivity/Archiving/Backup - -Source: %{name}-%{version}.tar.gz -#amanda-SuSE.tar.bz2 contain init scripts, config examples -Source1: %{name}-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 +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: permissions +PreReq: pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -84,12 +81,13 @@ %patch9 -p1 %patch10 %patch11 +%patch12 -p1 %build ./autogen -CFLAGS="$RPM_OPT_FLAGS -U BUILD_DATE -U BUILD_MACH -fno-strict-aliasing -fPIC -fPIE" \ -CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -fPIE" \ +CFLAGS="%{optflags} -U BUILD_DATE -U BUILD_MACH -fno-strict-aliasing -fPIC -fPIE" \ +CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fPIE" \ LDFLAGS="-pie" \ ./configure --mandir=%{_mandir} \ --with-bsdtcp-security --with-bsdudp-security \ @@ -98,11 +96,11 @@ --infodir=%{_infodir} \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} \ - --libexecdir=/usr/lib \ - --localstatedir=/var/lib \ + --libexecdir=%{_libexecdir} \ + --localstatedir=%{_localstatedir}/lib \ --with-index-server=localhost \ - --with-gnutar-listdir=/var/lib/amanda/gnutar-lists \ - --with-smbclient=%{_prefix}/bin/smbclient \ + --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \ + --with-smbclient=%{_bindir}/smbclient \ --with-amperldir=%{perl_vendorlib} \ --with-user=amanda \ --with-group=%{amanda_group} \ @@ -113,42 +111,42 @@ make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT/ install -install -d $RPM_BUILD_ROOT/%{_sysconfdir}/amanda \ - $RPM_BUILD_ROOT/var/lib/amanda/index \ - $RPM_BUILD_ROOT/var/lib/amanda/gnutar-lists \ - $RPM_BUILD_ROOT/var/lib/amanda/disklist \ - $RPM_BUILD_ROOT/var/lib/amanda/DailySet1 \ - $RPM_BUILD_ROOT/var/lib/amanda/lbl-templ \ - $RPM_BUILD_ROOT/%{_docdir}/%{name} \ - $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d -install NEWS README README.SuSE example/{amanda.conf,chg-multi.conf,disklist} $RPM_BUILD_ROOT/%{_docdir}/%{name} -chmod 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/* \ - $RPM_BUILD_ROOT/%{_mandir}/*/* -cp -a SuSE/* $RPM_BUILD_ROOT +make DESTDIR=%{buildroot}/ install +install -d %{buildroot}/%{_sysconfdir}/amanda \ + %{buildroot}%{_localstatedir}/lib/amanda/index \ + %{buildroot}%{_localstatedir}/lib/amanda/gnutar-lists \ + %{buildroot}%{_localstatedir}/lib/amanda/disklist \ + %{buildroot}%{_localstatedir}/lib/amanda/DailySet1 \ + %{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|' $RPM_BUILD_ROOT/etc/xinetd.d/am* + sed -i 's|amanda|disk|' %{buildroot}%{_sysconfdir}/xinetd.d/am* %endif # pdf doc -cp amanda-howto-collection.pdf $RPM_BUILD_ROOT/%{_docdir}/%{name}/ +cp amanda-howto-collection.pdf %{buildroot}/%{_docdir}/%{name}/ # label templates -cp -a example/*.ps $RPM_BUILD_ROOT/var/lib/amanda/lbl-templ +cp -a example/*.ps %{buildroot}%{_localstatedir}/lib/amanda/lbl-templ # contain docs,examples which are already included -rm -rf $RPM_BUILD_ROOT/usr/share/amanda +rm -rf %{buildroot}%{_datadir}/amanda # bnc#412636 -touch $RPM_BUILD_ROOT//usr/lib/amanda/exclude.gtar +touch %{buildroot}/%{_libexecdir}/amanda/exclude.gtar # delete all static linking remnats -find $RPM_BUILD_ROOT \( -name "*.a" -o -name "*.la" \) -delete +find %{buildroot} \( -name "*.a" -o -name "*.la" \) -delete # create a list of binaries to be checked externally -cat << EOF > $RPM_BUILD_ROOT/usr/lib/amanda/suidlist -/usr/sbin/amcheck -/usr/lib/amanda/calcsize -/usr/lib/amanda/rundump -/usr/lib/amanda/planner -/usr/lib/amanda/runtar -/usr/lib/amanda/dumper -/usr/lib/amanda/killpgrp +cat << EOF > %{buildroot}%{_libexecdir}/amanda/suidlist +%{_sbindir}/amcheck +%{_libexecdir}/amanda/calcsize +%{_libexecdir}/amanda/rundump +%{_libexecdir}/amanda/planner +%{_libexecdir}/amanda/runtar +%{_libexecdir}/amanda/dumper +%{_libexecdir}/amanda/killpgrp EOF %pre @@ -156,33 +154,33 @@ # so we must check group for "amanda" user %if 0%{?suse_version} > 1110 # create primary group for amanda user - /usr/sbin/groupadd -r amanda 2>/dev/null || : + %{_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) - /usr/bin/id -n -g amanda 2>&1 | grep "disk" >/dev/null \ - && /usr/sbin/usermod -g amanda -G tape amanda \ - || /usr/sbin/usermod -g amanda amanda 2>&1 \ + %{_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 - /usr/sbin/useradd -r -o -g amanda -G tape -u 37 -s /bin/bash \ - -c "Amanda admin" -d /var/lib/amanda amanda >/dev/null 2>&1 || : + %{_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 - /usr/sbin/useradd -r -o -g disk -u 37 -s /bin/bash \ - -c "Amanda admin" -d /var/lib/amanda amanda >/dev/null 2>&1 || : + %{_sbindir}/useradd -r -o -g disk -u 37 -s /bin/bash \ + -c "Amanda admin" -d %{_localstatedir}/lib/amanda amanda >/dev/null 2>&1 || : %endif %post %if 0%{?set_permissions:1} -%set_permissions /usr/sbin/amcheck /usr/lib/amanda/calcsize /usr/lib/amanda/rundump /usr/lib/amanda/planner /usr/lib/amanda/runtar /usr/lib/amanda/dumper /usr/lib/amanda/killpgrp +%set_permissions %{_sbindir}/amcheck %{_libexecdir}/amanda/calcsize %{_libexecdir}/amanda/rundump %{_libexecdir}/amanda/planner %{_libexecdir}/amanda/runtar %{_libexecdir}/amanda/dumper %{_libexecdir}/amanda/killpgrp %else %run_permissions %endif %if 0%{?suse_version} >= 1120 %verifyscript -%verify_permissions -f /usr/lib/amanda/suidlist +%verify_permissions -f %{_libexecdir}/amanda/suidlist %endif %files @@ -190,23 +188,23 @@ %doc %attr(644,root,root) amanda-howto-collection.pdf ChangeLog NEWS AUTHORS COPYRIGHT README ReleaseNotes %doc %attr(755,root,root) %dir %{_docdir}/%{name} %doc %{_mandir}/man*/* -%config /usr/lib/amanda/exclude.gtar -%attr(755,root,root) %dir /usr/lib/amanda +%config %{_libexecdir}/amanda/exclude.gtar +%attr(755,root,root) %dir %{_libexecdir}/amanda %attr(664,amanda,%{amanda_group}) %config(noreplace) %{_sysconfdir}/dumpdates %attr(664,amanda,%{amanda_group}) %config(noreplace) %{_sysconfdir}/amandates %attr(755,amanda,%{amanda_group}) %dir %{_sysconfdir}/amanda %attr(755,amanda,%{amanda_group}) %dir %{_sysconfdir}/amanda/example -%attr(755,amanda,%{amanda_group}) %dir /var/lib/amanda/ -%attr(755,amanda,%{amanda_group}) %dir /var/lib/amanda/disklist -%attr(755,amanda,%{amanda_group}) %dir /var/lib/amanda/gnutar-lists/ -%attr(755,amanda,%{amanda_group}) %dir /var/lib/amanda/index/ -%attr(755,amanda,%{amanda_group}) %dir /var/lib/amanda/DailySet1 -%attr(755,amanda,%{amanda_group}) %dir /var/lib/amanda/lbl-templ -%attr(644,amanda,%{amanda_group}) /var/lib/amanda/lbl-templ/* -%config %attr(644,amanda,%{amanda_group}) /var/lib/amanda/.bashrc -%config %attr(644,amanda,%{amanda_group}) /var/lib/amanda/.profile +%attr(755,amanda,%{amanda_group}) %dir %{_localstatedir}/lib/amanda/ +%attr(755,amanda,%{amanda_group}) %dir %{_localstatedir}/lib/amanda/disklist +%attr(755,amanda,%{amanda_group}) %dir %{_localstatedir}/lib/amanda/gnutar-lists/ +%attr(755,amanda,%{amanda_group}) %dir %{_localstatedir}/lib/amanda/index/ +%attr(755,amanda,%{amanda_group}) %dir %{_localstatedir}/lib/amanda/DailySet1 +%attr(755,amanda,%{amanda_group}) %dir %{_localstatedir}/lib/amanda/lbl-templ +%attr(644,amanda,%{amanda_group}) %{_localstatedir}/lib/amanda/lbl-templ/* +%config %attr(644,amanda,%{amanda_group}) %{_localstatedir}/lib/amanda/.bashrc +%config %attr(644,amanda,%{amanda_group}) %{_localstatedir}/lib/amanda/.profile # bnc#412636 file permissions of .amandahosts should be 600 -%config %attr(600,amanda,%{amanda_group}) /var/lib/amanda/.amandahosts +%config %attr(600,amanda,%{amanda_group}) %{_localstatedir}/lib/amanda/.amandahosts %config %attr(644,amanda,%{amanda_group}) %{_sysconfdir}/amanda/example/amanda.conf %config %attr(644,amanda,%{amanda_group}) %{_sysconfdir}/amanda/example/disklist %config(noreplace) %{_sysconfdir}/xinetd.d/* @@ -284,46 +282,46 @@ %{_sbindir}/amservice %{_sbindir}/amvault %defattr(644,amanda,%{amanda_group}) -/usr/lib/amanda/suidlist -/usr/lib/amanda/amcat.awk -/usr/lib/amanda/amplot.awk -/usr/lib/amanda/amplot.g -/usr/lib/amanda/amplot.gp +%{_libexecdir}/amanda/suidlist +%{_libexecdir}/amanda/amcat.awk +%{_libexecdir}/amanda/amplot.awk +%{_libexecdir}/amanda/amplot.g +%{_libexecdir}/amanda/amplot.gp %defattr(755,amanda,%{amanda_group}) -/usr/lib/amanda/amandad -/usr/lib/amanda/amdumpd -/usr/lib/amanda/amidxtaped -/usr/lib/amanda/amindexd -/usr/lib/amanda/amtrmidx -/usr/lib/amanda/chg-disk -/usr/lib/amanda/chg-manual -/usr/lib/amanda/chg-multi -/usr/lib/amanda/chg-zd-mtx -/usr/lib/amanda/driver -/usr/lib/amanda/amcheck-device +%{_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/amcheck-device %{_sbindir}/amcleanupdisk -/usr/lib/amanda/amlogroll -/usr/lib/amanda/amndmjob -/usr/lib/amanda/amtrmlog -/usr/lib/amanda/patch-system -/usr/lib/amanda/selfcheck -/usr/lib/amanda/sendbackup -/usr/lib/amanda/sendsize -/usr/lib/amanda/taper -/usr/lib/amanda/chunker -/usr/lib/amanda/noop -/usr/lib/amanda/ndmjob -/usr/lib/amanda/amanda-sh-lib.sh -/usr/lib/amanda/teecount -/usr/lib/amanda/chg-lib.sh -%verify(not mode) %attr(0750,root,%{amanda_group})/usr/lib/amanda/calcsize -%verify(not mode) %attr(0750,root,%{amanda_group})/usr/lib/amanda/dumper -%verify(not mode) %attr(0750,root,%{amanda_group})/usr/lib/amanda/killpgrp -%verify(not mode) %attr(0750,root,%{amanda_group})/usr/lib/amanda/planner -%verify(not mode) %attr(0750,root,%{amanda_group})/usr/lib/amanda/rundump -%verify(not mode) %attr(0750,root,%{amanda_group})/usr/lib/amanda/runtar -%dir /usr/lib/amanda/application/ -/usr/lib/amanda/application/* +%{_libexecdir}/amanda/amlogroll +%{_libexecdir}/amanda/amndmjob +%{_libexecdir}/amanda/amtrmlog +%{_libexecdir}/amanda/patch-system +%{_libexecdir}/amanda/selfcheck +%{_libexecdir}/amanda/sendbackup +%{_libexecdir}/amanda/sendsize +%{_libexecdir}/amanda/taper +%{_libexecdir}/amanda/chunker +%{_libexecdir}/amanda/noop +%{_libexecdir}/amanda/ndmjob +%{_libexecdir}/amanda/amanda-sh-lib.sh +%{_libexecdir}/amanda/teecount +%{_libexecdir}/amanda/chg-lib.sh +%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 +%verify(not mode) %attr(0750,root,%{amanda_group})%{_libexecdir}/amanda/planner +%verify(not mode) %attr(0750,root,%{amanda_group})%{_libexecdir}/amanda/rundump +%verify(not mode) %attr(0750,root,%{amanda_group})%{_libexecdir}/amanda/runtar +%dir %{_libexecdir}/amanda/application/ +%{_libexecdir}/amanda/application/* # include shared libs %dir %{_libdir}/amanda/ %{_libdir}/amanda/lib* ++++++ amanda-2.6.1p1-fix-perl-format.patch ++++++ index e18817a..9507676 100644 --- a/perl/Amanda/Report/human.pm +++ b/perl/Amanda/Report/human.pm @@ -85,8 +85,9 @@ sub divzero_col sub swrite { my ( $format, @args ) = @_; + my @copy_args = @args; local $^A = ""; - formline( $format, @args ); + formline( $format, @copy_args ); return $^A; } @@ -382,7 +383,7 @@ sub print_header unless ($report->{flags}{got_finish}); my $header_format = <<EOF; -@<<<<<<<: @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<... +@<<<<<<<: ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<... EOF if ($hostname) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org