Update to 1.3.23+2.8.6

5 files changed, 16 insertions, 39 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index bcb5746b0ccc..53e07d0760f8 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION=   4
 CATEGORIES=	www security
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://www.modssl.org/source/ \
@@ -48,8 +47,8 @@ USE_OPENSSL=	YES
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.22
-VERSION_MODSSL=	2.8.5
+VERSION_APACHE=	1.3.23
+VERSION_MODSSL=	2.8.6
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 5d941f8b3df4..cfb187527075 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90
-MD5 (mod_ssl-2.8.5-1.3.22.tar.gz) = 5139c874e759b8410a29f9dcb4b578e5
+MD5 (apache_1.3.23.tar.gz) = 4499443fa1d604243467afe64522abac
+MD5 (mod_ssl-2.8.6-1.3.23.tar.gz) = f3c65f873eaf391721d1c474e6485c22
diff --git a/www/apache13-modssl/files/patch-ab b/www/apache13-modssl/files/patch-ab
index f1bffafaedf2..73a754755efe 100644
--- a/www/apache13-modssl/files/patch-ab
+++ b/www/apache13-modssl/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.tmpl.orig	Mon Oct 22 21:27:50 2001
-+++ Makefile.tmpl	Mon Oct 22 21:30:58 2001
+--- Makefile.tmpl.orig	Thu Feb  7 23:46:03 2002
++++ Makefile.tmpl	Thu Feb  7 23:47:53 2002
 @@ -329,10 +329,12 @@
  	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
@@ -15,7 +15,7 @@
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(runtimedir)
-@@ -531,33 +533,40 @@
+@@ -533,33 +535,40 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -71,7 +71,7 @@
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
  	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -605,14 +614,14 @@
+@@ -607,10 +616,10 @@
  			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
  			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
@@ -86,8 +86,3 @@
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
  			-e 's;User nobody;User $(conf_user);' \
--			-e 's;Group #-1;Group $(conf_group);' \
-+			-e 's;Group "#-1";Group $(conf_group);' \
- 			-e 's;Port 80;Port $(conf_port);' \
- 			-e 's;Listen 80;Listen $(conf_port);' \
- 			-e 's;Listen 443;Listen $(conf_port_ssl);' \
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
index f042fad54b85..77973a5fa8e4 100644
--- a/www/apache13-modssl/files/patch-ac
+++ b/www/apache13-modssl/files/patch-ac
@@ -1,5 +1,5 @@
---- conf/httpd.conf-dist.orig	Thu Oct 18 13:57:36 2001
-+++ conf/httpd.conf-dist	Thu Oct 18 13:58:20 2001
+--- conf/httpd.conf-dist.orig	Thu Feb  7 23:50:37 2002
++++ conf/httpd.conf-dist	Thu Feb  7 23:50:38 2002
 @@ -92,8 +92,8 @@
  # server ignore these files altogether by using "/dev/null" (for Unix) or
  # "nul" (for Win32) for the arguments to the directives.
@@ -53,25 +53,3 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -779,13 +794,17 @@
-     # For example, the PHP 3.x module (not part of the Apache distribution - see
-     # http://www.php.net) will typically use:
-     #
--    #AddType application/x-httpd-php3 .php3
--    #AddType application/x-httpd-php3-source .phps
-+    <IfModule mod_php3.c>
-+        AddType application/x-httpd-php3 .php3
-+        AddType application/x-httpd-php3-source .php3s
-+    </IfModule>
-     #
-     # And for PHP 4.x, use:
-     #
--    #AddType application/x-httpd-php .php
--    #AddType application/x-httpd-php-source .phps
-+    <IfModule mod_php4.c>
-+        AddType application/x-httpd-php .php
-+        AddType application/x-httpd-php-source .phps
-+    </IfModule>
- 
-     AddType application/x-tar .tgz
- 
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 87339ca4e908..be000f5e1b78 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -1,3 +1,4 @@
+bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -184,6 +185,7 @@ share/doc/apache/footer.html
 share/doc/apache/handler.html.en
 share/doc/apache/handler.html.ja.jis
 share/doc/apache/header.html
+share/doc/apache/howto/auth.html
 share/doc/apache/howto/cgi.html.en
 share/doc/apache/howto/cgi.html.ja.jis
 share/doc/apache/howto/footer.html
@@ -276,7 +278,9 @@ share/doc/apache/mod/mod_cgi.html
 share/doc/apache/mod/mod_cookies.html
 share/doc/apache/mod/mod_define.html
 share/doc/apache/mod/mod_digest.html
-share/doc/apache/mod/mod_dir.html
+share/doc/apache/mod/mod_dir.html.en
+share/doc/apache/mod/mod_dir.html.html
+share/doc/apache/mod/mod_dir.html.ja.jis
 share/doc/apache/mod/mod_dld.html
 share/doc/apache/mod/mod_env.html.en
 share/doc/apache/mod/mod_env.html.html
@@ -398,6 +402,7 @@ share/doc/apache/search/manual-index.cgi
 share/doc/apache/server-wide.html.en
 share/doc/apache/server-wide.html.ja.jis
 share/doc/apache/sections.html
+share/doc/apache/sitemap.html
 share/doc/apache/sourcereorg.html
 share/doc/apache/stopping.html.en
 share/doc/apache/stopping.html.fr