- fix -Wformat-security errors

- rel 4

diff --git a/apache-mod_proxy_html.spec b/apache-mod_proxy_html.spec
index 6f0c833c9ec15b95f4b6ae209768111a91654c79..24c962106f7cc9538297f47407404f529a9f8fd6 100644 (file)
--- a/apache-mod_proxy_html.spec
+++ b/apache-mod_proxy_html.spec
@@ -1,14 +1,15 @@
 %define                mod_name        proxy_html
-%define        apxs            /usr/sbin/apxs
+%define                apxs            /usr/sbin/apxs
 Summary:       mod_proxy_html - additional proxy module for rewriting HTML links
 Summary(pl.UTF-8):     mod_proxy_html - dodatkowy moduł proxy do przepisywania odnośników HTML
 Name:          apache-mod_%{mod_name}
 Version:       3.0.1
-Release:       3
+Release:       4
 License:       GPL
 Group:         Networking/Daemons/HTTP
 Source0:       http://apache.webthing.com/mod_proxy_html/mod_proxy_html.c
 # Source0-md5: 6d38fbcd58e6e5cac246da3d1fcd22f4
+Patch0:                format-security.patch
 URL:           http://apache.webthing.com/mod_proxy_html/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.44
@@ -36,6 +37,7 @@ HTML w ten sposób, by nie były uszkadzane przez odwrotne proxy.
 %prep
 %setup -q -c -T
 cp %{SOURCE0} .
+%patch0 -p1
 
 %build
 %{apxs} \

diff --git a/format-security.patch b/format-security.patch
new file mode 100644 (file)
index 0000000..d9624de
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- apache-mod_proxy_html-3.0.1/mod_proxy_html.c~      2013-05-05 21:50:26.368139682 +0200
++++ apache-mod_proxy_html-3.0.1/mod_proxy_html.c       2013-05-05 21:50:59.228139444 +0200
+@@ -782,7 +782,7 @@
+     proxy_html_conf* cfg
+         = ap_get_module_config(f->r->per_dir_config, &proxy_html_module);
+     if ( cfg->verbose ) {
+-      ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, errmsg) ;
++      ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, "%s", errmsg) ;
+     }
+ #endif
+     ap_remove_output_filter(f) ;