commit b219b8dfce7618709145ae76c56dac151137ff92
Author: Jan Rękorajski <[email protected]>
Date: Mon Nov 12 22:39:09 2012 +0100
- fix -Wformat-security error
- rel 10
apache1-format-security.patch | 11 +++++++++++
apache1.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/apache1.spec b/apache1.spec
index c5b5972..a176977 100644
--- a/apache1.spec
+++ b/apache1.spec
@@ -32,7 +32,7 @@ Summary(uk.UTF-8): Найпопулярніший Web-Server
Summary(zh_CN.UTF-8): Internet 上应用最广泛的 Web 服务程序。
Name: apache1
Version: 1.3.42
-Release: 9
+Release: 10
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -112,6 +112,7 @@ Patch40:
%{name}-security_htpasswd_user_buffer_overflow.patch
Patch41: %{name}-security_check_forensic_tempfiles.patch
Patch42: %{name}-lingerd.patch
Patch43: %{name}-getline.patch
+Patch44: %{name}-format-security.patch
URL: http://httpd.apache.org/
BuildRequires: bash
BuildRequires: db-devel >= 4.1
@@ -1353,6 +1354,7 @@ cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h}
src/main
%patch42 -p1
%endif
%patch43 -p1
+%patch44 -p1
# make manual link with full path
%{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.*
diff --git a/apache1-format-security.patch b/apache1-format-security.patch
new file mode 100644
index 0000000..eab027b
--- /dev/null
+++ b/apache1-format-security.patch
@@ -0,0 +1,11 @@
+--- apache_1.3.42/src/main/http_log.c~ 2006-07-12 10:16:05.000000000 +0200
++++ apache_1.3.42/src/main/http_log.c 2012-11-12 22:36:48.615990057 +0100
+@@ -487,7 +487,7 @@
+ * that may screw up scripts written to do something
+ * based on the last modification time of the pid file.
+ */
+- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, NULL,
++ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, NULL, "%s",
+ ap_psprintf(p,
+ "pid file %s overwritten -- Unclean shutdown of
previous Apache run?",
+ fname)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache1.git/commitdiff/b219b8dfce7618709145ae76c56dac151137ff92
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
