mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

Accordingly update third-party echo module from 0.26 to 0.27.

Browse Source 
Remove needless extra patch.

Do not bump PORTREVISIONs.
This commit is contained in:
Sergey A. Osokin 2010-04-08 11:08:05 +00:00
parent 5ba2745f4f
commit 9dea737aa5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=252440
5 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/nginx-devel/Makefile
View File

@ -185,7 +185,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_MODUL
.endif
.if defined(WITH_ECHO_MODULE)
NGINX_ECHO_MODULE_VERSION= 0.26
NGINX_ECHO_MODULE_VERSION= 0.27
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:echo/}
MASTER_SITE_SUBDIR+= osa/:echo
DISTFILES+= ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}.tar.gz:echo
@ -461,10 +461,6 @@ post-patch:
@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
s!%%PREFIX%%!${PREFIX}!' \
${WRKSRC}/conf/nginx.conf
.if defined(WITH_ECHO_MODULE)
@${PATCH} ${PATCH_ARGS} < \
${PATCHDIR}/extra-patch-ngx_http_echo_timer.c
.endif
.if defined(WITH_HTTP_ACCESSKEY_MODULE)
@${REINPLACE_CMD} \
's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \

6
www/nginx-devel/distinfo
View File

@ -16,9 +16,9 @@ SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
MD5 (ngx_cache_purge-1.0.tar.gz) = ec1dabaa8321530c100f9baf65370294
SHA256 (ngx_cache_purge-1.0.tar.gz) = 6f4229a4edc0e8b914dc89c0a3c5b6a746469a3f9e5942b3d025dbe6a5ab2d13
SIZE (ngx_cache_purge-1.0.tar.gz) = 4569
MD5 (ngx_echo_module-0.26.tar.gz) = 21d1042481239c33b99b27bccbd2d574
SHA256 (ngx_echo_module-0.26.tar.gz) = b85eede1ca0c99856b0a812723f2bb68fc60828723ed37f8251771c0c0bdaa9e
SIZE (ngx_echo_module-0.26.tar.gz) = 112987
MD5 (ngx_echo_module-0.27.tar.gz) = a60455af4cdcd19a3247093891dee81a
SHA256 (ngx_echo_module-0.27.tar.gz) = 38b19eaba754d7a382bc1b08cf85ad675eb390a86d50d28370382e1afacd25ef
SIZE (ngx_echo_module-0.27.tar.gz) = 113761
MD5 (ngx_headers_more_module-0.07.tar.gz) = 2077c792e1bf2d51852e14a5f89102f5
SHA256 (ngx_headers_more_module-0.07.tar.gz) = 6cc57f41468bb8f363cd72e842c68cad5b696b829d93dd4e490bedab7a510083
SIZE (ngx_headers_more_module-0.07.tar.gz) = 73339

28
www/nginx-devel/files/extra-patch-ngx_http_echo_timer.c
View File

@ -1,28 +0,0 @@
--- ../ngx_echo_module-0.26/src/ngx_http_echo_timer.c.orig 2010-04-01 19:33:04.000000000 +0400
+++ ../ngx_echo_module-0.26/src/ngx_http_echo_timer.c 2010-04-01 19:33:09.000000000 +0400
@@ -23,7 +23,11 @@
ctx->timer_begin.msec = (ngx_msec_t) r->start_msec;
}
- ngx_time_update(0, 0); /* force the ngx timer to update */
+#if defined nginx_version && nginx_version >= 8035
+ ngx_time_update(); /* force the ngx timer to update */
+#else
+ ngx_time_update(0, 0); /* force the ngx timer to update */
+#endif
tp = ngx_timeofday();
dd("old sec msec: %ld %d\n", ctx->timer_begin.sec, ctx->timer_begin.msec);
@@ -52,7 +56,11 @@
ngx_http_echo_ctx_t *ctx)
{
dd("Exec timer...");
- ngx_time_update(0, 0); /* force the ngx timer to update */
+#if defined nginx_version && nginx_version >= 8035
+ ngx_time_update(); /* force the ngx timer to update */
+#else
+ ngx_time_update(0, 0); /* force the ngx timer to update */
+#endif
ctx->timer_begin = *ngx_timeofday();
return NGX_OK;

2
www/nginx/Makefile
View File

@ -178,7 +178,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_MODUL
.endif
.if defined(WITH_ECHO_MODULE)
NGINX_ECHO_MODULE_VERSION= 0.26
NGINX_ECHO_MODULE_VERSION= 0.27
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:echo/}
MASTER_SITE_SUBDIR+= osa/:echo
DISTFILES+= ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}.tar.gz:echo

6
www/nginx/distinfo
View File

@ -16,9 +16,9 @@ SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
MD5 (ngx_cache_purge-1.0.tar.gz) = ec1dabaa8321530c100f9baf65370294
SHA256 (ngx_cache_purge-1.0.tar.gz) = 6f4229a4edc0e8b914dc89c0a3c5b6a746469a3f9e5942b3d025dbe6a5ab2d13
SIZE (ngx_cache_purge-1.0.tar.gz) = 4569
MD5 (ngx_echo_module-0.26.tar.gz) = 21d1042481239c33b99b27bccbd2d574
SHA256 (ngx_echo_module-0.26.tar.gz) = b85eede1ca0c99856b0a812723f2bb68fc60828723ed37f8251771c0c0bdaa9e
SIZE (ngx_echo_module-0.26.tar.gz) = 112987
MD5 (ngx_echo_module-0.27.tar.gz) = a60455af4cdcd19a3247093891dee81a
SHA256 (ngx_echo_module-0.27.tar.gz) = 38b19eaba754d7a382bc1b08cf85ad675eb390a86d50d28370382e1afacd25ef
SIZE (ngx_echo_module-0.27.tar.gz) = 113761
MD5 (ngx_headers_more_module-0.07.tar.gz) = 2077c792e1bf2d51852e14a5f89102f5
SHA256 (ngx_headers_more_module-0.07.tar.gz) = 6cc57f41468bb8f363cd72e842c68cad5b696b829d93dd4e490bedab7a510083
SIZE (ngx_headers_more_module-0.07.tar.gz) = 73339