diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-11-10 01:56:01 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-11-10 01:56:01 +0000 |
| commit | 3352fe72738192c46b94c03033618e083a1d27de (patch) | |
| tree | 4421d229d9a9f0a5663acaeff3ba266c43c1151a /www/apache13-fp/files/patch-fd | |
| parent | Dummy commit because I forgot to explain what this port does (diff) | |
Fixup port to provide Apache version 1.3.3 with FrontPage extensions.
PR: 8522
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=14435
Diffstat (limited to 'www/apache13-fp/files/patch-fd')
| -rw-r--r-- | www/apache13-fp/files/patch-fd | 127 |
1 files changed, 45 insertions, 82 deletions
diff --git a/www/apache13-fp/files/patch-fd b/www/apache13-fp/files/patch-fd index 89b500967937..81d1cb8ac816 100644 --- a/www/apache13-fp/files/patch-fd +++ b/www/apache13-fp/files/patch-fd @@ -1,96 +1,59 @@ -*** support/suexec.h.orig Sat May 10 00:06:17 1997 ---- support/suexec.h Thu Apr 23 15:57:52 1998 +*** src/support/suexec.h.orig Tue Mar 31 06:54:09 1998 +--- src/support/suexec.h Thu May 21 19:18:25 1998 *************** -*** 50,55 **** ---- 50,62 ---- - * +*** 56,61 **** +--- 56,72 ---- */ -+ /* "FPEXE modification made on Nov 2nd 1997 by Mark Wormgoor (riddles@ipe.nl) + /* ++ * "FPEXE modification made on 98.05.21 by Scot Hetzel (hetzels@westbend.net) ++ * based on previous FPEXE modifications supplied by Mark Wormgoor ++ * (riddles@ipe.nl) + * + * Changes were made in order to use Suexec and Frontpage 98 at the same time. -+ * Instead of trying to run suid on /usr/local/frontpage/currentversion/bin/fpexe, -+ * we execute this so the suid-bit does all the work -+ */ ++ * After we change to the target_uid and target_gid. We check if cmd = FPEXE, ++ * if it does then we execute the cmd without performing any further tests. ++ * ++ */ + - /* ++ /* * suexec.h -- user-definable variables for the suexec wrapper code. */ -*************** -*** 114,129 **** - * debugging purposes. - */ - #ifndef LOG_EXEC -! #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */ - #endif - - /* - * DOC_ROOT -- Define as the DocumentRoot set for Apache. This - * will be the only hierarchy (aside from UserDirs) - * that can be used for suEXEC behavior. - */ - #ifndef DOC_ROOT -! #define DOC_ROOT "/usr/local/etc/httpd/htdocs" - #endif - - /* ---- 121,162 ---- - * debugging purposes. - */ - #ifndef LOG_EXEC -! #define LOG_EXEC "/var/log/httpd-cgi.log" /* Need me? */ - #endif - /* - * DOC_ROOT -- Define as the DocumentRoot set for Apache. This - * will be the only hierarchy (aside from UserDirs) - * that can be used for suEXEC behavior. -+ * This is not used, since we have VirtualHosts defined. +*************** +*** 129,134 **** +--- 140,173 ---- */ #ifndef DOC_ROOT -! #define DOC_ROOT "/usr/local/www" -! #endif -! -! /* -! * FPEXE -! * FRONTPAGE_EXE -- We are running frontpage and we don't need to run -! * fpexe suid, since it's already set suid. Also, the -! * dir-rights are incorrect and so on... -! */ -! #ifndef FPEXE -! #define FPEXE "fpexe" -! #endif -! -! #ifndef FRONTPAGE_EXE -! #define FRONTPAGE_EXE "/usr/local/frontpage/version3.0/apache-fp/_vti_bin/fpexe" -! #endif -! -! /* -! * SYSTEM_CGI -- Define as the cgi directory for system-wide CGI's -! * Note that UID/GID of the cgi or the directory are -! * NOT matched if they're in this directory, although -! * all the other checks still apply. Caveat Emptor. -! */ -! -! #ifndef SYSTEM_CGI -! #define SYSTEM_CGI "/usr/local/www/cgi-bin" + #define DOC_ROOT "/usr/local/apache/htdocs" ++ #endif ++ ++ /* ++ * FPEXE, FPSTUB ++ * FPSTUBDIR -- We are running frontpage and we don't need to run ++ * fpexe suid, since it's already set suid. Also, the ++ * dir-rights are incorrect and so on... ++ */ ++ #ifndef FPEXE ++ #define FPEXE "fpexe" ++ #endif ++ ++ #ifndef FPSTUB ++ #define FPSTUB "/usr/local/frontpage/version3.0/apache-fp/_vti_bin/fpexe" ++ #endif ++ ++ #ifndef FPSTUBDIR ++ #define FPSTUBDIR "/usr/local/frontpage/currentversion/apache-fp/_vti_bin" ++ #endif ++ ++ /* ++ * SYSTEM_CGI -- Define as the cgi directory for system-wide CGI's ++ * Note that UID/GID of the cgi or the directory are ++ * NOT matched if they're in this directory, although ++ * all the other checks still apply. Caveat Emptor. ++ */ ++ #ifndef SYSTEM_CGI ++ #define SYSTEM_CGI "/usr/local/www/cgi-bin" #endif /* -*************** -*** 131,137 **** - * - */ - #ifndef SAFE_PATH -! #define SAFE_PATH "/usr/local/bin:/usr/bin:/bin" - #endif - - #endif /* _SUEXEC_H */ ---- 164,170 ---- - * - */ - #ifndef SAFE_PATH -! #define SAFE_PATH "/usr/local/bin:/usr/bin:/bin:." - #endif - - #endif /* _SUEXEC_H */ |