Date: Tue, 7 May 2002 20:43:44 -0700 (PDT) From: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/37849: Upgrade Apache2 2.0.35 --> 2.0.36 Message-ID: <200205080343.g483hiXF015095@cwsys.cwsent.com>
next in thread | raw e-mail | index | archive | help
>Number: 37849 >Category: ports >Synopsis: Upgrade Apache2 2.0.35 --> 2.0.36 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 07 20:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Cy Schubert >Release: FreeBSD-4.5 >Organization: FreeBSD >Environment: System: FreeBSD cwsys 4.5-STABLE FreeBSD 4.5-STABLE #0: Sat Apr 27 18:03:28 PDT 2002 root@cwsys:/export/obj/opt/cvs-src/src/sys/CWSYS i386 >Description: Upgrade Apache2 port from 2.0.35 to 2.0.36. >How-To-Repeat: N/A >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache2/Makefile,v retrieving revision 1.113 diff -u -r1.113 Makefile --- Makefile 18 Apr 2002 20:29:40 -0000 1.113 +++ Makefile 8 May 2002 03:02:26 -0000 @@ -6,8 +6,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.35 -PORTREVISION= 1 +PORTVERSION= 2.0.36 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/apache2/distinfo,v retrieving revision 1.48 diff -u -r1.48 distinfo --- distinfo 8 Apr 2002 06:45:26 -0000 1.48 +++ distinfo 8 May 2002 03:02:26 -0000 @@ -1,2 +1,2 @@ -MD5 (httpd-2.0.35.tar.gz) = 29ec330f01594d1fd81f30c7a18752c6 +MD5 (httpd-2.0.36.tar.gz) = dc80f22608bccba6c49e1fe9f12f51c8 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/apache2/pkg-plist,v retrieving revision 1.38 diff -u -r1.38 pkg-plist --- pkg-plist 18 Apr 2002 20:29:40 -0000 1.38 +++ pkg-plist 8 May 2002 03:02:27 -0000 @@ -46,7 +46,6 @@ include/apache2/apr_inherit.h include/apache2/apr_ldap.h include/apache2/apr_lib.h -include/apache2/apr_lock.h include/apache2/apr_md4.h include/apache2/apr_md5.h include/apache2/apr_mmap.h @@ -422,65 +421,22 @@ %%PORTDOCS%%share/doc/apache2/server-wide.html.en %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis %%PORTDOCS%%share/doc/apache2/sitemap.html -%%PORTDOCS%%share/doc/apache2/ssl/Makefile %%PORTDOCS%%share/doc/apache2/ssl/footer.html %%PORTDOCS%%share/doc/apache2/ssl/header.html %%PORTDOCS%%share/doc/apache2/ssl/index.html -%%PORTDOCS%%share/doc/apache2/ssl/mod_ssl_sb.gif -%%PORTDOCS%%share/doc/apache2/ssl/openssl_ics.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.gfont000.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.wml -%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover.wml %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg -%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.gfont000.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.wml %%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.wml -%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.gfont000.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.wml -%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.gfont000.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.wml %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.gfont000.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.wml %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.gfont000.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.html -%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.wml -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-chapter.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-1.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-2.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-3.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-4.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-5.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-6.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-7.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.inc -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-next-n.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-next-s.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-prev-n.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-prev-s.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-abstract.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-compat.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-faq.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-gloss.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-howto.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-intro.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-over.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-preface.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-ref.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-toc.gif -%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-tutor.gif %%PORTDOCS%%share/doc/apache2/stopping.html %%PORTDOCS%%share/doc/apache2/style/build.sh %%PORTDOCS%%share/doc/apache2/style/build.xml Index: files/patch-Makefile.in =================================================================== RCS file: /home/ncvs/ports/www/apache2/files/patch-Makefile.in,v retrieving revision 1.6 diff -u -r1.6 patch-Makefile.in --- files/patch-Makefile.in 18 Apr 2002 20:29:41 -0000 1.6 +++ files/patch-Makefile.in 8 May 2002 03:02:27 -0000 @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Apr 6 04:36:06 2002 -+++ Makefile.in Thu Apr 18 09:22:29 2002 -@@ -33,23 +33,28 @@ +--- Makefile.in.orig Sun Apr 28 16:41:25 2002 ++++ Makefile.in Tue May 7 19:05:12 2002 +@@ -33,23 +33,27 @@ @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir) @cd $(top_srcdir)/docs/conf; \ for i in mime.types magic; do \ @@ -11,8 +11,8 @@ done; \ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ - for i in *-std* ssl.conf; do \ - [ -f $$i ] || continue; \ + for i in *-std*.conf ssl.conf; do \ +- [ -f $$i ] || continue; \ + [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \ ( \ n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ @@ -30,7 +30,7 @@ -e 'p' \ < $$i; \ for j in $(DSO_MODULES) "^EOL^"; do \ -@@ -57,7 +62,7 @@ +@@ -57,7 +61,7 @@ echo "<IfDefine SSL>"; \ fi; \ if test $$j != "^EOL^"; then \ @@ -39,7 +39,7 @@ fi; \ if test "x$$j" = "xssl"; then \ echo "</IfDefine>"; \ -@@ -106,11 +111,14 @@ +@@ -106,12 +110,14 @@ install-htdocs: @echo Installing HTML documents @@ -52,12 +52,13 @@ @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir) @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir)) - @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \; +- +.endif + @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \; - install-error: @echo Installing error documents -@@ -126,9 +134,10 @@ + @test -d $(errordir) || $(MKINSTALLDIRS) $(errordir) +@@ -126,9 +132,10 @@ install-cgi: @echo Installing CGIs Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/www/apache2/files/patch-configure,v retrieving revision 1.5 diff -u -r1.5 patch-configure --- files/patch-configure 8 Apr 2002 06:45:33 -0000 1.5 +++ files/patch-configure 8 May 2002 03:02:27 -0000 @@ -1,12 +1,12 @@ ---- configure.orig Sat Apr 6 15:19:30 2002 -+++ configure Sun Apr 7 09:13:07 2002 -@@ -12087,6 +12087,9 @@ +--- configure.orig Wed May 1 13:53:00 2002 ++++ configure Tue May 7 19:28:57 2002 +@@ -15077,6 +15077,9 @@ - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf" +#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log" +#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types" +#define DOCUMENT_LOCATION "${rel_htdocsdir}" - EOF + _ACEOF + - cat >> confdefs.h <<EOF Index: files/patch-docs:conf:httpd-std.conf.in =================================================================== RCS file: /home/ncvs/ports/www/apache2/files/patch-docs:conf:httpd-std.conf.in,v retrieving revision 1.1 diff -u -r1.1 patch-docs:conf:httpd-std.conf.in --- files/patch-docs:conf:httpd-std.conf.in 8 Apr 2002 06:45:33 -0000 1.1 +++ files/patch-docs:conf:httpd-std.conf.in 8 May 2002 03:02:27 -0000 @@ -1,5 +1,5 @@ ---- docs/conf/httpd-std.conf.in.orig Thu Apr 4 18:15:43 2002 -+++ docs/conf/httpd-std.conf.in Sun Apr 7 11:51:13 2002 +--- docs/conf/httpd-std.conf.in.orig Wed Apr 24 07:24:35 2002 ++++ docs/conf/httpd-std.conf.in Tue May 7 19:29:28 2002 @@ -68,7 +68,7 @@ # <IfModule !mpm_netware.c> @@ -9,16 +9,7 @@ </IfModule> </IfModule> -@@ -78,7 +78,7 @@ - # identification number when it starts. - # - <IfModule !mpm_netware.c> --PidFile @rel_logfiledir@/httpd.pid -+PidFile @rel_runtimedir@/httpd.pid - </IfModule> - - # -@@ -250,8 +250,8 @@ +@@ -263,8 +263,8 @@ # when the value of (unsigned)Group is above 60000; # don't use Group #-1 on these systems! # @@ -29,7 +20,7 @@ </IfModule> </IfModule> -@@ -437,7 +437,7 @@ +@@ -450,7 +450,7 @@ # logged here. If you *do* define an error logfile for a <VirtualHost> # container, that host's errors will be logged there and not here. # @@ -38,7 +29,7 @@ # # LogLevel: Control the number of messages logged to the error_log. -@@ -462,20 +462,20 @@ +@@ -475,20 +475,20 @@ # define per-<VirtualHost> access logfiles, transactions will be # logged therein and *not* in this file. # Index: files/patch-srclib:apr-util:configure =================================================================== RCS file: /home/ncvs/ports/www/apache2/files/patch-srclib:apr-util:configure,v retrieving revision 1.2 diff -u -r1.2 patch-srclib:apr-util:configure --- files/patch-srclib:apr-util:configure 8 Apr 2002 06:45:33 -0000 1.2 +++ files/patch-srclib:apr-util:configure 8 May 2002 03:02:27 -0000 @@ -1,11 +1,11 @@ ---- srclib/apr-util/configure.orig Sat Apr 6 15:19:28 2002 -+++ srclib/apr-util/configure Sun Apr 7 06:35:09 2002 -@@ -5790,7 +5790,7 @@ - +--- srclib/apr-util/configure.orig Wed May 1 13:52:45 2002 ++++ srclib/apr-util/configure Tue May 7 19:34:07 2002 +@@ -11419,7 +11419,7 @@ + fi; if test -z "$expat_include_dir"; then - for d in /usr /usr/local xml/expat-cvs xml/expat $srcdir/xml/expat ; do + for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do - - echo $ac_n "checking for Expat in $d""... $ac_c" 1>&6 - echo "configure:5797: checking for Expat in $d" >&5 + + echo "$as_me:$LINENO: checking for Expat in $d" >&5 + echo $ECHO_N "checking for Expat in $d... $ECHO_C" >&6 Index: files/patch-srclib:apr:include:apr_atomic.h =================================================================== RCS file: /home/ncvs/ports/www/apache2/files/patch-srclib:apr:include:apr_atomic.h,v retrieving revision 1.1 diff -u -r1.1 patch-srclib:apr:include:apr_atomic.h --- files/patch-srclib:apr:include:apr_atomic.h 8 Apr 2002 06:45:33 -0000 1.1 +++ files/patch-srclib:apr:include:apr_atomic.h 8 May 2002 03:02:27 -0000 @@ -1,6 +1,6 @@ ---- srclib/apr/include/apr_atomic.h.orig Sun Apr 7 22:54:09 2002 -+++ srclib/apr/include/apr_atomic.h Sun Apr 7 22:55:03 2002 -@@ -191,10 +191,10 @@ +--- srclib/apr/include/apr_atomic.h.orig Wed May 1 03:41:59 2002 ++++ srclib/apr/include/apr_atomic.h Tue May 7 19:37:45 2002 +@@ -175,10 +175,10 @@ #include <machine/atomic.h> #define apr_atomic_t apr_uint32_t @@ -12,6 +12,6 @@ +#define apr_atomic_dec(mem) (atomic_subtract_int(mem,1),mem) +#define apr_atomic_inc(mem) (atomic_add_int(mem,1),mem) +#define apr_atomic_set(mem, val) (atomic_set_int(mem, val),mem) - #define apr_atomic_read(mem) *mem + #define apr_atomic_read(mem) (*mem) #define APR_ATOMIC_NEED_CAS_DEFAULT 1 Index: files/patch-support:apachectl.in =================================================================== RCS file: /home/ncvs/ports/www/apache2/files/patch-support:apachectl.in,v retrieving revision 1.4 diff -u -r1.4 patch-support:apachectl.in --- files/patch-support:apachectl.in 8 Apr 2002 06:45:33 -0000 1.4 +++ files/patch-support:apachectl.in 8 May 2002 03:02:27 -0000 @@ -1,14 +1,5 @@ --- support/apachectl.in.orig Thu Apr 4 18:15:44 2002 +++ support/apachectl.in Sun Apr 7 08:49:25 2002 -@@ -29,7 +29,7 @@ - PIDFILE=@exp_runtimedir@/@progname@.pid - # - # the path to your httpd binary, including options if necessary --HTTPD='@exp_bindir@/@progname@' -+HTTPD='@exp_sbindir@/@progname@' - # - # pick up any necessary environment variables - if test -f @exp_bindir@/envvars; then @@ -47,6 +47,7 @@ # # -------------------- -------------------- >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?200205080343.g483hiXF015095>