Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at Fri Nov 27 16:26:11 CET 2009. -------- --- amanda/amanda.changes 2009-08-31 15:05:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/amanda/amanda.changes 2009-11-25 21:57:55.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 25 21:56:44 CET 2009 - meissner@suse.de + +- rediffed patches + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.QIjRW6/_old 2009-11-27 16:25:39.000000000 +0100 +++ /var/tmp/diff_new_pack.QIjRW6/_new 2009-11-27 16:25:39.000000000 +0100 @@ -27,13 +27,13 @@ BuildRequires: cups-libs gawk libsmbclient libsmbclient-devel libxslt mailx mtx readline-devel %define package_version 2.6.1p1 Version: 2.6.1.1 -Release: 2 +Release: 3 PreReq: pwdutils permissions Requires: dump /usr/bin/smbclient Requires: perl = %{perl_version} AutoReqProv: on Group: Productivity/Archiving/Backup -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Url: http://www.amanda.org/ Summary: Network Disk Archiver Source: %{name}-%{package_version}.tar.bz2 @@ -68,7 +68,7 @@ %prep %setup -q -a 1 -a 2 -n %{name}-%{package_version} -%patch1 +%patch1 -p1 %patch3 %patch4 ++++++ amanda-2.6.1p1-pie.patch ++++++ --- /var/tmp/diff_new_pack.QIjRW6/_old 2009-11-27 16:25:39.000000000 +0100 +++ /var/tmp/diff_new_pack.QIjRW6/_new 2009-11-27 16:25:39.000000000 +0100 @@ -1,6 +1,6 @@ ---- amandad-src/Makefile.am -+++ amandad-src/Makefile.am -@@ -18,6 +18,9 @@ +--- amanda-2.6.1p1/amandad-src/Makefile.am.orig 2008-12-01 22:17:16.000000000 +0100 ++++ amanda-2.6.1p1/amandad-src/Makefile.am 2009-11-25 21:54:45.643486000 +0100 +@@ -19,6 +19,9 @@ amlibexec_PROGRAMS = amandad @@ -10,55 +10,10 @@ 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 +--- amanda-2.6.1p1/device-src/Makefile.am.orig 2008-12-01 22:17:17.000000000 +0100 ++++ amanda-2.6.1p1/device-src/Makefile.am 2009-11-25 21:54:45.672471000 +0100 +@@ -66,6 +66,8 @@ + if WANT_S3_DEVICE sbin_PROGRAMS += activate-devpay activate_devpay_SOURCES = activate-devpay.c +activate_devpay_CFLAGS = -fPIE $(AM_CFLAGS) @@ -66,54 +21,11 @@ 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 +--- amanda-2.6.1p1/server-src/Makefile.am.orig 2008-12-08 02:59:26.000000000 +0100 ++++ amanda-2.6.1p1/server-src/Makefile.am 2009-11-25 21:54:45.734485000 +0100 +@@ -25,6 +25,21 @@ + amservice amtape \ + amreport +amadmin_CFLAGS = -fPIE $(AM_CFLAGS) +amadmin_LDFLAGS = -pie $(AM_LDFLAGS) @@ -133,7 +45,7 @@ noinst_PROGRAMS = taper_source_test amlibexec_PROGRAMS = amindexd amlogroll amtrmidx \ -@@ -31,6 +46,27 @@ +@@ -32,6 +47,27 @@ planner taper amcleanupdisk \ chunker @@ -160,4 +72,47 @@ + # Exclude scripts which depend on perl extension modules from the syntax checks CHECK_PERL = \ - amaddclient \ \ No newline at end of file + amaddclient \ +--- amanda-2.6.1p1/restore-src/Makefile.am.orig 2008-12-01 22:17:19.000000000 +0100 ++++ amanda-2.6.1p1/restore-src/Makefile.am 2009-11-25 21:54:45.713482000 +0100 +@@ -22,8 +22,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 +--- amanda-2.6.1p1/recover-src/Makefile.am.orig 2008-12-01 22:17:17.000000000 +0100 ++++ amanda-2.6.1p1/recover-src/Makefile.am 2009-11-25 21:54:45.706471000 +0100 +@@ -20,6 +20,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 +--- amanda-2.6.1p1/oldrecover-src/Makefile.am.orig 2008-12-01 22:17:16.000000000 +0100 ++++ amanda-2.6.1p1/oldrecover-src/Makefile.am 2009-11-25 21:54:45.681471000 +0100 +@@ -19,6 +19,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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org