Changeset 2469 for branches/fc19-dev/server/common/patches/httpd-suexec-scripts.patch

Timestamp:

Sep 22, 2013, 7:05:37 PM (11 years ago)

Author:

glasgall

Message:

update httpd patches for 2.4.6

File:

• branches/fc19-dev/server/common/patches/httpd-suexec-scripts.patch (modified) (16 diffs)

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

@@ -1 @@
-From 8445788d68230b2e18739166f4c3ae6434038421 Mon Sep 17 00:00:00 2001
+From 427d432a56df94d69a11cc438b08adb070615005 Mon Sep 17 00:00:00 2001
 From: Alexander Chernyakhovsky <achernya@mit.edu>
 Date: Fri, 3 May 2013 21:38:58 -0400
-Subject: [PATCH 1/4] Add scripts-specific support to suexec
+Subject: [PATCH] Add scripts-specific support to suexec
 
 This patch make suexec aware of static-cat, Scripts' tool to serve
@@ -19 +19 @@
 manner that will strip arguments passed by Apache to php-cgi.
 ---
- configure.in     |    4 ++
- support/suexec.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.in     |   4 ++
+ support/suexec.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 173 insertions(+), 3 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index d93f78c..14faccf 100644
+index 811aace..a95349f 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -720,6 +720,10 @@ AC_ARG_WITH(suexec-userdir,
+@@ -721,6 +721,10 @@ AC_ARG_WITH(suexec-userdir,
  APACHE_HELP_STRING(--with-suexec-userdir,User subdirectory),[
    AC_DEFINE_UNQUOTED(AP_USERDIR_SUFFIX, "$withval", [User subdirectory] ) ] )
@@ -39 +39 @@
    AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
 diff --git a/support/suexec.c b/support/suexec.c
-index 5b6b254..e377042 100644
+index 32e7320..3a4d802 100644
 --- a/support/suexec.c
 +++ b/support/suexec.c
@@ -60 +60 @@
  
      /* variable name is */
-@@ -264,9 +268,108 @@ static void clean_env(void)
+@@ -268,9 +272,108 @@ static void clean_env(void)
      environ = cleanenv;
  }
@@ -169 +169 @@
      gid_t gid;              /* target group placeholder  */
      char *target_uname;     /* target user name          */
-@@ -286,6 +389,7 @@ int main(int argc, char *argv[])
+@@ -290,6 +393,7 @@ int main(int argc, char *argv[])
       * Start with a "clean" environment
       */
@@ -177 +177 @@
      /*
       * Check existence/validity of the UID of the user
-@@ -369,6 +473,20 @@ int main(int argc, char *argv[])
+@@ -373,6 +477,20 @@ int main(int argc, char *argv[])
  #endif /*_OSD_POSIX*/
  
@@ -198 +198 @@
       * or attempts to back up out of the current directory,
       * to protect against attacks.  If any are
-@@ -390,6 +508,7 @@ int main(int argc, char *argv[])
+@@ -394,6 +512,7 @@ int main(int argc, char *argv[])
          userdir = 1;
      }
@@ -206 +206 @@
       * Error out if the target username is invalid.
       */
-@@ -471,7 +590,7 @@ int main(int argc, char *argv[])
+@@ -482,7 +601,7 @@ int main(int argc, char *argv[])
       * Error out if attempt is made to execute as root or as
       * a UID less than AP_UID_MIN.  Tsk tsk.
@@ -215 +215 @@
          exit(107);
      }
-@@ -503,6 +622,7 @@ int main(int argc, char *argv[])
+@@ -514,6 +633,7 @@ int main(int argc, char *argv[])
          log_err("failed to setuid (%lu: %s)\n", (unsigned long)uid, cmd);
          exit(110);
@@ -223 +223 @@
      /*
       * Get the current working directory, as well as the proper
-@@ -525,6 +645,21 @@ int main(int argc, char *argv[])
+@@ -536,6 +656,21 @@ int main(int argc, char *argv[])
              log_err("cannot get docroot information (%s)\n", target_homedir);
              exit(112);
@@ -245 +245 @@
      else {
          if (((chdir(AP_DOC_ROOT)) != 0) ||
-@@ -551,15 +686,17 @@ int main(int argc, char *argv[])
+@@ -562,15 +697,17 @@ int main(int argc, char *argv[])
      /*
       * Error out if cwd is writable by others.
@@ -264 +264 @@
          exit(117);
      }
-@@ -567,10 +704,12 @@ int main(int argc, char *argv[])
+@@ -578,10 +715,12 @@ int main(int argc, char *argv[])
      /*
       * Error out if the program is writable by others.
@@ -277 +277 @@
      /*
       * Error out if the file is setuid or setgid.
-@@ -584,6 +723,7 @@ int main(int argc, char *argv[])
+@@ -595,6 +734,7 @@ int main(int argc, char *argv[])
       * Error out if the target name/group is different from
       * the name/group of the cwd or the program.
@@ -285 +285 @@
          (gid != dir_info.st_gid) ||
          (uid != prg_info.st_uid) ||
-@@ -595,12 +735,14 @@ int main(int argc, char *argv[])
+@@ -606,12 +746,14 @@ int main(int argc, char *argv[])
                  (unsigned long)prg_info.st_uid, (unsigned long)prg_info.st_gid);
          exit(120);
@@ -301 +301 @@
          exit(121);
      }
-@@ -649,6 +791,30 @@ int main(int argc, char *argv[])
+@@ -660,6 +802,30 @@ int main(int argc, char *argv[])
      /*
       * Execute the command, replacing our image with its own.
@@ -333 +333 @@
      {
 -- 
-1.7.9.6 (Apple Git-31.1)
-
+1.8.1.2
+