head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2007.06.22.11.02.06;	author rse;	state dead;
branches;
next	1.2;
commitid	Z5FSE1qba3VhKTms;

1.2
date	2007.04.02.15.08.32;	author rse;	state Exp;
branches;
next	1.1;
commitid	KkHPAkqCw1mhIvcs;

1.1
date	2007.02.07.22.17.59;	author cs;	state Exp;
branches;
next	;
commitid	D8v9efI5kdcePB5s;


desc
@@


1.3
log
@new OpenPKG world order: upgrade from Apache 1.3 to 2.2 (part 3/3: remove obsolete packages)
@
text
@Index: apache_1.3.37/conf/mime.types
--- apache_1.3.37/conf/mime.types.orig	2004-11-24 20:10:19 +0100
+++ apache_1.3.37/conf/mime.types	2006-09-10 14:51:11 +0200
@@@@ -265,6 +265,22 @@@@
 application/vnd.novadigm.edm
 application/vnd.novadigm.edx
 application/vnd.novadigm.ext
+application/vnd.oasis.opendocument.text odt
+application/vnd.oasis.opendocument.spreadsheet ods
+application/vnd.oasis.opendocument.presentation odp
+application/vnd.oasis.opendocument.graphics odg
+application/vnd.oasis.opendocument.chart odc
+application/vnd.oasis.opendocument.formula odf
+application/vnd.oasis.opendocument.image odi
+application/vnd.oasis.opendocument.text-template ott
+application/vnd.oasis.opendocument.spreadsheet-template ots
+application/vnd.oasis.opendocument.presentation-template otp
+application/vnd.oasis.opendocument.graphics-template otg
+application/vnd.oasis.opendocument.chart-template otc
+application/vnd.oasis.opendocument.formula-template oft
+application/vnd.oasis.opendocument.image-template oti
+application/vnd.oasis.opendocument.text-master odm
+application/vnd.oasis.opendocument.text-web oth
 application/vnd.obn
 application/vnd.osa.netdeploy
 application/vnd.palm
Index: apache_1.3.37/configure
--- apache_1.3.37/configure.orig	2006-07-12 10:16:05 +0200
+++ apache_1.3.37/configure	2006-09-10 14:49:50 +0200
@@@@ -1175,10 +1175,10 @@@@
 ##   or we cannot support the case where the relative
 ##   path is just the emtpy one, i.e. ""]
 ##
-runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
-libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
+runtimedir_relative="$runtimedir/"
+logfiledir_relative="$logfiledir/"
+sysconfdir_relative="$sysconfdir/"
+libexecdir_relative="$libexecdir/"
 
 ##
 ##  check and debug
Index: apache_1.3.37/src/Configure
--- apache_1.3.37/src/Configure.orig	2006-07-12 10:16:05 +0200
+++ apache_1.3.37/src/Configure	2006-09-10 14:49:50 +0200
@@@@ -1158,14 +1158,20 @@@@
 	    SHLIB_SUFFIX_DEPTH=0
 	    ;;
 	*-solaris2*)
-	    if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then
-	        CFLAGS_SHLIB="-fPIC"
-	    else
-	        CFLAGS_SHLIB="-KPIC"
-	    fi
+	    CFLAGS_SHLIB="-KPIC"
 	    LDFLAGS_SHLIB="-G"
-	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
 	    LDFLAGS_SHLIB_EXPORT=""
+	    for word in `$CC -v 2>&1` ; do
+            case $word in 
+            --with-gnu-ld)
+                LDFLAGS_SHLIB="-shared"
+                ;;
+            *gcc*)
+                CFLAGS_SHLIB="-fPIC"
+                ;;
+            esac
+        done
+	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
 	    SHLIB_SUFFIX_DEPTH=1
 	    ;;
 	*-sunos4*)
@@@@ -1874,27 +1880,12 @@@@
 # set the default, based on whether expat-lite is bundled. if it is present,
 # then we can always include expat.
 if [ "x$RULE_EXPAT" = "xdefault" ]; then
-    if [ -d ./lib/expat-lite/ ]; then
-        RULE_EXPAT=yes
-    else
-        RULE_EXPAT=no
-    fi
+    RULE_EXPAT=no
 fi
 
 if [ "x$RULE_EXPAT" = "xyes" ]; then
-    if ./helpers/TestCompile lib expat; then
-        echo " + using system Expat"
-        LIBS="$LIBS -lexpat"
-    else
-        if [ ! -d ./lib/expat-lite/ ]; then
-            echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
-	    exit 1
-        fi
-        echo " + using builtin Expat"
-        EXPATLIB="lib/expat-lite/libexpat.a"
-        APLIBDIRS="expat-lite $APLIBDIRS"
-        CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
-    fi
+    echo " + using system Expat"
+    LIBS="$LIBS -lexpat"
 fi
 
 ####################################################################
Index: apache_1.3.37/src/main/util_script.c
--- apache_1.3.37/src/main/util_script.c.orig	2006-07-12 10:16:05 +0200
+++ apache_1.3.37/src/main/util_script.c	2006-09-10 14:49:50 +0200
@@@@ -204,6 +204,7 @@@@
 	}
     }
 
+    if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"))))
     if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) {
 	env_path = DEFAULT_PATH;
     }
Index: apache_1.3.37/src/include/ap_sha1.h
--- apache_1.3.37/src/include/ap_sha1.h.orig	2007-04-02 16:48:10 +0200
+++ apache_1.3.37/src/include/ap_sha1.h	2007-04-02 16:56:23 +0200
@@@@ -38,7 +38,7 @@@@
 #define AP_SHA1PW_ID "{SHA}"
 #define AP_SHA1PW_IDLEN 5
 
-typedef unsigned long AP_LONG;     /* a 32-bit quantity */
+typedef unsigned int AP_LONG;     /* a 32-bit quantity */
 
 typedef struct {
     AP_LONG digest[5];             /* message digest */
@


1.2
log
@fix SHA1 function under AMD64 (where "sizeof(unsigned long) == 8") by using "unsigned int" in the same brain-dead and still partly broken way (as "sizeof(unsigned int) == 4" cannot be assumed in general) as the MD5 function in the Apache source. KEEP IN MIND THAT THIS IS STILL UGLY, BUT AT LEAST SLIGHTLY BETTER AND AT LEAST AS BRAIN-DEAD AS THE EXISTING MD5 CODE.
@
text
@@


1.1
log
@new package: apache-php4 1.3.37 (Apache HTTP Server providing optional PHP4 support (legacy))
@
text
@d117 12
@