Changeset 1146


Ignore:
Timestamp:
Jun 3, 2009, 6:46:03 AM (12 years ago)
Author:
mitchb
Message:
Version, context, etc. fixups to build Apache on Fedora 11
Location:
branches/fc11-dev/server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev/server/common/patches/httpd-2.2.x-sni.patch

    r1115 r1146  
    971971Index: httpd-2.2.11/docs/manual/mod/mod_ssl.html.en
    972972===================================================================
    973 --- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (revision 768863)
    974 +++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (working copy)
     973--- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2008-08-20 19:02:48.000000000 -0400
     974+++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2009-06-03 05:33:23.000000000 -0400
    975975@@ -75,6 +75,7 @@ to provide the cryptography engine.</p>
    976976 <li><img alt="" src="../images/down.gif" /> <a href="#sslrequiressl">SSLRequireSSL</a></li>
     
    10261026+<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>
    10271027 <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>
    1028  </body></html>
     1028-</body></html>
     1029\ No newline at end of file
     1030+</body></html>
  • branches/fc11-dev/server/common/patches/httpd-suexec-scripts.patch

    r944 r1146  
    4545 APACHE_HELP_STRING(--with-suexec-docroot,SuExec root directory),[
    4646   AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
    47 --- httpd-2.2.2/support/suexec.c.old    2006-04-21 21:53:06.000000000 -0400
    48 +++ httpd-2.2.2/support/suexec.c        2007-05-22 10:32:04.000000000 -0400
     47--- httpd-2.2.11/support/suexec.c.old   2008-11-30 10:47:31.000000000 -0500
     48+++ httpd-2.2.11/support/suexec.c       2009-06-03 05:16:45.000000000 -0400
    4949@@ -30,6 +30,9 @@
    5050  *
     
    5757 #include "ap_config.h"
    5858 #include "suexec.h"
    59 @@ -46,6 +48,7 @@
     59@@ -46,6 +49,7 @@
    6060 #include <stdio.h>
    6161 #include <stdarg.h>
     
    6565 #ifdef HAVE_PWD_H
    6666 #include <pwd.h>
    67 @@ -95,6 +98,7 @@
     67@@ -95,6 +99,7 @@
    6868 {
    6969     /* variable name starts with */
     
    141141     gid_t gid;              /* target group placeholder  */
    142142     char *target_uname;     /* target user name          */
    143 @@ -350,6 +406,20 @@
     143@@ -350,6 +413,20 @@
    144144 #endif /*_OSD_POSIX*/
    145145 
     
    162162      * or attempts to back up out of the current directory,
    163163      * to protect against attacks.  If any are
    164 @@ -371,6 +441,7 @@
     164@@ -371,6 +448,7 @@
    165165         userdir = 1;
    166166     }
     
    170170      * Error out if the target username is invalid.
    171171      */
    172 @@ -450,7 +521,7 @@
     172@@ -452,7 +530,7 @@
    173173      * Error out if attempt is made to execute as root or as
    174174      * a UID less than AP_UID_MIN.  Tsk tsk.
     
    179179         exit(107);
    180180     }
    181 @@ -482,6 +553,21 @@
     181@@ -484,6 +562,21 @@
    182182         log_err("failed to setuid (%ld: %s)\n", uid, cmd);
    183183         exit(110);
     
    201201     /*
    202202      * Get the current working directory, as well as the proper
    203 @@ -504,6 +588,21 @@
     203@@ -506,6 +599,21 @@
    204204             log_err("cannot get docroot information (%s)\n", target_homedir);
    205205             exit(112);
     
    223223     else {
    224224         if (((chdir(AP_DOC_ROOT)) != 0) ||
    225 @@ -530,15 +629,17 @@
     225@@ -532,15 +640,17 @@
    226226     /*
    227227      * Error out if cwd is writable by others.
     
    242242         exit(117);
    243243     }
    244 @@ -546,10 +647,12 @@
     244@@ -548,10 +658,12 @@
    245245     /*
    246246      * Error out if the program is writable by others.
     
    255255     /*
    256256      * Error out if the file is setuid or setgid.
    257 @@ -563,6 +666,7 @@
     257@@ -565,6 +677,7 @@
    258258      * Error out if the target name/group is different from
    259259      * the name/group of the cwd or the program.
     
    263263         (gid != dir_info.st_gid) ||
    264264         (uid != prg_info.st_uid) ||
    265 @@ -574,12 +678,14 @@
     265@@ -576,16 +689,33 @@
    266266                 prg_info.st_uid, prg_info.st_gid);
    267267         exit(120);
     
    279279         exit(121);
    280280     }
    281 @@ -606,6 +711,21 @@
    282        exit(122);
    283      }
    284281 
    285282+    if (is_static_extension(cmd)) {
    286283+        argv[2] = STATIC_CAT_PATH;
    287284+        execv(STATIC_CAT_PATH, &argv[2]);
    288 +       log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
    289 +       exit(255);
     285+        log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
     286+        exit(255);
    290287+    }
    291288+    if (is_php_extension(cmd)) {
     
    294291+        argv[2] = "-f";
    295292+        execv(PHP_PATH, &argv[1]);
    296 +       log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[2]);
    297 +       exit(255);
    298 +    }
    299 +
    300      /*
    301       * Execute the command, replacing our image with its own.
    302       */
     293+        log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[2]);
     294+        exit(255);
     295+    }
     296+
     297 #ifdef AP_SUEXEC_UMASK
     298     /*
     299      * umask() uses inverse logic; bits are CLEAR for allowed access.
  • branches/fc11-dev/server/fedora/specs/httpd.spec.patch

    r1035 r1146  
    1 --- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
    2 +++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
    3 @@ -6,7 +6,7 @@
     1--- httpd.spec.orig     2009-03-17 09:12:22.000000000 -0400
     2+++ httpd.spec  2009-06-03 05:05:30.000000000 -0400
     3@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.10
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 2.2.11
     7-Release: 8
     8+Release: 8.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -54,6 +54,12 @@
     12@@ -56,6 +56,12 @@
    1313 Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    1515 
    1616+Provides: scripts-httpd
     
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -100,6 +106,7 @@
     25@@ -102,6 +108,7 @@
    2626 BuildRequires: openssl-devel, distcache-devel
    2727 Requires(post): openssl >= 0.9.7f-4, /bin/cat
     
    3131 
    3232 %description -n mod_ssl
    33 @@ -127,6 +134,11 @@
     33@@ -130,6 +137,11 @@
    3434 # Patch in vendor/release string
    3535 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    4343 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4444 if test "x${vmmn}" != "x%{mmn}"; then
    45 @@ -175,10 +187,12 @@
     45@@ -178,10 +190,12 @@
    4646         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    4747        --enable-suexec --with-suexec \
Note: See TracChangeset for help on using the changeset viewer.