Hello community, here is the log from the commit of package prelink for openSUSE:Factory checked in at Mon Mar 15 15:27:55 CET 2010. -------- --- prelink/prelink.changes 2010-01-30 11:08:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/prelink/prelink.changes 2010-03-15 14:43:39.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 15 14:42:31 CET 2010 - meissner@suse.de + +- updated to 20100106 + Naming seems to be snapshot based these days. + - Lots of fixes and improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- prelink-20071009.tar.bz2 New: ---- prelink-20100106.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prelink.spec ++++++ --- /var/tmp/diff_new_pack.JC6Gi0/_old 2010-03-15 15:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.JC6Gi0/_new 2010-03-15 15:27:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package prelink (Version 0.4.0) +# spec file for package prelink (Version 20100106) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,19 +21,19 @@ Name: prelink BuildRequires: gcc-c++ libelf0-devel Summary: An ELF Prelinking Utility -Version: 0.4.0 -Release: 40 +Version: 20100106 +Release: 1 Group: System/Base License: GPLv2+ Url: ftp://people.redhat.com/jakub/prelink PreReq: %fillup_prereq -Source: prelink-20071009.tar.bz2 -Source2: prelink.conf -Source3: SuSEconfig.prelink -Source4: sysconfig.prelink -Patch0: prelink-make_it_cool.diff -Patch3: prelink-tests.diff -Patch4: prelink-make-dry-run-verbose.diff +Source: %name-%version.tar.bz2 +Source2: %name.conf +Source3: SuSEconfig.%name +Source4: sysconfig.%name +Patch0: %name-make_it_cool.diff +Patch3: %name-tests.diff +Patch4: %name-make-dry-run-verbose.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # It does not work at all on ia64, so let's listen upstream supported # architectures ++++++ prelink-20071009.tar.bz2 -> prelink-20100106.tar.bz2 ++++++ ++++ 4014 lines of diff (skipped) ++++++ prelink-make-dry-run-verbose.diff ++++++ --- /var/tmp/diff_new_pack.JC6Gi0/_old 2010-03-15 15:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.JC6Gi0/_new 2010-03-15 15:27:40.000000000 +0100 @@ -31,7 +31,7 @@ case R_386_TLS_TPOFF32: --- src/conflict.c +++ src/conflict.c -@@ -453,9 +453,9 @@ +@@ -461,9 +461,9 @@ goto error_out; info->dsos[i] = dso; /* Now check that the DSO matches what we recorded about it. */ @@ -43,15 +43,15 @@ { error (0, 0, "%s: Library %s has changed since it has been prelinked", info->dso->filename, ent->filename); -@@ -749,6 +749,7 @@ - info->dynbss + cr.rela[i].r_offset - - info->dynbss_base, cr.rela[i].r_addend); +@@ -772,6 +772,7 @@ + - info->dynbss_base, cr.rela[i].r_addend, + cr.rela[i].r_offset); -+ if (!dry_run) { ++ if (!dry_run) { switch (j) { case 1: -@@ -763,6 +764,7 @@ +@@ -786,6 +787,7 @@ goto error_out; } } ++++++ prelink-make_it_cool.diff ++++++ --- /var/tmp/diff_new_pack.JC6Gi0/_old 2010-03-15 15:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.JC6Gi0/_new 2010-03-15 15:27:40.000000000 +0100 @@ -10,17 +10,17 @@ goto error_out; info->dsos[i] = dso; /* Now check that the DSO matches what we recorded about it. */ -@@ -533,8 +533,8 @@ - && dso->phdr[k].p_vaddr + dso->phdr[k].p_memsz - > info->conflict_rela[j].r_offset) - { -- error (0, 0, "%s: Cannot prelink against non-PIC shared library %s", -- info->dso->filename, dso->filename); -+ error (0, 0, "%s: shared library %s appears possibly non-PIC and contains conflicts. Symbol offset: %lx", -+ info->dso->filename, dso->filename, (long)info->conflict_rela[j].r_offset); - goto error_out; - } - } +@@ -623,8 +623,8 @@ + && dso->phdr[k].p_vaddr + dso->phdr[k].p_memsz + > info->conflict_rela[j].r_offset) + { +- error (0, 0, "%s: Cannot prelink against non-PIC shared library %s", +- info->dso->filename, dso->filename); ++ error (0, 0, "%s: shared library %s appears possibly non-PIC and contains conflicts. Symbol offset: %lx", ++ info->dso->filename, dso->filename, (long)info->conflict_rela[j].r_offset); + goto error_out; + } + } --- src.orig/gather.c 2002-12-03 19:55:59.000000000 +0100 +++ src/gather.c 2003-01-07 12:53:31.000000000 +0100 @@ -369,7 +369,7 @@ ++++++ prelink-tests.diff ++++++ --- /var/tmp/diff_new_pack.JC6Gi0/_old 2010-03-15 15:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.JC6Gi0/_new 2010-03-15 15:27:40.000000000 +0100 @@ -67,30 +67,21 @@ . `dirname $0`/functions.sh rm -f reloc11 reloc11lib*.so reloc11.log rm -f prelink.cache ---- testsuite/reloc8.sh -+++ testsuite/reloc8.sh -@@ -1,12 +1,10 @@ - #!/bin/bash +--- testsuite/reloc2.sh.orig 2009-12-16 13:02:06.000000000 +0100 ++++ testsuite/reloc2.sh 2010-03-15 14:39:16.353657000 +0100 +@@ -2,8 +2,7 @@ . `dirname $0`/functions.sh --# Disable this test under SELinux --test -x /usr/sbin/getenforce -a "`/usr/sbin/getenforce`" = Enforcing && exit 77 - rm -f reloc8 reloc8lib*.so reloc8.log - rm -f prelink.cache - NOCOPYRELOC=-Wl,-z,nocopyreloc + SHFLAGS= case "`uname -m`" in -- x86_64|s390*) if file reloc1lib1.so | grep -q 64-bit; then NOCOPYRELOC=; fi;; -+ x86_64|s390*|alpha) NOCOPYRELOC=; ;; +- ia64|ppc*|x86_64|mips*|arm*) SHFLAGS=-fpic;; # Does not support non-pic shared libs +- s390*) if file reloc1lib1.so | grep -q 64-bit; then SHFLAGS=-fpic; fi;; ++ ia64|ppc*|x86_64|mips*|s390*) SHFLAGS=-fpic;; # Does not support non-pic shared libs esac - $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc8lib1.so $srcdir/reloc3lib1.c - $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc8lib2.so $srcdir/reloc1lib2.c reloc8lib1.so ---- testsuite/reloc9.sh -+++ testsuite/reloc9.sh -@@ -1,12 +1,10 @@ - #!/bin/bash - . `dirname $0`/functions.sh --# Disable this test under SELinux --test -x /usr/sbin/getenforce -a "`/usr/sbin/getenforce`" = Enforcing && exit 77 - rm -f reloc9 reloc9lib*.so reloc9.log + # Disable this test under SELinux if textrel + if test -z "$SHFLAGS" -a -x /usr/sbin/getenforce; then +--- testsuite/reloc9.sh.orig 2009-12-16 13:23:03.000000000 +0100 ++++ testsuite/reloc9.sh 2010-03-15 14:38:33.361358000 +0100 +@@ -11,7 +11,7 @@ rm -f prelink.cache NOCOPYRELOC=-Wl,-z,nocopyreloc case "`uname -m`" in @@ -99,15 +90,14 @@ esac $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc9lib1.so $srcdir/reloc3lib1.c $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc9lib2.so $srcdir/reloc1lib2.c reloc9lib1.so ---- testsuite/reloc2.sh.orig 2007-06-27 15:42:52.000000000 +0200 -+++ testsuite/reloc2.sh 2010-01-30 11:07:13.528008000 +0100 -@@ -2,8 +2,7 @@ - . `dirname $0`/functions.sh - SHFLAGS= +--- testsuite/reloc8.sh.orig 2009-12-16 13:22:56.000000000 +0100 ++++ testsuite/reloc8.sh 2010-03-15 14:38:02.846940000 +0100 +@@ -11,7 +11,7 @@ + rm -f prelink.cache + NOCOPYRELOC=-Wl,-z,nocopyreloc case "`uname -m`" in -- ia64|ppc*|x86_64|mips*) SHFLAGS=-fpic;; # Does not support non-pic shared libs -- s390*) if file reloc1lib1.so | grep -q 64-bit; then SHFLAGS=-fpic; fi;; -+ ia64|ppc*|x86_64|mips*|s390*) SHFLAGS=-fpic;; # Does not support non-pic shared libs +- x86_64|s390*) if file reloc1lib1.so | grep -q 64-bit; then NOCOPYRELOC=; fi;; ++ x86_64|s390*|alpha) NOCOPYRELOC=; ;; esac - # Disable this test under SELinux if textrel - test -z "$SHFLAGS" -a -x /usr/sbin/getenforce -a "`/usr/sbin/getenforce`" = Enforcing && exit 77 + $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc8lib1.so $srcdir/reloc3lib1.c + $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc8lib2.so $srcdir/reloc1lib2.c reloc8lib1.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org