svn commit: r414894 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger rubygem-passenger/files
Sergey A. Osokin
osa at FreeBSD.org
Mon May 9 22:51:32 UTC 2016
Author: osa
Date: Mon May 9 22:51:30 2016
New Revision: 414894
URL: https://svnweb.freebsd.org/changeset/ports/414894
Log:
Upgrade from 5.0.27 to 5.0.28:
o) www/rubygem-passenger;
o) third-party modules for www/nginx and www/nginx-devel.
Added:
head/www/nginx-devel/files/extra-patch-passenger-cxx_portality.rb (contents, props changed)
head/www/nginx/files/extra-patch-passenger-cxx_portality.rb (contents, props changed)
head/www/rubygem-passenger/files/patch-cxx_portality.rb (contents, props changed)
Deleted:
head/www/nginx-devel/files/extra-patch-passenger-src-nginx_module-config
head/www/nginx/files/extra-patch-passenger-src-nginx_module-config
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/distinfo
head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
head/www/nginx/Makefile
head/www/nginx/distinfo
head/www/nginx/files/extra-patch-passenger-build-nginx.rb
head/www/rubygem-passenger/Makefile
head/www/rubygem-passenger/distinfo
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Mon May 9 21:17:59 2016 (r414893)
+++ head/www/nginx-devel/Makefile Mon May 9 22:51:30 2016 (r414894)
@@ -838,16 +838,16 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
.endif
.if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION= 5.0.27
+PASSENGER_VERSION= 5.0.28
MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
.if !empty(PORT_OPTIONS:MDSO)
CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-src-nginx_module-config
.else
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
.endif
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
+ ${PATCHDIR}/extra-patch-passenger-cxx_portality.rb
.if empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo Mon May 9 21:17:59 2016 (r414893)
+++ head/www/nginx-devel/distinfo Mon May 9 22:51:30 2016 (r414894)
@@ -22,8 +22,8 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4
SIZE (mod_zip-1.1.6.tar.gz) = 21991
SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
SIZE (modsecurity-2.9.1.tar.gz) = 4261212
-SHA256 (passenger-5.0.27.tar.gz) = 41f27a218a4beba7d251a4fb21819f87ecf37c2cea09aa3c01e40d7dc2b2532d
-SIZE (passenger-5.0.27.tar.gz) = 5568686
+SHA256 (passenger-5.0.28.tar.gz) = a5adb8c5446045f56a7c13bc75c5f3e96b7cfb01a10462107032929167dc17fa
+SIZE (passenger-5.0.28.tar.gz) = 5576921
SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Mon May 9 21:17:59 2016 (r414893)
+++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Mon May 9 22:51:30 2016 (r414894)
@@ -1,14 +1,21 @@
---- ../passenger-5.0.27/build/nginx.rb.orig 2013-10-27 02:00:00.000000000 +0400
-+++ ../passenger-5.0.27/build/nginx.rb 2015-09-26 02:05:27.664684000 +0300
-@@ -32,6 +32,7 @@
+--- ../passenger-5.0.28/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.0.28/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
+@@ -33,13 +33,12 @@
desc "Build Nginx support files"
task :nginx => [
:nginx_without_native_support,
+- NATIVE_SUPPORT_TARGET
+ LIBBOOST_OXT,
- NATIVE_SUPPORT_TARGET
].compact
-@@ -40,7 +41,6 @@
+ desc "Build Nginx support files, including objects suitable for dynamic linking against Nginx"
+ task 'nginx:as_dynamic_module' => [
+ :nginx_dynamic_without_native_support,
+- NATIVE_SUPPORT_TARGET
+ ].compact
+
+ # Workaround for https://github.com/jimweirich/rake/issues/274
+@@ -47,7 +46,6 @@
task :nginx_without_native_support => [
auto_generated_sources,
@@ -16,3 +23,11 @@
COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
].flatten
+@@ -55,7 +53,6 @@
+ # it also creates a namespace:clean task to clean up the output_dir
+ task :nginx_dynamic_without_native_support => [
+ auto_generated_sources,
+- AGENT_TARGET,
+ define_libboost_oxt_task("nginx", NGINX_DYNAMIC_OUTPUT_DIR + "libboost_oxt", "-fPIC"),
+ COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
+ set_namespace("nginx").set_output_dir(NGINX_DYNAMIC_OUTPUT_DIR + "module_libpassenger_common").define_tasks("-fPIC").
Added: head/www/nginx-devel/files/extra-patch-passenger-cxx_portality.rb
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-passenger-cxx_portality.rb Mon May 9 22:51:30 2016 (r414894)
@@ -0,0 +1,11 @@
+--- ../passenger-5.0.28/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb.orig 2016-05-08 18:50:00.990066000 -0400
++++ ../passenger-5.0.28/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb 2016-05-08 18:50:33.632523000 -0400
+@@ -211,7 +211,7 @@
+ end
+ result << ' -lrt' if has_rt_library?
+ result << ' -lmath' if has_math_library?
+- result << ' -ldl'
++ # result << ' -ldl'
+ result.strip!
+ return result
+ end
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Mon May 9 21:17:59 2016 (r414893)
+++ head/www/nginx/Makefile Mon May 9 22:51:30 2016 (r414894)
@@ -838,16 +838,16 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
.endif
.if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION= 5.0.27
+PASSENGER_VERSION= 5.0.28
MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
.if !empty(PORT_OPTIONS:MDSO)
CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-src-nginx_module-config
.else
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
.endif
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
+ ${PATCHDIR}/extra-patch-passenger-cxx_portality.rb
.if empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Mon May 9 21:17:59 2016 (r414893)
+++ head/www/nginx/distinfo Mon May 9 22:51:30 2016 (r414894)
@@ -22,8 +22,8 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4
SIZE (mod_zip-1.1.6.tar.gz) = 21991
SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
SIZE (modsecurity-2.9.1.tar.gz) = 4261212
-SHA256 (passenger-5.0.27.tar.gz) = 41f27a218a4beba7d251a4fb21819f87ecf37c2cea09aa3c01e40d7dc2b2532d
-SIZE (passenger-5.0.27.tar.gz) = 5568686
+SHA256 (passenger-5.0.28.tar.gz) = a5adb8c5446045f56a7c13bc75c5f3e96b7cfb01a10462107032929167dc17fa
+SIZE (passenger-5.0.28.tar.gz) = 5576921
SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
Modified: head/www/nginx/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx/files/extra-patch-passenger-build-nginx.rb Mon May 9 21:17:59 2016 (r414893)
+++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb Mon May 9 22:51:30 2016 (r414894)
@@ -1,14 +1,21 @@
---- ../passenger-5.0.27/build/nginx.rb.orig 2013-10-27 02:00:00.000000000 +0400
-+++ ../passenger-5.0.27/build/nginx.rb 2015-09-26 02:05:27.664684000 +0300
-@@ -32,6 +32,7 @@
+--- ../passenger-5.0.28/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.0.28/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
+@@ -33,13 +33,12 @@
desc "Build Nginx support files"
task :nginx => [
:nginx_without_native_support,
+- NATIVE_SUPPORT_TARGET
+ LIBBOOST_OXT,
- NATIVE_SUPPORT_TARGET
].compact
-@@ -40,7 +41,6 @@
+ desc "Build Nginx support files, including objects suitable for dynamic linking against Nginx"
+ task 'nginx:as_dynamic_module' => [
+ :nginx_dynamic_without_native_support,
+- NATIVE_SUPPORT_TARGET
+ ].compact
+
+ # Workaround for https://github.com/jimweirich/rake/issues/274
+@@ -47,7 +46,6 @@
task :nginx_without_native_support => [
auto_generated_sources,
@@ -16,3 +23,11 @@
COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
].flatten
+@@ -55,7 +53,6 @@
+ # it also creates a namespace:clean task to clean up the output_dir
+ task :nginx_dynamic_without_native_support => [
+ auto_generated_sources,
+- AGENT_TARGET,
+ define_libboost_oxt_task("nginx", NGINX_DYNAMIC_OUTPUT_DIR + "libboost_oxt", "-fPIC"),
+ COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
+ set_namespace("nginx").set_output_dir(NGINX_DYNAMIC_OUTPUT_DIR + "module_libpassenger_common").define_tasks("-fPIC").
Added: head/www/nginx/files/extra-patch-passenger-cxx_portality.rb
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-passenger-cxx_portality.rb Mon May 9 22:51:30 2016 (r414894)
@@ -0,0 +1,11 @@
+--- ../passenger-5.0.28/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb.orig 2016-05-08 18:50:00.990066000 -0400
++++ ../passenger-5.0.28/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb 2016-05-08 18:50:33.632523000 -0400
+@@ -211,7 +211,7 @@
+ end
+ result << ' -lrt' if has_rt_library?
+ result << ' -lmath' if has_math_library?
+- result << ' -ldl'
++ # result << ' -ldl'
+ result.strip!
+ return result
+ end
Modified: head/www/rubygem-passenger/Makefile
==============================================================================
--- head/www/rubygem-passenger/Makefile Mon May 9 21:17:59 2016 (r414893)
+++ head/www/rubygem-passenger/Makefile Mon May 9 22:51:30 2016 (r414894)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= passenger
-PORTVERSION= 5.0.27
+PORTVERSION= 5.0.28
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
@@ -71,7 +71,7 @@ pre-patch:
s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
s!-O2!!g; \
s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
- 230s!true!false!' \
+ 165s!true!false!' \
${WRKSRC}/build/basics.rb
.if ${PORT_OPTIONS:NDEBUG}
@${REINPLACE_CMD} \
Modified: head/www/rubygem-passenger/distinfo
==============================================================================
--- head/www/rubygem-passenger/distinfo Mon May 9 21:17:59 2016 (r414893)
+++ head/www/rubygem-passenger/distinfo Mon May 9 22:51:30 2016 (r414894)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-5.0.27.gem) = c3e6656f4f85ffef02089d3a90dc7896d9686b2077a243d4c5a6024225d9409f
-SIZE (rubygem/passenger-5.0.27.gem) = 5579264
+SHA256 (rubygem/passenger-5.0.28.gem) = c300238b98d25727d9a44b7ca16e95f7d34488727db1a9981b5fd2a03af76d35
+SIZE (rubygem/passenger-5.0.28.gem) = 5584384
Added: head/www/rubygem-passenger/files/patch-cxx_portality.rb
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/rubygem-passenger/files/patch-cxx_portality.rb Mon May 9 22:51:30 2016 (r414894)
@@ -0,0 +1,11 @@
+--- src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb.orig 2016-05-08 18:50:00.990066000 -0400
++++ src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb 2016-05-08 18:50:33.632523000 -0400
+@@ -211,7 +211,7 @@
+ end
+ result << ' -lrt' if has_rt_library?
+ result << ' -lmath' if has_math_library?
+- result << ' -ldl'
++ # result << ' -ldl'
+ result.strip!
+ return result
+ end
More information about the svn-ports-all
mailing list