From owner-freebsd-ports Thu Oct 19 5: 0:16 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 89C6837B4C5 for ; Thu, 19 Oct 2000 05:00:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id FAA47165; Thu, 19 Oct 2000 05:00:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from smtp10.atl.mindspring.net (smtp10.atl.mindspring.net [207.69.200.246]) by hub.freebsd.org (Postfix) with ESMTP id D68DC37B479 for ; Thu, 19 Oct 2000 04:52:13 -0700 (PDT) Received: from jupiter.delta.ny.us (nyf-ny4-39.ix.netcom.com [198.211.16.231]) by smtp10.atl.mindspring.net (8.9.3/8.8.5) with ESMTP id HAA08120; Thu, 19 Oct 2000 07:52:05 -0400 (EDT) Received: (from vsilyaev@localhost) by jupiter.delta.ny.us (8.9.3/8.9.3) id HAA00505; Thu, 19 Oct 2000 07:52:03 -0400 (EDT) (envelope-from vsilyaev) Message-Id: <200010191152.HAA00505@jupiter.delta.ny.us> Date: Thu, 19 Oct 2000 07:52:03 -0400 (EDT) From: vns@delta.odessa.ua Reply-To: vns@delta.odessa.ua To: FreeBSD-gnats-submit@freebsd.org Cc: Sergey Homenkow X-Send-Pr-Version: 3.2 Subject: ports/22112: Update: russian/apache13 port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22112 >Category: ports >Synopsis: Update: russian/apache13 port >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: Thu Oct 19 05:00:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Vladimir N. Silyaev >Release: FreeBSD 4.1-STABLE i386 >Organization: >Environment: FreeBSD 4.1-STABLE i386 >Description: Update russian/apache13 port to version 1.3.14-30.0 >How-To-Repeat: >Fix: Apply the following patch in the ports/russian directory diff -ruN apache13.bak/Makefile apache13/Makefile --- apache13.bak/Makefile Wed Oct 4 10:40:04 2000 +++ apache13/Makefile Thu Oct 19 14:50:44 2000 @@ -6,7 +6,7 @@ # PORTNAME= apache -PORTVERSION= 1.3.12 +PORTVERSION= 1.3.14 CATEGORIES= russian www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ @@ -31,7 +31,7 @@ MAINTAINER= vns@delta.odessa.ua -RA_VERSION= 29.4 +RA_VERSION= 30.0 Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # diff -ruN apache13.bak/distinfo apache13/distinfo --- apache13.bak/distinfo Mon Jul 10 06:01:52 2000 +++ apache13/distinfo Thu Oct 19 14:50:44 2000 @@ -1,2 +1,2 @@ -MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2 -MD5 (patches_1.3.12rusPL29.4.tar.gz) = 46c5531ea9c0100ec73d1391fb0a772a +MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109 +MD5 (patches_1.3.14rusPL30.0.tar.gz) = b3bb340dbcdd502c58091463b0abb400 diff -ruN apache13.bak/files/1 apache13/files/1 --- apache13.bak/files/1 Thu Jan 1 03:00:00 1970 +++ apache13/files/1 Thu Oct 19 14:50:44 2000 @@ -0,0 +1,11 @@ +--- Makefile.tmpl.1 Thu Oct 19 13:24:21 2000 ++++ Makefile.tmpl Thu Oct 19 13:24:36 2000 +@@ -525,7 +525,7 @@ + -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 -ruN apache13.bak/files/patch-ab apache13/files/patch-ab --- apache13.bak/files/patch-ab Sat Apr 1 10:02:14 2000 +++ apache13/files/patch-ab Thu Oct 19 14:50:44 2000 @@ -79,7 +79,8 @@ + -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/;' \ ++ -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 -ruN apache13.bak/files/patch-ac apache13/files/patch-ac --- apache13.bak/files/patch-ac Mon Jul 10 06:01:52 2000 +++ apache13/files/patch-ac Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- src/Configure.bak Sun Feb 6 04:27:19 2000 -+++ src/Configure Sun Mar 19 21:51:00 2000 -@@ -1043,7 +1043,7 @@ - LDFLAGS_SHLIB_EXPORT="" - SHLIB_SUFFIX_DEPTH=2 - ;; -- *-freebsd3*|*-freebsd4*) -+ *-freebsd[3-9]*) - LD_SHLIB="gcc" - CFLAGS_SHLIB="-fpic" - LDFLAGS_SHLIB="-shared" diff -ruN apache13.bak/pkg-descr apache13/pkg-descr --- apache13.bak/pkg-descr Mon Jul 10 06:01:53 2000 +++ apache13/pkg-descr Thu Oct 19 14:50:44 2000 @@ -1,5 +1,5 @@ Russian Apache - Version 29.4 (and up) + Version 30.0 (and up) Russian Apache is an HTTP server designed to work on a Russian market. diff -ruN apache13.bak/pkg-plist apache13/pkg-plist --- apache13.bak/pkg-plist Mon Jul 10 06:01:53 2000 +++ apache13/pkg-plist Thu Oct 19 14:50:44 2000 @@ -16,6 +16,70 @@ @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi etc/apache/srm.conf.default @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf +etc/apache/tables/cyrillic/dos-dos.tab +etc/apache/tables/cyrillic/dos-iso.tab +etc/apache/tables/cyrillic/dos-koi.tab +etc/apache/tables/cyrillic/dos-koiu.tab +etc/apache/tables/cyrillic/dos-mac.tab +etc/apache/tables/cyrillic/dos-macu.tab +etc/apache/tables/cyrillic/dos-utf7.tab +etc/apache/tables/cyrillic/dos-utf8.tab +etc/apache/tables/cyrillic/dos-win.tab +etc/apache/tables/cyrillic/iso-dos.tab +etc/apache/tables/cyrillic/iso-iso.tab +etc/apache/tables/cyrillic/iso-koi.tab +etc/apache/tables/cyrillic/iso-koiu.tab +etc/apache/tables/cyrillic/iso-mac.tab +etc/apache/tables/cyrillic/iso-macu.tab +etc/apache/tables/cyrillic/iso-utf7.tab +etc/apache/tables/cyrillic/iso-utf8.tab +etc/apache/tables/cyrillic/iso-win.tab +etc/apache/tables/cyrillic/koi-dos.tab +etc/apache/tables/cyrillic/koi-iso.tab +etc/apache/tables/cyrillic/koi-koi.tab +etc/apache/tables/cyrillic/koi-koiu.tab +etc/apache/tables/cyrillic/koi-mac.tab +etc/apache/tables/cyrillic/koi-macu.tab +etc/apache/tables/cyrillic/koi-utf7.tab +etc/apache/tables/cyrillic/koi-utf8.tab +etc/apache/tables/cyrillic/koi-win.tab +etc/apache/tables/cyrillic/koiu-dos.tab +etc/apache/tables/cyrillic/koiu-iso.tab +etc/apache/tables/cyrillic/koiu-koi.tab +etc/apache/tables/cyrillic/koiu-koiu.tab +etc/apache/tables/cyrillic/koiu-mac.tab +etc/apache/tables/cyrillic/koiu-macu.tab +etc/apache/tables/cyrillic/koiu-utf7.tab +etc/apache/tables/cyrillic/koiu-utf8.tab +etc/apache/tables/cyrillic/koiu-win.tab +etc/apache/tables/cyrillic/mac-dos.tab +etc/apache/tables/cyrillic/mac-iso.tab +etc/apache/tables/cyrillic/mac-koi.tab +etc/apache/tables/cyrillic/mac-koiu.tab +etc/apache/tables/cyrillic/mac-mac.tab +etc/apache/tables/cyrillic/mac-macu.tab +etc/apache/tables/cyrillic/mac-utf7.tab +etc/apache/tables/cyrillic/mac-utf8.tab +etc/apache/tables/cyrillic/mac-win.tab +etc/apache/tables/cyrillic/macu-dos.tab +etc/apache/tables/cyrillic/macu-iso.tab +etc/apache/tables/cyrillic/macu-koi.tab +etc/apache/tables/cyrillic/macu-koiu.tab +etc/apache/tables/cyrillic/macu-mac.tab +etc/apache/tables/cyrillic/macu-macu.tab +etc/apache/tables/cyrillic/macu-utf7.tab +etc/apache/tables/cyrillic/macu-utf8.tab +etc/apache/tables/cyrillic/macu-win.tab +etc/apache/tables/cyrillic/readme.txt +etc/apache/tables/cyrillic/win-dos.tab +etc/apache/tables/cyrillic/win-iso.tab +etc/apache/tables/cyrillic/win-koi.tab +etc/apache/tables/cyrillic/win-koiu.tab +etc/apache/tables/cyrillic/win-mac.tab +etc/apache/tables/cyrillic/win-macu.tab +etc/apache/tables/cyrillic/win-utf7.tab +etc/apache/tables/cyrillic/win-utf8.tab +etc/apache/tables/cyrillic/win-win.tab etc/apache/tables/russian/alt-alt.tab etc/apache/tables/russian/alt-iso.tab etc/apache/tables/russian/alt-koi.tab @@ -101,8 +165,8 @@ etc/apache/tables/ukrainian2/win-ruscii.tab etc/apache/tables/ukrainian2/win-trans.tab etc/rc.d/apache.sh -include/apache/alloc.h include/apache/ap.h +include/apache/ap_alloc.h include/apache/ap_compat.h include/apache/ap_config.h include/apache/ap_config_auto.h @@ -168,6 +232,7 @@ sbin/rotatelogs share/doc/apache/apache_pb.gif share/doc/apache/ra-powered.gif +share/doc/apache/README.rus @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @@ -182,17 +247,29 @@ share/doc/apache/index.html.en share/doc/apache/index.html.es share/doc/apache/index.html.fr +share/doc/apache/index.html.he.iso8859-8 share/doc/apache/index.html.it share/doc/apache/index.html.ja.jis +share/doc/apache/index.html.kr.iso-kr share/doc/apache/index.html.lu share/doc/apache/index.html.nl +share/doc/apache/index.html.no share/doc/apache/index.html.po.iso-pl share/doc/apache/index.html.pt share/doc/apache/index.html.pt-br +share/doc/apache/index.html.ru.cp-1251 +share/doc/apache/index.html.ru.cp866 +share/doc/apache/index.html.ru.iso-ru +share/doc/apache/index.html.ru.koi8-r +share/doc/apache/index.html.ru.ucs2 +share/doc/apache/index.html.ru.ucs4 +share/doc/apache/index.html.ru.utf8 share/doc/apache/index.html.se +share/doc/apache/index.html.tw.Big5 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/content-negotiation.html share/doc/apache/manual/custom-error.html share/doc/apache/manual/dns-caveats.html @@ -238,6 +315,7 @@ share/doc/apache/manual/misc/perf.html share/doc/apache/manual/misc/rewriteguide.html share/doc/apache/manual/misc/security_tips.html +share/doc/apache/manual/misc/tutorials.html share/doc/apache/manual/misc/vif-info.html share/doc/apache/manual/misc/windoz_keepalive.html share/doc/apache/manual/mod/core.html @@ -245,6 +323,7 @@ share/doc/apache/manual/mod/directives.html share/doc/apache/manual/mod/footer.html share/doc/apache/manual/mod/header.html +share/doc/apache/manual/mod/index-bytype.html share/doc/apache/manual/mod/index.html share/doc/apache/manual/mod/mod_access.html share/doc/apache/manual/mod/mod_actions.html @@ -290,12 +369,15 @@ 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/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_2_0.html share/doc/apache/manual/process-model.html share/doc/apache/manual/readme-tpf.html share/doc/apache/manual/search/manual-index.cgi @@ -319,6 +401,8 @@ 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 +share/doc/apache/manual/win_compiling.html +share/doc/apache/manual/win_service.html share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi @@ -434,6 +518,7 @@ @exec mkdir -p %D/www/proxy @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi +@dirrm etc/apache/tables/cyrillic @dirrm etc/apache/tables/russian @dirrm etc/apache/tables/russian2 @dirrm etc/apache/tables/czech >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message