Date: Fri, 25 Jan 2002 17:50:07 -0600 (CST) From: "Scot W. Hetzel" <hetzels@westbend.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34290: www/apache13-fp - Update to Apache 1.3.23 Message-ID: <200201252350.g0PNo7g64725@mail.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 34290 >Category: ports >Synopsis: www/apache13-fp - Update to Apache 1.3.23 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 25 16:00:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.4-STABLE i386 >Organization: West Bend Internet >Environment: System: FreeBSD wbiW009.westbend.net 4.5-RC FreeBSD 4.5-RC #0: Tue Jan 15 12:14:35 CST 2002 root@wbiW009.westbend.net:/usr/obj/usr/src/sys/GENERIC-SMP i386 >Description: Upgrade to Apache 1.3.23 >How-To-Repeat: >Fix: Changed Files: Makefile distinfo pkg-plist files/patch-aa files/patch-ab files/patch-ag Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache13-fp/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 31 Dec 2001 17:17:45 -0000 1.30 +++ Makefile 25 Jan 2002 23:33:46 -0000 @@ -7,8 +7,8 @@ PORTNAME= apache PKGNAMESUFFIX= _fp -PORTVERSION= 1.3.22 -PORTREVISION= 1 +PORTVERSION= 1.3.23 +PORTREVISION= 0 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://www.freebsd.org/gifs/ \ @@ -37,7 +37,7 @@ APACHE= ${DISTNAME}${EXTRACT_SUFX} -RUN_DEPENDS= ${LOCALBASE}/frontpage/bin/owsadm.exe:${PORTSDIR}/www/frontpage +RUN_DEPENDS= ${LOCALBASE}/frontpage/version5.0/bin/owsadm.exe:${PORTSDIR}/www/frontpage .ifndef WITHOUT_LIBEXPAT LIB_DEPENDS+= expat.2:${PORTSDIR}/textproc/expat2 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/apache13-fp/distinfo,v retrieving revision 1.17 diff -u -r1.17 distinfo --- distinfo 28 Dec 2001 00:39:45 -0000 1.17 +++ distinfo 25 Jan 2002 20:15:48 -0000 @@ -1,3 +1,3 @@ -MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90 +MD5 (apache_1.3.23.tar.gz) = 4499443fa1d604243467afe64522abac MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/apache13-fp/pkg-plist,v retrieving revision 1.19 diff -u -r1.19 pkg-plist --- pkg-plist 28 Dec 2001 00:39:45 -0000 1.19 +++ pkg-plist 25 Jan 2002 23:28:42 -0000 @@ -163,6 +163,7 @@ share/doc/apache/manual/handler.html.html share/doc/apache/manual/handler.html.ja.jis share/doc/apache/manual/header.html +share/doc/apache/manual/howto/auth.html share/doc/apache/manual/howto/cgi.html.en share/doc/apache/manual/howto/cgi.html.html share/doc/apache/manual/howto/cgi.html.ja.jis @@ -263,7 +264,9 @@ share/doc/apache/manual/mod/mod_cgi.html share/doc/apache/manual/mod/mod_cookies.html share/doc/apache/manual/mod/mod_digest.html -share/doc/apache/manual/mod/mod_dir.html +share/doc/apache/manual/mod/mod_dir.html.en +share/doc/apache/manual/mod/mod_dir.html.html +share/doc/apache/manual/mod/mod_dir.html.ja.jis share/doc/apache/manual/mod/mod_dld.html share/doc/apache/manual/mod/mod_env.html.en share/doc/apache/manual/mod/mod_env.html.html @@ -336,6 +339,7 @@ share/doc/apache/manual/server-wide.html.fr share/doc/apache/manual/server-wide.html.html share/doc/apache/manual/server-wide.html.ja.jis +share/doc/apache/manual/sitemap.html share/doc/apache/manual/sourcereorg.html share/doc/apache/manual/stopping.html.en share/doc/apache/manual/stopping.html.fr Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-aa,v retrieving revision 1.7 diff -u -r1.7 patch-aa --- files/patch-aa 1 Mar 2000 06:25:06 -0000 1.7 +++ files/patch-aa 25 Jan 2002 20:39:33 -0000 @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 17 16:53:17 2000 -+++ configure Sun Feb 20 15:43:26 2000 -@@ -1151,7 +1151,8 @@ +--- configure.orig Thu Sep 27 13:12:03 2001 ++++ configure Fri Jan 25 14:32:58 2002 +@@ -1169,7 +1169,8 @@ conf_port="80" fi conf_serveradmin="you@your.address" @@ -10,7 +10,7 @@ if [ "x$confadjust" = "x1" ]; then if [ -f /etc/passwd ]; then if [ "x$conf_user" = "x" ]; then -@@ -1175,7 +1176,10 @@ +@@ -1193,7 +1194,10 @@ conf_port="8080" fi conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`" @@ -22,7 +22,7 @@ fi ## -@@ -1232,8 +1236,8 @@ +@@ -1251,8 +1255,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" @@ -33,7 +33,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1330,8 +1334,8 @@ +@@ -1350,8 +1354,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-ab,v retrieving revision 1.13 diff -u -r1.13 patch-ab --- files/patch-ab 20 Oct 2001 14:09:31 -0000 1.13 +++ files/patch-ab 25 Jan 2002 20:49:48 -0000 @@ -1,5 +1,5 @@ ---- Makefile.tmpl.orig Sat Oct 6 17:01:09 2001 -+++ Makefile.tmpl Thu Oct 18 12:39:52 2001 +--- Makefile.tmpl.orig Wed Nov 28 09:02:12 2001 ++++ Makefile.tmpl Fri Jan 25 14:48:40 2002 @@ -127,6 +127,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ @@ -61,7 +61,7 @@ fi @echo "<=== [programs]" -@@ -410,6 +426,7 @@ +@@ -411,6 +427,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);' \ @@ -69,7 +69,7 @@ < $(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.8 $(root)$(mandir)/man8/$${apachectl}.8"; \ -@@ -457,15 +474,15 @@ +@@ -459,15 +476,15 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -93,7 +93,7 @@ -@if [ -d $(TOP)/htdocs/manual ]; then \ echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ -@@ -473,17 +490,17 @@ +@@ -475,17 +492,17 @@ find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ fi @@ -117,7 +117,7 @@ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -517,42 +534,46 @@ +@@ -519,15 +536,17 @@ -e 's;@@ServerRoot@@/icons;$(iconsdir);' \ -e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ @@ -139,11 +139,7 @@ -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;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \ - -e 's;ServerName new.host.name;ServerName $(conf_servername);' \ +@@ -539,23 +558,25 @@ > $(TOP)/$(SRC)/.apaci.install.tmp && \ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \ Index: files/patch-ag =================================================================== RCS file: /home/ncvs/ports/www/apache13-fp/files/patch-ag,v retrieving revision 1.8 diff -u -r1.8 patch-ag --- files/patch-ag 20 Oct 2001 14:09:31 -0000 1.8 +++ files/patch-ag 25 Jan 2002 21:08:33 -0000 @@ -1,5 +1,5 @@ ---- conf/httpd.conf-dist.orig Fri Oct 5 22:40:04 2001 -+++ conf/httpd.conf-dist Wed Oct 17 18:16:27 2001 +--- conf/httpd.conf-dist.orig Wed Jan 9 10:05:31 2002 ++++ conf/httpd.conf-dist Fri Jan 25 15:07:51 2002 @@ -95,6 +95,9 @@ #ResourceConfig conf/srm.conf #AccessConfig conf/access.conf @@ -93,32 +93,33 @@ # # Optionally add a line containing the server version and virtual host -@@ -768,13 +804,17 @@ - # For example, the PHP 3.x module (not part of the Apache distribution - see - # http://www.php.net) will typically use: +@@ -765,6 +801,21 @@ + # AddType allows you to tweak mime.types without actually editing it, or to + # make certain files to be certain types. # -- #AddType application/x-httpd-php3 .php3 -- #AddType application/x-httpd-php3-source .phps ++ # For example, the PHP 3.x module (not part of the Apache distribution - see ++ # http://www.php.net) will typically use: ++ # + <IfModule mod_php3.c> -+ AddType application/x-httpd-php3 .php3 -+ AddType application/x-httpd-php3-source .php3s ++ 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 ++ # ++ # And for PHP 4.x, use: ++ # + <IfModule mod_php4.c> -+ AddType application/x-httpd-php .php -+ AddType application/x-httpd-php-source .phps ++ AddType application/x-httpd-php .php ++ AddType application/x-httpd-php-source .phps + </IfModule> - ++ AddType application/x-tar .tgz -@@ -984,3 +1024,14 @@ + # +@@ -972,4 +1023,15 @@ + # ServerName dummy-host.example.com # ErrorLog logs/dummy-host.example.com-error_log # CustomLog logs/dummy-host.example.com-access_log common - #</VirtualHost> ++#</VirtualHost> + +# This Virtual Host makes it so FrontPage will display pages from the +# root web. When multiple Listen directives are specified, Frontpage @@ -129,4 +130,4 @@ +#<VirtualHost _default_:80> +# ServerAdmin webmaster@@@HOSTNAME@@ +# ServerName @@HOSTNAME@@ -+#</VirtualHost> + #</VirtualHost> >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?200201252350.g0PNo7g64725>