Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at Tue Aug 11 17:55:51 CEST 2009. -------- --- amanda/amanda.changes 2009-02-16 01:12:28.000000000 +0100 +++ amanda/amanda.changes 2009-08-04 02:10:07.097451000 +0200 @@ -1,0 +2,34 @@ +Wed Jul 29 09:58:42 CEST 2009 - mseben@suse.cz + +- updated to version 2.6.1p1 + - amplot: better output + - don't include genversion.h in distribution tarballs. + - many bugs fixed :S3 device driver,rait device driver + amstatus, configure, application-api, others small bug + +------------------------------------------------------------------- +Fri Jun 12 15:39:45 CET 2009 - mseben@suse.cz + +- update to version 2.6.1 + - four new programs implementing application-api: + amgtar, amstar, amsamba, amzfs-sendrecv + - swithching from the program "GNUTAR" to the application "amgtar" + - two new scripts implementing script-api : amzfs-snapshot, script-email + - added new program amarchiver to manipulate file in amanda archive format + - added new perl modules: + * Application (perl utility functions for Applications) + * Archive (Perl access to the amanda archive library) + * Constants (perl access to build-time configuration values) + * MainLoop (Perl interface to the Glib MainLoop) + * Process (interface to process), used by amcleanup. + * Script (perl utility functions for Scripts) + * Tapelist (Manipulate the Amanda tapelist) + * Xfer (Xfer-api) +- obsolete *-no_chown.patch,*-chg-multi.patch,*-gnulib.patch +- added *-return_val.patch to fix NULL return value +- added *-amxfer_version.patch to fix libamxfer version name +- updated amanda-how-to-collection.pdf +- amanda user has now primary group amanda (created in %pre phase) + and supplementary group tape (see also bnc#523006) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- AMANDA-HOWTO-Collection.pdf.tar.bz2 amanda-2.5.2.1-chg-multi.patch amanda-2.5.2.1-gnulib.patch amanda-2.5.2.1-no_chown.patch amanda-2.5.2.1-pie.patch amanda-2.5.2.1-shellbang.patch amanda-2.5.2p1.tar.bz2 New: ---- amanda-2.6.1p1-pie.patch amanda-2.6.1p1-return_val.patch amanda-2.6.1p1-shellbang.patch amanda-2.6.1p1.tar.bz2 amanda-howto-collection.pdf.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.c4luBw/_old 2009-08-11 17:54:36.000000000 +0200 +++ /var/tmp/diff_new_pack.c4luBw/_new 2009-08-11 17:54:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package amanda (Version 2.5.2.1) +# spec file for package amanda (Version 2.6.1.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,28 +16,33 @@ # +%if 0%{?suse_version} <= 1110 + %define amanda_group disk +%else + %define amanda_group amanda +%endif Name: amanda -BuildRequires: cups-libs dump gawk gnuplot krb5-devel libsmbclient libsmbclient-devel libxslt mailx mtx popt-devel readline-devel samba-client sendmail -%define package_version 2.5.2p1 -Version: 2.5.2.1 -Release: 207 -PreReq: /usr/sbin/useradd permissions +BuildRequires: dump glib2-devel gnuplot krb5-devel perl-base popt-devel samba-client sendmail +BuildRequires: cups-libs gawk libsmbclient libsmbclient-devel libxslt mailx mtx readline-devel +%define package_version 2.6.1p1 +Version: 2.6.1.1 +Release: 1 +PreReq: pwdutils permissions Requires: dump /usr/bin/smbclient +Requires: perl = %{perl_version} AutoReqProv: on Group: Productivity/Archiving/Backup -License: GPL v2 or later; X11/MIT +License: GPL v2 or later ; MIT License (or similar) Url: http://www.amanda.org/ Summary: Network Disk Archiver Source: %{name}-%{package_version}.tar.bz2 +#amanda-SuSE.tar.bz2 contain init scripts, config examples Source1: %{name}-SuSE.tar.bz2 -Source2: AMANDA-HOWTO-Collection.pdf.tar.bz2 -Patch1: %{name}-%{version}-pie.patch -Patch2: %{name}-%{version}-no_chown.patch -Patch3: %{name}-%{version}-shellbang.patch -# upstream patch -Patch4: %{name}-%{version}-chg-multi.patch -Patch5: %{name}-%{version}-gnulib.patch +Source2: amanda-howto-collection.pdf.tar.bz2 +Patch1: %{name}-%{package_version}-pie.patch +Patch3: %{name}-%{package_version}-shellbang.patch +Patch4: %{name}-%{package_version}-return_val.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,62 +69,59 @@ %prep %setup -q -a 1 -a 2 -n %{name}-%{package_version} %patch1 -%patch2 %patch3 %patch4 -%patch5 %build -%{suse_update_config ./ config} -# Remove broken libtool macros -sed -i '/m4_include/,$!d' acinclude.m4 -autoreconf -fi +./autogen CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" \ ./configure --mandir=%{_mandir} \ + --with-bsdtcp-security \ + --with-bsdudp-security \ --prefix=%{_prefix} \ --infodir=%{_infodir} \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} \ - --libexecdir=/usr/lib/amanda \ + --libexecdir=/usr/lib \ --localstatedir=/var/lib \ --with-index-server=localhost \ --with-gnutar-listdir=/var/lib/amanda/gnutar-lists \ --with-smbclient=%{_prefix}/bin/smbclient \ - --with-dumperdir=/usr/lib/dumper \ - --with-amandahosts \ + --with-amperldir=%{perl_vendorlib} \ --with-user=amanda \ - --with-group=disk \ + --with-group=%{amanda_group} \ --with-gnutar=/bin/tar \ - --with-maxtapeblocksize=256 \ --disable-libtool \ - --disable-shared \ - --disable-static + --with-amandahosts \ + --disable-installperms make %install make DESTDIR=$RPM_BUILD_ROOT/ install -install -d $RPM_BUILD_ROOT/etc/amanda \ +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/etc/xinetd.d -install NEWS README README.SuSE docs/* example/{amanda.conf,chg-multi.conf,disklist} $RPM_BUILD_ROOT/%{_docdir}/%{name} -rm -f $RPM_BUILD_ROOT/%{_docdir}/%{name}/Makefile* -#chown root:root $RPM_BUILD_ROOT/%{_docdir}/%{name}/* \ -# $RPM_BUILD_ROOT/%{_mandir}/*/* + $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 -# +#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* +%endif # pdf doc -cp AMANDA-HOWTO-Collection.pdf $RPM_BUILD_ROOT/%{_docdir}/%{name}/ -# +cp amanda-howto-collection.pdf $RPM_BUILD_ROOT/%{_docdir}/%{name}/ # label templates cp -a example/*.ps $RPM_BUILD_ROOT/var/lib/amanda/lbl-templ -# +# contain docs,examples which are already included +rm -rf $RPM_BUILD_ROOT/usr/share/amanda +# bnc#412636 +touch $RPM_BUILD_ROOT//usr/lib/amanda/exclude.gtar # create a list of binaries to be checked externally cat << EOF > $RPM_BUILD_ROOT/usr/lib/amanda/suidlist /usr/sbin/amcheck @@ -130,13 +132,20 @@ /usr/lib/amanda/dumper /usr/lib/amanda/killpgrp EOF -rm -rf $RPM_BUILD_ROOT/usr/share/amanda -# bnc#412636 -touch $RPM_BUILD_ROOT/usr/lib/amanda/exclude.gtar %pre -/usr/sbin/useradd -r -o -g disk -u 37 -s /bin/bash -c "Amanda admin" \ --d /var/lib/amanda amanda 2> /dev/null || : +# 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 + /usr/sbin/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 + /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 +#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 || : +# in <= 11.1 use old disk group for amanda user +%else + /usr/sbin/useradd -r -o -g disk -u 37 -s /bin/bash -c "Amanda admin" -d /var/lib/amanda amanda >/dev/null 2>&1 || : +%endif %post %run_permissions @@ -148,61 +157,91 @@ %files %defattr(-,root,root) -%doc AMANDA-HOWTO-Collection.pdf ChangeLog NEWS INSTALL AUTHORS COPYRIGHT README ReleaseNotes docs/*.txt -%doc %{_mandir}/man*/am* +%doc amanda-howto-collection.pdf ChangeLog NEWS AUTHORS COPYRIGHT README ReleaseNotes +%doc %{_mandir}/man*/* %config /usr/lib/amanda/exclude.gtar -%attr(664,amanda,disk) %config(noreplace) /etc/dumpdates -%attr(664,amanda,disk) %config(noreplace) /etc/amandates -%attr(755,amanda,disk) %dir /etc/amanda -%attr(755,amanda,disk) %dir /etc/amanda/example -%dir /usr/lib/amanda -%attr(755,amanda,disk) %dir /var/lib/amanda/ -%attr(755,amanda,disk) %dir /var/lib/amanda/disklist -%attr(755,amanda,disk) %dir /var/lib/amanda/gnutar-lists/ -%attr(755,amanda,disk) %dir /var/lib/amanda/index/ -%attr(755,amanda,disk) %dir /var/lib/amanda/DailySet1 -%attr(755,amanda,disk) %dir /var/lib/amanda/lbl-templ -%attr(644,amanda,disk) /var/lib/amanda/lbl-templ/* -%config %attr(644,amanda,disk) /var/lib/amanda/.bashrc -%config %attr(644,amanda,disk) /var/lib/amanda/.profile +%attr(755,root,root) %dir /usr/lib/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 # bnc#412636 file permissions of .amandahosts should be 600 -%config %attr(600,amanda,disk) /var/lib/amanda/.amandahosts -%config %attr(644,amanda,disk) /etc/amanda/example/amanda.conf -%config %attr(644,amanda,disk) /etc/amanda/example/disklist -%config(noreplace) /etc/xinetd.d/* -%defattr(755,amanda,disk) -/usr/sbin/amadmin -%verify(not mode) %attr(0750,root,disk)/usr/sbin/amcheck -/usr/sbin/amcheckdb -/usr/sbin/amcleanup -/usr/sbin/amdd -/usr/sbin/amdump -/usr/sbin/amflush -/usr/sbin/amgetconf -/usr/sbin/amlabel -/usr/sbin/ammt -/usr/sbin/amoverview -/usr/sbin/amplot -%attr(0750,amanda,disk)/usr/sbin/amrecover -/usr/sbin/amreport -/usr/sbin/amrestore -/usr/sbin/amrmtape -/usr/sbin/amstatus -/usr/sbin/amtape -/usr/sbin/amtapetype -/usr/sbin/amtoc -/usr/sbin/amverify -/usr/sbin/amverifyrun -/usr/sbin/amcrypt-ossl -/usr/sbin/amcrypt-ossl-asym -/usr/sbin/amoldrecover -%defattr(644,amanda,disk) +%config %attr(600,amanda,%{amanda_group}) /var/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/* +# perl scripts +%dir %{perl_vendorlib}/Amanda/ +%dir %{perl_vendorlib}/Amanda/Application +%dir %{perl_vendorlib}/Amanda/Changer +%dir %{perl_vendorlib}/Amanda/DB +%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/Config +%dir %{perl_vendorlib}/auto/Amanda/Debug +%dir %{perl_vendorlib}/auto/Amanda/Device +%dir %{perl_vendorlib}/auto/Amanda/Logfile +%dir %{perl_vendorlib}/auto/Amanda/MainLoop +%dir %{perl_vendorlib}/auto/Amanda/Tapelist +%dir %{perl_vendorlib}/auto/Amanda/Tests +%dir %{perl_vendorlib}/auto/Amanda/Types +%dir %{perl_vendorlib}/auto/Amanda/Util +%dir %{perl_vendorlib}/auto/Amanda/Xfer +%{perl_vendorlib}/Amanda/*/*.pm +%{perl_vendorlib}/Amanda/*.pm +%{perl_vendorlib}/auto/Amanda/*/*.so +%defattr(755,amanda,%{amanda_group}) +%{_sbindir}/amadmin +%{_sbindir}/amcheckdb +%{_sbindir}/amcleanup +%{_sbindir}/amdump +%{_sbindir}/amflush +%{_sbindir}/amgetconf +%{_sbindir}/amlabel +%{_sbindir}/amoverview +%{_sbindir}/amplot +%verify(not mode) %attr(0750,root,%{amanda_group}) %{_sbindir}/amcheck +%attr(0750,amanda,%{amanda_group}) %{_sbindir}/amrecover +%{_sbindir}/amreport +%{_sbindir}/amrestore +%{_sbindir}/amrmtape +%{_sbindir}/amstatus +%{_sbindir}/amtape +%{_sbindir}/amtapetype +%{_sbindir}/amtoc +%{_sbindir}/amcrypt-ossl +%{_sbindir}/amcrypt-ossl-asym +%{_sbindir}/amoldrecover +%{_sbindir}/amgpgcrypt +%{_sbindir}/amaespipe +%{_sbindir}/amcrypt +%{_sbindir}/amfetchdump +%{_sbindir}/amaddclient +%{_sbindir}/amarchiver +%{_sbindir}/amcheckdump +%{_sbindir}/amcryptsimple +%{_sbindir}/amdevcheck +%{_sbindir}/amserverconfig +%{_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 -%defattr(755,amanda,disk) +%defattr(755,amanda,%{amanda_group}) /usr/lib/amanda/amandad /usr/lib/amanda/amidxtaped /usr/lib/amanda/amindexd @@ -225,30 +264,33 @@ /usr/lib/amanda/amcleanupdisk /usr/lib/amanda/amlogroll /usr/lib/amanda/amtrmlog -%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/calcsize -%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/dumper -%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/killpgrp -%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/planner -%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/rundump -%verify(not mode) %attr(0750,root,disk)/usr/lib/amanda/runtar /usr/lib/amanda/patch-system /usr/lib/amanda/selfcheck /usr/lib/amanda/sendbackup /usr/lib/amanda/sendsize /usr/lib/amanda/taper /usr/lib/amanda/versionsuffix -/usr/lib/amanda/chg-lib.sh -%attr(755,amanda,disk) %dir /usr/lib/dumper -/usr/lib/dumper/generic-dumper -/usr/lib/dumper/amgtar /usr/lib/amanda/chunker /usr/lib/amanda/noop -/usr/sbin/amaespipe -/usr/sbin/amcrypt -/usr/sbin/amfetchdump -%{_libdir}/lib* +/usr/lib/amanda/amanda-sh-lib.sh +/usr/lib/amanda/teecount +/usr/lib/amanda/chg-glue +/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/* +# include shared libs +%dir %{_libdir}/amanda/ +%{_libdir}/amanda/lib* # excluding static libs -%exclude %{_libdir}/lib*.la -%exclude %{_libdir}/lib*.a +%exclude %{_libdir}/amanda/lib*.la +%exclude %{_libdir}/amanda/lib*.a +%exclude %{perl_vendorlib}/auto/Amanda/*/*.la +%exclude %{perl_vendorlib}/auto/Amanda/*/*.a %changelog ++++++ amanda-2.6.1p1-pie.patch ++++++ --- amandad-src/Makefile.am +++ amandad-src/Makefile.am @@ -18,6 +18,9 @@ amlibexec_PROGRAMS = amandad +amandad_CFLAGS = -fPIE $(AM_CFLAGS) +amandad_LDFLAGS = -pie $(AM_LDFLAGS) + libamandad_la_SOURCES= amandad_util.c libamandad_la_LDFLAGS = -release $(VERSION) libamandad_la_LIBADD = ../common-src/libamanda.la --- changer-src/Makefile.am +++ changer-src/Makefile.am @@ -18,10 +18,14 @@ if WANT_CHG_SCSI_CHIO CHIO_SCSI = chg-scsi-chio +chg_scsi_chio_CFLAGS = -fPIE $(AM_CFLAGS) +chg_scsi_chio_LDFLAGS = -pie $(AM_LDFLAGS) endif if WANT_CHG_SCSI CHG_SCSI = chg-scsi +chg_scsi_CFLAGS = -fPIE $(AM_CFLAGS) +chg_scsi_LDFLAGS = -pie $(AM_LDFLAGS) endif amlibexec_PROGRAMS = $(CHG_SCSI) --- client-src/Makefile.am +++ client-src/Makefile.am @@ -20,6 +20,25 @@ amlibexec_PROGRAMS = noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix +noop_CFLAGS = -fPIE $(AM_CFLAGS) +noop_LDFLAGS = -pie $(AM_LDFLAGS) +calcsize_CFLAGS = -fPIE $(AM_CFLAGS) +calcsize_LDFLAGS = -pie $(AM_LDFLAGS) +killpgrp_CFLAGS = -fPIE $(AM_CFLAGS) +killpgrp_LDFLAGS = -pie $(AM_LDFLAGS) +rundump_CFLAGS = -fPIE $(AM_CFLAGS) +rundump_LDFLAGS = -pie $(AM_LDFLAGS) +runtar_CFLAGS = -fPIE $(AM_CFLAGS) +runtar_LDFLAGS = -pie $(AM_LDFLAGS) +selfcheck_CFLAGS = -fPIE $(AM_CFLAGS) +selfcheck_LDFLAGS = -pie $(AM_LDFLAGS) +sendbackup_CFLAGS = -fPIE $(AM_CFLAGS) +sendbackup_LDFLAGS = -pie $(AM_LDFLAGS) +sendsize_CFLAGS = -fPIE $(AM_CFLAGS) +sendsize_LDFLAGS = -pie $(AM_LDFLAGS) +versionsuffix_CFLAGS = -fPIE $(AM_CFLAGS) +versionsuffix_LDFLAGS = -pie $(AM_LDFLAGS) + amlibexec_SCRIPTS = patch-system CHECK_PERL = $(sbin_SCRIPTS) --- device-src/Makefile.am +++ device-src/Makefile.am @@ -52,6 +52,8 @@ if WANT_DEVPAY sbin_PROGRAMS += activate-devpay activate_devpay_SOURCES = activate-devpay.c +activate_devpay_CFLAGS = -fPIE $(AM_CFLAGS) +activate_devpay_LDFLAGS = -pie $(AM_LDFLAGS) endif ## headers --- oldrecover-src/Makefile.am +++ oldrecover-src/Makefile.am @@ -18,6 +18,9 @@ sbin_PROGRAMS = amoldrecover +amoldrecover_CFLAGS = -fPIE $(AM_CFLAGS) +amoldrecover_LDFLAGS = -pie $(AM_LDFLAGS) + ### # Because libamanda includes routines (e.g. regex) provided by some system # libraries, and because of the way libtool sets up the command line, we --- recover-src/Makefile.am +++ recover-src/Makefile.am @@ -18,6 +18,9 @@ sbin_PROGRAMS = amrecover +amrecover_CFLAGS = -fPIE $(AM_CFLAGS) +amrecover_LDFLAGS = -pie $(AM_LDFLAGS) + ### # Because libamanda includes routines (e.g. regex) provided by some system # libraries, and because of the way libtool sets up the command line, we --- restore-src/Makefile.am +++ restore-src/Makefile.am @@ -21,8 +21,16 @@ sbin_PROGRAMS = amrestore amfetchdump +amrestore_CFLAGS = -fPIE $(AM_CFLAGS) +amrestore_LDFLAGS = -pie $(AM_LDFLAGS) +amfetchdump_CFLAGS = -fPIE $(AM_CFLAGS) +amfetchdump_LDFLAGS = -pie $(AM_LDFLAGS) + amlibexec_PROGRAMS = amidxtaped +amidxtaped_CFLAGS = -fPIE $(AM_CFLAGS) +amidxtaped_LDFLAGS = -pie $(AM_LDFLAGS) + ### # Because libamanda includes routines (e.g. regex) provided by some system # libraries, and because of the way libtool sets up the command line, we --- server-src/Makefile.am +++ server-src/Makefile.am @@ -24,6 +24,21 @@ amflush amgetconf amlabel \ amtape amreport +amadmin_CFLAGS = -fPIE $(AM_CFLAGS) +amadmin_LDFLAGS = -pie $(AM_LDFLAGS) +amcheck_CFLAGS = -fPIE $(AM_CFLAGS) +amcheck_LDFLAGS = -pie $(AM_LDFLAGS) +amflush_CFLAGS = -fPIE $(AM_CFLAGS) +amflush_LDFLAGS = -pie $(AM_LDFLAGS) +amgetconf_CFLAGS = -fPIE $(AM_CFLAGS) +amgetconf_LDFLAGS = -pie $(AM_LDFLAGS) +amlabel_CFLAGS = -fPIE $(AM_CFLAGS) +amlabel_LDFLAGS = -pie $(AM_LDFLAGS) +amtape_CFLAGS = -fPIE $(AM_CFLAGS) +amtape_LDFLAGS = -pie $(AM_LDFLAGS) +amreport_CFLAGS = -fPIE $(AM_CFLAGS) +amreport_LDFLAGS = -pie $(AM_LDFLAGS) + noinst_PROGRAMS = taper_source_test amlibexec_PROGRAMS = amindexd amlogroll amtrmidx \ @@ -31,6 +46,27 @@ planner taper amcleanupdisk \ chunker +amindexd_CFLAGS = -fPIE $(AM_CFLAGS) +amindexd_LDFLAGS = -pie $(AM_LDFLAGS) +amlogroll_CFLAGS = -fPIE $(AM_CFLAGS) +amlogroll_LDFLAGS = -pie $(AM_LDFLAGS) +amtrmidx_CFLAGS = -fPIE $(AM_CFLAGS) +amtrmidx_LDFLAGS = -pie $(AM_LDFLAGS) +amtrmlog_CFLAGS = -fPIE $(AM_CFLAGS) +amtrmlog_LDFLAGS = -pie $(AM_LDFLAGS) +driver_CFLAGS = -fPIE $(AM_CFLAGS) +driver_LDFLAGS = -pie $(AM_LDFLAGS) +dumper_CFLAGS = -fPIE $(AM_CFLAGS) +dumper_LDFLAGS = -pie $(AM_LDFLAGS) +planner_CFLAGS = -fPIE $(AM_CFLAGS) +planner_LDFLAGS = -pie $(AM_LDFLAGS) +taper_CFLAGS = -fPIE $(AM_CFLAGS) +taper_LDFLAGS = -pie $(AM_LDFLAGS) +amclenupdisk_CFLAGS = -fPIE $(AM_CFLAGS) +amclenupdisk_LDFLAGS = -pie $(AM_LDFLAGS) +chunker_CFLAGS = -fPIE $(AM_CFLAGS) +chunker_LDFLAGS = -pie $(AM_LDFLAGS) + # Exclude scripts which depend on perl extension modules from the syntax checks CHECK_PERL = \ amaddclient \++++++ amanda-2.6.1p1-return_val.patch ++++++ --- perl/Amanda/MainLoop.c +++ perl/Amanda/MainLoop.c @@ -1500,6 +1500,7 @@ static void amglue_source_remove(amglue_Source *self); SWIGINTERN amglue_Source *new_amglue_Source(){ die("Amanda::MainLoop::Source is an abstract base class"); + return NULL; } SWIGINTERN void delete_amglue_Source(amglue_Source *self){ amglue_source_unref(self); ++++++ amanda-2.6.1p1-shellbang.patch ++++++ --- 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 @@ +#!@SHELL@ # Shell library containing functions and definitions common to amanda's # shell scripts and wrappers. ++++++ amanda-2.5.2p1.tar.bz2 -> amanda-2.6.1p1.tar.bz2 ++++++ ++++ 488395 lines of diff (skipped) ++++++ amanda-SuSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSE/etc/amanda/example/amanda.conf new/SuSE/etc/amanda/example/amanda.conf --- old/SuSE/etc/amanda/example/amanda.conf 2008-08-18 17:17:46.000000000 +0200 +++ new/SuSE/etc/amanda/example/amanda.conf 2009-07-15 18:07:59.000000000 +0200 @@ -42,8 +42,7 @@ ctimeout 30 # maximum number of seconds that amcheck waits # for each client host - -tapebufs 20 + # A positive integer telling taper how many 32k buffers to allocate. # WARNING! If this is set too high, taper will not be able to allocate # the memory and will die. The default is 20 (640k). @@ -70,14 +69,13 @@ runtapes 1 # number of tapes to be used in a single run of amdump #tpchanger "chg-manual" # the tape-changer glue script tapedev "/dev/nst0" # the no-rewind tape device to be used -rawtapedev "/dev/nst0" # the raw device to be used (ftape only) #changerfile "/var/lib/amanda/DailySet1/changer" #changerfile "/var/lib/amanda/DailySet1/changer-status" #changerfile "/etc/amanda/DailySet1/changer.conf" #changerdev "/dev/null" tapetype HP-DAT # what kind of tape it is (see tapetypes below) -labelstr "^DailySet1[0-9][0-9]*$" # label constraint regex: all tapes must match +labelstr "^DailySet1-[0-9][0-9]*$" # label constraint regex: all tapes must match # Specify holding disks. These are used as a temporary staging area for # dumps before they are written to tape and are recommended for most sites. @@ -382,6 +380,7 @@ # indexing, recording, etc. Some examples: # index yes # record no + # auth "bsdudp" } define dumptype always-full { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSE/etc/xinetd.d/amanda new/SuSE/etc/xinetd.d/amanda --- old/SuSE/etc/xinetd.d/amanda 2003-02-28 17:19:40.000000000 +0100 +++ new/SuSE/etc/xinetd.d/amanda 2009-07-31 21:34:50.000000000 +0200 @@ -7,8 +7,9 @@ protocol = udp wait = yes user = amanda - group = disk + group = amanda server = /usr/lib/amanda/amandad disable = yes + server_args = -auth=bsdudp amdump } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSE/etc/xinetd.d/amandaidx new/SuSE/etc/xinetd.d/amandaidx --- old/SuSE/etc/xinetd.d/amandaidx 2003-02-28 17:22:04.000000000 +0100 +++ new/SuSE/etc/xinetd.d/amandaidx 2009-07-31 21:34:55.000000000 +0200 @@ -7,7 +7,7 @@ protocol = tcp wait = no user = amanda - group = disk + group = amanda server = /usr/lib/amanda/amindexd disable = yes } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSE/etc/xinetd.d/amidxtape new/SuSE/etc/xinetd.d/amidxtape --- old/SuSE/etc/xinetd.d/amidxtape 2003-07-25 14:33:04.000000000 +0200 +++ new/SuSE/etc/xinetd.d/amidxtape 2009-07-31 21:35:01.000000000 +0200 @@ -7,7 +7,7 @@ protocol = tcp wait = no user = amanda - group = disk + group = amanda server = /usr/lib/amanda/amidxtaped disable = yes } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org