packages: apache/apache-apxs.patch, apache/apache-paths.patch, apache/apach...

glen glen at pld-linux.org
Wed Sep 1 12:53:52 CEST 2010 

Author: glen                         Date: Wed Sep  1 10:53:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert wrong branch commit (update to 2.3.6, now tagged as DEVEL)

---- Files affected:
packages/apache:
   apache-apxs.patch (1.9 -> 1.10) , apache-paths.patch (1.2 -> 1.3) , apache.spec (1.602 -> 1.603) , httpd-2.0.45-encode.patch (1.4 -> 1.5) , httpd-2.0.46-sslmutex.patch (1.3 -> 1.4) , httpd-2.0.48-corelimit.patch (1.2 -> 1.3) , httpd-2.0.48-debuglog.patch (1.2 -> 1.3) , httpd-2.2.x-mod_ssl-sessioncaching.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/apache/apache-apxs.patch
diff -u packages/apache/apache-apxs.patch:1.9 packages/apache/apache-apxs.patch:1.10
--- packages/apache/apache-apxs.patch:1.9	Wed Sep  1 12:50:37 2010
+++ packages/apache/apache-apxs.patch	Wed Sep  1 12:53:46 2010
@@ -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) {

================================================================
Index: packages/apache/apache-paths.patch
diff -u packages/apache/apache-paths.patch:1.2 packages/apache/apache-paths.patch:1.3
--- packages/apache/apache-paths.patch:1.2	Wed Sep  1 12:50:37 2010
+++ packages/apache/apache-paths.patch	Wed Sep  1 12:53:46 2010
@@ -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
+ ##

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.602 packages/apache/apache.spec:1.603
--- packages/apache/apache.spec:1.602	Wed Sep  1 12:50:37 2010
+++ packages/apache/apache.spec	Wed Sep  1 12:53:46 2010
@@ -1,3 +1,5 @@
+# $Revision$, $Date$
+# # TODO:
 # - config examples for mod_*
 # - --with-suexec-uidmin=500 or =1000 ?
 # - subpackages for MPMs
@@ -20,16 +22,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 +41,12 @@
 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 +83,7 @@
 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 +1760,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#%patch7 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -1775,7 +1777,7 @@
 %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`
@@ -2762,8 +2764,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.602  2010/09/01 10:50:37  glen
-- updated patches to 2.3.8, does not fully compile
+Revision 1.603  2010/09/01 10:53:46  glen
+- revert wrong branch commit (update to 2.3.6, now tagged as DEVEL)
 
 Revision 1.601  2010/08/03 07:39:00  shadzik
 - rel 1, builds

================================================================
Index: packages/apache/httpd-2.0.45-encode.patch
diff -u packages/apache/httpd-2.0.45-encode.patch:1.4 packages/apache/httpd-2.0.45-encode.patch:1.5
--- packages/apache/httpd-2.0.45-encode.patch:1.4	Wed Sep  1 12:50:37 2010
+++ packages/apache/httpd-2.0.45-encode.patch	Wed Sep  1 12:53:46 2010
@@ -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 @@
  
  <h2>Error <!--#echo encoding="none" var="REDIRECT_STATUS" --></h2>
  <address>
 -  <a href="/"><!--#echo var="SERVER_NAME" --></a><br />
+-  <!--#config timefmt="%c" -->
+-  <span><!--#echo var="DATE_LOCAL" --><br />
+-  <!--#echo var="SERVER_SOFTWARE" --></span>
 +  <a href="/"><!--#echo encoding="entity" var="SERVER_NAME" --></a><br />
-   <span><!--#echo var="SERVER_SOFTWARE" --></span>
++  <span><!--#echo var="SERVER_SOFTWARE" --></span>
  </address>
  </body>
+ </html>
+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 @@

================================================================
Index: packages/apache/httpd-2.0.46-sslmutex.patch
diff -u packages/apache/httpd-2.0.46-sslmutex.patch:1.3 packages/apache/httpd-2.0.46-sslmutex.patch:1.4
--- packages/apache/httpd-2.0.46-sslmutex.patch:1.3	Wed Sep  1 12:50:37 2010
+++ packages/apache/httpd-2.0.46-sslmutex.patch	Wed Sep  1 12:53:46 2010
@@ -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) {

================================================================
Index: packages/apache/httpd-2.0.48-corelimit.patch
diff -u packages/apache/httpd-2.0.48-corelimit.patch:1.2 packages/apache/httpd-2.0.48-corelimit.patch:1.3
--- packages/apache/httpd-2.0.48-corelimit.patch:1.2	Wed Sep  1 12:50:37 2010
+++ packages/apache/httpd-2.0.48-corelimit.patch	Wed Sep  1 12:53:46 2010
@@ -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 @@
 +    }
 +#endif
 +
-     ap_setup_auth_internal(ptemp);
-     if (!sys_privileges) {
-         ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL,
+     return OK;
+ }
+ 

================================================================
Index: packages/apache/httpd-2.0.48-debuglog.patch
diff -u packages/apache/httpd-2.0.48-debuglog.patch:1.2 packages/apache/httpd-2.0.48-debuglog.patch:1.3
--- packages/apache/httpd-2.0.48-debuglog.patch:1.2	Wed Sep  1 12:50:37 2010
+++ packages/apache/httpd-2.0.48-debuglog.patch	Wed Sep  1 12:53:46 2010
@@ -9,16 +9,16 @@
 
 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
  
  /**

================================================================
Index: packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch
diff -u packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch:1.3 packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch:1.4
--- packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch:1.3	Wed Sep  1 12:50:37 2010
+++ packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch	Wed Sep  1 12:53:46 2010
@@ -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 @@
  
          /*
           * 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")
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-apxs.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-paths.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.602&r2=1.603&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.0.45-encode.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.0.46-sslmutex.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.0.48-corelimit.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.0.48-debuglog.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.2.x-mod_ssl-sessioncaching.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list