tomh pushed to libdwarf (f22). "Drop PPC patch and re-enable hardened builds"

[notifications at fedoraproject.org]

>From 6bfa0ae7649c3d0109ee5948c82ade49d7259a6a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom at compton.nu>
Date: Mon, 20 Apr 2015 08:29:21 +0100
Subject: Drop PPC patch and re-enable hardened builds


diff --git a/libdwarf-uninitialized-optopt-linker-conflict-workaround.patch b/libdwarf-uninitialized-optopt-linker-conflict-workaround.patch
deleted file mode 100644
index 46abcb8..0000000
--- a/libdwarf-uninitialized-optopt-linker-conflict-workaround.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur dwarf-20150310.orig/dwarfdump/dwgetopt.c dwarf-20150310/dwarfdump/dwgetopt.c
---- dwarf-20150310.orig/dwarfdump/dwgetopt.c	2015-03-10 16:59:49.000000000 +0100
-+++ dwarf-20150310/dwarfdump/dwgetopt.c	2015-04-15 19:15:02.311785906 +0200
-@@ -52,7 +52,7 @@
- 
- int opterr = 1,     /* if error message should be printed */
-     optind = 1,    /* index into parent argv vector */
--    optopt,        /* character checked for validity */
-+    optopt = 0,        /* character checked for validity */
-     optreset;      /* reset getopt */
- char *optarg;      /* argument associated with option */
- 
-diff -Naur dwarf-20150310.orig/libdwarf/dwgetopt.c dwarf-20150310/libdwarf/dwgetopt.c
---- dwarf-20150310.orig/libdwarf/dwgetopt.c	2015-03-10 17:01:44.000000000 +0100
-+++ dwarf-20150310/libdwarf/dwgetopt.c	2015-04-15 19:15:32.621786769 +0200
-@@ -52,7 +52,7 @@
- 
- int opterr = 1,     /* if error message should be printed */
-     optind = 1,    /* index into parent argv vector */
--    optopt,        /* character checked for validity */
-+    optopt = 0,        /* character checked for validity */
-     optreset;      /* reset getopt */
- char *optarg;      /* argument associated with option */
- 
diff --git a/libdwarf.spec b/libdwarf.spec
index 20918db..7f43cde 100644
--- a/libdwarf.spec
+++ b/libdwarf.spec
@@ -2,11 +2,9 @@
 %define soname libdwarf.so.%{soversion}
 %define sofullname libdwarf.so.%{soversion}.%{version}.0
 
-%undefine _hardened_build
-
 Name:          libdwarf
 Version:       20150310
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Library to access the DWARF Debugging file format 
 Group:         Development/Libraries
 
@@ -14,8 +12,6 @@ License:       LGPLv2
 URL:           http://www.prevanders.net/dwarf.html
 Source0:       http://www.prevanders.net/%{name}-%{version}.tar.gz
 Patch0:        libdwarf-shlib.patch
-#1208467 - FTBFS workaround (ppc linker bug)
-Patch1:        libdwarf-uninitialized-optopt-linker-conflict-workaround.patch
 
 BuildRequires: binutils-devel elfutils-libelf-devel
 
@@ -55,7 +51,6 @@ to access DWARF debug information.
 %prep
 %setup -q -n dwarf-%{version}
 %patch0 -p1 -b .shlib
-%patch1 -p1 -b .optopt
 
 %build
 %configure --enable-shared
@@ -92,6 +87,10 @@ install -pDm 0755 dwarfdump/dwarfdump      %{buildroot}%{_bindir}/dwarfdump
 %{_bindir}/dwarfdump
 
 %changelog
+* Mon Apr 20 2015 Tom Hughes <tom at compton.nu> - 20150310-4
+- Drop PPC linker bug patch, as the bug is now fixed
+- Re-enable hardended builds (was the same bug)
+
 * Wed Apr 15 2015 Jaromir Capik <jcapik at redhat.com> - 20150310-3
 - ppc linker bug workaround (#1208467)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libdwarf.git/commit/?h=f22&id=6bfa0ae7649c3d0109ee5948c82ade49d7259a6a