Upgrade to 1.3.28.

PR:		ports/56737
Submitted by:	Jeroen Ruigrok van der Werven <asmodai@tendra.org>

4 files changed, 122 insertions, 0 deletions

diff --git a/www/apache13+ipv6/files/patch-ac b/www/apache13+ipv6/files/patch-ac
new file mode 100644
index 0000000..f4f02e8
--- /dev/null
+++ b/www/apache13+ipv6/files/patch-ac
@@ -0,0 +1,31 @@
+--- src/modules/standard/mod_auth_db.module.bak	Tue Oct 16 13:12:02 2001
++++ src/modules/standard/mod_auth_db.module	Thu Feb 20 12:55:19 2003
+@@ -4,23 +4,23 @@
+     DB_LIB=''
+     if ./helpers/TestCompile func db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+-    elif ./helpers/TestCompile lib db db_create; then
++    elif ./helpers/TestCompile lib dbXXX db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+         DB_LIB='-ldb'
+     elif ./helpers/TestCompile func db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+-    elif ./helpers/TestCompile lib db db_open; then
++    elif ./helpers/TestCompile lib dbXXX db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+         DB_LIB='-ldb'
+-    elif ./helpers/TestCompile lib db2 db_open; then
++    elif ./helpers/TestCompile lib db2XXX db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+         DB_LIB='-ldb2'
+     elif ./helpers/TestCompile func dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+-    elif ./helpers/TestCompile lib db dbopen; then
++    elif ./helpers/TestCompile lib dbXXX dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+         DB_LIB='-ldb'
+-    elif ./helpers/TestCompile lib db1 dbopen; then
++    elif ./helpers/TestCompile lib db1XXX dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+         DB_LIB='-ldb1'
+     elif TCADDINCL='#include <db.h>' INCLUDES1="$INCLUDES1 -I/usr/include/db1" TLIB="-ldb1" \
diff --git a/www/apache13+ipv6/files/patch-ad b/www/apache13+ipv6/files/patch-ad
new file mode 100644
index 0000000..d92d2f4
--- /dev/null
+++ b/www/apache13+ipv6/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/support/dbmmanage.bak	Thu Mar 14 00:05:37 2002
++++ src/support/dbmmanage	Mon Jun  2 23:05:27 2003
+@@ -338,6 +338,8 @@
+     } elsif (substr($chkpass, 0, 5) eq '{SHA}') {
+         need_sha1_crypt;
+         $crypt_method = "sha1";
++    } elsif (substr($chkpass, 0, 3) eq '$1$') {
++	$crypt_method = "crypt";
+     } elsif (length($chkpass) == 13 && $chkpass ne $testpass) {
+         $crypt_method = "crypt";
+     } else {
diff --git a/www/apache13+ipv6/files/patch-ba b/www/apache13+ipv6/files/patch-ba
new file mode 100644
index 0000000..1f92bd3
--- /dev/null
+++ b/www/apache13+ipv6/files/patch-ba
@@ -0,0 +1,20 @@
+--- src/support/Makefile.tmpl.orig	Sat Mar  2 20:46:23 2002
++++ src/support/Makefile.tmpl	Tue Oct 22 00:31:18 2002
+@@ -7,7 +7,7 @@
+ # LIBS=-L$(SSLLOC)/lib -lssl -lcrypto -lm -lap -los $(EXTRA_LIBS) $(LIBS1)
+ # INCLUDES=-I$(SSLLOC)/include $(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
+ 
+-CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
++CFLAGS=-DLOGIN_CAP $(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
+ LIBS=-lm -lap -los $(EXTRA_LIBS) $(LIBS1)
+ INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
+ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L$(OSDIR) -L$(SRCDIR)/ap
+@@ -50,7 +50,7 @@
+ 	    -e 's%@LIBS_SHLIB@%$(LIBS_SHLIB)%g' && chmod a+x apxs
+ 
+ suexec: suexec.o
+-	$(CC) $(CFLAGS) -o suexec $(LDFLAGS) suexec.o $(LIBS)
++	$(CC) $(CFLAGS) -lutil -o suexec $(LDFLAGS) suexec.o $(LIBS)
+ 
+ clean:
+ 	rm -f $(TARGETS) *.o
diff --git a/www/apache13+ipv6/files/patch-bb b/www/apache13+ipv6/files/patch-bb
new file mode 100644
index 0000000..313c5f5
--- /dev/null
+++ b/www/apache13+ipv6/files/patch-bb
@@ -0,0 +1,60 @@
+--- src/support/suexec.c.orig	Wed Mar  5 18:50:29 2003
++++ src/support/suexec.c	Fri Jul 18 18:09:56 2003
+@@ -90,6 +90,9 @@
+ #include <sys/types.h>
+ 
+ #include <stdarg.h>
++#ifdef LOGIN_CAP
++#include <login_cap.h>
++#endif
+ 
+ #include "suexec.h"
+ 
+@@ -322,6 +325,9 @@
+ #ifdef LOG_EXEC
+         fprintf(stderr, " -D LOG_EXEC=\"%s\"\n", LOG_EXEC);
+ #endif
++#ifdef LOGIN_CAP
++	fprintf(stderr, " -D LOGIN_CAP\n");
++#endif
+ #ifdef SAFE_PATH
+         fprintf(stderr, " -D SAFE_PATH=\"%s\"\n", SAFE_PATH);
+ #endif
+@@ -480,7 +486,28 @@
+ 
+     /*
+      * Change UID/GID here so that the following tests work over NFS.
+-     *
++     */
++
++#ifdef LOGIN_CAP
++    /*
++     * Set user context (resources, priority and grouplist).
++     * If unsuccessful, error out.
++     */
++    if (setusercontext(NULL, pw, uid, LOGIN_SETRESOURCES | LOGIN_SETPRIORITY |
++      LOGIN_SETGROUP | LOGIN_SETLOGIN) == -1) {
++	log_err("emerg: failed to set user context (%ld: %s)\n", uid, cmd);
++	exit(108);
++    }
++
++    /*
++     * Set gid to the target group. If unsuccessful, error out.
++     */
++    if ((setgid(gid)) != 0) {
++	log_err("emerg: failed to setgid (%ld: %s)\n", gid, cmd);
++	exit(109);
++    }
++#else /* !LOGIN_CAP */
++    /*
+      * Initialize the group access list for the target user,
+      * and setgid() to the target group. If unsuccessful, error out.
+      */
+@@ -488,6 +515,7 @@
+ 	log_err("emerg: failed to setgid (%ld: %s)\n", gid, cmd);
+ 	exit(109);
+     }
++#endif /* LOGIN_CAP */
+ 
+     /*
+      * setuid() to the target user.  Error out on fail.