Author: arekm Date: Sat Mar 6 16:59:02 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.2.15
---- Files affected: packages/apache: apache.spec (1.592 -> 1.593) , httpd-2.2.x-mod_ssl-sessioncaching.patch (1.1 -> 1.2) , apache-shutdown-sockets.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/apache/apache.spec diff -u packages/apache/apache.spec:1.592 packages/apache/apache.spec:1.593 --- packages/apache/apache.spec:1.592 Tue Jan 19 15:04:17 2010 +++ packages/apache/apache.spec Sat Mar 6 17:58:57 2010 @@ -41,12 +41,12 @@ Summary(ru.UTF-8): Самый популярный веб-сервер Summary(tr.UTF-8): Lider WWW tarayıcı Name: apache -Version: 2.2.14 -Release: 14 +Version: 2.2.15 +Release: 1 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz -# Source0-md5: 2c1e3c7ba00bcaa0163da7b3e66aaa1e +# Source0-md5: 31fa022dc3c0908c6eaafe73c81c65df Source1: %{name}.init Source2: %{name}.logrotate Source3: %{name}.sysconfig @@ -96,10 +96,8 @@ Patch20: %{name}-apxs.patch Patch23: %{name}-suexec_fcgi.patch Patch24: %{name}-bug-48094.patch -# http://marc.info/?l=apache-httpd-dev&m=125712658610440&w=2 -Patch25: %{name}-shutdown-sockets.patch # http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348 -Patch26: httpd-2.2.x-mod_ssl-sessioncaching.patch +Patch25: httpd-2.2.x-mod_ssl-sessioncaching.patch URL: http://httpd.apache.org/ BuildRequires: apr-devel >= 1:1.2 BuildRequires: apr-util-devel >= 1:1.3 @@ -1466,6 +1464,21 @@ Implementacja zawiera obsługę FTP, CONNECT (dla SSL), HTTP/0.9, HTTP/1.0 i HTTP/1.1. +%package mod_reqtimeout +Summary: Apache module to set timeout and minimum data rate for receiving requests +Summary(pl.UTF-8): Moduł Apache'a pozwalający na ustawianie timeout oraz minimalnego transferu danych +Group: Networking/Daemons/HTTP +URL: http://httpd.apache.org/docs/2.2/mod/mod_reqtimeout.html +Requires: %{name}-base = %{version}-%{release} +Provides: apache(mod_reqtimeout) = %{version}-%{release} +Provides: webserver(reqtimeout) + +%description mod_reqtimeout +Apache module to set timeout and minimum data rate for receiving requests. + +%description mod_reqtimeout -l pl.UTF-8 +Moduł Apache'a pozwalający na ustawianie timeout oraz minimalnego transferu danych. + %package mod_rewrite Summary: Apache module with rule-based engine for rewrite requested URLs on the fly Summary(pl.UTF-8): Moduł Apache'a do "przepisywania" adresów URL w locie @@ -1757,7 +1770,6 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 # using system apr, apr-util and pcre rm -rf srclib/{apr,apr-util,pcre} @@ -1993,6 +2005,7 @@ echo "LoadModule usertrack_module modules/mod_usertrack.so" > $CFG/00_mod_usertrack.conf echo "LoadModule unique_id_module modules/mod_unique_id.so" > $CFG/00_mod_unique_id.conf echo "LoadModule substitute_module modules/mod_substitute.so" > $CFG/00_mod_substitute.conf +echo "LoadModule reqtimeout_module modules/mod_reqtimeout.so" >> $CFG/00_mod_reqtimeout.conf # anything in style dir not ending with .css is trash rm -rf $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl} @@ -2256,6 +2269,7 @@ %module_scripts mod_mime_magic %module_scripts mod_negotiation %module_scripts mod_proxy +%module_scripts mod_reqtimeout %module_scripts mod_rewrite %module_scripts mod_setenvif %module_scripts mod_speling @@ -2654,6 +2668,11 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_proxy.conf %attr(755,root,root) %{_libexecdir}/mod_proxy*.so +%files mod_reqtimeout +%defattr(644,root,root,755) +%attr(755,root,root) %{_libexecdir}/mod_reqtimeout.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_reqtimeout.conf + %files mod_rewrite %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/httxt2dbm @@ -2739,6 +2758,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.593 2010/03/06 16:58:57 arekm +- up to 2.2.15 + Revision 1.592 2010/01/19 14:04:17 baggins - rel 14 - fixed mod_dav example config ================================================================ Index: packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch diff -u packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch:1.1 packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch:1.2 --- packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch:1.1 Wed Jan 6 19:06:33 2010 +++ packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch Sat Mar 6 17:58:57 2010 @@ -13,9 +13,9 @@ void *pV1, *pV2, *pV3, *pV4, *pV5, *pV6, *pV7, *pV8, *pV9, *pV10; } rCtx; @@ -545,6 +548,7 @@ const char *ssl_cmd_SSLRequire(cmd_parm - const char *ssl_cmd_SSLUserName(cmd_parms *, void *, const char *); const char *ssl_cmd_SSLRenegBufferSize(cmd_parms *cmd, void *dcfg, const char *arg); const char *ssl_cmd_SSLStrictSNIVHostCheck(cmd_parms *cmd, void *dcfg, int flag); + const char *ssl_cmd_SSLInsecureRenegotiation(cmd_parms *cmd, void *dcfg, int flag); +const char *ssl_cmd_SSLSessionTicketExtension(cmd_parms *cmd, void *cdfg, int flag); const char *ssl_cmd_SSLProxyEngine(cmd_parms *cmd, void *dcfg, int flag); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.592&r2=1.593&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
