aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2012-06-14 19:29:08 +0800
committerosa <osa@FreeBSD.org>2012-06-14 19:29:08 +0800
commit48ece88dbc4acb24f70e95dd1f03da092a458b23 (patch)
tree4c5f02b8e9dc7dc5a780d6c58ff49b2b8caa1ea1
parent59a3c396c43cc10f7b503ac994cee042b05776b7 (diff)
downloadfreebsd-ports-gnome-48ece88dbc4acb24f70e95dd1f03da092a458b23.tar.gz
freebsd-ports-gnome-48ece88dbc4acb24f70e95dd1f03da092a458b23.tar.zst
freebsd-ports-gnome-48ece88dbc4acb24f70e95dd1f03da092a458b23.zip
Update third-party modules:
o) drizzle - from 0.1.2rc6 to 0.1.2rc7, sync with ngx_openresty 1.0.15.10 stable; o) rtmp - from 0.1.5 to 0.1.10. Do not bump PORTREVISION because these modules are disabled by default.
Diffstat
-rw-r--r--www/nginx-devel/Makefile9
-rw-r--r--www/nginx-devel/distinfo8
-rw-r--r--www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config4
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c14
-rw-r--r--www/nginx/Makefile9
-rw-r--r--www/nginx/distinfo8
-rw-r--r--www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config4
-rw-r--r--www/nginx/files/extra-patch-ngx_rtmp_exec_module.c14
8 files changed, 50 insertions, 20 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index c7a24e30744e..85a2ec09a278 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -538,8 +538,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-chunkin-nginx-module-${GIT_CHUNKI
.if ${PORT_OPTIONS:MDRIZZLE}
LIB_DEPENDS+= drizzle.0:${PORTSDIR}/databases/drizzle
-NGINX_DRIZZLE_VERSION= 0.1.2rc6
-GIT_DRIZZLE_VERSION= 0-ge05b5ff
+NGINX_DRIZZLE_VERSION= 0.1.2rc7
+GIT_DRIZZLE_VERSION= 0-g272cabf
FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
DISTFILES+= chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
@@ -667,12 +667,13 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_
.endif
.if ${PORT_OPTIONS:MRTMP}
-NGINX_RTMP_VERSION= 0.1.5
-GIT_RTMP_VERSION= 0-gd216f3d
+NGINX_RTMP_VERSION= 0.1.10
+GIT_RTMP_VERSION= 0-g80db4c4
FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/arut/nginx-rtmp-module/tarball/v${NGINX_RTMP_VERSION}/:rtmp
DISTFILES+= arut-rtmp-nginx-module-v${NGINX_RTMP_VERSION}-${GIT_RTMP_VERSION}.tar.gz:rtmp
CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-rtmp-module-${GIT_RTMP_VERSION:S/^0-g//}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_rtmp_exec_module.c
.endif
.if ${PORT_OPTIONS:MSET_MISC}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index a0d62565f880..a435e3fdf2b5 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -52,8 +52,8 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
SIZE (mod_zip-1.1.6.tar.gz) = 21991
SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca
SIZE (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 32575
-SHA256 (chaoslawful-drizzle-nginx-module-v0.1.2rc6-0-ge05b5ff.tar.gz) = 377fc10cb3590dfc373d0b6c73088d38dc0dfb52696457be00a328ab9977e4a9
-SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc6-0-ge05b5ff.tar.gz) = 61078
+SHA256 (chaoslawful-drizzle-nginx-module-v0.1.2rc7-0-g272cabf.tar.gz) = 3e26ee338c3a7b456bfbd4ea79540728410c72ff3096a0b6dc2ebd7c4a99c1fe
+SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc7-0-g272cabf.tar.gz) = 61112
SHA256 (agentzh-encrypted-session-nginx-module-v0.02-0-gc752861.tar.gz) = 9689fbef49b6c3b4c4fc67b21fe1aa60880a374af988e93b36b8cf5335109cd9
SIZE (agentzh-encrypted-session-nginx-module-v0.02-0-gc752861.tar.gz) = 8763
SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
@@ -78,8 +78,8 @@ SHA256 (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 903b4c88b43
SIZE (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 32794
SHA256 (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2
SIZE (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 28039
-SHA256 (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 3ae7fa0f72d0576e4e95933422a5f4defdaf3af10c9cce256434a9d58ab54a2c
-SIZE (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 942171
+SHA256 (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 09129fdf3591f9162e250fa0481e2ba44e5b3f9aea5cad709217822f63876037
+SIZE (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 949482
SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd
SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
diff --git a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
index 237a7347e2ea..79fb6ffdc046 100644
--- a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
+++ b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
@@ -1,5 +1,5 @@
---- ../chaoslawful-drizzle-nginx-module-e05b5ff/config.orig 2011-12-30 10:26:53.000000000 +0400
-+++ ../chaoslawful-drizzle-nginx-module-e05b5ff/config 2011-12-30 10:28:20.000000000 +0400
+--- ../chaoslawful-drizzle-nginx-module-272cabf/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../chaoslawful-drizzle-nginx-module-272cabf/config 2011-12-30 10:28:20.000000000 +0400
@@ -22,12 +22,12 @@
if [ $ngx_found = no ]; then
diff --git a/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c b/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c
new file mode 100644
index 000000000000..c8e724a5d035
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c
@@ -0,0 +1,14 @@
+--- ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c.orig 2012-06-14 15:14:50.000000000 +0400
++++ ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c 2012-06-14 15:15:06.000000000 +0400
+@@ -4,7 +4,11 @@
+
+
+ #include "ngx_rtmp_cmd_module.h"
++#ifdef NGX_FREEBSD
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+
+ #ifdef NGX_LINUX
+ #include <unistd.h>
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 3eed0c6e21d7..303c14dd5dcd 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -537,8 +537,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-chunkin-nginx-module-${GIT_CHUNKI
.if ${PORT_OPTIONS:MDRIZZLE}
LIB_DEPENDS+= drizzle.0:${PORTSDIR}/databases/drizzle
-NGINX_DRIZZLE_VERSION= 0.1.2rc6
-GIT_DRIZZLE_VERSION= 0-ge05b5ff
+NGINX_DRIZZLE_VERSION= 0.1.2rc7
+GIT_DRIZZLE_VERSION= 0-g272cabf
FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
DISTFILES+= chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
@@ -665,12 +665,13 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_
.endif
.if ${PORT_OPTIONS:MRTMP}
-NGINX_RTMP_VERSION= 0.1.5
-GIT_RTMP_VERSION= 0-gd216f3d
+NGINX_RTMP_VERSION= 0.1.10
+GIT_RTMP_VERSION= 0-g80db4c4
FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/arut/nginx-rtmp-module/tarball/v${NGINX_RTMP_VERSION}/:rtmp
DISTFILES+= arut-rtmp-nginx-module-v${NGINX_RTMP_VERSION}-${GIT_RTMP_VERSION}.tar.gz:rtmp
CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-rtmp-module-${GIT_RTMP_VERSION:S/^0-g//}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_rtmp_exec_module.c
.endif
.if ${PORT_OPTIONS:MSET_MISC}
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 1f70de14cb68..17d8958cc9d7 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -52,8 +52,8 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
SIZE (mod_zip-1.1.6.tar.gz) = 21991
SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca
SIZE (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 32575
-SHA256 (chaoslawful-drizzle-nginx-module-v0.1.2rc6-0-ge05b5ff.tar.gz) = 377fc10cb3590dfc373d0b6c73088d38dc0dfb52696457be00a328ab9977e4a9
-SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc6-0-ge05b5ff.tar.gz) = 61078
+SHA256 (chaoslawful-drizzle-nginx-module-v0.1.2rc7-0-g272cabf.tar.gz) = 3e26ee338c3a7b456bfbd4ea79540728410c72ff3096a0b6dc2ebd7c4a99c1fe
+SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc7-0-g272cabf.tar.gz) = 61112
SHA256 (agentzh-encrypted-session-nginx-module-v0.02-0-gc752861.tar.gz) = 9689fbef49b6c3b4c4fc67b21fe1aa60880a374af988e93b36b8cf5335109cd9
SIZE (agentzh-encrypted-session-nginx-module-v0.02-0-gc752861.tar.gz) = 8763
SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
@@ -78,8 +78,8 @@ SHA256 (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 903b4c88b43
SIZE (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 32794
SHA256 (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2
SIZE (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 28039
-SHA256 (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 3ae7fa0f72d0576e4e95933422a5f4defdaf3af10c9cce256434a9d58ab54a2c
-SIZE (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 942171
+SHA256 (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 09129fdf3591f9162e250fa0481e2ba44e5b3f9aea5cad709217822f63876037
+SIZE (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 949482
SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd
SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
diff --git a/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
index 237a7347e2ea..79fb6ffdc046 100644
--- a/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
+++ b/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
@@ -1,5 +1,5 @@
---- ../chaoslawful-drizzle-nginx-module-e05b5ff/config.orig 2011-12-30 10:26:53.000000000 +0400
-+++ ../chaoslawful-drizzle-nginx-module-e05b5ff/config 2011-12-30 10:28:20.000000000 +0400
+--- ../chaoslawful-drizzle-nginx-module-272cabf/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../chaoslawful-drizzle-nginx-module-272cabf/config 2011-12-30 10:28:20.000000000 +0400
@@ -22,12 +22,12 @@
if [ $ngx_found = no ]; then
diff --git a/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c b/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c
new file mode 100644
index 000000000000..c8e724a5d035
--- /dev/null
+++ b/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c
@@ -0,0 +1,14 @@
+--- ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c.orig 2012-06-14 15:14:50.000000000 +0400
++++ ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c 2012-06-14 15:15:06.000000000 +0400
+@@ -4,7 +4,11 @@
+
+
+ #include "ngx_rtmp_cmd_module.h"
++#ifdef NGX_FREEBSD
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+
+ #ifdef NGX_LINUX
+ #include <unistd.h>
generated by cgit (git 2.34.1) at 2024-11-27 23:27:07 +0800