Hello community, here is the log from the commit of package prelink for openSUSE:Factory checked in at 2015-05-02 21:37:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prelink (Old) and /work/SRC/openSUSE:Factory/.prelink.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prelink" Changes: -------- --- /work/SRC/openSUSE:Factory/prelink/prelink.changes 2013-09-26 07:12:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.prelink.new/prelink.changes 2015-05-02 21:37:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 29 13:05:07 UTC 2015 - [email protected] + +- prelink-make-dry-run-verbose.diff: remove doit.c part, it was + making the action happen even in dryrun mode. bsc#923948 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prelink.spec ++++++ --- /var/tmp/diff_new_pack.uDJmiG/_old 2015-05-02 21:37:10.000000000 +0200 +++ /var/tmp/diff_new_pack.uDJmiG/_new 2015-05-02 21:37:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package prelink # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ prelink-make-dry-run-verbose.diff ++++++ --- /var/tmp/diff_new_pack.uDJmiG/_old 2015-05-02 21:37:11.000000000 +0200 +++ /var/tmp/diff_new_pack.uDJmiG/_new 2015-05-02 21:37:11.000000000 +0200 @@ -59,9 +59,19 @@ } if (info->conflict_rela_size) +--- src/execstack.c ++++ src/execstack.c +@@ -31,6 +31,7 @@ + + int set; + int execflag; ++int dry_run = 0; // for arch-i386 + + const char *argp_program_version = "execstack 1.0"; + --- src/doit.c +++ src/doit.c -@@ -137,10 +137,6 @@ +@@ -121,22 +121,17 @@ goto error_out; } @@ -69,28 +79,29 @@ - close_dso (dso); - else - { - if (prelink_prepare (dso)) - goto make_unprelinkable; - if (ent->type == ET_DYN && relocate_dso (dso, ent->base)) -@@ -152,7 +148,10 @@ - dso = NULL; - goto error_out; - } +- if (prelink_prepare (dso)) +- goto make_unprelinkable; +- if (ent->type == ET_DYN && relocate_dso (dso, ent->base)) +- goto make_unprelinkable; +- if (prelink (dso, ent)) +- goto make_unprelinkable; +- if (update_dso (dso, NULL)) +- { +- dso = NULL; +- goto error_out; +- } - } -+ -+ if (dry_run) -+ close_dso (dso); -+ ++ if (prelink_prepare (dso)) goto make_unprelinkable; ++ if (ent->type == ET_DYN && relocate_dso (dso, ent->base)) ++ goto make_unprelinkable; ++ if (prelink (dso, ent)) goto make_unprelinkable; ++ ++ if (dry_run) close_dso (dso); ++ else if (update_dso (dso, NULL)) { ++ dso = NULL; ++ goto error_out; ++ } ++ ent->done = 2; ent->flags |= PCF_PRELINKED; ---- src/execstack.c -+++ src/execstack.c -@@ -31,6 +31,7 @@ - - int set; - int execflag; -+int dry_run = 0; // for arch-i386 - - const char *argp_program_version = "execstack 1.0"; -
