From: Elan Ruusamäe Date: Wed, 1 Sep 2010 10:53:46 +0000 (+0000) Subject: - revert wrong branch commit (update to 2.3.6, now tagged as DEVEL) X-Git-Tag: auto/ac/apache-2_2_17-1~4 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=7ed09ac459163b180290084a1b53665c70d4961f - revert wrong branch commit (update to 2.3.6, now tagged as DEVEL) Changed files: apache-apxs.patch -> 1.10 apache-paths.patch -> 1.3 apache.spec -> 1.603 httpd-2.0.45-encode.patch -> 1.5 httpd-2.0.46-sslmutex.patch -> 1.4 httpd-2.0.48-corelimit.patch -> 1.3 httpd-2.0.48-debuglog.patch -> 1.3 httpd-2.2.x-mod_ssl-sessioncaching.patch -> 1.4 --- diff --git a/apache-apxs.patch b/apache-apxs.patch index 9cabf9c..7ee05ad 100644 --- a/apache-apxs.patch +++ b/apache-apxs.patch @@ -25,6 +25,30 @@ print STDERR "apxs:Error: no config variable $var\n"; &usage; } +@@ -199,11 +201,10 @@ + ($httpd = $0) =~ s:support/apxs$::; + } + +-unless (-x "$httpd") { +- error("$httpd not found or not executable"); +- exit 1; ++if (not -x "$httpd") { ++ print STDERR "Note: $httpd not found or not executable.\n"; + } +- ++else { + unless (grep /mod_so/, `. $envvars && $httpd -l`) { + error("Sorry, no shared object support for Apache"); + error("available under your platform. Make sure"); +@@ -211,7 +212,7 @@ + error("your server binary `$httpd'."); + exit 1; + } +- ++} + sub get_config_vars{ + my ($file, $rh_config) = @_; + @@ -479,8 +480,8 @@ $t =~ s|\.[^./\\]+$|\.so|; if ($opt_i) { diff --git a/apache-paths.patch b/apache-paths.patch index 53f9db3..65bd1e0 100644 --- a/apache-paths.patch +++ b/apache-paths.patch @@ -1,12 +1,8 @@ ---- httpd-2.3.8/docs/cgi-examples/printenv~ 2008-09-06 23:26:15.000000000 +0300 -+++ httpd-2.3.8/docs/cgi-examples/printenv 2010-09-01 13:14:05.820581537 +0300 -@@ -1,8 +1,4 @@ --# -- --# To permit this cgi, replace # on the first line above with the --# appropriate #!/path/to/perl shebang, and set this script executable --# with chmod 755. +--- httpd-2.2.0/docs/cgi-examples/printenv.save 2005-12-26 23:09:55.000000000 +0200 ++++ httpd-2.2.0/docs/cgi-examples/printenv 2005-12-26 23:09:55.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl +#!/usr/bin/perl - # - # Note that it is subject to cross site scripting attacks on MS IE - # and any other browser which fails to honor RFC2616, so never use + ## + ## printenv -- demo CGI program which just prints its environment + ## diff --git a/apache.spec b/apache.spec index d259d01..37d43ca 100644 --- a/apache.spec +++ b/apache.spec @@ -1,3 +1,4 @@ +# # TODO: # - config examples for mod_* # - --with-suexec-uidmin=500 or =1000 ? # - subpackages for MPMs @@ -20,16 +21,16 @@ %bcond_without event # event MPM %bcond_with distcache # distcache support %bcond_with bucketeer # debug one - +# +%include /usr/lib/rpm/macros.perl # this is internal macro, don't change to %%apache_modules_api -%define _apache_modules_api 20100723 +%define _apache_modules_api 20051115 %if "%{pld_release}" != "ac" %define openssl_ver 0.9.8i %else %define openssl_ver 0.9.7d %endif -%include /usr/lib/rpm/macros.perl Summary: The most widely used Web server on the Internet Summary(de.UTF-8): Leading World Wide Web-Server Summary(es.UTF-8): Servidor HTTPD para proveer servicios WWW @@ -39,12 +40,12 @@ Summary(pt_BR.UTF-8): Servidor HTTPD para prover serviços WWW Summary(ru.UTF-8): Самый популярный веб-сервер Summary(tr.UTF-8): Lider WWW tarayıcı Name: apache -Version: 2.3.8 -Release: 0.1 +Version: 2.2.16 +Release: 1 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz -# Source0-md5: 275b3dea795edb19f74470ff9b591ccd +# Source0-md5: 7f33f2c8b213ad758c009ae46d2795ed Source1: %{name}.init Source2: %{name}.logrotate Source3: %{name}.sysconfig @@ -81,7 +82,7 @@ Patch3: %{name}-branding.patch Patch4: %{name}-apr.patch # what about this? it isn't applied... Patch6: httpd-2.0.40-xfsz.patch -#Patch7: %{name}-syslibs.patch +Patch7: %{name}-syslibs.patch Patch8: httpd-2.0.45-encode.patch Patch9: %{name}-paths.patch Patch10: httpd-2.0.46-dav401dest.patch @@ -1758,7 +1759,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env. %patch2 -p1 %patch3 -p1 %patch4 -p1 -#%patch7 -p1 +%patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -1775,7 +1776,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env. %patch26 -p1 # using system apr, apr-util and pcre -#rm -rf srclib/{apr,apr-util,pcre} +rm -rf srclib/{apr,apr-util,pcre} # sanity check MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h` diff --git a/httpd-2.0.45-encode.patch b/httpd-2.0.45-encode.patch index e875449..82d9a0b 100644 --- a/httpd-2.0.45-encode.patch +++ b/httpd-2.0.45-encode.patch @@ -3,17 +3,23 @@ * remove dates from error pages (#86474), since they won't be in the right language ---- httpd-2.3.8/docs/error/include/bottom.html~ 2007-07-31 22:49:08.000000000 +0300 -+++ httpd-2.3.8/docs/error/include/bottom.html 2010-09-01 13:12:26.494207986 +0300 -@@ -5,7 +5,7 @@ +diff -ur httpd-2.2.0.org/docs/error/include/bottom.html httpd-2.2.0/docs/error/include/bottom.html +--- httpd-2.2.0.org/docs/error/include/bottom.html 2004-11-20 21:16:24.000000000 +0100 ++++ httpd-2.2.0/docs/error/include/bottom.html 2005-12-02 23:04:57.540690250 +0100 +@@ -5,10 +5,8 @@

Error

-
+- +-
+- +
- ++
+ +diff -ur httpd-2.2.0.org/server/util_script.c httpd-2.2.0/server/util_script.c --- httpd-2.2.0.org/server/util_script.c 2005-11-10 16:20:05.000000000 +0100 +++ httpd-2.2.0/server/util_script.c 2005-12-02 23:04:50.848272000 +0100 @@ -224,8 +224,7 @@ diff --git a/httpd-2.0.46-sslmutex.patch b/httpd-2.0.46-sslmutex.patch index 28ca2b7..dadc6e0 100644 --- a/httpd-2.0.46-sslmutex.patch +++ b/httpd-2.0.46-sslmutex.patch @@ -1,12 +1,14 @@ ---- httpd-2.3.8/modules/ssl/ssl_engine_mutex.c~ 2010-05-04 20:40:43.000000000 +0300 -+++ httpd-2.3.8/modules/ssl/ssl_engine_mutex.c 2010-09-01 13:15:13.397109981 +0300 -@@ -47,6 +47,9 @@ +diff -urbB httpd-2.2.0.org/modules/ssl/ssl_engine_mutex.c httpd-2.2.0/modules/ssl/ssl_engine_mutex.c +--- httpd-2.2.0.org/modules/ssl/ssl_engine_mutex.c 2005-11-10 16:20:05.000000000 +0100 ++++ httpd-2.2.0/modules/ssl/ssl_engine_mutex.c 2005-12-02 23:11:09.183916500 +0100 +@@ -45,6 +45,10 @@ + if (mc->pMutex) { return TRUE; } - ++ + if (mc->szMutexFile) -+ apr_file_remove(mc->szMutexFile, p); ++ apr_file_remove(mc->szMutexFile, p); + - if ((rv = ap_global_mutex_create(&mc->pMutex, NULL, SSL_CACHE_MUTEX_TYPE, - NULL, s, s->process->pool, 0)) + if ((rv = apr_global_mutex_create(&mc->pMutex, mc->szMutexFile, + mc->nMutexMech, s->process->pool)) != APR_SUCCESS) { diff --git a/httpd-2.0.48-corelimit.patch b/httpd-2.0.48-corelimit.patch index b0c4877..1496b4b 100644 --- a/httpd-2.0.48-corelimit.patch +++ b/httpd-2.0.48-corelimit.patch @@ -2,11 +2,11 @@ Automatically raise the core file size limit if CoreDumpDirectory is configured. ---- httpd-2.3.8/server/core.c~ 2010-09-01 13:15:44.000000000 +0300 -+++ httpd-2.3.8/server/core.c 2010-09-01 13:16:25.533795195 +0300 -@@ -3646,6 +3646,25 @@ +--- httpd-2.0.48/server/core.c.corelimit ++++ httpd-2.0.48/server/core.c +@@ -4233,6 +4233,25 @@ - set_banner(pconf); + ap_set_version(pconf); ap_setup_make_content_type(pconf); + +#ifdef RLIMIT_CORE @@ -27,6 +27,6 @@ is configured. + } +#endif + - ap_setup_auth_internal(ptemp); - if (!sys_privileges) { - ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, + return OK; + } + diff --git a/httpd-2.0.48-debuglog.patch b/httpd-2.0.48-debuglog.patch index d2b7aa9..6fac4e2 100644 --- a/httpd-2.0.48-debuglog.patch +++ b/httpd-2.0.48-debuglog.patch @@ -9,16 +9,16 @@ go upstream. Note this patch depends on the pie patch. ---- httpd-2.3.8/include/http_log.h~ 2010-06-14 22:59:05.000000000 +0300 -+++ httpd-2.3.8/include/http_log.h 2010-09-01 13:18:19.608547664 +0300 -@@ -213,7 +213,11 @@ +--- httpd-2.0.48/include/http_log.h.debuglog ++++ httpd-2.0.48/include/http_log.h +@@ -130,7 +130,11 @@ extern int AP_DECLARE_DATA ap_default_loglevel; +#ifdef AP_FNAME -+#define APLOG_MARK AP_FNAME,__LINE__,APLOG_MODULE_INDEX ++#define APLOG_MARK AP_FNAME,__LINE__ +#else - #define APLOG_MARK __FILE__,__LINE__,APLOG_MODULE_INDEX + #define APLOG_MARK __FILE__,__LINE__ +#endif /** diff --git a/httpd-2.2.x-mod_ssl-sessioncaching.patch b/httpd-2.2.x-mod_ssl-sessioncaching.patch index c444125..f0ee0a3 100644 --- a/httpd-2.2.x-mod_ssl-sessioncaching.patch +++ b/httpd-2.2.x-mod_ssl-sessioncaching.patch @@ -1,15 +1,17 @@ ---- httpd-2.3.8/modules/ssl/ssl_private.h~ 2010-09-01 13:21:44.000000000 +0300 -+++ httpd-2.3.8/modules/ssl/ssl_private.h 2010-09-01 13:22:12.923733895 +0300 -@@ -394,6 +394,9 @@ +Index: httpd-2.2.x/modules/ssl/ssl_private.h +=================================================================== +--- httpd-2.2.x/modules/ssl/ssl_private.h (revision 833672) ++++ httpd-2.2.x/modules/ssl/ssl_private.h (working copy) +@@ -395,6 +395,9 @@ typedef struct { #if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT) const char *szCryptoDevice; #endif +#ifndef OPENSSL_NO_TLSEXT + ssl_enabled_t session_tickets_enabled; +#endif - - #ifdef HAVE_OCSP_STAPLING - const ap_socache_provider_t *stapling_cache; + struct { + 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_SSLRenegBufferSize(cmd_parms *cmd, void *dcfg, const char *arg); const char *ssl_cmd_SSLStrictSNIVHostCheck(cmd_parms *cmd, void *dcfg, int flag); @@ -159,12 +161,14 @@ Index: httpd-2.2.x/modules/ssl/ssl_engine_kernel.c /* * Save the found server into our SSLConnRec for later ---- httpd-2.3.8/modules/ssl/mod_ssl.c~ 2010-06-06 20:10:23.000000000 +0300 -+++ httpd-2.3.8/modules/ssl/mod_ssl.c 2010-09-01 13:22:58.820804816 +0300 -@@ -69,6 +69,8 @@ +Index: httpd-2.2.x/modules/ssl/mod_ssl.c +=================================================================== +--- httpd-2.2.x/modules/ssl/mod_ssl.c (revision 833672) ++++ httpd-2.2.x/modules/ssl/mod_ssl.c (working copy) +@@ -92,6 +92,8 @@ static const command_rec ssl_config_cmds SSL_CMD_SRV(RandomSeed, TAKE23, "SSL Pseudo Random Number Generator (PRNG) seeding source " - "('startup|connect builtin|file:/path|exec:/path [bytes]')") + "(`startup|connect builtin|file:/path|exec:/path [bytes]')") + SSL_CMD_SRV(SessionTicketExtension, FLAG, + "TLS Session Ticket extension support")