diff options
| author | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-11-21 12:15:52 +0000 |
|---|---|---|
| committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-11-21 12:15:52 +0000 |
| commit | e1f82681c76ad11a7d399623aa8ba421f891e91e (patch) | |
| tree | a6e136d407f01fe68ad0e9042a8e3eec819df699 /russian/apache13-modssl | |
| parent | Fix last commit. PORTVERSION should be 4.1.29, not 4.1.27. (diff) | |
Update to version 1.3.29+30.19+2.8.16
Notes
Notes:
svn path=/head/; revision=94633
Diffstat (limited to 'russian/apache13-modssl')
| -rw-r--r-- | russian/apache13-modssl/Makefile | 7 | ||||
| -rw-r--r-- | russian/apache13-modssl/distinfo | 6 | ||||
| -rw-r--r-- | russian/apache13-modssl/files/patch-src::main::alloc.c | 25 | ||||
| -rw-r--r-- | russian/apache13-modssl/pkg-plist | 5 |
4 files changed, 10 insertions, 33 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile index 5280678ecae2..e38f55a82763 100644 --- a/russian/apache13-modssl/Makefile +++ b/russian/apache13-modssl/Makefile @@ -7,7 +7,6 @@ PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL} -PORTREVISION= 2 CATEGORIES= russian www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_MODSSL:S/$/:modssl/} \ @@ -50,9 +49,9 @@ DOCSDIR= ${PREFIX}/share/doc/apache .include <bsd.port.pre.mk> -VERSION_APACHE= 1.3.28 -VERSION_MODSSL= 2.8.15 -VERSION_RA= 30.18 +VERSION_APACHE= 1.3.29 +VERSION_MODSSL= 2.8.16 +VERSION_RA= 30.19 # # some defaults diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo index 6cd51587c6d0..25f00c8c5b30 100644 --- a/russian/apache13-modssl/distinfo +++ b/russian/apache13-modssl/distinfo @@ -1,3 +1,3 @@ -MD5 (apache_1.3.28.tar.gz) = 2cdece7b4881d541e072de6a2b65db77 -MD5 (mod_ssl-2.8.15-1.3.28.tar.gz) = 0f37d6efd51128f696000d73624f5aff -MD5 (patches_1.3.28rusPL30.18.tar.gz) = 1ba4842baf15b42e6a9e6c4929178846 +MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3 +MD5 (mod_ssl-2.8.16-1.3.29.tar.gz) = 4f6c580ffa07d33e8584406132b98e86 +MD5 (patches_1.3.29rusPL30.19.tar.gz) = 58d4c5305cc80cf76d744a9722958320 diff --git a/russian/apache13-modssl/files/patch-src::main::alloc.c b/russian/apache13-modssl/files/patch-src::main::alloc.c deleted file mode 100644 index 08ab0e343b75..000000000000 --- a/russian/apache13-modssl/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-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist index c585437a18fc..4830452279bc 100644 --- a/russian/apache13-modssl/pkg-plist +++ b/russian/apache13-modssl/pkg-plist @@ -316,6 +316,7 @@ sbin/rotatelogs %%DOCSDIR%%/index.html.se %%DOCSDIR%%/index.html.zh-tw.big5 %%DOCSDIR%%/manual/LICENSE +%%DOCSDIR%%/manual/FAQ.html %%DOCSDIR%%/manual/bind.html.en %%DOCSDIR%%/manual/bind.html.fr %%DOCSDIR%%/manual/bind.html.html @@ -498,7 +499,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 |