Changeset 1146

Timestamp:

Jun 3, 2009, 6:46:03 AM (16 years ago)

Author:

mitchb

Message:

Version, context, etc. fixups to build Apache on Fedora 11

Location:

branches/fc11-dev/server

Files:

• common/patches/httpd-2.2.x-sni.patch (modified) (2 diffs)
• common/patches/httpd-suexec-scripts.patch (modified) (14 diffs)
• fedora/specs/httpd.spec.patch (modified) (4 diffs)

branches/fc11-dev/server/common/patches/httpd-2.2.x-sni.patch

@@ -971 +971 @@
 Index: httpd-2.2.11/docs/manual/mod/mod_ssl.html.en
 ===================================================================
---- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (revision 768863)
-+++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (working copy)
+--- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2008-08-20 19:02:48.000000000 -0400
++++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2009-06-03 05:33:23.000000000 -0400
 @@ -75,6 +75,7 @@ to provide the cryptography engine.</p>
  <li><img alt="" src="../images/down.gif" /> <a href="#sslrequiressl">SSLRequireSSL</a></li>
@@ -1026 +1026 @@
 +<p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
  <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
- </body></html>
+-</body></html>
+\ No newline at end of file
++</body></html>

branches/fc11-dev/server/common/patches/httpd-suexec-scripts.patch

@@ -45 +45 @@
  APACHE_HELP_STRING(--with-suexec-docroot,SuExec root directory),[
    AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
---- httpd-2.2.2/support/suexec.c.old    2006-04-21 21:53:06.000000000 -0400
-+++ httpd-2.2.2/support/suexec.c        2007-05-22 10:32:04.000000000 -0400
+--- httpd-2.2.11/support/suexec.c.old   2008-11-30 10:47:31.000000000 -0500
++++ httpd-2.2.11/support/suexec.c       2009-06-03 05:16:45.000000000 -0400
 @@ -30,6 +30,9 @@
   *
@@ -57 +57 @@
  #include "ap_config.h"
  #include "suexec.h"
-@@ -46,6 +48,7 @@
+@@ -46,6 +49,7 @@
  #include <stdio.h>
  #include <stdarg.h>
@@ -65 +65 @@
  #ifdef HAVE_PWD_H
  #include <pwd.h>
-@@ -95,6 +98,7 @@
+@@ -95,6 +99,7 @@
  {
      /* variable name starts with */
@@ -141 +141 @@
      gid_t gid;              /* target group placeholder  */
      char *target_uname;     /* target user name          */
-@@ -350,6 +406,20 @@
+@@ -350,6 +413,20 @@
  #endif /*_OSD_POSIX*/
  
@@ -162 +162 @@
       * or attempts to back up out of the current directory,
       * to protect against attacks.  If any are
-@@ -371,6 +441,7 @@
+@@ -371,6 +448,7 @@
          userdir = 1;
      }
@@ -170 +170 @@
       * Error out if the target username is invalid.
       */
-@@ -450,7 +521,7 @@
+@@ -452,7 +530,7 @@
       * Error out if attempt is made to execute as root or as
       * a UID less than AP_UID_MIN.  Tsk tsk.
@@ -179 +179 @@
          exit(107);
      }
-@@ -482,6 +553,21 @@
+@@ -484,6 +562,21 @@
          log_err("failed to setuid (%ld: %s)\n", uid, cmd);
          exit(110);
@@ -201 +201 @@
      /*
       * Get the current working directory, as well as the proper
-@@ -504,6 +588,21 @@
+@@ -506,6 +599,21 @@
              log_err("cannot get docroot information (%s)\n", target_homedir);
              exit(112);
@@ -223 +223 @@
      else {
          if (((chdir(AP_DOC_ROOT)) != 0) ||
-@@ -530,15 +629,17 @@
+@@ -532,15 +640,17 @@
      /*
       * Error out if cwd is writable by others.
@@ -242 +242 @@
          exit(117);
      }
-@@ -546,10 +647,12 @@
+@@ -548,10 +658,12 @@
      /*
       * Error out if the program is writable by others.
@@ -255 +255 @@
      /*
       * Error out if the file is setuid or setgid.
-@@ -563,6 +666,7 @@
+@@ -565,6 +677,7 @@
       * Error out if the target name/group is different from
       * the name/group of the cwd or the program.
@@ -263 +263 @@
          (gid != dir_info.st_gid) ||
          (uid != prg_info.st_uid) ||
-@@ -574,12 +678,14 @@
+@@ -576,16 +689,33 @@
                  prg_info.st_uid, prg_info.st_gid);
          exit(120);
@@ -279 +279 @@
          exit(121);
      }
-@@ -606,6 +711,21 @@
-       exit(122);
-     }
  
 +    if (is_static_extension(cmd)) {
 +        argv[2] = STATIC_CAT_PATH;
 +        execv(STATIC_CAT_PATH, &argv[2]);
-+       log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
-+       exit(255);
++        log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
++        exit(255);
 +    }
 +    if (is_php_extension(cmd)) {
@@ -294 +291 @@
 +        argv[2] = "-f";
 +        execv(PHP_PATH, &argv[1]);
-+       log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[2]);
-+       exit(255);
-+    }
-+
-     /*
-      * Execute the command, replacing our image with its own.
-      */
++        log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[2]);
++        exit(255);
++    }
++
+ #ifdef AP_SUEXEC_UMASK
+     /*
+      * umask() uses inverse logic; bits are CLEAR for allowed access.

branches/fc11-dev/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
-+++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
-@@ -6,7 +6,7 @@
+--- httpd.spec.orig     2009-03-17 09:12:22.000000000 -0400
++++ httpd.spec  2009-06-03 05:05:30.000000000 -0400
+@@ -7,7 +7,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.10
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 2.2.11
+-Release: 8
++Release: 8.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -54,6 +54,12 @@
+@@ -56,6 +56,12 @@
  Conflicts: pcre < 4.0
- Requires: httpd-tools = %{version}-%{release}
+ Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
  
 +Provides: scripts-httpd
@@ -23 +23 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -100,6 +106,7 @@
+@@ -102,6 +108,7 @@
  BuildRequires: openssl-devel, distcache-devel
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -31 +31 @@
  
  %description -n mod_ssl
-@@ -127,6 +134,11 @@
+@@ -130,6 +137,11 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -43 +43 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +187,12 @@
+@@ -178,10 +190,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \