From 25b14979ccfcb08dfdac5b1ea5931c6feb5612e3 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 11 Jan 2019 09:02:23 +0000
Subject: [PATCH] Update to 2.70

- New upstream release 2.70
  - Fixes for hardened CCFLAGS with -Werror (CPAN RT#128167)
---
 GD-2.64-cflags.patch | 11 -----------
 GD-2.70-cflags.patch | 11 +++++++++++
 perl-GD.spec         | 10 +++++++---
 sources              |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 GD-2.64-cflags.patch
 create mode 100644 GD-2.70-cflags.patch

diff --git a/GD-2.64-cflags.patch b/GD-2.64-cflags.patch
deleted file mode 100644
index 9fd3657..0000000
--- a/GD-2.64-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.PL
-+++ Makefile.PL
-@@ -259,7 +259,7 @@ print F $DEFINES,"\n";
- close F;
- 
- my $CCFLAGS = $Config{ccflags};
--$CCFLAGS .= " -Wall -Wextra -Wformat=0" if $Config{gccversion} and $] > 5.020;
-+$CCFLAGS .= " -Wall -Wextra" if $Config{gccversion} and $] > 5.020;
- 
- my %WriteMakefileArgs = (
-     'NAME'	=> 'GD',
diff --git a/GD-2.70-cflags.patch b/GD-2.70-cflags.patch
new file mode 100644
index 0000000..fab1d98
--- /dev/null
+++ b/GD-2.70-cflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -259,7 +259,7 @@ print F $DEFINES,"\n";
+ close F;
+ 
+ my $CCFLAGS = $Config{ccflags};
+-$CCFLAGS .= " -Wall -Wextra -Wformat=1" if $Config{gccversion} and $] > 5.020;
++$CCFLAGS .= " -Wall -Wextra" if $Config{gccversion} and $] > 5.020;
+ # hardened CFLAGS for testing
+ #$CCFLAGS .= ' -D_GNU_SOURCE -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches';
+ 
diff --git a/perl-GD.spec b/perl-GD.spec
index 20bd6d3..6524269 100644
--- a/perl-GD.spec
+++ b/perl-GD.spec
@@ -1,12 +1,12 @@
 Name:           perl-GD
-Version:        2.69
+Version:        2.70
 Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 License:        GPL+ or Artistic 2.0
 URL:            https://metacpan.org/release/GD
 Source0:        https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-%{version}.tar.gz
 Patch0:         GD-2.56-utf8.patch
-Patch1:         GD-2.64-cflags.patch
+Patch1:         GD-2.70-cflags.patch
 # Module Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -56,7 +56,7 @@ create PNG images on the fly or modify existing files.
 # Re-code documentation as UTF8
 %patch0
 
-# Upstream wants -Wformat=0 but we don't
+# Upstream wants -Wformat=1 but we don't
 %patch1
 
 # Fix shellbangs in sample scripts
@@ -92,6 +92,10 @@ make test TEST_VERBOSE=1
 %{_mandir}/man3/GD::Simple.3*
 
 %changelog
+* Fri Jan 11 2019 Paul Howarth <paul@city-fan.org> - 2.70-1
+- Update to 2.70
+  - Fixes for hardened CCFLAGS with -Werror (CPAN RT#128167)
+
 * Mon Aug 27 2018 Tom Callaway <spot@fedoraproject.org> - 2.69-1
 - update to 2.69
 
diff --git a/sources b/sources
index 53e8abc..cbd7c3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (GD-2.69.tar.gz) = 9df5bc704c7723c032874f2c715c8abac9102826278c7502ec8396568176abb11f95a4fcc91f1d5fac7c92685481f3d759b760c3dfadf86564d110128e41c677
+SHA512 (GD-2.70.tar.gz) = 07175fca2564e2b73b8cb15ebadbdafb2cac388a7a1ff35e64604c63966eecd428fe46831122b6f03ef6e0cca5d5886f5fc375d389b3b981379d9d7d0f1c55c1