Hello community, here is the log from the commit of package patch for openSUSE:Factory checked in at 2014-06-18 22:04:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patch (Old) and /work/SRC/openSUSE:Factory/.patch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patch" Changes: -------- --- /work/SRC/openSUSE:Factory/patch/patch.changes 2012-12-10 12:20:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.patch.new/patch.changes 2014-06-18 22:04:31.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 20 07:44:03 UTC 2014 - sch...@suse.de + +- error-report-crash.patch: fix crash after reporting error during option + parsing + +------------------------------------------------------------------- New: ---- error-report-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patch.spec ++++++ --- /var/tmp/diff_new_pack.kLKS9s/_old 2014-06-18 22:04:32.000000000 +0200 +++ /var/tmp/diff_new_pack.kLKS9s/_new 2014-06-18 22:04:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package patch # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ License: GPL-3.0+ Group: Productivity/Text/Utilities Source: http://ftp.gnu.org/gnu/patch/patch-%version.tar.bz2 +Patch: error-report-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,6 +44,7 @@ %prep %setup -q +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" ++++++ error-report-crash.patch ++++++ >From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher <agr...@linbit.com> Date: Thu, 4 Oct 2012 12:33:09 +0200 Subject: [PATCH] Initialize data structures early enough * src/patch.c (main): Initialize data structures early enough, before error paths can access them. * tests/bad-usage: Test bad command line usage. * tests/Makefile.am (TESTS): Add bad-usage here. --- src/patch.c | 8 ++++---- tests/Makefile.am | 1 + tests/bad-usage | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 tests/bad-usage Index: patch-2.7.1/src/patch.c =================================================================== --- patch-2.7.1.orig/src/patch.c +++ patch-2.7.1/src/patch.c @@ -150,6 +150,10 @@ main (int argc, char **argv) else if ((version_control = getenv ("VERSION_CONTROL"))) version_control_context = "$VERSION_CONTROL"; + init_backup_hash_table (); + init_files_to_delete (); + init_files_to_output (); + /* parse switches */ Argc = argc; Argv = argv; @@ -162,10 +166,6 @@ main (int argc, char **argv) if (make_backups | backup_if_mismatch) backup_type = get_version (version_control_context, version_control); - init_backup_hash_table (); - init_files_to_delete (); - init_files_to_output (); - init_output (&outstate); if (outfile) outstate.ofp = open_outfile (outfile); Index: patch-2.7.1/tests/Makefile.am =================================================================== --- patch-2.7.1.orig/tests/Makefile.am +++ patch-2.7.1/tests/Makefile.am @@ -20,6 +20,7 @@ TESTS = \ asymmetric-hunks \ backup-prefix-suffix \ bad-filenames \ + bad-usage \ concat-git-diff \ copy-rename \ corrupt-reject-files \ Index: patch-2.7.1/tests/Makefile.in =================================================================== --- patch-2.7.1.orig/tests/Makefile.in +++ patch-2.7.1/tests/Makefile.in @@ -1075,6 +1075,7 @@ TESTS = \ asymmetric-hunks \ backup-prefix-suffix \ bad-filenames \ + bad-usage \ concat-git-diff \ copy-rename \ corrupt-reject-files \ @@ -1294,6 +1295,8 @@ backup-prefix-suffix.log: backup-prefix- @p='backup-prefix-suffix'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) bad-filenames.log: bad-filenames @p='bad-filenames'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +bad-usage.log: bad-usage + @p='bad-usage'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) concat-git-diff.log: concat-git-diff @p='concat-git-diff'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) copy-rename.log: copy-rename Index: patch-2.7.1/tests/bad-usage =================================================================== --- /dev/null +++ patch-2.7.1/tests/bad-usage @@ -0,0 +1,18 @@ +# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. +# +# Copying and distribution of this file, with or without modification, +# in any medium, are permitted without royalty provided the copyright +# notice and this notice are preserved. + +. $srcdir/test-lib.sh + +require_cat +use_local_patch +use_tmpdir + +# ============================================================== + +check 'patch -px || echo "status: $?"' <<EOF +$PATCH: **** strip count x is not a number +status: 2 +EOF -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
