summaryrefslogtreecommitdiff
path: root/www/mod_frontpage/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/mod_frontpage/files')
-rw-r--r--www/mod_frontpage/files/patch-Makefile.PL49
-rw-r--r--www/mod_frontpage/files/patch-fpexec.c26
-rw-r--r--www/mod_frontpage/files/patch-mod_frontpage.c21
3 files changed, 0 insertions, 96 deletions
diff --git a/www/mod_frontpage/files/patch-Makefile.PL b/www/mod_frontpage/files/patch-Makefile.PL
deleted file mode 100644
index 70c675d0b01d..000000000000
--- a/www/mod_frontpage/files/patch-Makefile.PL
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.PL.orig Sun Dec 9 23:55:38 2001
-+++ Makefile.PL Sun Jan 20 17:22:36 2002
-@@ -41,23 +41,23 @@
- open(FILE,"$httpdconf") or die "Can't find $httpdconf!\n";
- print "Reading httpd.conf...\n";
- while(<FILE>) {
-- if (/^User (\w*)/) {
-+ if (!$user && /^User (\w*)/) {
- $user=$1;
- }
-- if (/^Group (\w*)/) {
-+ if (!$group && /^Group (\w*)/) {
- $group=$1;
- }
-- if (/^UserDir (\w*)/) {
-+ if (!$userdir && /^UserDir (\w*)/) {
- $userdir=$1;
- }
-- if (/^ServerRoot (\S*)/) {
-+ if (!$serverroot && /^ServerRoot (\S*)/) {
- $serverroot=$1;
- }
-- if (/^ErrorLog (\S*)/) {
-+ if (!$errorlog && /^ErrorLog (\S*)/) {
- $errorlog=$1;
- $errorlog=~ s/error_log/fpexec_log/;
- }
-- if (/^DocumentRoot (\S*)/) {
-+ if (!$documentroot && /^DocumentRoot (\S*)/) {
- $documentroot=$1;
- }
- }
-@@ -82,13 +82,13 @@
- print "Content uid, gid: $uid, $gid\n";
-
- #
--# User "apache" in Mandrake has user 48, gid 48
-+# User "www" in FreeBSD has user 80, gid 80
- #
--if ($uid < 48) {
-+if ($uid < 80) {
- print "UID too low! Using default value 100\n";
- $uid=100;
- }
--if ($gid < 48) {
-+if ($gid < 80) {
- print "GID too low! Using default value 100\n";
- $gid=100;
- }
diff --git a/www/mod_frontpage/files/patch-fpexec.c b/www/mod_frontpage/files/patch-fpexec.c
deleted file mode 100644
index a026fb84cfab..000000000000
--- a/www/mod_frontpage/files/patch-fpexec.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- fpexec.c.orig Sun Dec 9 23:35:39 2001
-+++ fpexec.c Wed Jan 23 20:10:14 2002
-@@ -247,6 +247,11 @@
- cidx++;
-
- for (ep = environ; *ep && cidx < AP_ENVBUF-1; ep++) {
-+ if (*ep == NULL) {
-+ log_err("HTTP header mismatch, stop\n");
-+ exit(120);
-+ }
-+
- if (!strncmp(*ep, "HTTP_", 5) || !strncmp(*ep,"HTTPS",5)
- || !strncmp(*ep,"SSL_",4)) {
- cleanenv[cidx] = *ep;
-@@ -327,6 +332,11 @@
- exit(103);
- }
- #endif /*_OSD_POSIX*/
-+
-+ if (target_uname == NULL) {
-+ log_err("invalid target user name: (NULL)\n");
-+ exit(105);
-+ }
-
- if (!strncmp("~", target_uname, 1)) {
- target_uname++;
diff --git a/www/mod_frontpage/files/patch-mod_frontpage.c b/www/mod_frontpage/files/patch-mod_frontpage.c
deleted file mode 100644
index 4291062e5902..000000000000
--- a/www/mod_frontpage/files/patch-mod_frontpage.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- mod_frontpage.c.orig Sun Dec 9 23:48:35 2001
-+++ mod_frontpage.c Mon Jan 21 13:02:01 2002
-@@ -110,7 +110,7 @@
-
- static void init (server_rec* s, pool* p)
- {
-- ap_add_version_component ("FrontPage/5.0.2.2510");
-+ ap_add_version_component ("FrontPage/5.0.2.2623");
- while (s != NULL) {
- conf* c = ap_get_module_config (s->module_config, &frontpage_module);
- if (c->disabled == -1)
-@@ -280,6 +280,9 @@
- return log_scripterror (r, c, NOT_FOUND, APLOG_NOERRNO,
- "unrecognized FrontPage request");
-
-+ if (strcmp(vti, SHTMLDLL) == 0)
-+ bcopy(SHTML, vti, strlen(SHTML));
-+
- ap_table_set (r->subprocess_env, "FPEXE", ap_pstrdup (r->pool, vti));
-
- webroot = ap_pstrndup (r->pool, r->filename, (vti - r->filename));