1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Update to apache version 1.3.9 and RA 29.0.

PR:		14846
Submitted by:	maintainer
This commit is contained in:
Steve Price 1999-11-14 03:10:30 +00:00
parent fff94efdc8
commit c7e763ba8e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=23100
10 changed files with 146 additions and 135 deletions

View File

@ -6,8 +6,10 @@
# $FreeBSD$
#
DISTNAME= apache_1.3.6
PKGNAME= ru-apache-1.3.6
VERSION= 1.3.9
RA_VERSION= 29.0
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/ \
@ -25,13 +27,13 @@ MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
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
PATCH_SITES= ftp://ftp.lexa.ru/pub/apache-rus/ \
ftp://ftp.lexa.ru/pub/apache-rus/old-versions
PATCHFILES= patches_${VERSION}rusPL${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
@ -45,14 +47,9 @@ GZCAT=sh -c 'tar -zxf $$0 -C ${WRKSRC};${CAT} ${WRKSRC}/RA-1.3rusPL${RA_VERSION}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
--with-layout=GNU \
--sysconfdir=${PREFIX}/etc/apache \
--includedir=${PREFIX}/include/apache \
--localstatedir=/var \
--datadir=${PREFIX}/www \
--with-perl=${PERL} \
--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
--suexec-docroot=${PREFIX}/www/data \
--proxycachedir=${PREFIX}/www/proxy \
--libexecdir=${PREFIX}/libexec/apache \
--without-confadjust \
--enable-shared=remain \
--enable-module=most \

View File

@ -1,2 +1,2 @@
MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
MD5 (patches_1.3.6rusPL28.16.tar.gz) = 34a84fefba2cef2034c2594dbf0ca06b
MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
MD5 (patches_1.3.9rusPL29.0.tar.gz) = 5dc6007954de62f2fea3920d5c4933b0

View File

@ -0,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>

View File

@ -1,6 +1,15 @@
--- configure.orig Sat Jan 2 16:19:41 1999
+++ configure Fri Jan 15 00:44:01 1999
@@ -1012,8 +1012,8 @@
--- 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,7 +20,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"
@@ -1091,8 +1091,8 @@
@@ -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

View File

@ -1,14 +1,6 @@
--- 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@
--- 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,19 +8,19 @@
libexecdir_relative = @libexecdir_relative@
@@ -250,9 +251,9 @@
@@ -255,9 +256,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(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)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
@@ -380,26 +381,34 @@
@@ -441,26 +442,34 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
@ -76,18 +68,19 @@
@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;' \
@@ -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/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;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;conf/mime\.types;$(sysconfdir)/mime.types;' \
-e 's;User nobody;User $(conf_user);' \

View File

@ -1,20 +0,0 @@
--- 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`

View File

@ -1,15 +1,6 @@
--- 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 @@
--- 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,7 +9,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
@@ -472,7 +472,7 @@
@@ -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.
#

View File

@ -1,5 +1,5 @@
--- src/support/apachectl.orig Tue Feb 9 21:00:34 1999
+++ src/support/apachectl Fri Mar 26 00:08:20 1999
--- 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,15 +9,6 @@
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

View File

@ -1,50 +1,24 @@
*** 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;
--- 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;

View File

@ -52,6 +52,44 @@ etc/apache/tables/czech/cp1250-cp437.tab
etc/apache/tables/czech/cp1250-cp895.tab
etc/apache/tables/czech/cp1250-koi8cs.tab
etc/apache/tables/czech/cp1250-latin2.tab
etc/apache/tables/ukrainian/alt-koi.tab
etc/apache/tables/ukrainian/alt-mac.tab
etc/apache/tables/ukrainian/alt-win.tab
etc/apache/tables/ukrainian/koi-alt.tab
etc/apache/tables/ukrainian/koi-mac.tab
etc/apache/tables/ukrainian/koi-win.tab
etc/apache/tables/ukrainian/mac-alt.tab
etc/apache/tables/ukrainian/mac-koi.tab
etc/apache/tables/ukrainian/mac-win.tab
etc/apache/tables/ukrainian/win-alt.tab
etc/apache/tables/ukrainian/win-koi.tab
etc/apache/tables/ukrainian/win-mac.tab
etc/apache/tables/ukrainian2/alt-koi8u.tab
etc/apache/tables/ukrainian2/alt-ruscii.tab
etc/apache/tables/ukrainian2/alt-trans.tab
etc/apache/tables/ukrainian2/alt-win.tab
etc/apache/tables/ukrainian2/koi-koi8u.tab
etc/apache/tables/ukrainian2/koi8u-alt.tab
etc/apache/tables/ukrainian2/koi8u-iso.tab
etc/apache/tables/ukrainian2/koi8u-koi.tab
etc/apache/tables/ukrainian2/koi8u-mac.tab
etc/apache/tables/ukrainian2/koi8u-ruscii.tab
etc/apache/tables/ukrainian2/koi8u-trans.tab
etc/apache/tables/ukrainian2/koi8u-win.tab
etc/apache/tables/ukrainian2/ruscii-alt.tab
etc/apache/tables/ukrainian2/ruscii-iso.tab
etc/apache/tables/ukrainian2/ruscii-koi.tab
etc/apache/tables/ukrainian2/ruscii-koi8u.tab
etc/apache/tables/ukrainian2/ruscii-mac.tab
etc/apache/tables/ukrainian2/ruscii-trans.tab
etc/apache/tables/ukrainian2/ruscii-win.tab
etc/apache/tables/ukrainian2/win-alt.tab
etc/apache/tables/ukrainian2/win-iso.tab
etc/apache/tables/ukrainian2/win-koi.tab
etc/apache/tables/ukrainian2/win-koi8u.tab
etc/apache/tables/ukrainian2/win-mac.tab
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
@ -61,6 +99,7 @@ include/apache/ap_config_auto.h
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,6 +124,18 @@ include/apache/util_date.h
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,6 +149,7 @@ libexec/apache/mod_rewrite.so
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,6 +225,7 @@ share/doc/apache/manual/mod/mod_auth.html
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,6 +260,7 @@ share/doc/apache/manual/mod/mod_status.html
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
@ -351,8 +405,11 @@ www/icons/world2.gif
@dirrm etc/apache/tables/russian
@dirrm etc/apache/tables/russian2
@dirrm etc/apache/tables/czech
@dirrm etc/apache/tables/ukrainian
@dirrm etc/apache/tables/ukrainian2
@dirrm etc/apache/tables
@dirrm etc/apache
@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
@dirrm share/doc/apache/manual/images