diff options
| author | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-11-21 11:17:41 +0000 |
|---|---|---|
| committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-11-21 11:17:41 +0000 |
| commit | c4d5f84407e7b1d06468f4e961fdadac188bd83f (patch) | |
| tree | 86ce2d7f7cf3fe451a350f196278b02dafe49d90 /russian/apache13 | |
| parent | Use new rc script suite. (diff) | |
Update to latest version 30.19+1.3.29
Notes
Notes:
svn path=/head/; revision=94623
Diffstat (limited to 'russian/apache13')
| -rw-r--r-- | russian/apache13/Makefile | 5 | ||||
| -rw-r--r-- | russian/apache13/distinfo | 4 | ||||
| -rw-r--r-- | russian/apache13/files/patch-src::main::alloc.c | 25 | ||||
| -rw-r--r-- | russian/apache13/pkg-plist | 5 |
4 files changed, 8 insertions, 31 deletions
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile index 59f7ccc74e16..fff43ccf7182 100644 --- a/russian/apache13/Makefile +++ b/russian/apache13/Makefile @@ -7,7 +7,6 @@ PORTNAME= apache PORTVERSION= ${APACHE_VERSION}+${RA_VERSION} -PORTREVISION= 1 CATEGORIES= russian www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= ${PORTNAME}_${APACHE_VERSION} @@ -27,8 +26,8 @@ CONFLICTS= apache+ipv6-* \ publicfile-* \ ru-apache+mod_ssl-* -RA_VERSION= 30.18 -APACHE_VERSION= 1.3.28 +RA_VERSION= 30.19 +APACHE_VERSION= 1.3.29 # # Small hack for alternate processing patchfiles diff --git a/russian/apache13/distinfo b/russian/apache13/distinfo index 20b90409dcbc..22e0f0f81157 100644 --- a/russian/apache13/distinfo +++ b/russian/apache13/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.28.tar.gz) = 2cdece7b4881d541e072de6a2b65db77 -MD5 (patches_1.3.28rusPL30.18.tar.gz) = 1ba4842baf15b42e6a9e6c4929178846 +MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3 +MD5 (patches_1.3.29rusPL30.19.tar.gz) = 58d4c5305cc80cf76d744a9722958320 diff --git a/russian/apache13/files/patch-src::main::alloc.c b/russian/apache13/files/patch-src::main::alloc.c deleted file mode 100644 index 08ab0e343b75..000000000000 --- a/russian/apache13/files/patch-src::main::alloc.c +++ /dev/null @@ -1,25 +0,0 @@ -Index: src/main/alloc.c -=================================================================== -RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v -retrieving revision 1.145 -retrieving revision 1.146 -diff -u -r1.145 -r1.146 ---- src/main/alloc.c 20 Jun 2003 15:05:40 -0000 1.145 -+++ src/main/alloc.c 2 Sep 2003 18:17:05 -0000 1.146 -@@ -2859,12 +2859,10 @@ - if ((p->kill_how == kill_after_timeout) - || (p->kill_how == kill_only_once)) { - /* Subprocess may be dead already. Only need the timeout if not. */ -- if (ap_os_kill(p->pid, SIGTERM) == -1) { -- p->kill_how = kill_never; -- } -- else { -- need_timeout = 1; -- } -+ if ( (ap_os_kill(p->pid, SIGTERM) == -1) && (errno == ESRCH) ) -+ p->kill_how = kill_never; -+ else -+ need_timeout = 1; - } - else if (p->kill_how == kill_always) { - kill(p->pid, SIGKILL); diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist index c94150e41ee5..f8c43116d482 100644 --- a/russian/apache13/pkg-plist +++ b/russian/apache13/pkg-plist @@ -289,6 +289,7 @@ sbin/rotatelogs %%DOCSDIR%%/index.html.ru.utf8 %%DOCSDIR%%/index.html.se %%DOCSDIR%%/index.html.zh-tw.big5 +%%DOCSDIR%%/manual/FAQ.html %%DOCSDIR%%/manual/LICENSE %%DOCSDIR%%/manual/bind.html.en %%DOCSDIR%%/manual/bind.html.fr @@ -467,7 +468,9 @@ sbin/rotatelogs %%DOCSDIR%%/manual/mod/mod_negotiation.html.html %%DOCSDIR%%/manual/mod/mod_negotiation.html.ja.jis %%DOCSDIR%%/manual/mod/mod_proxy.html -%%DOCSDIR%%/manual/mod/mod_rewrite.html +%%DOCSDIR%%/manual/mod/mod_rewrite.html.en +%%DOCSDIR%%/manual/mod/mod_rewrite.html.html +%%DOCSDIR%%/manual/mod/mod_rewrite.html.ja.jis %%DOCSDIR%%/manual/mod/mod_setenvif.html.en %%DOCSDIR%%/manual/mod/mod_setenvif.html.html %%DOCSDIR%%/manual/mod/mod_setenvif.html.ja.jis |