diff options
Diffstat (limited to 'www/apache-jserv/files')
| -rw-r--r-- | www/apache-jserv/files/patch-aa | 11 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-ab | 11 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-ac | 11 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-ad | 37 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-ae | 20 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-af | 10 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-ag | 31 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-ah | 11 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-docs::api::Makefile.in | 11 |
9 files changed, 0 insertions, 153 deletions
diff --git a/www/apache-jserv/files/patch-aa b/www/apache-jserv/files/patch-aa deleted file mode 100644 index addcb364415f..000000000000 --- a/www/apache-jserv/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Wed Mar 3 08:46:29 1999 -+++ configure Wed Mar 3 08:46:42 1999 -@@ -1239,7 +1239,7 @@ - fi - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='libtool' - - # Check for any special flags to pass to ltconfig. - libtool_flags= diff --git a/www/apache-jserv/files/patch-ab b/www/apache-jserv/files/patch-ab deleted file mode 100644 index d7c90ec22be7..000000000000 --- a/www/apache-jserv/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/Makefile.in.orig Wed Jan 26 18:21:50 2000 -+++ docs/Makefile.in Wed Jan 26 18:22:14 2000 -@@ -115,7 +115,7 @@ - - DOCFILES = $(strip $(shell ls $(EXTRA_DIST))) - --docdir = ${prefix}/docs -+docdir = ${prefix}/share/doc/mod_jserv - doc_DATA = $(DOCFILES) - mkinstalldirs = $(SHELL) $(top_srcdir)/src/scripts/build/unix/mkinstalldirs - CONFIG_CLEAN_FILES = diff --git a/www/apache-jserv/files/patch-ac b/www/apache-jserv/files/patch-ac deleted file mode 100644 index 2c5a27f548ef..000000000000 --- a/www/apache-jserv/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/jserv.conf.in.orig Wed Jan 26 18:37:20 2000 -+++ conf/jserv.conf.in Wed Jan 26 18:38:36 2000 -@@ -40,7 +40,7 @@ - # Syntax: ApJServLogFile [filename] - # Default: "./logs/mod_jserv.log" - # Note: when set to "DISABLED", the log will be redirected to Apache error log --ApJServLogFile @JSERV_LOG@/mod_jserv.log -+ApJServLogFile /var/log/mod_jserv.log - - # Log Level for this module - # Syntax: ApJServLogLevel [debug|info|notice|warn|error|crit|alert|emerg] diff --git a/www/apache-jserv/files/patch-ad b/www/apache-jserv/files/patch-ad deleted file mode 100644 index b466feeb11af..000000000000 --- a/www/apache-jserv/files/patch-ad +++ /dev/null @@ -1,37 +0,0 @@ ---- conf/jserv.properties.in.orig Sat Jan 15 01:58:57 2000 -+++ conf/jserv.properties.in Fri Apr 7 01:57:42 2000 -@@ -53,8 +53,15 @@ - # MUST NOT be in this classpath or the classpath of the shell - # you start the Apache from. - # --wrapper.classpath=@JSERV_CLASSES@ -+wrapper.classpath=@prefix@/share/java/classes/ApacheJServ.jar - wrapper.classpath=@JSDK_CLASSES@ -+# Uncomment if you use Cocoon. -+#wrapper.classpath=@prefix@/share/java/classes/Cocoon.jar -+#wrapper.classpath=@prefix@/share/java/classes/openxml.jar -+#wrapper.classpath=@prefix@/share/java/classes/xslp.jar -+# Currently, these are not officially supported by the Cocoon team. -+#wrapper.classpath=@prefix@/share/java/classes/xml4j.jar -+#wrapper.classpath=@prefix@/share/java/classes/lotusxsl.jar - - # An environment name with value passed to the JVM - # Syntax: wrapper.env=[name]=[value] (String) -@@ -117,7 +124,7 @@ - # Syntax: [servlet zone name as on the zones list].properties=[full path to configFile] (String) - # Default: NONE - # Note: if the file could not be opened, try using absolute paths. --root.properties=@JSERV_CONF@/zone.properties -+root.properties=@sysconfdir@/zone.properties - - # - # Thread Pool parameters -@@ -247,7 +254,7 @@ - # Syntax: log.file=[log path and filename] (String) - # Default: NONE - # Note: if the file could not be opened, try using absolute paths. --log.file=@JSERV_LOG@/jserv.log -+log.file=/var/log/jserv.log - - # Enable the timestamp before the log message - # Syntax: log.timestamp=[true,false] (boolean) diff --git a/www/apache-jserv/files/patch-ae b/www/apache-jserv/files/patch-ae deleted file mode 100644 index 7160b939b3b1..000000000000 --- a/www/apache-jserv/files/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ ---- conf/zone.properties.in.orig Wed Jan 26 18:30:38 2000 -+++ conf/zone.properties.in Wed Jan 26 18:31:53 2000 -@@ -23,6 +23,8 @@ - # here. - - repositories=@JSERV_REPO@ -+# Uncomment if you use Cocoon. -+#repositories=@prefix@/share/java/classes/Cocoon.jar - - # Classloader parameters - ######################### -@@ -141,6 +143,8 @@ - # Syntax: servlet.[classname].initArgs=[name]=[value],[name]=[value],... - # Default: NONE - # servlet.org.fool.Dummy.initArgs=message=I'm a dummy servlet -+# Uncomment if you use Cocoon. -+#servlet.org.apache.cocoon.Cocoon.initArgs=properties=@prefix@/etc/apache/cocoon.properties - - # Aliased Servlet Init Parameters - ################################## diff --git a/www/apache-jserv/files/patch-af b/www/apache-jserv/files/patch-af deleted file mode 100644 index e7901830f97f..000000000000 --- a/www/apache-jserv/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- src/java/org/apache/java/lang/AdaptiveClassLoader.java.orig Sun Mar 12 06:34:42 2000 -+++ src/java/org/apache/java/lang/AdaptiveClassLoader.java Fri May 19 00:10:41 2000 -@@ -723,6 +723,7 @@ - if ( zipfile != null ) { - try { - zipfile.close(); -+ zipfile = null; - } catch ( IOException ignored ) { - } - } diff --git a/www/apache-jserv/files/patch-ag b/www/apache-jserv/files/patch-ag deleted file mode 100644 index b2ff44682907..000000000000 --- a/www/apache-jserv/files/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ ---- src/java/org/apache/jserv/JServConnection.java.orig Wed Feb 9 00:05:03 2000 -+++ src/java/org/apache/jserv/JServConnection.java Wed Feb 9 00:15:59 2000 -@@ -1062,6 +1062,14 @@ - * known. - */ - public String getRemoteUser() { -+ String type = getAuthType(); -+ if(type == null) { -+ return (String) env_vars.get("REMOTE_USER"); -+ } else if(type.equalsIgnoreCase("SSL")) { -+ String name = (String)env_vars.get("SSL_CLIENT_DN"); -+ name = name.replace('/', ','); -+ return name.substring(1); -+ } - return (String) env_vars.get("REMOTE_USER"); - } - -@@ -1072,7 +1080,12 @@ - * @return this request's authentication scheme, or null if none. - */ - public String getAuthType() { -- return (String) env_vars.get("AUTH_TYPE"); -+ String temp = (String) env_vars.get("SSL_CLIENT_DN"); -+ if(temp != null && temp.equals("") == false) { -+ return "SSL"; -+ } else { -+ return (String) env_vars.get("AUTH_TYPE"); -+ } - } - - /** diff --git a/www/apache-jserv/files/patch-ah b/www/apache-jserv/files/patch-ah deleted file mode 100644 index efa2c044ea32..000000000000 --- a/www/apache-jserv/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java/Makefile.in.orig Fri Apr 7 01:36:25 2000 -+++ src/java/Makefile.in Fri Apr 7 01:37:51 2000 -@@ -109,7 +109,7 @@ - SUBDIRS = org - - ARCHIVE = $(PACKAGE).jar --jardir = ${libexecdir} -+jardir = $(prefix)/share/java/classes - jar_DATA = ${ARCHIVE} - - # VT: NOTE: This is not going to be as bad as in ECS because the findstring diff --git a/www/apache-jserv/files/patch-docs::api::Makefile.in b/www/apache-jserv/files/patch-docs::api::Makefile.in deleted file mode 100644 index 8bfdebab261e..000000000000 --- a/www/apache-jserv/files/patch-docs::api::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/api/Makefile.in.orig Sun Jun 18 04:07:12 2000 -+++ docs/api/Makefile.in Thu May 24 13:22:22 2001 -@@ -114,7 +114,7 @@ - - FILES = org *.html *.css package-list - --docdir = ${prefix}/docs/api -+docdir = ${prefix}/share/doc/mod_jserv/api - mkinstalldirs = $(SHELL) $(top_srcdir)/src/scripts/build/unix/mkinstalldirs - CONFIG_CLEAN_FILES = - DIST_COMMON = Makefile.am Makefile.in |
