diff options
author | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-08-02 19:44:38 +0000 |
---|---|---|
committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-08-02 19:44:38 +0000 |
commit | 6ca6023531c596ec697d463841e5894b4b54edcc (patch) | |
tree | bc87329ff1838b6e5953aca84add27aca5beb502 /russian/apache13-modssl | |
parent | Update to 1.3.28+30.18 (diff) |
Update to 1.3.28+30.18+2.8.15
Fix CONFLICTS
Notes
Notes:
svn path=/head/; revision=86201
Diffstat (limited to 'russian/apache13-modssl')
-rw-r--r-- | russian/apache13-modssl/Makefile | 10 | ||||
-rw-r--r-- | russian/apache13-modssl/distinfo | 6 | ||||
-rw-r--r-- | russian/apache13-modssl/files/patch-bb | 35 | ||||
-rw-r--r-- | russian/apache13-modssl/pkg-plist | 13 |
4 files changed, 28 insertions, 36 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile index 54733444b33b..1921311bf8bb 100644 --- a/russian/apache13-modssl/Makefile +++ b/russian/apache13-modssl/Makefile @@ -40,16 +40,16 @@ CONFLICTS= apache+ipv6-* \ apache-* \ apache_fp-* \ publicfile-* \ - apache+mod_ssl-* + ru-apache-* -USE_OPENSSL= YES +USE_OPENSSL= yes USE_PERL5= yes .include <bsd.port.pre.mk> -VERSION_APACHE= 1.3.27 -VERSION_MODSSL= 2.8.14 -VERSION_RA= 30.17 +VERSION_APACHE= 1.3.28 +VERSION_MODSSL= 2.8.15 +VERSION_RA= 30.18 # # some defaults diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo index 7c3ecbfddf38..6cd51587c6d0 100644 --- a/russian/apache13-modssl/distinfo +++ b/russian/apache13-modssl/distinfo @@ -1,3 +1,3 @@ -MD5 (apache_1.3.27.tar.gz) = 65b89365a65dcad71d4402b4862beeaa -MD5 (mod_ssl-2.8.14-1.3.27.tar.gz) = 8ba44e6ad3701f445b0f86f17f24ff1c -MD5 (patches_1.3.27rusPL30.17.tar.gz) = dc5d9074c85b8876ef6e0152f90520ef +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 diff --git a/russian/apache13-modssl/files/patch-bb b/russian/apache13-modssl/files/patch-bb index 1f2731eb4aff..313c5f515759 100644 --- a/russian/apache13-modssl/files/patch-bb +++ b/russian/apache13-modssl/files/patch-bb @@ -1,5 +1,5 @@ ---- src/support/suexec.c.orig Thu Mar 14 00:05:37 2002 -+++ src/support/suexec.c Wed Sep 25 00:22:18 2002 +--- src/support/suexec.c.orig Wed Mar 5 18:50:29 2003 ++++ src/support/suexec.c Fri Jul 18 18:09:56 2003 @@ -90,6 +90,9 @@ #include <sys/types.h> @@ -10,32 +10,17 @@ #include "suexec.h" -@@ -296,11 +299,14 @@ - fprintf(stderr, " -D DOC_ROOT=\"%s\"\n", DOC_ROOT); - #endif - #ifdef GID_MIN -- fprintf(stderr, " -D GID_MID=%d\n", GID_MIN); -+ fprintf(stderr, " -D GID_MIN=%d\n", GID_MIN); - #endif - #ifdef HTTPD_USER - fprintf(stderr, " -D HTTPD_USER=\"%s\"\n", HTTPD_USER); - #endif -+#ifdef LOGIN_CAP -+ fprintf(stderr, " -D LOGIN_CAP\n"); -+#endif +@@ -322,6 +325,9 @@ #ifdef LOG_EXEC fprintf(stderr, " -D LOG_EXEC=\"%s\"\n", LOG_EXEC); #endif -@@ -311,7 +317,7 @@ - fprintf(stderr, " -D SUEXEC_UMASK=%03o\n", SUEXEC_UMASK); - #endif - #ifdef UID_MIN -- fprintf(stderr, " -D UID_MID=%d\n", UID_MIN); -+ fprintf(stderr, " -D UID_MIN=%d\n", UID_MIN); ++#ifdef LOGIN_CAP ++ fprintf(stderr, " -D LOGIN_CAP\n"); ++#endif + #ifdef SAFE_PATH + fprintf(stderr, " -D SAFE_PATH=\"%s\"\n", SAFE_PATH); #endif - #ifdef USERDIR_SUFFIX - fprintf(stderr, " -D USERDIR_SUFFIX=\"%s\"\n", USERDIR_SUFFIX); -@@ -461,7 +467,28 @@ +@@ -480,7 +486,28 @@ /* * Change UID/GID here so that the following tests work over NFS. @@ -65,7 +50,7 @@ * Initialize the group access list for the target user, * and setgid() to the target group. If unsuccessful, error out. */ -@@ -469,6 +496,7 @@ +@@ -488,6 +515,7 @@ log_err("emerg: failed to setgid (%ld: %s)\n", gid, cmd); exit(109); } diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist index 34dd6ad8e2b3..435e344328b2 100644 --- a/russian/apache13-modssl/pkg-plist +++ b/russian/apache13-modssl/pkg-plist @@ -314,7 +314,7 @@ share/doc/apache/index.html.ru.ucs2 share/doc/apache/index.html.ru.ucs4 share/doc/apache/index.html.ru.utf8 share/doc/apache/index.html.se -share/doc/apache/index.html.zh +share/doc/apache/index.html.zh-tw.big5 share/doc/apache/manual/LICENSE share/doc/apache/manual/bind.html.en share/doc/apache/manual/bind.html.fr @@ -328,7 +328,9 @@ share/doc/apache/manual/configuring.html.en share/doc/apache/manual/configuring.html.fr share/doc/apache/manual/configuring.html.html share/doc/apache/manual/configuring.html.ja.jis -share/doc/apache/manual/content-negotiation.html +share/doc/apache/manual/content-negotiation.html.en +share/doc/apache/manual/content-negotiation.html.html +share/doc/apache/manual/content-negotiation.html.ja.jis share/doc/apache/manual/custom-error.html.en share/doc/apache/manual/custom-error.html.fr share/doc/apache/manual/custom-error.html.html @@ -417,6 +419,7 @@ share/doc/apache/manual/misc/windoz_keepalive.html share/doc/apache/manual/mod/core.html.en share/doc/apache/manual/mod/core.html.fr share/doc/apache/manual/mod/core.html.html +share/doc/apache/manual/mod/core.html.ja.jis share/doc/apache/manual/mod/mod_define.html share/doc/apache/manual/mod/directive-dict.html.en share/doc/apache/manual/mod/directive-dict.html.fr @@ -444,11 +447,13 @@ share/doc/apache/manual/mod/mod_actions.html.en share/doc/apache/manual/mod/mod_actions.html.html share/doc/apache/manual/mod/mod_actions.html.ja.jis share/doc/apache/manual/mod/mod_alias.html.en +share/doc/apache/manual/mod/mod_alias.html.html share/doc/apache/manual/mod/mod_alias.html.ja.jis share/doc/apache/manual/mod/mod_asis.html.en share/doc/apache/manual/mod/mod_asis.html.html share/doc/apache/manual/mod/mod_asis.html.ja.jis share/doc/apache/manual/mod/mod_auth.html.en +share/doc/apache/manual/mod/mod_auth.html.html share/doc/apache/manual/mod/mod_auth.html.ja.jis share/doc/apache/manual/mod/mod_auth_anon.html share/doc/apache/manual/mod/mod_auth_db.html @@ -480,7 +485,9 @@ share/doc/apache/manual/mod/mod_info.html.ja.jis share/doc/apache/manual/mod/mod_isapi.html share/doc/apache/manual/mod/mod_log_agent.html share/doc/apache/manual/mod/mod_log_common.html -share/doc/apache/manual/mod/mod_log_config.html +share/doc/apache/manual/mod/mod_log_config.html.en +share/doc/apache/manual/mod/mod_log_config.html.html +share/doc/apache/manual/mod/mod_log_config.html.ja.jis share/doc/apache/manual/mod/mod_log_referer.html share/doc/apache/manual/mod/mod_mime.html.en share/doc/apache/manual/mod/mod_mime.html.html |