|
|
@@ -1,13 +1,12 @@
|
|
|
-%define contentdir %{_datadir}/apache2
|
|
|
-%define docroot /var/www/apache2
|
|
|
+%define contentdir /var/www
|
|
|
%define suexec_caller apache
|
|
|
%define mmn 20051115
|
|
|
%define pkgname apache2
|
|
|
|
|
|
Summary: Apache HTTP Server
|
|
|
Name: %{pkgname}
|
|
|
-Version: 2.2.23
|
|
|
-Release: 2%{_dist_release}
|
|
|
+Version: 2.2.25
|
|
|
+Release: 1%{_dist_release}
|
|
|
URL: http://httpd.apache.org/
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -39,6 +38,7 @@ Patch3: httpd-2.0.45-deplibs.patch
|
|
|
Patch4: httpd-2.1.10-disablemods.patch
|
|
|
# features/functional changes
|
|
|
Patch21: httpd-2.0.40-xfsz.patch
|
|
|
+# Patch22: httpd-2.1.10-pod.patch
|
|
|
Patch22: httpd-2.2.23-pod.patch
|
|
|
Patch23: httpd-2.0.45-export.patch
|
|
|
Patch24: httpd-2.0.48-corelimit.patch
|
|
|
@@ -48,17 +48,15 @@ Patch60: httpd-2.2.3-sslusername.patch
|
|
|
|
|
|
# Security fixes
|
|
|
|
|
|
+
|
|
|
License: Apache Software License
|
|
|
Group: System Environment/Daemons
|
|
|
-
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: db4-devel, expat-devel
|
|
|
BuildRequires: findutils, perl, openldap-devel, zlib-devel
|
|
|
BuildRequires: apr-devel, apr-util-devel
|
|
|
BuildRequires: pcre-devel, sqlite3-devel
|
|
|
-BuildRequires: www-common
|
|
|
Requires: mailcap, gawk, file, findutils, apr, apr-util
|
|
|
-Requires(pre): www-common
|
|
|
Requires(pre): chkconfig, mktemp, fileutils
|
|
|
Requires(pre): sh-utils, textutils, shadow-utils
|
|
|
Requires(post): alternatives
|
|
|
@@ -179,7 +177,7 @@ AP_CONFOPTS="\
|
|
|
--with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
|
|
--enable-suexec --with-suexec \
|
|
|
--with-suexec-caller=%{suexec_caller} \
|
|
|
- --with-suexec-docroot=%{docroot} \
|
|
|
+ --with-suexec-docroot=%{contentdir} \
|
|
|
--with-suexec-logfile=%{_localstatedir}/log/apache2/suexec.log \
|
|
|
--with-suexec-bin=%{_libdir}/%{pkgname}/suexec \
|
|
|
--with-suexec-uidmin=500 --with-suexec-gidmin=500 \
|
|
|
@@ -248,8 +246,8 @@ mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
|
|
|
# Make the MMN accessible to module packages
|
|
|
echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/apache2/.mmn
|
|
|
|
|
|
-# contentdir
|
|
|
-#mkdir $RPM_BUILD_ROOT%{contentdir}/html
|
|
|
+# docroot
|
|
|
+# mkdir $RPM_BUILD_ROOT%{contentdir}/html
|
|
|
install -m 644 $RPM_SOURCE_DIR/index.html.ja \
|
|
|
$RPM_BUILD_ROOT%{contentdir}/error/noindex.html
|
|
|
rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
|
|
|
@@ -257,9 +255,6 @@ rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
|
|
|
install -m 644 $RPM_SOURCE_DIR/vine.png \
|
|
|
$RPM_BUILD_ROOT%{contentdir}/icons
|
|
|
|
|
|
-# docroot
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{docroot}/html
|
|
|
-
|
|
|
# logs
|
|
|
# rmdir $RPM_BUILD_ROOT%{_sysconfdir}/apache2/logs
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/apache2
|
|
|
@@ -336,10 +331,14 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/mime.types \
|
|
|
$RPM_BUILD_ROOT%{_libdir}/apache2/modules/*.exp \
|
|
|
$RPM_BUILD_ROOT%{_libdir}/apache2/build/config.nice \
|
|
|
$RPM_BUILD_ROOT%{_sbindir}/{apache2,checkgid,dbmmanage,envvars*} \
|
|
|
- $RPM_BUILD_ROOT%{docroot}/html/* \
|
|
|
$RPM_BUILD_ROOT%{contentdir}/html/* \
|
|
|
$RPM_BUILD_ROOT%{contentdir}/cgi-bin/*
|
|
|
|
|
|
+%pre
|
|
|
+# Add the "apache" user
|
|
|
+/usr/sbin/useradd -c "Apache" -u 48 \
|
|
|
+ -s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
|
|
|
+
|
|
|
%triggerpostun -- apache < 2.0
|
|
|
/sbin/chkconfig --add apache2
|
|
|
|
|
|
@@ -449,11 +448,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%config(noreplace) %{contentdir}/error/*.var
|
|
|
%config(noreplace) %{contentdir}/error/include/*.html
|
|
|
|
|
|
-%dir %{docroot}/html
|
|
|
-
|
|
|
%attr(0700,root,root) %dir %{_localstatedir}/log/apache2
|
|
|
|
|
|
-%attr(0700,www-data,www-data) %dir %{_localstatedir}/lib/dav
|
|
|
+%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
|
|
|
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
|
@@ -470,10 +467,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%attr(0700,root,root) %dir %{_sysconfdir}/apache2/conf/ssl.*
|
|
|
%config %{_sysconfdir}/apache2/conf/Makefile
|
|
|
%config %{_sysconfdir}/apache2/conf/ssl.*/*
|
|
|
-%attr(0700,www-data,root) %dir %{_localstatedir}/cache/mod_ssl
|
|
|
-%attr(0600,www-data,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
|
|
|
-%attr(0600,www-data,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
|
|
|
-%attr(0600,www-data,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
|
|
|
+%attr(0700,apache,root) %dir %{_localstatedir}/cache/mod_ssl
|
|
|
+%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
|
|
|
+%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
|
|
|
+%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root)
|
|
|
@@ -485,20 +482,27 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/apache2/build/*.sh
|
|
|
|
|
|
%changelog
|
|
|
-* Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.23-2
|
|
|
-- rebuild with pcre-8.31
|
|
|
+* Sat Sep 28 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.25-1
|
|
|
+- new upstream release with security fix (CVE-2013-1862,1896)
|
|
|
+- drop patch100 (is included in new release)
|
|
|
+
|
|
|
+* Fri May 17 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.24-2
|
|
|
+- add patch100 for fix CVE-2013-1862 (mod_rewrite)
|
|
|
+
|
|
|
+* Wed Feb 27 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.24-1
|
|
|
+- new upstream release with security fix (CVE-2012-3499, 4558)
|
|
|
|
|
|
-* Wed Mar 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.23-1
|
|
|
-- update to 2.2.23
|
|
|
-- add R(pre): www-common, BR: www-common
|
|
|
-- move apache contents to %{contentdir}
|
|
|
+* Sun Sep 16 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.23-1
|
|
|
+- new upstream release with security fix (CVE-2012-3502,CVE-2012-2687)
|
|
|
+- update patch22 to fit new release
|
|
|
+- update man filename convert list
|
|
|
|
|
|
* Wed Mar 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.22-1
|
|
|
- update to 2.2.22
|
|
|
- CVE-2012-0021 (mod_log_config)
|
|
|
- CVE-2012-0031
|
|
|
- CVE-2012-0053
|
|
|
- - remove upstreamed patches
|
|
|
+- remove upstreamed patches
|
|
|
|
|
|
* Fri Dec 9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-5
|
|
|
- add patch120 for fix CVE-2011-4317 (mod_rewrite/mod_proxy)
|
|
|
@@ -608,7 +612,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
* Thu May 10 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 2.2.3-0vl5
|
|
|
- rebuilt with new toolchain and db4-4.3.x
|
|
|
|
|
|
-* Tue Feb 7 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.3-0vl4
|
|
|
+* Wed Feb 7 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.3-0vl4
|
|
|
- added BuildRequires: pcre-devel, sqlite3-devel <BTS:VineLinux:474>
|
|
|
|
|
|
* Mon Sep 11 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 2.2.3-0vl3
|
|
|
@@ -684,11 +688,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
- update %%files section
|
|
|
- rename httpd.8 manpage
|
|
|
|
|
|
-* Tue May 12 2003 Satoshi MACHINO <machino@vinelinux.org> 2.0.45-0vl1
|
|
|
+* Mon May 12 2003 Satoshi MACHINO <machino@vinelinux.org> 2.0.45-0vl1
|
|
|
- new upstream version
|
|
|
- used vine-config.layout in srclib
|
|
|
|
|
|
-* Tue May 12 2003 Satoshi MACHINO <machino@vinelinux.org> 2.0.44-0vl9
|
|
|
+* Mon May 12 2003 Satoshi MACHINO <machino@vinelinux.org> 2.0.44-0vl9
|
|
|
- rebuild
|
|
|
|
|
|
* Sun Apr 6 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl8
|
Takemikaduchi