update to 2.2.22

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5930 ec354946-7b23-47d6-9f5a-488ba84defc7

a/apache2/apache2-vl.spec

@@ -5,7 +5,7 @@
 
 Summary: Apache HTTP Server
 Name: %{pkgname}
-Version: 2.2.19
+Version: 2.2.22
 Release: 1%{_dist_release}
 URL: http://httpd.apache.org/
 
@@ -120,7 +120,6 @@ Security (TLS) protocols.
 %patch54 -p1 -b .authnoprov
 %patch60 -p1 -b .sslusername
 
-
 # copy across the migration guide and sed it's location into apachectl
 cp $RPM_SOURCE_DIR/migration.{html,css} .
 %{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
@@ -198,12 +197,6 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Classify ab and logresolve as section 1 commands, as they are in /usr/bin
-cp -p docs/man/ab.8 docs/man/ab.1
-sed -e "1s/logresolve 8/logresolve 1/" \
-  < docs/man/logresolve.8 > docs/man/logresolve.1
-#rm docs/man/logresolve.8
-
 # install mpms binary 
 pushd mpm-prefork
   make DESTDIR=$RPM_BUILD_ROOT install
@@ -310,7 +303,7 @@ done;
 
 mv $RPM_BUILD_ROOT/%{_sbindir}/apxs $RPM_BUILD_ROOT/%{_bindir}/apxs
 
-%define cflman usr/share/man/man1/dbmmanage.1 usr/share/man/man1/htdigest.1 usr/share/man/man1/htpasswd.1 usr/share/man/man8/rotatelogs.8 usr/share/man/man8/suexec.8 usr/share/man/man8/apxs.8 usr/share/man/man8/httpd.8
+%define cflman usr/share/man/man1/dbmmanage.1 usr/share/man/man1/htdigest.1 usr/share/man/man1/htpasswd.1 usr/share/man/man8/rotatelogs.8 usr/share/man/man8/suexec.8 usr/share/man/man1/apxs.1 usr/share/man/man8/httpd.8
 
 (cd $RPM_BUILD_ROOT;
 for i in %{cflman}; do \
@@ -482,11 +475,47 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apache2
 %{_sysconfdir}/apache2/build
 %{_bindir}/apxs
-%{_mandir}/man8/apxs*
+%{_mandir}/man?/apxs*
 %{_libdir}/apache2/build/*.mk
 %{_libdir}/apache2/build/*.sh
 
 %changelog
+* 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
+
+* 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)
+
+* Fri Nov 18 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-4
+- add patch110 for fix CVE-2011-3607-4415 (ModSetEnvIf)
+
+* Wed Oct 12 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-3
+- add patch70 for fix byterange filter
+
+* Tue Oct 11 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-2
+- add Patch100 for fix CVE-2011-3368 (mod_proxy)
+
+* Wed Sep 14 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-1
+- new upstream release with security fix (CVE-2011-3348)
+- regression fixes of CVE-2011-3192 byterange fix in 2.2.20
+
+* Tue Sep  6 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.20-3
+- update Patch101 (Thanks to debian team)
+
+* Sat Sep  3 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.20-2
+- add Patch101 for fix CVE-2011-3192 regression
+
+* Thu Sep  1 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.20-1
+- new upstream release with security fix (CVE-2011-3192)
+- drop patch100 (is included in new release)
+
+* Thu Aug 25 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.19-2
+- add patch100 for fix CVE-2011-3192 (Range Header DoS)
+
 * Mon May 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.19-1
 - update to 2.2.19