Date: Mon, 13 Sep 1999 08:00:54 -0400 (EDT) From: "Vladimir N.Silyaev" <vns@delta.odessa.ua> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13723: upgrade russian/apache port to 1.3.9 Message-ID: <199909131200.IAA00489@delta.odessa.ua>
next in thread | raw e-mail | index | archive | help
>Number: 13723
>Category: ports
>Synopsis: upgrade russian/apache port to 1.3.9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 13 05:10:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Vladimir N.Silyaev
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
FreeBSD 4.0-CURRENT FreeBSD 4.0-CURRENT #19: Mon Sep 6 23:39:33 EDT 1999
>Description:
This patch upgrades port russian/apache from version 1.3.6 to 1.3.9
>How-To-Repeat:
>Fix:
Apply the next patch, and remove patches/patch-ac.
*** ./files/md5.orig Sun Aug 1 06:13:14 1999
--- files/md5 Sun Sep 12 23:16:14 1999
***************
*** 1,2 ****
! MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
! MD5 (patches_1.3.6rusPL28.16.tar.gz) = 34a84fefba2cef2034c2594dbf0ca06b
--- 1,2 ----
! MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
! MD5 (patches_1.3.9rusPL28.18.tar.gz) = ca23b50890d8206bdaaaa3a65fdf1c2b
*** ./files/FreeBSD.layout.orig Sun Sep 12 23:53:15 1999
--- ./files/FreeBSD.layout Sun Sep 12 23:53:05 1999
***************
*** 0 ****
--- 1,19 ----
+ # FreeBSD layout...
+ <Layout FreeBSD>
+ prefix: /usr/local
+ exec_prefix: $prefix
+ bindir: $exec_prefix/bin
+ sbindir: $exec_prefix/sbin
+ libexecdir: $exec_prefix/libexec/apache
+ mandir: $prefix/man
+ sysconfdir: $prefix/etc/apache
+ datadir: $prefix/www
+ iconsdir: $datadir/icons
+ htdocsdir: $datadir/data
+ cgidir: $datadir/cgi-bin
+ includedir: $prefix/include/apache
+ localstatedir: /var
+ runtimedir: $localstatedir/run
+ logfiledir: $localstatedir/log
+ proxycachedir: $datadir/proxy
+ </Layout>
*** ./patches/patch-ab.orig Sun May 2 23:57:53 1999
--- ./patches/patch-ab Sun Sep 12 23:44:01 1999
***************
*** 1,14 ****
! --- Makefile.tmpl.orig Sun Apr 11 10:49:30 1999
! +++ Makefile.tmpl Sun Apr 11 10:54:15 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@
--- 1,6 ----
! --- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999
! +++ Makefile.tmpl Fri Sep 3 14:57:01 1999
! @@ -120,6 +120,7 @@
runtimedir = @runtimedir@
logfiledir = @logfiledir@
proxycachedir = @proxycachedir@
***************
*** 16,34 ****
libexecdir_relative = @libexecdir_relative@
! @@ -250,9 +251,9 @@
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(sysconfdir)/tables
- $(MKDIR) $(root)$(htdocsdir)
+ $(MKDIR) $(root)$(doc_prefix)
$(MKDIR) $(root)$(iconsdir)
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
! $(MKDIR) $(root)$(logfiledir)
! @@ -380,26 +381,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
--- 8,26 ----
libexecdir_relative = @libexecdir_relative@
! @@ -255,9 +256,9 @@
! $(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(htdocsdir)
+ $(MKDIR) $(root)$(doc_prefix)
$(MKDIR) $(root)$(iconsdir)
- $(MKDIR) $(root)$(cgidir)
+ $(MKDIR) $(root)$(cgidir).default
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
! @@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
***************
*** 76,93 ****
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
! @@ -439,10 +448,10 @@
! -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;' \
- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
! + -e "s;logs/access_log;$(logfiledir)/httpd-access.log;" \
! + -e "s;logs/error_log;$(logfiledir)/httpd-error.log;" \
! + -e "s;logs/referer_log;$(logfiledir)/httpd-referer.log;" \
! + -e "s;logs/agent_log;$(logfiledir)/httpd-agent.log;" \
-e 's;conf/tables/;$(sysconfdir)/tables/;' \
-e 's;conf/magic;$(sysconfdir)/magic;' \
! -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
--- 68,86 ----
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
! @@ -498,10 +507,10 @@
! -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;' \
- -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
- -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
- -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
- -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
! + -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
! + -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/magic;$(sysconfdir)/magic;' \
! -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
! -e 's;User nobody;User $(conf_user);' \
*** ./patches/patch-ac.orig Sun May 2 23:57:54 1999
--- ./patches/patch-ac Sun Sep 12 23:18:54 1999
***************
*** 1,20 ****
- --- src/Configure.orig Sun Mar 21 08:07:24 1999
- +++ src/Configure Fri Mar 26 00:57:25 1999
- @@ -454,7 +454,7 @@
- PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
- OS="FreeBSD $PLATOSVERS"
- case "$PLATOSVERS" in
- - [23]*)
- + [234]*)
- DEF_WANTHSREGEX=no
- CFLAGS="$CFLAGS -funsigned-char"
- ;;
- @@ -955,7 +955,7 @@
- LDFLAGS_SHLIB_EXPORT=""
- SHLIB_SUFFIX_DEPTH=2
- ;;
- - *-freebsd3*)
- + *-freebsd[34]*)
- CFLAGS_SHLIB="-fpic"
- LDFLAGS_SHLIB="-Bshareable"
- OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--- 0 ----
*** ./patches/patch-al.orig Sun May 2 23:57:54 1999
--- ./patches/patch-al Sun Sep 12 23:35:01 1999
***************
*** 1,50 ****
! *** src/support/log_server_status.orig Tue Mar 31 16:53:50 1998
! --- src/support/log_server_status Tue Apr 21 17:18:10 1998
! ***************
! *** 67,76 ****
! #
! require 'sys/socket.ph';
!
! ! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
! $server = "localhost"; # Name of server, could be "www.foo.com"
! $port = "80"; # Port on server
! ! $request = "/status/?auto"; # Request to send
!
! sub tcp_connect
! {
! --- 67,76 ----
! #
! require 'sys/socket.ph';
!
! ! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
! $server = "localhost"; # Name of server, could be "www.foo.com"
! $port = "80"; # Port on server
! ! $request = "/server-status/?auto"; # Request to send
!
! sub tcp_connect
! {
! ***************
! *** 93,103 ****
! ### Main
!
! {
! ! $date=`date +%y%m%d:%H%M%S`;
! chop($date);
! ($day,$time)=split(/:/,$date);
! $res=&tcp_connect($server,$port);
! ! open(OUT,">>$wherelog$day");
! if ($res) {
! print OUT "$time:-1:-1:-1:-1:$res\n";
! exit 1;
! --- 93,103 ----
! ### Main
!
! {
! ! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
! chop($date);
! ($day,$time)=split(/:/,$date);
! $res=&tcp_connect($server,$port);
! ! open(OUT,">>$wherelog$day.log");
! if ($res) {
! print OUT "$time:-1:-1:-1:-1:$res\n";
! exit 1;
--- 1,24 ----
! --- src/support/log_server_status.orig Fri Jun 4 19:54:19 1999
! +++ src/support/log_server_status Fri Sep 3 15:53:16 1999
! @@ -67,10 +67,10 @@
! #
! require 'sys/socket.ph';
!
! -$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
! +$wherelog = "/var/log/httpd-status-";
! $server = "localhost"; # Name of server, could be "www.foo.com"
! $port = "80"; # Port on server
! -$request = "/status/?auto"; # Request to send
! +$request = "/server-status/?auto"; # Request to send
!
! sub tcp_connect
! {
! @@ -100,7 +100,7 @@
! chomp($date);
! ($day,$time)=split(/:/,$date);
! $res=&tcp_connect($server,$port);
! - open(OUT,">>$wherelog$day");
! + open(OUT,">>$wherelog$day.log");
! if ($res) {
! print OUT "$time:-1:-1:-1:-1:$res\n";
! exit 1;
*** ./patches/patch-aa.orig Sun Sep 12 23:18:51 1999
--- ./patches/patch-aa Sun Sep 12 23:36:03 1999
***************
*** 1,6 ****
! --- configure.orig Sat Jan 2 16:19:41 1999
! +++ configure Fri Jan 15 00:44:01 1999
! @@ -1012,8 +1012,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
--- 1,15 ----
! --- configure.orig Sat Aug 14 12:29:05 1999
! +++ configure Fri Sep 3 15:38:10 1999
! @@ -1084,7 +1084,7 @@
! ## UID/GID as production oriented as a web server in NIS anyway.
! ##
! conf_user="nobody"
! -conf_group="#-1"
! +conf_group="nogroup"
! conf_port="80"
! conf_serveradmin="you@your.address"
! conf_servername="new.host.name"
! @@ -1153,8 +1153,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
***************
*** 11,17 ****
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
! @@ -1091,8 +1091,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
--- 20,26 ----
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
! @@ -1244,8 +1244,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
*** ./patches/patch-ak.orig Sun May 2 23:57:53 1999
--- ./patches/patch-ak Sun Sep 12 23:33:24 1999
***************
*** 1,5 ****
! --- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
! +++ src/support/apachectl Fri Mar 26 00:08:20 1999
@@ -39,6 +39,8 @@
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
--- 1,5 ----
! --- src/support/apachectl.orig Wed Apr 7 00:36:33 1999
! +++ src/support/apachectl Fri Sep 3 15:41:01 1999
@@ -39,6 +39,8 @@
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
***************
*** 9,23 ****
ERROR=0
ARGV="$@"
if [ "x$ARGV" = "x" ] ; then
- @@ -50,7 +52,7 @@
- # check for pidfile
- if [ -f $PIDFILE ] ; then
- PID=`cat $PIDFILE`
- - 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
@@ -82,6 +84,7 @@
fi
if kill $PID ; then
--- 9,14 ----
*** ./patches/patch-ag.orig Sun May 2 23:57:53 1999
--- ./patches/patch-ag Sun Sep 12 23:38:01 1999
***************
*** 1,15 ****
! --- conf/httpd.conf-dist.orig Sat Dec 12 20:04:29 1998
! +++ conf/httpd.conf-dist Fri Jan 15 01:08:36 1999
! @@ -241,7 +241,7 @@
! # don't use Group #-1 on these systems!
! #
! User nobody
! -Group #-1
! +Group nogroup
!
! #
! # ServerAdmin: Your address, where problems with the server should be
! @@ -459,7 +459,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
--- 1,6 ----
! --- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999
! +++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999
! @@ -467,7 +467,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
***************
*** 18,24 ****
#
# If you would like to have agent and referer logfiles, uncomment the
! @@ -472,7 +472,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
--- 9,15 ----
#
# If you would like to have agent and referer logfiles, uncomment the
! @@ -480,7 +480,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
*** ./pkg/PLIST.orig Sun May 2 23:57:53 1999
--- ./pkg/PLIST Sun Sep 12 23:58:24 1999
***************
*** 61,66 ****
--- 61,67 ----
include/apache/ap_ctype.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
+ include/apache/ap_sha1.h
include/apache/buff.h
include/apache/compat.h
include/apache/conf.h
***************
*** 85,90 ****
--- 86,103 ----
include/apache/util_md5.h
include/apache/util_script.h
include/apache/util_uri.h
+ include/apache/xml/asciitab.h
+ include/apache/xml/hashtable.h
+ include/apache/xml/iasciitab.h
+ include/apache/xml/latin1tab.h
+ include/apache/xml/nametab.h
+ include/apache/xml/utf8tab.h
+ include/apache/xml/xmldef.h
+ include/apache/xml/xmlparse.h
+ include/apache/xml/xmlrole.h
+ include/apache/xml/xmltok.h
+ include/apache/xml/xmltok_impl.h
+ libexec/apache/httpd.exp
libexec/apache/libproxy.so
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.so
***************
*** 98,103 ****
--- 111,117 ----
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
+ libexec/apache/mod_vhost_alias.so
sbin/ab
sbin/apachectl
sbin/apxs
***************
*** 173,178 ****
--- 187,193 ----
share/doc/apache/manual/mod/mod_auth_anon.html
share/doc/apache/manual/mod/mod_auth_db.html
share/doc/apache/manual/mod/mod_auth_dbm.html
+ share/doc/apache/manual/mod/mod_auth_digest.html
share/doc/apache/manual/mod/mod_autoindex.html
share/doc/apache/manual/mod/mod_browser.html
share/doc/apache/manual/mod/mod_cern_meta.html
***************
*** 207,212 ****
--- 222,228 ----
share/doc/apache/manual/mod/mod_unique_id.html
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/multilogs.html
share/doc/apache/manual/new_features_1_0.html
share/doc/apache/manual/new_features_1_1.html
***************
*** 353,358 ****
--- 369,375 ----
@dirrm etc/apache/tables/czech
@dirrm etc/apache/tables
@dirrm etc/apache
+ @dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images
*** ./Makefile.orig Tue Aug 31 06:17:27 1999
--- ./Makefile Sun Sep 12 23:32:46 1999
***************
*** 6,13 ****
# $FreeBSD: ports/russian/apache13/Makefile,v 1.6 1999/08/31 01:46:56 peter Exp $
#
! DISTNAME= apache_1.3.6
! PKGNAME= ru-apache-1.3.6
CATEGORIES= www russian
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
--- 6,15 ----
# $FreeBSD: ports/russian/apache13/Makefile,v 1.6 1999/08/31 01:46:56 peter Exp $
#
! VERSION= 1.3.9
! RA_VERSION= 28.18
! DISTNAME= apache_${VERSION}
! PKGNAME= rapache-${VERSION}
CATEGORIES= www russian
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
***************
*** 26,37 ****
ftp://apache.nextpath.com/pub/apache/dist/
PATCH_SITES= ftp://ftp.lexa.ru/pub/apache-rus/
! PATCHFILES= patches_1.3.6rusPL${RA_VERSION}.tar.gz
!
MAINTAINER= vns@delta.odessa.ua
-
Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
- RA_VERSION= 28.16
#
# Small hack for alternate processing patchfiles
--- 28,36 ----
ftp://apache.nextpath.com/pub/apache/dist/
PATCH_SITES= ftp://ftp.lexa.ru/pub/apache-rus/
! PATCHFILES= patches_${VERSION}rusPL${RA_VERSION}.tar.gz
MAINTAINER= vns@delta.odessa.ua
Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000
#
# Small hack for alternate processing patchfiles
***************
*** 45,58 ****
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
! --with-layout=GNU \
! --sysconfdir=${PREFIX}/etc/apache \
! --includedir=${PREFIX}/include/apache \
! --localstatedir=/var \
! --datadir=${PREFIX}/www \
--suexec-docroot=${PREFIX}/www/data \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
--- 44,52 ----
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
! --with-perl=${PERL} \
! --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \
>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?199909131200.IAA00489>