From f5d0e3e896275cbe27b873f2f017784a73ad1b9513291f69f7fe8a677111e491 Mon Sep 17 00:00:00 2001 From: James Oakley Date: Tue, 16 Jul 2013 20:42:44 +0000 Subject: [PATCH] - Add -Wformat to emperor_pg CFLAGS since pg-config --cflags returns -Wformat-security and gcc complains about it's exclusion OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=14 --- uwsgi-1.9.13-emperor_pg-Wformat.patch | 12 ++++++++++++ uwsgi.changes | 6 ++++++ uwsgi.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 uwsgi-1.9.13-emperor_pg-Wformat.patch diff --git a/uwsgi-1.9.13-emperor_pg-Wformat.patch b/uwsgi-1.9.13-emperor_pg-Wformat.patch new file mode 100644 index 0000000..2fe5fa7 --- /dev/null +++ b/uwsgi-1.9.13-emperor_pg-Wformat.patch @@ -0,0 +1,12 @@ +--- a/plugins/emperor_pg/uwsgiplugin.py ++++ b/plugins/emperor_pg/uwsgiplugin.py +@@ -3,6 +3,9 @@ import os + NAME='emperor_pg' + CFLAGS = os.popen('pg_config --cflags').read().rstrip().split() + CFLAGS.append('-I' + os.popen('pg_config --includedir').read().rstrip()) ++# Add -Wformat since gcc complains about it's exclusion when -Wformat-security ++# comes from pg_config ++CFLAGS.append('-Wformat') + LDFLAGS = os.popen('pg_config --ldflags').read().rstrip().split() + LIBS = ['-L' + os.popen('pg_config --libdir').read().rstrip(), '-lpq'] + diff --git a/uwsgi.changes b/uwsgi.changes index add4194..a4c7916 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 16 20:41:08 UTC 2013 - jfunk@funktronics.ca + +- Add -Wformat to emperor_pg CFLAGS since pg-config --cflags returns + -Wformat-security and gcc complains about it's exclusion + ------------------------------------------------------------------- Tue Jul 16 17:15:59 UTC 2013 - jfunk@funktronics.ca diff --git a/uwsgi.spec b/uwsgi.spec index 170c9a8..1079017 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -40,6 +40,8 @@ Patch1: uwsgi-1.9.11-no-LD_RUN_PATH.patch Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.11-systemd_logger-old_systemd.patch - Older systemd in 12.2 does not implicity include syslog.h Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch +# PATCH-FIX-OPENSUSE uwsgi-1.9.13-emperor_pg-Wformat.patch - gcc complains about lack of -Wformat with -Wformat-security from pg_config +Patch4: uwsgi-1.9.13-emperor_pg-Wformat.patch %if 0%{?suse_version} > 1210 BuildRequires: erlang %endif @@ -387,6 +389,7 @@ This package contains support for rendering XML content using XSLT. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Generate a config that builds all plugins except for examples and stuff we # can't satisfy the requirements for or are just broken excluded_plugins=""