diff options
author | Michael Haro <mharo@FreeBSD.org> | 2000-04-01 06:02:17 +0000 |
---|---|---|
committer | Michael Haro <mharo@FreeBSD.org> | 2000-04-01 06:02:17 +0000 |
commit | d5d2aae0c43d2f55c1ac7c8da403ddff8d036466 (patch) | |
tree | cb76f9dad445bc26ccd014de1c28e96d70bc6474 /russian | |
parent | Change termcap and resource. (diff) |
update to apache 1.3.11
PR: 16659
Submitted by: maintainer
Diffstat (limited to 'russian')
-rw-r--r-- | russian/apache13/Makefile | 5 | ||||
-rw-r--r-- | russian/apache13/distinfo | 4 | ||||
-rw-r--r-- | russian/apache13/files/patch-aa | 17 | ||||
-rw-r--r-- | russian/apache13/files/patch-ab | 45 | ||||
-rw-r--r-- | russian/apache13/pkg-descr | 2 | ||||
-rw-r--r-- | russian/apache13/pkg-plist | 22 |
6 files changed, 54 insertions, 41 deletions
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile index 35e221c3f425..2e9dca4578e4 100644 --- a/russian/apache13/Makefile +++ b/russian/apache13/Makefile @@ -6,8 +6,8 @@ # $FreeBSD$ # -VERSION= 1.3.9 -RA_VERSION= 29.2 +VERSION= 1.3.11 +RA_VERSION= 29.3 DISTNAME= apache_${VERSION} PKGNAME= ru-apache-${VERSION} CATEGORIES= www russian @@ -47,6 +47,7 @@ GZCAT=sh -c 'tar -zxf $$0 -C ${WRKSRC};${CAT} ${WRKSRC}/RA-1.3rusPL${RA_VERSION} HAS_CONFIGURE= yes CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --server-gid=nogroup \ --with-perl=${PERL} \ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ diff --git a/russian/apache13/distinfo b/russian/apache13/distinfo index 84cc4c18c61a..5e53fe3a63d5 100644 --- a/russian/apache13/distinfo +++ b/russian/apache13/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 -MD5 (patches_1.3.9rusPL29.2.tar.gz) = c23e879622501e3fbe18fd16ca9a42f3 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 +MD5 (patches_1.3.11rusPL29.3.tar.gz) = 51450694dacc969ab599067c9d4a5730 diff --git a/russian/apache13/files/patch-aa b/russian/apache13/files/patch-aa index b0478de26053..15cd58c27ef2 100644 --- a/russian/apache13/files/patch-aa +++ b/russian/apache13/files/patch-aa @@ -1,15 +1,6 @@ ---- 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 @@ +--- configure.orig Tue Jan 18 01:53:17 2000 ++++ configure Mon Jan 24 19:37:21 2000 +@@ -1232,8 +1232,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" @@ -20,7 +11,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" -@@ -1244,8 +1244,8 @@ +@@ -1330,8 +1330,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 diff --git a/russian/apache13/files/patch-ab b/russian/apache13/files/patch-ab index 467360f6debd..aa384db03d92 100644 --- a/russian/apache13/files/patch-ab +++ b/russian/apache13/files/patch-ab @@ -1,6 +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 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ @@ -8,7 +8,7 @@ libexecdir_relative = @libexecdir_relative@ -@@ -255,9 +256,9 @@ +@@ -266,9 +267,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -20,37 +20,38 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -441,26 +442,34 @@ +@@ -452,25 +453,33 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ + (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ + find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ -+# fi ++# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ @@ -60,15 +61,13 @@ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -- fi -+# fi ++# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ -+ fi + fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -498,10 +507,10 @@ +@@ -509,10 +518,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;' \ diff --git a/russian/apache13/pkg-descr b/russian/apache13/pkg-descr index 46af75645cf3..2f1bdbaf8fce 100644 --- a/russian/apache13/pkg-descr +++ b/russian/apache13/pkg-descr @@ -1,5 +1,5 @@ Russian Apache - Version 28.14 (and up) + Version 29.3 (and up) Russian Apache is an HTTP server designed to work on a Russian market. diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist index e443f5928dba..f33b7eea196c 100644 --- a/russian/apache13/pkg-plist +++ b/russian/apache13/pkg-plist @@ -2,10 +2,15 @@ bin/dbmmanage bin/htdigest bin/htpasswd etc/apache/access.conf.default +@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf etc/apache/httpd.conf.default +@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf etc/apache/magic.default +@exec [ ! -f %B/magic ] && cp %B/%f %B/magic etc/apache/mime.types.default +@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types etc/apache/srm.conf.default +@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf etc/apache/tables/russian/alt-alt.tab etc/apache/tables/russian/alt-iso.tab etc/apache/tables/russian/alt-koi.tab @@ -161,7 +166,22 @@ share/doc/apache/ra-powered.gif @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default +@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data +@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin share/doc/apache/index.html +share/doc/apache/index.html.ca +share/doc/apache/index.html.cz +share/doc/apache/index.html.de +share/doc/apache/index.html.dk +share/doc/apache/index.html.ee +share/doc/apache/index.html.en +share/doc/apache/index.html.es +share/doc/apache/index.html.fr +share/doc/apache/index.html.it +share/doc/apache/index.html.lu +share/doc/apache/index.html.nl +share/doc/apache/index.html.pt +share/doc/apache/index.html.se share/doc/apache/manual/LICENSE share/doc/apache/manual/bind.html share/doc/apache/manual/cgi_path.html @@ -208,6 +228,7 @@ share/doc/apache/manual/misc/perf-dec.html share/doc/apache/manual/misc/perf-hp.html share/doc/apache/manual/misc/perf-tuning.html 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/vif-info.html share/doc/apache/manual/misc/windoz_keepalive.html @@ -262,6 +283,7 @@ 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/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 |