From 0ef0d480c72b74f096d04b9f58c2c7a987c6dbc57549bfc6f623018f6324a270 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 22 Feb 2017 16:28:45 +0000
Subject: [PATCH] Accepting request 459712 from
 home:bmwiedemann:branches:Base:System

Add autogen-catch-race-error.patch (boo#1021353)

OBS-URL: https://build.opensuse.org/request/show/459712
OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=52
---
 autogen-catch-race-error.patch | 31 +++++++++++++++++++++++++++++++
 autogen.changes                |  5 +++++
 autogen.spec                   |  3 +++
 3 files changed, 39 insertions(+)
 create mode 100644 autogen-catch-race-error.patch

diff --git a/autogen-catch-race-error.patch b/autogen-catch-race-error.patch
new file mode 100644
index 0000000..5e778d5
--- /dev/null
+++ b/autogen-catch-race-error.patch
@@ -0,0 +1,31 @@
+This would have made the racy build fail
+instead of producing missing and incorrect files
+
+https://bugzilla.opensuse.org/show_bug.cgi?id=1021353
+
+Index: autogen-5.18.12/agen5/agDep.c
+===================================================================
+--- autogen-5.18.12.orig/agen5/agDep.c
++++ autogen-5.18.12/agen5/agDep.c
+@@ -303,7 +303,7 @@ tidy_dep_file(void)
+         pzn[len] = NUL;
+ 
+         unlink(pzn);
+-        rename(dep_file, pzn);
++        if (rename(dep_file, pzn)) { exit(95); }
+         AGFREE(dep_file);
+         dep_file = pzn;
+     } while (false);
+Index: autogen-5.18.12/agen5/expOutput.c
+===================================================================
+--- autogen-5.18.12.orig/agen5/expOutput.c
++++ autogen-5.18.12/agen5/expOutput.c
+@@ -251,7 +251,7 @@ ag_scm_out_move(SCM new_file)
+ 
+     if (strcmp(pz, cur_fpstack->stk_fname) != 0) {
+ 
+-        rename(cur_fpstack->stk_fname, pz);
++        if (rename(cur_fpstack->stk_fname, pz)) { exit(94); }
+ 
+         if (dep_fp != NULL) {
+             rm_target_file(cur_fpstack->stk_fname);
diff --git a/autogen.changes b/autogen.changes
index 4a1b131..01ea6c7 100644
--- a/autogen.changes
+++ b/autogen.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 22 14:28:17 UTC 2017 - bwiedemann@suse.com
+
+- Add autogen-catch-race-error.patch (boo#1021353)
+
 -------------------------------------------------------------------
 Sun Jan  8 07:20:11 UTC 2017 - mpluskal@suse.com
 
diff --git a/autogen.spec b/autogen.spec
index 62094f0..a9b634c 100644
--- a/autogen.spec
+++ b/autogen.spec
@@ -28,6 +28,8 @@ Source0:        https://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}
 Source1:        https://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz.sig
 Source2:        http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=autogen&download=1#/%{name}.keyring
 Patch1:         autogen-build_ldpath.patch
+# PATCH-FIX-UPSTREAM -- https://savannah.gnu.org/support/index.php?109234 boo#1021353
+Patch2:         autogen-catch-race-error.patch
 BuildRequires:  fdupes
 BuildRequires:  guile-devel
 BuildRequires:  libtool
@@ -80,6 +82,7 @@ This package contains devel files for libopts
 %prep
 %setup -q
 %patch1
+%patch2 -p1
 
 %build
 %configure \