aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2018-07-17 12:15:27 +0800
committerosa <osa@FreeBSD.org>2018-07-17 12:15:27 +0800
commit398f83cb89885c59bb09aacbd17490c4287788a8 (patch)
treef86077df54bd30ac8a20b596e2d878554c9894c2
parent5524e17022d1d767814031e0258388561841bd8a (diff)
downloadfreebsd-ports-gnome-398f83cb89885c59bb09aacbd17490c4287788a8.tar.gz
freebsd-ports-gnome-398f83cb89885c59bb09aacbd17490c4287788a8.tar.zst
freebsd-ports-gnome-398f83cb89885c59bb09aacbd17490c4287788a8.zip
Change location for third-party sticky module from bitbucket.org
to a fork on GH cause last one contains additional fixes. Remove needless patch. Bump PORTREVISION.
-rw-r--r--www/nginx-devel/Makefile1
-rw-r--r--www/nginx-devel/Makefile.extmod6
-rw-r--r--www/nginx-devel/distinfo6
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c17
4 files changed, 6 insertions, 24 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 84bed669307a..d3e6072541cb 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.15.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index b376f98e87dd..f33a623e6f2c 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -166,10 +166,8 @@ HTTP_UPSTREAM_FAIR_GH_TUPLE= cryptofuture:nginx-upstream-fair:b5be36f:upstreamf
HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair
HTTP_UPSTREAM_STICKY_IMPLIES= HTTP_SSL
-HTTP_UPSTREAM_STICKY_MASTER_SITES= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky
-HTTP_UPSTREAM_STICKY_DISTFILES= 08a395c66e42.tar.gz:upstreamsticky
-HTTP_UPSTREAM_STICKY_CONFIGURE_ON= --add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42/
-HTTP_UPSTREAM_STICKY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c
+HTTP_UPSTREAM_STICKY_GH_TUPLE= thomsonreuters:nginx-sticky-module-ng:0d58565:upstreamsticky
+HTTP_UPSTREAM_STICKY_CONFIGURE_ON= --add-module=${WRKSRC_upstreamsticky}
HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libavcodec.so:multimedia/ffmpeg \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 3d962607e33f..a2ef8950b1c6 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1530659749
+TIMESTAMP = 1531438512
SHA256 (nginx-1.15.1.tar.gz) = c7206858d7f832b8ef73a45c9b8f8e436bcb1ee88db2bc85b8e438ecec9d5460
SIZE (nginx-1.15.1.tar.gz) = 1024086
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -11,8 +11,6 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b25
SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
SIZE (ngx_http_response-0.3.tar.gz) = 2244
-SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90
-SIZE (08a395c66e42.tar.gz) = 120603
SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5
SIZE (modsecurity-2.9.2.tar.gz) = 4298993
SHA256 (passenger-5.3.3.tar.gz) = 97c4f023894215ac672cc6515cc22a74167a2ee4937709e267065a80c716c90f
@@ -91,6 +89,8 @@ SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e
SIZE (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 130039
SHA256 (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = e765afcaab6cd1601e914039a8d00ab18eb6fe01180c58e0e4e098bc5b4d8233
SIZE (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = 10174
+SHA256 (thomsonreuters-nginx-sticky-module-ng-0d58565_GH0.tar.gz) = 85c178046de8036ce6339d69c1c12f470c1d9aa797b45d3151118dbe9b8fe2a5
+SIZE (thomsonreuters-nginx-sticky-module-ng-0d58565_GH0.tar.gz) = 120608
SHA256 (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 6ad7d12b3f7b65ec8e7f3e0f471463929967cb76ff1a81b35a5a34b33604f3cb
SIZE (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 2709894
SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c b/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c
deleted file mode 100644
index 098cc78cdf61..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c.orig 2016-07-10 11:39:07.943834000 -0400
-+++ ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c 2016-07-10 11:43:05.601078000 -0400
-@@ -12,6 +12,14 @@
-
- #include "ngx_http_sticky_misc.h"
-
-+#ifndef MD5_DIGEST_LENGTH
-+ #define MD5_DIGEST_LENGTH 16
-+#endif
-+#ifndef MD5_CBLOCK
-+ #define MD5_CBLOCK 64
-+#endif
-+
-+
- #ifndef ngx_str_set
- #define ngx_str_set(str, text) (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text
- #endif