From a18ca017b2074ae56349df138018e87ee1c685c9 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 21 Nov 1999 22:09:26 +0000 Subject: Update Apache package to version 1.3.9 (SSL Module 2.4.8) using patches suppled by SUNAGAWA Keiki in PR pkg/8819. This version mostly fixes bugs discovered since version 1.3.6. --- www/apache/Makefile | 12 ++++++------ www/apache/files/md5 | 6 +++--- www/apache/files/patch-sum | 10 +++++----- www/apache/patches/patch-aa | 21 ++++++--------------- www/apache/patches/patch-af | 33 +++++++++++++++++---------------- www/apache/patches/patch-ag | 29 ----------------------------- www/apache/patches/patch-ak | 18 +++++++++--------- www/apache/patches/patch-an | 23 +++++++++++++++++++++++ www/apache/pkg/PLIST | 25 ++++++++++++++++++++++--- 9 files changed, 91 insertions(+), 86 deletions(-) delete mode 100644 www/apache/patches/patch-ag create mode 100644 www/apache/patches/patch-an (limited to 'www/apache') diff --git a/www/apache/Makefile b/www/apache/Makefile index 6a91b816234..e30ab90d57a 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 1999/08/18 08:29:10 agc Exp $ +# $NetBSD: Makefile,v 1.38 1999/11/21 22:09:26 tron Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -6,10 +6,9 @@ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). -# -DISTNAME= apache_1.3.6 -PKGNAME= apache-1.3.6p0 +DISTNAME= apache_1.3.9 +PKGNAME= apache-1.3.9p0 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.modssl.org/source/ \ @@ -23,12 +22,13 @@ HOMEPAGE= http://www.apache.org/ CONFLICTS= apache-*modssl-* apache6-* -SSL_DISTNAME= mod_ssl-2.2.8-1.3.6 +SSL_DISTNAME= mod_ssl-2.4.8-1.3.9 EXTRACT_ONLY= ${DISTFILES:N*.gif} HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \ --runtimedir=/var/run --datadir=${PREFIX}/share/httpd \ + --cgidir=${PREFIX}/libexec/cgi-bin \ --logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \ --proxycachedir=/var/spool/httpd/proxy \ --includedir=${PREFIX}/include/httpd \ @@ -54,7 +54,7 @@ CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations PLIST_SRC= ${WRKDIR}/PLIST -BUILD_DEFS+= APACHE_PERF_TUNING APACHE_SUEXEC +BUILD_DEFS+= APACHE_PERF_TUNING APACHE_SUEXEC # Note that there is NO static compile module hook here. This is intentional. # Under Apache 1.3, modules can be compiled to link dynamically to the server diff --git a/www/apache/files/md5 b/www/apache/files/md5 index 865fb8bf201..a16ad23842f 100644 --- a/www/apache/files/md5 +++ b/www/apache/files/md5 @@ -1,5 +1,5 @@ -$NetBSD: md5,v 1.11 1999/04/30 17:05:20 tv Exp $ +$NetBSD: md5,v 1.12 1999/11/21 22:09:28 tron Exp $ -MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643 -MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5 +MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (mod_ssl-2.4.8-1.3.9.tar.gz) = f764b961220b8c067e88ae3abc717785 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1 diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum index a154215b649..1dbb098189a 100644 --- a/www/apache/files/patch-sum +++ b/www/apache/files/patch-sum @@ -1,12 +1,12 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:16 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/21 22:09:28 tron Exp $ -MD5 (patch-aa) = 94caf42a041fc6d4d92eeffdb4492543 +MD5 (patch-aa) = bc5b9953696e7f125962e96bb68ef49c MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069 -MD5 (patch-af) = cefef0d44750fcb5a32c893c9b33a3c2 -MD5 (patch-ag) = 05d7657a8048c3d64ce4843af547479b +MD5 (patch-af) = ef50e09f4691dd62b0671761f1a864c4 MD5 (patch-ah) = c3e3a232e0c5028a15dea4473bf39955 MD5 (patch-aj) = e4878583ffc2957e50c25d3d22d1d4db -MD5 (patch-ak) = 789f4a45ea6f9ee5b739db378326b3de +MD5 (patch-ak) = 8f5c8212b6925fb05e3af6c32f990d87 MD5 (patch-al) = 392b4228824401ad7d1676d2054fa1d6 MD5 (patch-am) = 0c970f2338262248f41fcd8ebfde0bce +MD5 (patch-an) = 2fb334639042640cbb2bd1d13bbcce32 diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index ebeb3fe22fe..1ee22e81ed0 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $ +$NetBSD: patch-aa,v 1.11 1999/11/21 22:09:28 tron Exp $ ---- Makefile.tmpl.orig Fri May 7 09:49:05 1999 -+++ Makefile.tmpl Fri May 7 09:52:16 1999 -@@ -114,7 +114,7 @@ - datadir = @datadir@ - iconsdir = $(datadir)/icons - htdocsdir = $(datadir)/htdocs --cgidir = $(datadir)/cgi-bin -+cgidir = $(prefix)/libexec/cgi-bin - includedir = @includedir@ - localstatedir = @localstatedir@ - runtimedir = @runtimedir@ -@@ -344,34 +344,6 @@ +--- Makefile.tmpl.orig Mon Sep 27 18:03:16 1999 ++++ Makefile.tmpl Mon Sep 27 18:03:18 1999 +@@ -371,34 +371,6 @@ file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \ echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \ $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \ @@ -46,7 +37,7 @@ $NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $ done; \ fi @echo "<=== [programs]" -@@ -453,12 +425,13 @@ +@@ -524,12 +496,13 @@ find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ fi @@ -61,7 +52,7 @@ $NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $ > $(TOP)/$(SRC)/.apaci.install.tmp; \ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ -@@ -475,7 +448,7 @@ +@@ -546,7 +519,7 @@ # and initial config files while preserving existing ones. install-config: @echo "===> [config: Installing Apache configuration files]" diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af index a89a8f7845c..9cb08f242d6 100644 --- a/www/apache/patches/patch-af +++ b/www/apache/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ +$NetBSD: patch-af,v 1.5 1999/11/21 22:09:28 tron Exp $ ---- src/modules/standard/mod_include.c.orig Thu Sep 24 10:06:42 1998 -+++ src/modules/standard/mod_include.c Mon Dec 7 11:17:39 1998 +--- src/modules/standard/mod_include.c.orig Sat May 22 08:57:57 1999 ++++ src/modules/standard/mod_include.c Mon Oct 4 20:53:14 1999 @@ -92,7 +92,11 @@ #include "http_log.h" #include "http_main.h" @@ -43,17 +43,18 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ error_fmt = "unable to include file \"%s\" " "in parsed file %s"; } -@@ -1010,7 +1016,8 @@ - int ret=0; - - if (!strcmp(tag, "file")) { -- ap_getparents(tag_val); /* get rid of any nasties */ -+ if (ap_allow_options(r) & OPT_INCNOEXEC) -+ ap_getparents(tag_val); /* get rid of any nasties */ - - rr = ap_sub_req_lookup_file(tag_val, r); +@@ -1057,7 +1063,9 @@ + "in parsed file %s"; + } + else { +- ap_getparents(tag_val); /* get rid of any nasties */ ++ if (ap_allow_options(r) & OPT_INCNOEXEC) ++ ap_getparents(tag_val); /* get rid of any nasties */ ++ + rr = ap_sub_req_lookup_file(tag_val, r); -@@ -2090,6 +2097,16 @@ + if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) { +@@ -2135,6 +2143,16 @@ } } @@ -70,7 +71,7 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ /* -------------------------- The main function --------------------------- */ -@@ -2214,6 +2231,13 @@ +@@ -2259,6 +2277,13 @@ } #endif else { @@ -82,5 +83,5 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ + continue; + ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, - "httpd: unknown directive \"%s\" " - "in parsed doc %s", + "unknown directive \"%s\" " + "in parsed doc %s", diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag deleted file mode 100644 index e8d3973f363..00000000000 --- a/www/apache/patches/patch-ag +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1999/04/30 17:05:20 tv Exp $ - ---- src/Configure.orig Mon Apr 26 14:34:33 1999 -+++ src/Configure Mon Apr 26 15:10:13 1999 -@@ -974,16 +974,15 @@ - LDFLAGS_SHLIB_EXPORT="" - SHLIB_SUFFIX_DEPTH=2 - ;; -- alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*) -- CFLAGS_SHLIB="-fpic -DPIC" -- LDFLAGS_SHLIB="-shared" -- LDFLAGS_SHLIB_EXPORT="" -- SHLIB_SUFFIX_DEPTH=2 -- ;; - *-netbsd*) -- CFLAGS_SHLIB="-fpic -DPIC" -- LDFLAGS_SHLIB="-Bshareable" -- LDFLAGS_SHLIB_EXPORT="" -+ CFLAGS_SHLIB="-fPIC -DPIC" -+ if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then -+ LDFLAGS_SHLIB="-Bshareable" -+ LDFLAGS_SHLIB_EXPORT="" -+ else -+ LDFLAGS_SHLIB="-shared" -+ LDFLAGS_SHLIB_EXPORT="-Wl,-E" -+ fi - SHLIB_SUFFIX_DEPTH=2 - ;; - *-bsdi) diff --git a/www/apache/patches/patch-ak b/www/apache/patches/patch-ak index d223f973929..82b80df1085 100644 --- a/www/apache/patches/patch-ak +++ b/www/apache/patches/patch-ak @@ -1,14 +1,14 @@ -$NetBSD: patch-ak,v 1.1 1998/12/04 17:24:33 tv Exp $ +$NetBSD: patch-ak,v 1.2 1999/11/21 22:09:28 tron Exp $ ---- src/support/apxs.pl.orig Fri Dec 4 11:34:17 1998 -+++ src/support/apxs.pl Fri Dec 4 11:36:26 1998 -@@ -383,8 +383,7 @@ - } +--- src/support/apxs.pl.orig Mon Sep 27 18:28:55 1999 ++++ src/support/apxs.pl Mon Sep 27 18:31:42 1999 +@@ -426,8 +426,7 @@ my $t = $f; $t =~ s|^.+/([^/]+)$|$1|; -- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); -- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); + if ($opt_i) { +- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); + } # determine module symbolname and filename - my $filename = ''; diff --git a/www/apache/patches/patch-an b/www/apache/patches/patch-an new file mode 100644 index 00000000000..7edc1a42b97 --- /dev/null +++ b/www/apache/patches/patch-an @@ -0,0 +1,23 @@ +$NetBSD: patch-an,v 1.1 1999/11/21 22:10:55 tron Exp $ + +--- configure.orig Mon Sep 27 18:50:00 1999 ++++ configure Mon Sep 27 18:50:09 1999 +@@ -395,6 +395,7 @@ + echo " --mandir=DIR install manual pages in DIR" + echo " --sysconfdir=DIR install configuration files in DIR" + echo " --datadir=DIR install read-only data files in DIR" ++ echo " --cgidir=DIR install cgi files in DIR" + echo " --includedir=DIR install includes files in DIR" + echo " --localstatedir=DIR install modifiable data files in DIR" + echo " --runtimedir=DIR install runtime data in DIR" +@@ -626,6 +627,10 @@ + --datadir=*) + datadir="$apc_optarg" + autosuffix_datadir=no ++ ;; ++ --cgidir=*) ++ cgidir="$apc_optarg" ++ autosuffix_cgidir=no + ;; + --includedir=*) + includedir="$apc_optarg" diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST index 6de9bcf6fad..040e01c110f 100644 --- a/www/apache/pkg/PLIST +++ b/www/apache/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 1999/05/11 20:26:23 tron Exp $ +@comment $NetBSD: PLIST,v 1.12 1999/11/21 22:09:29 tron Exp $ bin/dbmmanage bin/htdigest bin/htpasswd @@ -19,7 +19,9 @@ include/httpd/ap_ctype.h include/httpd/ap_hook.h include/httpd/ap_include_extern.h include/httpd/ap_md5.h +include/httpd/ap_mm.h include/httpd/ap_mmn.h +include/httpd/ap_sha1.h include/httpd/buff.h include/httpd/compat.h include/httpd/conf.h @@ -44,7 +46,19 @@ include/httpd/util_date.h include/httpd/util_md5.h include/httpd/util_script.h include/httpd/util_uri.h +include/httpd/xml/asciitab.h +include/httpd/xml/xmltok.h +include/httpd/xml/xmlrole.h +include/httpd/xml/xmlparse.h +include/httpd/xml/xmldef.h +include/httpd/xml/utf8tab.h +include/httpd/xml/nametab.h +include/httpd/xml/latin1tab.h +include/httpd/xml/iasciitab.h +include/httpd/xml/hashtable.h +include/httpd/xml/xmltok_impl.h lib/httpd/mod_proxy.so +lib/httpd/httpd.exp libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi man/man1/dbmmanage.1 @@ -126,6 +140,7 @@ share/httpd/htdocs/manual/mod/mod_asis.html share/httpd/htdocs/manual/mod/mod_auth.html share/httpd/htdocs/manual/mod/mod_auth_anon.html share/httpd/htdocs/manual/mod/mod_auth_db.html +share/httpd/htdocs/manual/mod/mod_auth_digest.html share/httpd/htdocs/manual/mod/mod_auth_dbm.html share/httpd/htdocs/manual/mod/mod_autoindex.html share/httpd/htdocs/manual/mod/mod_browser.html @@ -161,6 +176,7 @@ share/httpd/htdocs/manual/mod/mod_status.html share/httpd/htdocs/manual/mod/mod_unique_id.html share/httpd/htdocs/manual/mod/mod_userdir.html share/httpd/htdocs/manual/mod/mod_usertrack.html +share/httpd/htdocs/manual/mod/mod_vhost_alias.html share/httpd/htdocs/manual/multilogs.html share/httpd/htdocs/manual/new_features_1_0.html share/httpd/htdocs/manual/new_features_1_1.html @@ -300,15 +316,18 @@ share/httpd/icons/uu.gif share/httpd/icons/uuencoded.gif share/httpd/icons/world1.gif share/httpd/icons/world2.gif -@exec mkdir -p /var/log/httpd /var/spool/httpd/proxy %D/lib/httpd %D/etc/httpd/ssl.crt %D/etc/httpd/ssl.csr %D/etc/httpd/ssl.key +@exec mkdir -p /var/log/httpd /var/spool/httpd/proxy %D/lib/httpd %D/etc/httpd/ssl.crl %D/etc/httpd/ssl.crt %D/etc/httpd/ssl.csr %D/etc/httpd/ssl.key %D/etc/httpd/ssl.prm @unexec rmdir /var/log/httpd /var/spool/httpd/proxy /var/spool/httpd 2>/dev/null || true +@dirrm etc/httpd/ssl.crl @dirrm etc/httpd/ssl.crt @dirrm etc/httpd/ssl.csr @dirrm etc/httpd/ssl.key +@dirrm etc/httpd/ssl.prm @unexec rmdir %D/etc/httpd 2>/dev/null || true +@dirrm include/httpd/xml @dirrm include/httpd @dirrm lib/httpd -@dirrm libexec/cgi-bin +@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true @dirrm share/httpd/htdocs/manual/images @dirrm share/httpd/htdocs/manual/misc @dirrm share/httpd/htdocs/manual/mod -- cgit v1.2.3