From owner-freebsd-ports Mon Jun 11 19:20:19 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B221C37B40C for ; Mon, 11 Jun 2001 19:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f5C2K1f79759; Mon, 11 Jun 2001 19:20:01 -0700 (PDT) (envelope-from gnats) Received: from granger.mail.mindspring.net (granger.mail.mindspring.net [207.69.200.148]) by hub.freebsd.org (Postfix) with ESMTP id 9798737B403 for ; Mon, 11 Jun 2001 19:16:28 -0700 (PDT) (envelope-from vsilyaev@mindspring.com) Received: from delta.rc.ny.us (nyf-ny8-44.ix.netcom.com [198.211.17.236]) by granger.mail.mindspring.net (8.9.3/8.8.5) with ESMTP id WAA00148; Mon, 11 Jun 2001 22:15:28 -0400 (EDT) Received: (from vsilyaev@localhost) by delta.rc.ny.us (8.11.1/8.9.3) id f5C2EwQ15931; Mon, 11 Jun 2001 22:14:58 -0400 (EDT) (envelope-from vsilyaev) Message-Id: <200106120214.f5C2EwQ15931@delta.rc.ny.us> Date: Mon, 11 Jun 2001 22:14:58 -0400 (EDT) From: vns@delta.odessa.ua Reply-To: vns@delta.odessa.ua To: FreeBSD-gnats-submit@freebsd.org Cc: never@uic-in.net, mike@vlink.ru X-Send-Pr-Version: 3.2 Subject: ports/28088: port russina/apache update Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 28088 >Category: ports >Synopsis: port russian/appache update >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: Mon Jun 11 19:20:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Vladimir Silyaev >Release: FreeBSD 4.2-STABLE i386 >Organization: >Environment: FreeBSD 4.X-Stable >Description: Update port russian/appache to 1.3.19/ RA 30.4 >How-To-Repeat: >Fix: Apply the following patch inside port/russian directory: diff -ur apache13.orig/Makefile apache13/Makefile --- apache13.orig/Makefile Mon Jun 11 20:59:09 2001 +++ apache13/Makefile Mon Jun 11 21:02:04 2001 @@ -6,23 +6,23 @@ # PORTNAME= apache -PORTVERSION= 1.3.14 +PORTVERSION= 1.3.19 CATEGORIES= russian www -MASTER_SITES= http://www.apache.org/dist/ \ - ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ - ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ - ftp://apache.compuex.com/pub/apache/dist/ \ - ftp://apache.arctic.org/pub/apache/dist/ \ - ftp://ftp.epix.net/pub/apache/dist/ \ - ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ - ftp://ftp.connectnet.com/pub/www/apache/ \ - ftp://apache.technomancer.com/mirrors/apache/dist/ \ - ftp://ftp.raver.net/pub/ftp.apache.org/ \ - ftp://www3.service.digital.com/apache/dist/ \ - ftp://galileo.galilei.com/pub/apache/ \ - ftp://ftp.mtnranch.net/pub/apache/dist/ \ - ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ - ftp://apache.nextpath.com/pub/apache/dist/ +MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ + ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ + ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \ + ftp://apache.compuex.com/pub/apache/dist/httpd/ \ + ftp://apache.arctic.org/pub/apache/dist/httpd/ \ + ftp://ftp.epix.net/pub/apache/dist/httpd/ \ + ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \ + ftp://ftp.connectnet.com/pub/www/apache/httpd/ \ + ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \ + ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \ + ftp://www3.service.digital.com/apache/dist/httpd/ \ + ftp://galileo.galilei.com/pub/apache/httpd/ \ + ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \ + ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \ + ftp://apache.nextpath.com/pub/apache/dist/httpd/ DISTNAME= ${PORTNAME}_${PORTVERSION} PATCH_SITES= ftp://ftp.lexa.ru/pub/apache-rus/ \ @@ -31,7 +31,7 @@ MAINTAINER= vns@delta.odessa.ua -RA_VERSION= 30.0 +RA_VERSION= 30.4 Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # diff -ur apache13.orig/distinfo apache13/distinfo --- apache13.orig/distinfo Mon Jun 11 20:59:09 2001 +++ apache13/distinfo Mon Jun 11 21:08:13 2001 @@ -1,2 +1,2 @@ -MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109 -MD5 (patches_1.3.14rusPL30.0.tar.gz) = b3bb340dbcdd502c58091463b0abb400 +MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855 +MD5 (patches_1.3.19rusPL30.4.tar.gz) = 7d62733f6151cd59187ec1ef469f9a47 diff -ur apache13.orig/files/patch-ab apache13/files/patch-ab --- apache13.orig/files/patch-ab Mon Jun 11 20:59:09 2001 +++ apache13/files/patch-ab Mon Jun 11 21:25:51 2001 @@ -67,7 +67,7 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ -@@ -509,10 +518,10 @@ +@@ -509,9 +518,9 @@ -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;' \ @@ -79,8 +79,6 @@ + -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -- -e 's;conf/tables/;$(sysconfdir)/tables/;' \ -+ -e 's;conf/tables/;$(sysconfdir)/tables/;g' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ diff -ur apache13.orig/pkg-plist apache13/pkg-plist --- apache13.orig/pkg-plist Mon Jun 11 20:59:09 2001 +++ apache13/pkg-plist Mon Jun 11 22:05:47 2001 @@ -244,6 +244,7 @@ share/doc/apache/index.html.de share/doc/apache/index.html.dk share/doc/apache/index.html.ee +share/doc/apache/index.html.el share/doc/apache/index.html.en share/doc/apache/index.html.es share/doc/apache/index.html.fr @@ -269,16 +270,31 @@ share/doc/apache/manual/LICENSE share/doc/apache/manual/bind.html share/doc/apache/manual/cgi_path.html -share/doc/apache/manual/configuring.html +share/doc/apache/manual/configuring.html.en +share/doc/apache/manual/configuring.html.html +share/doc/apache/manual/configuring.html.ja.jis share/doc/apache/manual/content-negotiation.html -share/doc/apache/manual/custom-error.html +share/doc/apache/manual/custom-error.html.en +share/doc/apache/manual/custom-error.html.html +share/doc/apache/manual/custom-error.html.ja.jis share/doc/apache/manual/dns-caveats.html share/doc/apache/manual/dso.html share/doc/apache/manual/ebcdic.html share/doc/apache/manual/env.html share/doc/apache/manual/footer.html -share/doc/apache/manual/handler.html +share/doc/apache/manual/handler.html.en +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/cgi.html.en +share/doc/apache/manual/howto/cgi.html.html +share/doc/apache/manual/howto/cgi.html.ja.jis +share/doc/apache/manual/howto/footer.html +share/doc/apache/manual/howto/header.html +share/doc/apache/manual/howto/ssi.html.en +share/doc/apache/manual/howto/ssi.html.html +share/doc/apache/manual/howto/ssi.html.ja.jis +share/doc/apache/manual/images/apache_header.gif share/doc/apache/manual/images/custom_errordocs.gif share/doc/apache/manual/images/home.gif share/doc/apache/manual/images/index.gif @@ -286,11 +302,19 @@ share/doc/apache/manual/images/mod_rewrite_fig1.gif share/doc/apache/manual/images/mod_rewrite_fig2.fig share/doc/apache/manual/images/mod_rewrite_fig2.gif +share/doc/apache/manual/images/pixel.gif share/doc/apache/manual/images/sub.gif -share/doc/apache/manual/index.html +share/doc/apache/manual/index.html.en +share/doc/apache/manual/index.html.fr +share/doc/apache/manual/index.html.html +share/doc/apache/manual/index.html.ja.jis share/doc/apache/manual/install-tpf.html -share/doc/apache/manual/install.html +share/doc/apache/manual/install.html.en +share/doc/apache/manual/install.html.fr +share/doc/apache/manual/install.html.html +share/doc/apache/manual/install.html.ja.jis share/doc/apache/manual/invoking.html +share/doc/apache/manual/invoking.html.fr share/doc/apache/manual/keepalive.html share/doc/apache/manual/location.html share/doc/apache/manual/man-template.html @@ -319,7 +343,9 @@ share/doc/apache/manual/misc/vif-info.html share/doc/apache/manual/misc/windoz_keepalive.html share/doc/apache/manual/mod/core.html -share/doc/apache/manual/mod/directive-dict.html +share/doc/apache/manual/mod/directive-dict.html.en +share/doc/apache/manual/mod/directive-dict.html.html +share/doc/apache/manual/mod/directive-dict.html.ja.jis share/doc/apache/manual/mod/directives.html share/doc/apache/manual/mod/footer.html share/doc/apache/manual/mod/header.html @@ -342,7 +368,6 @@ share/doc/apache/manual/mod/mod_digest.html share/doc/apache/manual/mod/mod_dir.html share/doc/apache/manual/mod/mod_dld.html -share/doc/apache/manual/mod/mod_dll.html share/doc/apache/manual/mod/mod_env.html share/doc/apache/manual/mod/mod_example.html share/doc/apache/manual/mod/mod_expires.html @@ -358,7 +383,9 @@ share/doc/apache/manual/mod/mod_mime.html share/doc/apache/manual/mod/mod_mime_magic.html share/doc/apache/manual/mod/mod_mmap_static.html -share/doc/apache/manual/mod/mod_negotiation.html +share/doc/apache/manual/mod/mod_negotiation.html.en +share/doc/apache/manual/mod/mod_negotiation.html.html +share/doc/apache/manual/mod/mod_negotiation.html.ja.jis share/doc/apache/manual/mod/mod_proxy.html share/doc/apache/manual/mod/mod_rewrite.html share/doc/apache/manual/mod/mod_setenvif.html @@ -369,25 +396,48 @@ share/doc/apache/manual/mod/mod_userdir.html share/doc/apache/manual/mod/mod_usertrack.html share/doc/apache/manual/mod/mod_vhost_alias.html -share/doc/apache/manual/mod/module-dict.html +share/doc/apache/manual/mod/module-dict.html.en +share/doc/apache/manual/mod/module-dict.html.html +share/doc/apache/manual/mod/module-dict.html.ja.jis share/doc/apache/manual/mpeix.html share/doc/apache/manual/multilogs.html share/doc/apache/manual/netware.html share/doc/apache/manual/new_features_1_0.html share/doc/apache/manual/new_features_1_1.html share/doc/apache/manual/new_features_1_2.html -share/doc/apache/manual/new_features_1_3.html +share/doc/apache/manual/new_features_1_3.html.en +share/doc/apache/manual/new_features_1_3.html.html +share/doc/apache/manual/new_features_1_3.html.ja.jis share/doc/apache/manual/new_features_2_0.html share/doc/apache/manual/process-model.html +share/doc/apache/manual/programs/ab.html +share/doc/apache/manual/programs/apachectl.html +share/doc/apache/manual/programs/apxs.html +share/doc/apache/manual/programs/dbmmanage.html +share/doc/apache/manual/programs/footer.html +share/doc/apache/manual/programs/header.html +share/doc/apache/manual/programs/htdigest.html +share/doc/apache/manual/programs/htpasswd.html +share/doc/apache/manual/programs/httpd.html +share/doc/apache/manual/programs/index.html +share/doc/apache/manual/programs/logresolve.html +share/doc/apache/manual/programs/other.html +share/doc/apache/manual/programs/rotatelogs.html +share/doc/apache/manual/programs/suexec.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/server-wide.html.en +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/sourcereorg.html share/doc/apache/manual/stopping.html share/doc/apache/manual/suexec.html share/doc/apache/manual/suexec_1_2.html share/doc/apache/manual/unixware.html share/doc/apache/manual/upgrading_to_1_3.html +share/doc/apache/manual/urlmapping.html share/doc/apache/manual/vhosts/details.html share/doc/apache/manual/vhosts/details_1_2.html share/doc/apache/manual/vhosts/examples.html @@ -395,7 +445,9 @@ share/doc/apache/manual/vhosts/footer.html share/doc/apache/manual/vhosts/header.html share/doc/apache/manual/vhosts/host.html -share/doc/apache/manual/vhosts/index.html +share/doc/apache/manual/vhosts/index.html.en +share/doc/apache/manual/vhosts/index.html.html +share/doc/apache/manual/vhosts/index.html.ja.jis share/doc/apache/manual/vhosts/ip-based.html share/doc/apache/manual/vhosts/mass.html share/doc/apache/manual/vhosts/name-based.html @@ -529,9 +581,11 @@ @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache +@dirrm share/doc/apache/manual/howto @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod +@dirrm share/doc/apache/manual/programs @dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message