Date: Sat, 3 Apr 1999 16:42:35 -0600 (CST) From: "Scot W. Hetzel" <hetzels@westbend.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10937: Apache13-FP port upgrade to v1.3.6 Message-ID: <199904032242.QAA15603@wbiW09.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 10937 >Category: ports >Synopsis: Apache13-FP port upgrade to v1.3.6 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 3 14:50:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 2.2.8-STABLE i386 >Organization: West Bend Internet >Environment: FreeBSD 2.2-stable >Description: The attached patch upgrades the Apache server to v1.3.6 in the Apache13-FP port. >How-To-Repeat: >Fix: Apply the following patch: diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile --- apache13-fp.orig/Makefile Sat Mar 27 02:08:34 1999 +++ apache13-fp/Makefile Sat Apr 3 14:39:36 1999 @@ -30,8 +30,7 @@ MAINTAINER= hetzels@westbend.net -#PATCH_SITES= http://www.apache.org/dist//patches/apply_to_${AP_VERS}/ \ -# http://www.apache.org/dist/patches/apply_to_${AP_VERS}/ +#PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${AP_VERS}/ #PATCHFILES= .if defined(PATCH_DEBUG) @@ -40,7 +39,7 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} .endif -AP_VERS= 1.3.4 +AP_VERS= 1.3.6 APACHE= ${DISTNAME}${EXTRACT_SUFX} FRONTPAGE= fp30.bsdi3.tar.Z @@ -95,8 +94,8 @@ CONFIGURE_ENV= OPTIM='${OPTIM}' -MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1 -MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8 +MAN1= dbmmanage.1 htdigest.1 htpasswd.1 +MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 .if defined(SUEXEC) HTTPD_USER?=www diff -ruN apache13-fp.orig/files/md5 apache13-fp/files/md5 --- apache13-fp.orig/files/md5 Sun Jan 17 21:06:02 1999 +++ apache13-fp/files/md5 Sat Apr 3 14:46:45 1999 @@ -1,2 +1,2 @@ -MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3 +MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643 MD5 (fp30.bsdi3.tar.Z) = 344b956cca8f367099d7c33e8c7ba174 diff -ruN apache13-fp.orig/patches/patch-ab apache13-fp/patches/patch-ab --- apache13-fp.orig/patches/patch-ab Sat Jan 23 00:10:18 1999 +++ apache13-fp/patches/patch-ab Sat Apr 3 15:26:26 1999 @@ -1,6 +1,14 @@ ---- Makefile.tmpl.orig Thu Jan 7 05:50:45 1999 -+++ Makefile.tmpl Fri Jan 22 22:24:16 1999 -@@ -110,6 +110,7 @@ +--- Makefile.tmpl.orig Mon Mar 15 18:38:46 1999 ++++ Makefile.tmpl Sat Apr 3 15:25:47 1999 +@@ -113,13 +113,14 @@ + sysconfdir = @sysconfdir@ + datadir = @datadir@ + iconsdir = $(datadir)/icons +-htdocsdir = $(datadir)/htdocs ++htdocsdir = $(datadir)/data + cgidir = $(datadir)/cgi-bin + includedir = @includedir@ + localstatedir = @localstatedir@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ @@ -8,27 +16,27 @@ libexecdir_relative = @libexecdir_relative@ -@@ -124,6 +125,7 @@ +@@ -134,6 +135,7 @@ suexec_safepath = @suexec_safepath@ # some substituted configuration parameters -+conf_user = @conf_user@ ++conf_user = @conf_user@ conf_group = @conf_group@ conf_port = @conf_port@ conf_serveradmin = @conf_serveradmin@ -@@ -239,9 +241,9 @@ +@@ -249,9 +251,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) -- $(MKDIR) $(root)$(datadir)/htdocs +- $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) - $(MKDIR) $(root)$(datadir)/icons -- $(MKDIR) $(root)$(datadir)/cgi-bin -+ $(MKDIR) $(root)$(datadir)/cgi-bin.default + $(MKDIR) $(root)$(iconsdir) +- $(MKDIR) $(root)$(cgidir) ++ $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) -@@ -278,9 +280,11 @@ +@@ -294,9 +296,11 @@ file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \ echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \ $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \ @@ -43,7 +51,7 @@ done; \ echo "" >>$(SRC)/.apaci.install.conf; \ echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \ -@@ -288,6 +292,7 @@ +@@ -304,6 +308,7 @@ echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \ echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \ egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\ @@ -51,72 +59,67 @@ sed -e 's:SharedModule:AddModule:' \ -e 's:modules/[^/]*/::' \ -e 's:[ ]lib: mod_:' \ -@@ -308,6 +313,7 @@ +@@ -324,6 +329,7 @@ echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \ sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \ -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \ + -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib\:$(prefix)/lib;' \ < $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \ - echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/$${apachectl}.1"; \ -@@ -363,25 +369,32 @@ + echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \ +@@ -379,25 +385,32 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ -- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \ -+# -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ +# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\ -- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \ -- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ -+ (cd $(root)$(doc_prefix) && $(TAR) -xf -); \ -+ find $(root)$(doc_prefix) -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(doc_prefix) -type f -exec chmod a+r {} \; ; \ + (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ +- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ +- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ ++ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ ++ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ ++ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ +# fi -+ if [ ! -d $(root)$(datadir)/data ]; then \ -+ $(CP) -rp $(root)$(doc_prefix) $(root)$(datadir)/data; \ ++ if [ ! -d $(root)$(htdocsdir) ]; then \ ++ $(CP) -rp $(root)$(doc_prefix) $(root)$(htdocsdir); \ fi -- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ - else \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default -+# -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ -- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \ -- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ -- done; \ -+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \ -+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \ -+ done; +- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ + done; \ +# fi -+ if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -+ $(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ ++ if [ ! -d $(root)$(cgidir) ]; then \ ++ $(CP) -rp $(root)$(cgidir).default $(root)$(cgidir); \ fi - @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ - (cd $(TOP)/icons/ && $(TAR) -hcf - *) |\ -@@ -411,20 +424,23 @@ - echo ""; \ - cat $(TOP)/conf/$${conf}-dist ) |\ - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ -+ -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \ - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ + (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ +@@ -431,17 +444,20 @@ + -e 's;@@ServerRoot@@/icons;$(iconsdir);' \ + -e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ + -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \ + -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \ -e 's;@@ServerRoot@@;$(prefix);g' \ + -e 's;httpd.conf;$(TARGET).conf;' \ -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;' \ diff -ruN apache13-fp.orig/patches/patch-ak apache13-fp/patches/patch-ak --- apache13-fp.orig/patches/patch-ak Thu Jan 21 20:15:11 1999 +++ apache13-fp/patches/patch-ak Sat Apr 3 15:54:48 1999 @@ -1,5 +1,5 @@ ---- src/support/apachectl.orig Fri Jan 1 13:05:32 1999 -+++ src/support/apachectl Thu Jan 21 20:14:27 1999 +--- src/support/apachectl.orig Tue Feb 9 12:00:34 1999 ++++ src/support/apachectl Sat Apr 3 15:40:42 1999 @@ -27,6 +27,10 @@ # the path to your httpd binary, including options if necessary HTTPD='/usr/local/apache/src/httpd' @@ -24,8 +24,8 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` -- if kill -0 $PID; then -+ if kill -0 $PID > /dev/null 2>&1; then +- if [ ! "x$PID" = "x" ] && kill -0 $PID; then ++ if [ ! "x$PID" = "x" ] && kill -0 $PID > /dev/null 2>&1; then STATUS="httpd (pid $PID) running" RUNNING=1 else diff -ruN apache13-fp.orig/patches/patch-fi apache13-fp/patches/patch-fi --- apache13-fp.orig/patches/patch-fi Tue Nov 10 01:56:00 1998 +++ apache13-fp/patches/patch-fi Sat Apr 3 16:03:42 1999 @@ -1,23 +1,19 @@ -*** src/main/http_request.c.orig Tue Oct 6 14:06:09 1998 ---- src/main/http_request.c Sat Oct 31 15:49:04 1998 -*************** -*** 187,192 **** ---- 187,194 ---- - return OK; - } - -+ if (r->execfilename) path = r->execfilename; -+ - #ifdef WIN32 - /* If the path is x:/, then convert it to x:/., coz that's what stat - * needs to work properly -*************** -*** 461,466 **** ---- 463,469 ---- - res = ap_parse_htaccess(&htaccess_conf, r, overrides_here, - ap_pstrdup(r->pool, test_dirname), - sconf->access_name); -+ if (r->execfilename) r->filename = r->execfilename; - if (res) - return res; - +--- src/main/http_request.c.orig Sun Mar 7 09:05:36 1999 ++++ src/main/http_request.c Sat Apr 3 16:02:26 1999 +@@ -187,6 +187,8 @@ + return OK; + } + ++ if (r->execfilename) path = r->execfilename; ++ + #ifdef HAVE_DRIVE_LETTERS + /* If the directory is x:\, then we don't want to strip + * the trailing slash since x: is not a valid directory. +@@ -509,6 +511,7 @@ + res = ap_parse_htaccess(&htaccess_conf, r, overrides_here, + ap_pstrdup(r->pool, test_dirname), + sconf->access_name); ++ if (r->execfilename) r->filename = r->execfilename; + if (res) + return res; + diff -ruN apache13-fp.orig/pkg/PLIST apache13-fp/pkg/PLIST --- apache13-fp.orig/pkg/PLIST Thu Jan 21 22:34:37 1999 +++ apache13-fp/pkg/PLIST Sat Apr 3 16:37:08 1999 @@ -169,6 +169,7 @@ share/doc/apache/manual/new_features_1_3.html share/doc/apache/manual/process-model.html share/doc/apache/manual/readme-tpf.html +share/doc/apache/manual/search/manual-index.cgi share/doc/apache/manual/sections.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html @@ -185,6 +186,7 @@ share/doc/apache/manual/vhosts/host.html share/doc/apache/manual/vhosts/index.html share/doc/apache/manual/vhosts/ip-based.html +share/doc/apache/manual/vhosts/mass.html share/doc/apache/manual/vhosts/name-based.html share/doc/apache/manual/vhosts/vhosts-in-depth.html share/doc/apache/manual/vhosts/virtual-host.html @@ -304,6 +306,7 @@ @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod +@dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual @dirrm share/doc/apache >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199904032242.QAA15603>