- Upgrade to Apache 1.3.4

- Upgrade to mod_ssl 2.1.7
- Add additional master site
- Add Y2K link
- Make portlint happy

6 files changed, 98 insertions, 65 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index fd64e072cf4d..70f194432211 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	Apache + mod_ssl
-# Version required:	1.3.3 + 2.1.6
+# Version required:	1.3.4 + 2.1.7
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.14 1999/01/06 16:48:34 rse Exp $
+# $Id: Makefile,v 1.15 1999/01/10 14:11:18 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -12,6 +12,7 @@ CATEGORIES=	www security
 MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
 		http://www.engelschall.com/sw/mod_ssl/distrib/ \
 		ftp://ftp.engelschall.com/sw/mod_ssl/ \
+		ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \
 		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \
 		ftp://ftp.ulpgc.es/pub/mod_ssl/ \
 		ftp://glock.missouri.edu/pub/mod_ssl/ \
@@ -20,7 +21,6 @@ MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.blatzheim.com/pub/mod_ssl/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
 		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
-
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
 
@@ -31,13 +31,15 @@ BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/openssl \
 		${PREFIX}/lib/libcrypto.a:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/openssl
 
-VERSION_APACHE=	1.3.3
-VERSION_MODSSL=	2.1.6
+VERSION_APACHE=	1.3.4
+VERSION_MODSSL=	2.1.7
 
+Y2K=		http://www.engelschall.com/sw/mod_ssl/docs/2.1/ssl_faq.html#y2k
 RESTRICTED=	"Contains cryptography"
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/apache \
+CONFIGURE_ARGS=	--with-layout=GNU \
+		--sysconfdir=${PREFIX}/etc/apache \
 		--includedir=${PREFIX}/include/apache \
 		--logfiledir=/var/log \
 		--runtimedir=/var/run \
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 5db203b328cf..e236cd2b219b 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
-MD5 (mod_ssl-2.1.6-1.3.3.tar.gz) = 1c2d245c199421de0ae94f127eba03fc
+MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
+MD5 (mod_ssl-2.1.7-1.3.4.tar.gz) = 03e0db5d710b40481bab9e66ba5e36ad
diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
index 21ea6449f6ca..6bb44ee30a0a 100644
--- a/www/apache13-modssl/files/patch-aa
+++ b/www/apache13-modssl/files/patch-aa
@@ -1,40 +1,40 @@
-*** configure.bak	Sun Jul 12 13:25:46 1998
---- configure	Thu Jul 23 16:52:04 1998
+*** configure.orig	Tue Jan 12 13:23:40 1999
+--- configure	Tue Jan 12 13:33:38 1999
 ***************
-*** 877,884 ****
-      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
-      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
-      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
+*** 1024,1031 ****
+      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
 !     echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
 !     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
       echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
       echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
---- 877,884 ----
-      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
-      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
-      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
+--- 1024,1031 ----
+      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
 !     echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
 !     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
       echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
       echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
 ***************
-*** 942,949 ****
-  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
+*** 1106,1113 ****
+  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
   echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
-  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
+  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
   echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
---- 942,949 ----
-  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
+--- 1106,1113 ----
+  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
   echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
-  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
+  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
   echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
index 11aedaa76270..f631045f2106 100644
--- a/www/apache13-modssl/files/patch-ac
+++ b/www/apache13-modssl/files/patch-ac
@@ -1,53 +1,53 @@
-*** conf/httpd.conf-dist.orig	Thu May  7 01:12:39 1998
---- conf/httpd.conf-dist	Fri Jun  5 19:34:17 1998
+*** conf/httpd.conf-dist.orig	Tue Jan 12 13:51:58 1999
+--- conf/httpd.conf-dist	Tue Jan 12 13:52:37 1999
 ***************
-*** 50,56 ****
+*** 252,258 ****
   #  don't use Group #-1 on these systems!
-  
+  #
   User nobody
 ! Group #-1
   
+  #
   # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
---- 50,56 ----
+--- 252,258 ----
   #  don't use Group #-1 on these systems!
-  
+  #
   User nobody
-! Group nogroup
+! Group nobody
   
+  #
   # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
 ***************
-*** 94,100 ****
-  # The location of the access logfile (Common Logfile Format).
-  # If this does not start with /, ServerRoot is prepended to it.
-  
+*** 470,476 ****
+  # define per-<VirtualHost> access logfiles, transactions will be
+  # logged therein and *not* in this file.
+  #
 ! CustomLog logs/access_log common
   
-  # If you would like to have an agent and referer logfile uncomment the
-  # following directives.
---- 94,100 ----
-  # The location of the access logfile (Common Logfile Format).
-  # If this does not start with /, ServerRoot is prepended to it.
-  
+  #
+  # If you would like to have agent and referer logfiles, uncomment the
+--- 470,476 ----
+  # define per-<VirtualHost> access logfiles, transactions will be
+  # logged therein and *not* in this file.
+  #
 ! #CustomLog logs/access_log common
   
-  # If you would like to have an agent and referer logfile uncomment the
-  # following directives.
+  #
+  # If you would like to have agent and referer logfiles, uncomment the
 ***************
-*** 105,111 ****
-  # If you prefer a single logfile with access, agent and referer information
+*** 483,489 ****
+  # If you prefer a single logfile with access, agent, and referer information
   # (Combined Logfile Format) you can use the following directive.
-  
+  #
 ! #CustomLog logs/access_log combined
   
-  # PidFile: The file the server should log its pid to
-  PidFile logs/httpd.pid
---- 105,111 ----
-  # If you prefer a single logfile with access, agent and referer information
+  #
+  # Optionally add a line containing the server version and virtual host
+--- 483,489 ----
+  # If you prefer a single logfile with access, agent, and referer information
   # (Combined Logfile Format) you can use the following directive.
-  
+  #
 ! CustomLog logs/access_log combined
   
-  # PidFile: The file the server should log its pid to
-  PidFile logs/httpd.pid
+  #
+  # Optionally add a line containing the server version and virtual host
diff --git a/www/apache13-modssl/pkg-descr b/www/apache13-modssl/pkg-descr
index 41717dce9942..fba40b25264e 100644
--- a/www/apache13-modssl/pkg-descr
+++ b/www/apache13-modssl/pkg-descr
@@ -1,4 +1,3 @@
-
  Apache 1.3 + mod_ssl 2.1          ``mod_ssl combines the flexibility of  
  ========================            Apache with the security of SSLeay.''
 
@@ -10,7 +9,6 @@
  developed by Ben Laurie for use in the Apache-SSL HTTP server project. 
 
  As a summary, here are its main SSL/TLS-related features:
-
    o  Open-Source software (BSD-style license)
    o  Useable for both commercial and non-commercial use
    o  Available for both Unix and Win32 platforms
@@ -33,8 +31,6 @@
    o  Assistance in X.509 v3 certificate generation
 
  All documentation can be found on-line on the Web:
-
    o  Apache:  http://www.apache.org/
    o  mod_ssl: http://www.engelschall.com/sw/mod_ssl/
    o  SSLeay:  http://www.ssleay.org/
-
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index df546954b9aa..5dd95edf4775 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -49,6 +49,7 @@ include/apache/http_vhost.h
 include/apache/httpd.h
 include/apache/multithread.h
 include/apache/os.h
+include/apache/os-inline.c
 include/apache/rfc1413.h
 include/apache/scoreboard.h
 include/apache/util_date.h
@@ -123,6 +124,8 @@ share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/misc/API.html
 share/doc/apache/manual/misc/FAQ.html
 share/doc/apache/manual/misc/HTTP_Features.tsv
@@ -253,6 +256,7 @@ share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
+share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
 share/doc/apache/manual/vhosts/details.html
@@ -346,6 +350,36 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+www/icons/small/README.txt
+www/icons/small/back.gif
+www/icons/small/binary.gif
+www/icons/small/binhex.gif
+www/icons/small/blank.gif
+www/icons/small/broken.gif
+www/icons/small/burst.gif
+www/icons/small/comp1.gif
+www/icons/small/comp2.gif
+www/icons/small/compressed.gif
+www/icons/small/continued.gif
+www/icons/small/dir.gif
+www/icons/small/dir2.gif
+www/icons/small/forward.gif
+www/icons/small/generic.gif
+www/icons/small/generic2.gif
+www/icons/small/generic3.gif
+www/icons/small/image.gif
+www/icons/small/image2.gif
+www/icons/small/index.gif
+www/icons/small/key.gif
+www/icons/small/movie.gif
+www/icons/small/rainbow.gif
+www/icons/small/sound.gif
+www/icons/small/sound2.gif
+www/icons/small/tar.gif
+www/icons/small/text.gif
+www/icons/small/transfer.gif
+www/icons/small/unknown.gif
+www/icons/small/uu.gif
 @exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
 @exec mkdir -p %D/www
 @exec mkdir -p %D/www/proxy
@@ -356,6 +390,7 @@ www/icons/world2.gif
 @unexec rm -f %D/www/cgi-bin
 @dirrm www/cgi-bin.default
 @dirrm www/proxy
+@dirrm www/icons/small
 @dirrm www/icons
 @dirrm www
 @unexec rm -f %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*