From 260cfa25de7da76e75dda3dfdcb2de25d4f1b6c3 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 10 Dec 2013 16:58:58 +0000 Subject: [PATCH] don't drop -Wall when building swig Perl bindings (#1037341) Resolves: rhbz#1037341 --- subversion-1.8.5-subversion-1.8.5.patch | 0 subversion-1.8.5-swigplWall.patch | 16 ++++++++++++++++ subversion.spec | 7 ++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 subversion-1.8.5-subversion-1.8.5.patch create mode 100644 subversion-1.8.5-swigplWall.patch diff --git a/subversion-1.8.5-subversion-1.8.5.patch b/subversion-1.8.5-subversion-1.8.5.patch new file mode 100644 index 0000000..e69de29 diff --git a/subversion-1.8.5-swigplWall.patch b/subversion-1.8.5-swigplWall.patch new file mode 100644 index 0000000..af66806 --- /dev/null +++ b/subversion-1.8.5-swigplWall.patch @@ -0,0 +1,16 @@ + +Don't drop -Wall in the swig Perl bindings, otherwise building with +e.g. -Wformat-security might break. + +https://bugzilla.redhat.com/show_bug.cgi?id=1037341 + +--- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall ++++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1 + # SWIG is using C++ style comments in an extern "C" code. + $cflags =~ s/-ansi\s+//g; + $cflags =~ s/-std=c89\s+//g; +-$cflags =~ s/-Wall//g; + $cflags =~ s/-Wunused//g; + $cflags =~ s/-Wshadow//g; + $cflags =~ s/-Wstrict-prototypes//g; diff --git a/subversion.spec b/subversion.spec index 6ea95aa..e753db1 100644 --- a/subversion.spec +++ b/subversion.spec @@ -26,7 +26,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.8.5 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Development/Tools URL: http://subversion.apache.org/ @@ -45,6 +45,7 @@ Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.0-aarch64.patch Patch6: subversion-1.8.4-r1543145.patch Patch7: subversion-1.8.5-r1542774+.patch +Patch8: subversion-1.8.5-swigplWall.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 @@ -185,6 +186,7 @@ This package includes supplementary tools for use with Subversion. %patch5 -p1 -b .aarch64 %patch6 -p1 -b .r1543145 %patch7 -p1 -b .r1542774+ +%patch8 -p1 -b .swigplWall %build # Regenerate the buildsystem, so that: @@ -478,6 +480,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue Dec 10 2013 Joe Orton - 1.8.5-2 +- don't drop -Wall when building swig Perl bindings (#1037341) + * Tue Nov 26 2013 Joe Orton - 1.8.5-1 - update to 1.8.5 (#1034130) - add fix for wc-queries-test breakage (h/t Andreas Stieger, r1542774)