Browse Source

apache2-2.4.20-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10349 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 7 years ago
parent
commit
de90732327
1 changed files with 11 additions and 6 deletions
  1. 11 6
      a/apache2/apache2-vl.spec

+ 11 - 6
a/apache2/apache2-vl.spec

@@ -8,8 +8,8 @@
 
 Summary: Apache HTTP Server
 Name: %{pkgname}
-Version: 2.4.18
-Release: 2%{_dist_release}
+Version: 2.4.20
+Release: 1%{_dist_release}
 URL: http://httpd.apache.org/
 
 Vendor: Project Vine
@@ -58,7 +58,7 @@ Patch31: httpd-2.4.18-sslmultiproxy.patch
 Patch55: httpd-2.4.4-malformed-host.patch
 Patch56: httpd-2.4.4-mod_unique_id.patch
 Patch57: httpd-2.4.10-sigint.patch
-Patch58: httpd-2.4.17-debug-crash.patch
+Patch58: httpd-2.4.20-debug-crash.patch
 
 # Security fixes
 
@@ -196,7 +196,7 @@ AP_CONFOPTS="\
 	--with-suexec-caller=%{suexec_caller} \
 	--with-suexec-docroot=%{docroot} \
 	--with-suexec-logfile=%{_localstatedir}/log/apache2/suexec.log \
-	--with-suexec-bin=%{_libdir}/%{pkgname}/suexec \
+	--with-suexec-bin=%{_sbindir}/suexec \
 	--with-suexec-uidmin=500 --with-suexec-gidmin=500 \
 	--with-pcre \
 	--enable-pie \
@@ -419,7 +419,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %doc ABOUT_APACHE README CHANGES LAYOUT LICENSE
-%doc migration.html migration.css
 %doc docs/conf/extra/*.conf
 
 %dir %{_sysconfdir}/apache2
@@ -520,11 +519,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.20-1
+- updated to 2.4.20.
+- updated Patch58.
+- fixed %%files.
+- fixed location of suexec (BTS#3007).
+
 * Thu Mar 10 2016 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.4.18-2
 - rebuilt with openssl 1.0.2g
 
 * Thu Feb  4 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.18-1
-- update to 2.4.18.
+- updated to 2.4.18.
 - fixed 00-base.conf.
 - updated Patch31.