Update ap-ssl to 2.8.2. Relevant changes from version 2.8.1:

   *) Moved the Shared Memory Cyclic Buffer (SHMCB) session cache
      variant from "experimental" state to "production" by removing the
      `#ifdef SSL_EXPERIMENTAL_SHMCB ...#endif' wrappers. This means
      that now `SSLSessionCache shmcb:...' is unconditionally available.

   *) Made the mutex handling more robust by retrying the
      semaphore-based operations in interrupt situations
      (errno == EINTR).

   *) Also log the OpenSSL error message if the RSA temporary
      key(s) cannot be generated.

   *) Fixed mod_ssl Auth handler: it now returns DECLINED instead of
      OK if authentication is passed successfully to allow other modules
      (usually mod_auth) to still deny the request.

   *) Fixed certificate DN handling under EBCDIC platforms.

3 files changed, 176 insertions, 21 deletions

diff --git a/www/ap-ssl/pkg/DEINSTALL b/www/ap-ssl/pkg/DEINSTALL
new file mode 100644
index 00000000000..dd98806fed8
--- /dev/null
+++ b/www/ap-ssl/pkg/DEINSTALL
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/04/29 20:36:48 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+RM="@RM@"
+
+SERVERROOT="@APACHE_SYSCONFDIR@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/mod_ssl
+CONFDIR=${SERVERROOT}
+CONFFILES="apache_start.conf"
+NONCONFFILES="	ssl.crl/Makefile.crl					\
+		ssl.crl/README.CRL					\
+		ssl.crt/Makefile.crt					\
+		ssl.crt/README.CRT					\
+		ssl.crt/ca-bundle.crt					\
+		ssl.csr/README.CSR					\
+		ssl.key/README.KEY					\
+		ssl.prm/README.PRM"
+
+case ${STAGE} in
+DEINSTALL)
+	# Remove configuration files if they don't differ from the default
+	# config file.
+	#
+	for file in ${CONFFILES} ${NONCONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}
+		if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+		then
+			${RM} -f ${FILE}
+		fi
+	done
+	;;
+
+POST-DEINSTALL)
+	modified_files=''
+	for file in ${CONFFILES} ${NONCONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		if [ -f ${FILE} ]
+		then
+			modified_files="${modified_files} ${FILE}"
+		fi
+	done
+
+	if [ -n "${modified_files}" -o -n "${existing_dirs}" ]
+	then
+        	${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove:
+EOF
+		if [ -n "${modified_files}" ]
+		then
+			${CAT} << EOF
+
+  * the following files:
+
+EOF
+			for file in ${modified_files}
+			do
+				echo "  ${file}"
+			done
+		fi
+		${CAT} << EOF
+===========================================================================
+EOF
+	fi
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/ap-ssl/pkg/INSTALL b/www/ap-ssl/pkg/INSTALL
new file mode 100644
index 00000000000..59910682357
--- /dev/null
+++ b/www/ap-ssl/pkg/INSTALL
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/04/29 20:36:48 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CP="@CP@"
+MKDIR="@MKDIR@"
+
+SERVERROOT="@APACHE_SYSCONFDIR@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/mod_ssl
+CONFDIR=${SERVERROOT}
+CONFFILES="apache_start.conf"
+NONCONFFILES="	ssl.crl/Makefile.crl					\
+		ssl.crl/README.CRL					\
+		ssl.crt/Makefile.crt					\
+		ssl.crt/README.CRT					\
+		ssl.crt/ca-bundle.crt					\
+		ssl.csr/README.CSR					\
+		ssl.key/README.KEY					\
+		ssl.prm/README.PRM"
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	# ${SERVERROOT} (${CONFDIR}) is already set up by apache/pkg/INSTALL,
+	# so we don't need to create those directories here.
+
+	echo "Installing configuration files:"
+	for file in ${CONFFILES} ${NONCONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}
+		if [ -f ${FILE} ]
+		then
+			echo "    ${FILE} already exists"
+		else
+			echo "    ${FILE}"
+			${CP} ${SAMPLEFILE} ${FILE}
+			${CHMOD} 644 ${FILE}
+		fi
+	done
+	${CAT} << EOF
+
+===========================================================================
+Some files you might need to customize include the following:
+
+EOF
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		echo "	${FILE}"
+	done
+        ${CAT} << EOF
+===========================================================================
+EOF
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST
index d13c2b7c97f..7e609d9b6bf 100644
--- a/www/ap-ssl/pkg/PLIST
+++ b/www/ap-ssl/pkg/PLIST
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.9 2001/02/02 16:41:23 jlam Exp $
-etc/httpd/apache_start.conf
-etc/httpd/ssl.crl/Makefile.crl
-etc/httpd/ssl.crl/README.CRL
-etc/httpd/ssl.crt/Makefile.crt
-etc/httpd/ssl.crt/README.CRT
-etc/httpd/ssl.crt/ca-bundle.crt
-etc/httpd/ssl.crt/snakeoil-ca-dsa.crt
-etc/httpd/ssl.crt/snakeoil-ca-rsa.crt
-etc/httpd/ssl.crt/snakeoil-dsa.crt
-etc/httpd/ssl.crt/snakeoil-rsa.crt
-etc/httpd/ssl.csr/README.CSR
-etc/httpd/ssl.key/README.KEY
-etc/httpd/ssl.key/snakeoil-ca-dsa.key
-etc/httpd/ssl.key/snakeoil-ca-rsa.key
-etc/httpd/ssl.key/snakeoil-dsa.key
-etc/httpd/ssl.key/snakeoil-rsa.key
-etc/httpd/ssl.prm/README.PRM
-etc/httpd/ssl.prm/snakeoil-ca-dsa.prm
-etc/httpd/ssl.prm/snakeoil-dsa.prm
+@comment $NetBSD: PLIST,v 1.10 2001/04/29 20:36:48 jlam Exp $
 lib/httpd/mod_ssl.so
-sbin/mkcert.sh
+sbin/mkcert
 share/doc/mod_ssl/README.mkcert
+share/examples/mod_ssl/apache_start.conf
+share/examples/mod_ssl/ssl.crl/Makefile.crl
+share/examples/mod_ssl/ssl.crl/README.CRL
+share/examples/mod_ssl/ssl.crt/Makefile.crt
+share/examples/mod_ssl/ssl.crt/README.CRT
+share/examples/mod_ssl/ssl.crt/ca-bundle.crt
+share/examples/mod_ssl/ssl.crt/snakeoil-ca-dsa.crt
+share/examples/mod_ssl/ssl.crt/snakeoil-ca-rsa.crt
+share/examples/mod_ssl/ssl.crt/snakeoil-dsa.crt
+share/examples/mod_ssl/ssl.crt/snakeoil-rsa.crt
+share/examples/mod_ssl/ssl.csr/README.CSR
+share/examples/mod_ssl/ssl.key/README.KEY
+share/examples/mod_ssl/ssl.key/snakeoil-ca-dsa.key
+share/examples/mod_ssl/ssl.key/snakeoil-ca-rsa.key
+share/examples/mod_ssl/ssl.key/snakeoil-dsa.key
+share/examples/mod_ssl/ssl.key/snakeoil-rsa.key
+share/examples/mod_ssl/ssl.prm/README.PRM
+share/examples/mod_ssl/ssl.prm/snakeoil-ca-dsa.prm
+share/examples/mod_ssl/ssl.prm/snakeoil-dsa.prm
 share/httpd/htdocs/manual/mod/mod_ssl/apache_pb.gif
 share/httpd/htdocs/manual/mod/mod_ssl/feather.jpg
 share/httpd/htdocs/manual/mod/mod_ssl/index.html
@@ -76,4 +76,10 @@ share/mod_ssl/loadcacert.cgi
 share/mod_ssl/sign.sh
 @dirrm share/mod_ssl
 @dirrm share/httpd/htdocs/manual/mod/mod_ssl
+@dirrm share/examples/mod_ssl/ssl.prm
+@dirrm share/examples/mod_ssl/ssl.key
+@dirrm share/examples/mod_ssl/ssl.csr
+@dirrm share/examples/mod_ssl/ssl.crt
+@dirrm share/examples/mod_ssl/ssl.crl
+@dirrm share/examples/mod_ssl
 @dirrm share/doc/mod_ssl