[packages/apache1-mod_auth_ldap/v1.6.0] format-security patch

[glen]

commit 11ff6804f4a5536b81f36f4451b652113b9d0d53
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 12 10:37:02 2016 +0300

    format-security patch

 apache1-mod_auth_ldap.spec | 10 ++++++----
 format-security.patch      | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/apache1-mod_auth_ldap.spec b/apache1-mod_auth_ldap.spec
index 25f315c..026c040 100644
--- a/apache1-mod_auth_ldap.spec
+++ b/apache1-mod_auth_ldap.spec
@@ -19,12 +19,13 @@ Summary(sv.UTF-8):	En LDAP autentiseringsmodul för Apache
 Summary(zh_CN.UTF-8):	这是用于 Apache 的 LDAP 验证模块
 Name:		apache1-mod_%{mod_name}
 Version:	1.6.0
-Release:	7
+Release:	8
 License:	BSD
 Group:		Networking/Daemons
 Source0:	http://www.rudedog.org/auth_ldap/auth_ldap-%{version}.tar.gz
 # Source0-md5:	ff7de9027fe8852facd27be93462c5cc
 Patch0:		%{name}-makefile.patch
+Patch1:		format-security.patch
 URL:		http://www.rudedog.org/auth_ldap/
 BuildRequires:	apache1-devel >= 1.3.39
 BuildRequires:	autoconf
@@ -116,10 +117,9 @@ LDAP-katalog.
 
 %prep
 %setup -q -n auth_ldap-%{version}
+mv auth_ldap.c mod_auth_ldap.c
 %patch0 -p1
-mv -f auth_ldap.c mod_auth_ldap.c
-
-lynx -nolist -dump auth_ldap.html > auth_ldap.txt
+%patch1 -p1
 
 %build
 %{__autoconf}
@@ -130,6 +130,8 @@ lynx -nolist -dump auth_ldap.html > auth_ldap.txt
 
 %{__make}
 
+lynx -nolist -dump auth_ldap.html > auth_ldap.txt
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..28f7c2f
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- auth_ldap-1.6.0/mod_auth_ldap.c~	2001-07-04 17:38:03.000000000 +0300
++++ auth_ldap-1.6.0/mod_auth_ldap.c	2016-05-12 10:35:41.559346956 +0300
+@@ -87,7 +87,7 @@
+ #if APACHE_RELEASE < 1030000
+   log_reason(buf, r->uri, r);
+ #else
+-  ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, buf);
++  ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, "%s", buf);
+ #endif
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache1-mod_auth_ldap.git/commitdiff/11ff6804f4a5536b81f36f4451b652113b9d0d53