diff --git a/ap2-passenger/Makefile b/ap2-passenger/Makefile index 3348f72fe1..9b8f8f160e 100644 --- a/ap2-passenger/Makefile +++ b/ap2-passenger/Makefile @@ -1,29 +1,26 @@ -# $NetBSD: Makefile,v 1.20 2015/04/02 15:40:14 fhajny Exp $ +# $NetBSD$ PKGNAME= ${APACHE_PKG_PREFIX}-${RUBY_PKGPREFIX}-${DISTNAME} - COMMENT= Passenger module for running Rails and Rack applications on Apache2 -BUILDLINK_DEPMETHOD.libeio= build BUILDLINK_DEPMETHOD.curl= build -RUBY_VERSIONS_ACCEPTED= 22 23 # www/ruby-rack via wip/ruby-passenger - -.include "../../wip/ruby-passenger/Makefile.common" - -APACHE_MODULE= YES -USE_APR= YES - DEPENDS+= ${RUBY_PKGPREFIX}-${DISTNAME}:../../wip/ruby-passenger -INSTALLATION_DIRS+= lib/httpd +.include "../../wip/ruby-passenger/Makefile.common" + +RUBY_VERSIONS_ACCEPTED= 22 23 # www/ruby-rack via wip/ruby-passenger +APACHE_MODULE= YES +USE_APR= YES # Get rid of these bits from www/apache24 as they break build on SunOS -BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED=1 BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE +BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED=1 + +INSTALLATION_DIRS+= lib/httpd do-build: - cd ${WRKSRC}/build && ${PKGSRC_SETENV} ${MAKE_ENV} ${RAKE} apache2 + cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ${RAKE} apache2 do-install: ${INSTALL_LIB} ${WRKSRC}/buildout/apache2/mod_passenger.so \ diff --git a/ruby-passenger/Makefile b/ruby-passenger/Makefile index 5183dfac6c..f5f575fd3c 100644 --- a/ruby-passenger/Makefile +++ b/ruby-passenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/10/29 12:59:17 fhajny Exp $ +# $NetBSD$ PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -11,23 +11,21 @@ RUBY_VERSIONS_ACCEPTED= 22 23 # www/ruby-rack BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc DEPENDS+= ${RUBY_PKGPREFIX}-daemon_controller>=1.2.0:../../devel/ruby-daemon_controller DEPENDS+= ${RUBY_PKGPREFIX}-rack-[0-9]*:../../www/ruby-rack -.if ${RUBY_VERSION_DEFAULT} == 18 -DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.2.0:../../misc/rubygems -.endif INSTALL_ENV+= FS_PREFIX=${PREFIX} INSTALL_ENV+= FS_DOCDIR=${PREFIX}/share/doc INSTALL_ENV+= RUBYLIBDIR=${PREFIX}/${RUBY_VENDORLIB_BASE} INSTALL_ENV+= RUBYARCHDIR=${PREFIX}/${RUBY_ARCHLIB} -INSTALL_ENV+= APACHE2_MODULE_PATH=${PREFIX}/lib/httpd +INSTALL_ENV+= APACHE2_MODULE_PATH=${PREFIX}/lib/httpd/mod_passenger.so +INSTALL_ENV+= NATIVE_PACKAGING_METHOD=pkgsrc + +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 do-build: - cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ${RAKE} common:clean agents + cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ${RAKE} agent nginx nginx:as_dynamic_module native_support do-install: cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RAKE} fakeroot - ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_MAN} ${WRKSRC}/man/passenger-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/man/passenger-memory-stats.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_MAN} ${WRKSRC}/man/passenger-status.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 diff --git a/ruby-passenger/Makefile.common b/ruby-passenger/Makefile.common index 7fa667af6b..9d34a86ac0 100644 --- a/ruby-passenger/Makefile.common +++ b/ruby-passenger/Makefile.common @@ -1,17 +1,16 @@ -# $NetBSD: Makefile.common,v 1.13 2015/04/20 16:25:04 fhajny Exp $ +# $NetBSD$ # used by wip/ap2-passenger/Makefile # used by wip/ruby-passenger/Makefile -# -DISTNAME= passenger-5.0.6 + +DISTNAME= passenger-5.1.12 CATEGORIES= www MASTER_SITES= http://s3.amazonaws.com/phusion-passenger/releases/ -MAINTAINER= filip@joyent.com +MAINTAINER?= filip@joyent.com HOMEPAGE= http://www.phusionpassenger.com/ LICENSE= mit USE_LANGUAGES= c c++ -USE_RAKE= yes PATCHDIR= ${.CURDIR}/../../wip/ruby-passenger/patches DISTINFO_FILE= ${.CURDIR}/../../wip/ruby-passenger/distinfo @@ -26,46 +25,31 @@ REPLACE_RUBY+= bin/passenger-install-apache2-module REPLACE_RUBY+= bin/passenger-install-nginx-module REPLACE_RUBY+= bin/passenger-memory-stats REPLACE_RUBY+= bin/passenger-status -REPLACE_RUBY+= helper-scripts/backtrace-sanitizer.rb -REPLACE_RUBY+= helper-scripts/crash-watch.rb -REPLACE_RUBY+= helper-scripts/download_binaries/extconf.rb -REPLACE_RUBY+= helper-scripts/meteor-loader.rb -REPLACE_RUBY+= helper-scripts/prespawn -REPLACE_RUBY+= helper-scripts/rack-loader.rb -REPLACE_RUBY+= helper-scripts/rack-preloader.rb +REPLACE_RUBY+= src/helper-scripts/*.rb +REPLACE_RUBY+= src/helper-scripts/prespawn CHECK_INTERPRETER_SKIP+= ${RUBY_VENDORLIB}/phusion_passenger/wsgi/request_handler.py CHECK_INTERPRETER_SKIP+= share/passenger/helper-scripts/system-memory-stats.py CHECK_INTERPRETER_SKIP+= share/passenger/helper-scripts/wsgi-loader.py CHECK_INTERPRETER_SKIP+= share/passenger/helper-scripts/wsgi-preloader.py +CHECK_INTERPRETER_SKIP+= share/passenger/node/vendor-copy/winston/node_modules/async/support/sync-package-managers.js SUBST_CLASSES+= rake -SUBST_STAGE.rake= post-patch +SUBST_STAGE.rake= pre-configure SUBST_MESSAGE.rake= Fixing installation directories -SUBST_FILES.rake= build/common_library.rb -SUBST_FILES.rake+= lib/phusion_passenger.rb -SUBST_FILES.rake+= lib/phusion_passenger/platform_info/apache.rb -SUBST_FILES.rake+= lib/phusion_passenger/platform_info/cxx_portability.rb -SUBST_VARS.rake= COMPILER_RPATH_FLAG PKG_SYSCONFDIR PREFIX +SUBST_FILES.rake= src/ruby_supportlib/phusion_passenger.rb +SUBST_FILES.rake+= src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb +SUBST_VARS.rake= PKG_SYSCONFDIR PREFIX MAKE_ENV+= EXTRA_LDFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib -MAKE_ENV+= USE_VENDORED_LIBEIO=no .if ${OPSYS} == "SunOS" -LIBEV_EXTRA_ARGS= ac_cv_header_sys_inotify_h=no +MAKE_ENV+= LIBEV_EXTRA_ARGS=ac_cv_header_sys_inotify_h=no .endif -SUBST_CLASSES+= ev -SUBST_STAGE.ev= pre-configure -SUBST_FILES.ev= build/common_library.rb -SUBST_MESSAGE.ev= Fix libev build on SunOS -SUBST_VARS.ev= LIBEV_EXTRA_ARGS +pre-install: + ${RM} -f ${WRKSRC}/src/ruby_supportlib/phusion_passenger/packaging.rb.orig \ + ${WRKSRC}/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb.orig -post-patch: - ${RM} -f ${WRKSRC}/lib/phusion_passenger/packaging.rb.orig \ - ${WRKSRC}/lib/phusion_passenger/platform_info/apache.rb.orig \ - ${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb.orig - -.include "../../wip/libeio/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../lang/ruby/modules.mk" diff --git a/ruby-passenger/PLIST b/ruby-passenger/PLIST index 3a813fb91d..b0ce07d0d0 100644 --- a/ruby-passenger/PLIST +++ b/ruby-passenger/PLIST @@ -1,35 +1,54 @@ -@comment $NetBSD: PLIST,v 1.10 2015/04/02 15:40:14 fhajny Exp $ +@comment $NetBSD$ bin/passenger bin/passenger-config bin/passenger-install-apache2-module bin/passenger-install-nginx-module lib/passenger/common/libboost_oxt.a -lib/passenger/common/libpassenger_common/AgentsBase.o -lib/passenger/common/libpassenger_common/ApplicationPool2/AppTypes.o -lib/passenger/common/libpassenger_common/ApplicationPool2/Implementation.o +lib/passenger/common/libpassenger_common/AppTypes.o +lib/passenger/common/libpassenger_common/Crypto.o +lib/passenger/common/libpassenger_common/DataStructures/LString.o lib/passenger/common/libpassenger_common/Exceptions.o -lib/passenger/common/libpassenger_common/Logging.o +lib/passenger/common/libpassenger_common/LoggingKit.o lib/passenger/common/libpassenger_common/MemoryKit/mbuf.o lib/passenger/common/libpassenger_common/MemoryKit/palloc.o +lib/passenger/common/libpassenger_common/ProcessManagement/Ruby.o +lib/passenger/common/libpassenger_common/ProcessManagement/Spawn.o +lib/passenger/common/libpassenger_common/ProcessManagement/Utils.o lib/passenger/common/libpassenger_common/ServerKit/Implementation.o lib/passenger/common/libpassenger_common/ServerKit/http_parser.o +lib/passenger/common/libpassenger_common/UnionStationFilterSupport.o lib/passenger/common/libpassenger_common/Utils.o lib/passenger/common/libpassenger_common/Utils/CachedFileStat.o lib/passenger/common/libpassenger_common/Utils/Hasher.o lib/passenger/common/libpassenger_common/Utils/IOUtils.o lib/passenger/common/libpassenger_common/Utils/LargeFiles.o -lib/passenger/common/libpassenger_common/Utils/MD5.o lib/passenger/common/libpassenger_common/Utils/StrIntUtils.o lib/passenger/common/libpassenger_common/Utils/StrIntUtilsNoStrictAliasing.o lib/passenger/common/libpassenger_common/Utils/SystemTime.o -lib/passenger/common/libpassenger_common/Utils/jsoncpp.o -lib/passenger/common/libpassenger_common/Utils/modp_b64.o -lib/passenger/common/libpassenger_common/agents/LoggingAgent/FilterSupport.o +lib/passenger/common/libpassenger_common/WatchdogLauncher.o +lib/passenger/common/libpassenger_common/jsoncpp.o +lib/passenger/common/libpassenger_common/vendor-modified/modp_b64.o +lib/passenger/common/libpassenger_common/vendor-modified/modp_b64_strict_aliasing.o +lib/passenger/nginx_dynamic/libboost_oxt.a +lib/passenger/nginx_dynamic/module_libpassenger_common/AppTypes.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Exceptions.o +lib/passenger/nginx_dynamic/module_libpassenger_common/LoggingKit.o +lib/passenger/nginx_dynamic/module_libpassenger_common/ProcessManagement/Spawn.o +lib/passenger/nginx_dynamic/module_libpassenger_common/ProcessManagement/Utils.o +lib/passenger/nginx_dynamic/module_libpassenger_common/UnionStationFilterSupport.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/CachedFileStat.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/Hasher.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/IOUtils.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/StrIntUtils.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/StrIntUtilsNoStrictAliasing.o +lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/SystemTime.o +lib/passenger/nginx_dynamic/module_libpassenger_common/WatchdogLauncher.o +lib/passenger/nginx_dynamic/module_libpassenger_common/jsoncpp.o lib/passenger/support-binaries/PassengerAgent ${RUBY_ARCHLIB}/passenger_native_support.${RUBY_DLEXT} ${RUBY_VENDORLIB_BASE}/phusion_passenger.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/abstract_installer.rb -${RUBY_VENDORLIB_BASE}/phusion_passenger/active_support3_extensions/init.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/admin_tools.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/admin_tools/instance.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/admin_tools/instance_registry.rb @@ -37,8 +56,8 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/admin_tools/memory_stats.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/apache2/config_options.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/common_library.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/config/about_command.rb -${RUBY_VENDORLIB_BASE}/phusion_passenger/config/admin_command_command.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/config/agent_compiler.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/config/api_call_command.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/config/build_native_support_command.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/config/command.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/config/compile_agent_command.rb @@ -72,6 +91,7 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/apache.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/apache_detector.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/binary_compatibility.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/compiler.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/crypto.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/curl.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/cxx_portability.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/depcheck.rb @@ -82,6 +102,7 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/depcheck_specs/libs.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/depcheck_specs/ruby.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/depcheck_specs/utilities.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/linux.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/openssl.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/operating_system.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/ruby.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/platform_info/zlib.rb @@ -90,6 +111,7 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/preloader_shared_helpers.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/public_api.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/rack/out_of_band_gc.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/rack/thread_handler_extension.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/rack_handler.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/request_handler.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/request_handler/thread_handler.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/ruby_core_enhancements.rb @@ -97,6 +119,7 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/ruby_core_io_enhancements.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/simple_benchmarking.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/app_finder.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/command.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/config_options_list.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/config_utils.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/control_utils.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/main.rb @@ -106,9 +129,6 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/start_command/nginx_engine.r ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/status_command.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/stop_command.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/standalone/version_command.rb -${RUBY_VENDORLIB_BASE}/phusion_passenger/union_station/connection.rb -${RUBY_VENDORLIB_BASE}/phusion_passenger/union_station/core.rb -${RUBY_VENDORLIB_BASE}/phusion_passenger/union_station/transaction.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/utils.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/utils/ansi_colors.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/utils/download.rb @@ -124,76 +144,68 @@ ${RUBY_VENDORLIB_BASE}/phusion_passenger/utils/terminal_choice_menu.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/utils/tmpio.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/utils/unseekable_socket.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/crash_watch/app.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/crash_watch/base.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/crash_watch/gdb_controller.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/crash_watch/lldb_controller.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/crash_watch/utils.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/crash_watch/version.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/daemon_controller.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/daemon_controller/lock_file.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/daemon_controller/spawn.rb ${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/daemon_controller/version.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/CONFIG.md +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/Gemfile +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/Gemfile.lock +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/LICENSE.md +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/README-API.md +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/README.md +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/Rakefile +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/api.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/connection.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/context.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/lock.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/log.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/message_channel.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/request_reporter.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/request_reporter/basics.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/request_reporter/controllers.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/request_reporter/misc.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/request_reporter/view_rendering.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/simple_json.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/spec_helper.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/time_point.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/transaction.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/utils.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/version.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/version_data.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.example +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.travis +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.travis-with-sudo +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_core/union_station_hooks_core.gemspec +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/Gemfile +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/Gemfile.lock +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/LICENSE.md +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/README.md +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/Rakefile +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/action_controller_extension.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/action_view_subscriber.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/active_record_subscriber.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/active_support_benchmarkable_extension.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/active_support_cache_subscriber.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/exception_logger.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/initialize.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/version.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/lib/union_station_hooks_rails/version_data.rb +${RUBY_VENDORLIB_BASE}/phusion_passenger/vendor/union_station_hooks_rails/union_station_hooks_rails.gemspec man/man1/passenger-config.1 man/man8/passenger-memory-stats.8 man/man8/passenger-status.8 sbin/passenger-memory-stats sbin/passenger-status -share/doc/passenger/CloudLicensingConfiguration.html -share/doc/passenger/Design and Architecture.html -share/doc/passenger/Packaging.html -share/doc/passenger/Security of user switching support.html -share/doc/passenger/ServerOptimizationGuide.html -share/doc/passenger/Users guide Apache.html -share/doc/passenger/Users guide Nginx.html -share/doc/passenger/Users guide Standalone.html -share/doc/passenger/Users guide.html -share/doc/passenger/images/by_sa.png -share/doc/passenger/images/cloud_licensing_batch_job.png -share/doc/passenger/images/code_walkthrough.jpg -share/doc/passenger/images/direct_spawning.png -share/doc/passenger/images/direct_spawning.svg -share/doc/passenger/images/glyphicons-halflings-white.png -share/doc/passenger/images/glyphicons-halflings.png -share/doc/passenger/images/helper_agent_core_architecture.png -share/doc/passenger/images/icons/README -share/doc/passenger/images/icons/callouts/1.png -share/doc/passenger/images/icons/callouts/10.png -share/doc/passenger/images/icons/callouts/11.png -share/doc/passenger/images/icons/callouts/12.png -share/doc/passenger/images/icons/callouts/13.png -share/doc/passenger/images/icons/callouts/14.png -share/doc/passenger/images/icons/callouts/15.png -share/doc/passenger/images/icons/callouts/2.png -share/doc/passenger/images/icons/callouts/3.png -share/doc/passenger/images/icons/callouts/4.png -share/doc/passenger/images/icons/callouts/5.png -share/doc/passenger/images/icons/callouts/6.png -share/doc/passenger/images/icons/callouts/7.png -share/doc/passenger/images/icons/callouts/8.png -share/doc/passenger/images/icons/callouts/9.png -share/doc/passenger/images/icons/caution.png -share/doc/passenger/images/icons/example.png -share/doc/passenger/images/icons/home.png -share/doc/passenger/images/icons/important.png -share/doc/passenger/images/icons/next.png -share/doc/passenger/images/icons/note.png -share/doc/passenger/images/icons/prev.png -share/doc/passenger/images/icons/tip.png -share/doc/passenger/images/icons/up.png -share/doc/passenger/images/icons/warning.png -share/doc/passenger/images/many_web_framework_protocols.png -share/doc/passenger/images/passenger_architecture.png -share/doc/passenger/images/passenger_architecture.svg -share/doc/passenger/images/passenger_architecture_overview.png -share/doc/passenger/images/passenger_nodejs_architecture.svg -share/doc/passenger/images/phusion_banner.png share/doc/passenger/images/phusion_banner_small.png -share/doc/passenger/images/rack.png -share/doc/passenger/images/smart_spawning.png -share/doc/passenger/images/smart_spawning.svg -share/doc/passenger/images/spawn_server_architecture.png -share/doc/passenger/images/spawn_server_architecture.svg -share/doc/passenger/images/spawning_preparation_work.png -share/doc/passenger/images/startup_sequence.png -share/doc/passenger/images/typical_isolated_web_application.png -share/doc/passenger/images/typical_isolated_web_application.svg +share/passenger/helper-scripts/README.md share/passenger/helper-scripts/backtrace-sanitizer.rb share/passenger/helper-scripts/crash-watch.rb share/passenger/helper-scripts/download_binaries/extconf.rb @@ -203,38 +215,109 @@ share/passenger/helper-scripts/prespawn share/passenger/helper-scripts/rack-loader.rb share/passenger/helper-scripts/rack-preloader.rb share/passenger/helper-scripts/wsgi-loader.py -share/passenger/include/boost/detail/endian.hpp -share/passenger/include/common/AgentsStarter.h -share/passenger/include/common/ApplicationPool2/AppTypes.h -share/passenger/include/common/Constants.h -share/passenger/include/common/Exceptions.h -share/passenger/include/common/Utils/CachedFileStat.h -share/passenger/include/common/Utils/modp_b64.cpp -share/passenger/include/common/Utils/modp_b64.h -share/passenger/include/common/Utils/modp_b64_data.h -share/passenger/include/common/agents/LoggingAgent/FilterSupport.h +share/passenger/include/cxx_supportlib/AppTypes.h +share/passenger/include/cxx_supportlib/Constants.h +share/passenger/include/cxx_supportlib/Exceptions.h +share/passenger/include/cxx_supportlib/UnionStationFilterSupport.h +share/passenger/include/cxx_supportlib/Utils/CachedFileStat.h +share/passenger/include/cxx_supportlib/WatchdogLauncher.h +share/passenger/include/cxx_supportlib/vendor-modified/modp_b64.cpp +share/passenger/include/cxx_supportlib/vendor-modified/modp_b64.h +share/passenger/include/cxx_supportlib/vendor-modified/modp_b64_data.h +share/passenger/include/cxx_supportlib/vendor-modified/modp_b64_strict_aliasing.cpp share/passenger/mime.types share/passenger/ngx_http_passenger_module/CacheLocationConfig.c -share/passenger/ngx_http_passenger_module/CacheLocationConfig.c.erb +share/passenger/ngx_http_passenger_module/CacheLocationConfig.c.cxxcodebuilder share/passenger/ngx_http_passenger_module/Configuration.c share/passenger/ngx_http_passenger_module/Configuration.h share/passenger/ngx_http_passenger_module/ConfigurationCommands.c -share/passenger/ngx_http_passenger_module/ConfigurationCommands.c.erb -share/passenger/ngx_http_passenger_module/ConfigurationFields.h -share/passenger/ngx_http_passenger_module/ConfigurationFields.h.erb +share/passenger/ngx_http_passenger_module/ConfigurationCommands.c.cxxcodebuilder share/passenger/ngx_http_passenger_module/ContentHandler.c share/passenger/ngx_http_passenger_module/ContentHandler.h share/passenger/ngx_http_passenger_module/CreateLocationConfig.c -share/passenger/ngx_http_passenger_module/CreateLocationConfig.c.erb +share/passenger/ngx_http_passenger_module/CreateLocationConfig.c.cxxcodebuilder +share/passenger/ngx_http_passenger_module/LocationConfig.h +share/passenger/ngx_http_passenger_module/LocationConfig.h.cxxcodebuilder share/passenger/ngx_http_passenger_module/MergeLocationConfig.c -share/passenger/ngx_http_passenger_module/MergeLocationConfig.c.erb +share/passenger/ngx_http_passenger_module/MergeLocationConfig.c.cxxcodebuilder +share/passenger/ngx_http_passenger_module/README.md share/passenger/ngx_http_passenger_module/StaticContentHandler.c share/passenger/ngx_http_passenger_module/StaticContentHandler.h share/passenger/ngx_http_passenger_module/config share/passenger/ngx_http_passenger_module/ngx_http_passenger_module.c share/passenger/ngx_http_passenger_module/ngx_http_passenger_module.h share/passenger/node/phusion_passenger/line_reader.js -share/passenger/oss-binaries.phusionpassenger.com.crt +share/passenger/node/phusion_passenger/log_express.js +share/passenger/node/phusion_passenger/log_mongodb.js +share/passenger/node/phusion_passenger/ustreporter.js +share/passenger/node/phusion_passenger/ustrouter_connector.js +share/passenger/node/vendor-copy/codify/codify.js +share/passenger/node/vendor-copy/codify/package.json +share/passenger/node/vendor-copy/continuation-local-storage/context.js +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/async-listener/glue.js +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/async-listener/index.js +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/async-listener/node_modules/shimmer/index.js +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/async-listener/node_modules/shimmer/package.json +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/async-listener/package.json +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/emitter-listener/listener.js +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/emitter-listener/node_modules/shimmer/index.js +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/emitter-listener/node_modules/shimmer/package.json +share/passenger/node/vendor-copy/continuation-local-storage/node_modules/emitter-listener/package.json +share/passenger/node/vendor-copy/continuation-local-storage/package.json +share/passenger/node/vendor-copy/network-byte-order/lib/index.js +share/passenger/node/vendor-copy/network-byte-order/package.json +share/passenger/node/vendor-copy/winston/LICENSE +share/passenger/node/vendor-copy/winston/lib/winston.js +share/passenger/node/vendor-copy/winston/lib/winston/common.js +share/passenger/node/vendor-copy/winston/lib/winston/config.js +share/passenger/node/vendor-copy/winston/lib/winston/config/cli-config.js +share/passenger/node/vendor-copy/winston/lib/winston/config/npm-config.js +share/passenger/node/vendor-copy/winston/lib/winston/config/syslog-config.js +share/passenger/node/vendor-copy/winston/lib/winston/container.js +share/passenger/node/vendor-copy/winston/lib/winston/exception.js +share/passenger/node/vendor-copy/winston/lib/winston/logger.js +share/passenger/node/vendor-copy/winston/lib/winston/transports.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/console.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/daily-rotate-file.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/file.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/http.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/memory.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/transport.js +share/passenger/node/vendor-copy/winston/lib/winston/transports/webhook.js +share/passenger/node/vendor-copy/winston/node_modules/async/LICENSE +share/passenger/node/vendor-copy/winston/node_modules/async/lib/async.js +share/passenger/node/vendor-copy/winston/node_modules/async/package.json +share/passenger/node/vendor-copy/winston/node_modules/async/support/sync-package-managers.js +share/passenger/node/vendor-copy/winston/node_modules/colors/MIT-LICENSE.txt +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/colors.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/custom/trap.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/custom/zalgo.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/extendStringPrototype.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/index.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/maps/america.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/maps/rainbow.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/maps/random.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/maps/zebra.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/styles.js +share/passenger/node/vendor-copy/winston/node_modules/colors/lib/system/supports-colors.js +share/passenger/node/vendor-copy/winston/node_modules/colors/package.json +share/passenger/node/vendor-copy/winston/node_modules/colors/safe.js +share/passenger/node/vendor-copy/winston/node_modules/colors/themes/generic-logging.js +share/passenger/node/vendor-copy/winston/node_modules/cycle/cycle.js +share/passenger/node/vendor-copy/winston/node_modules/cycle/package.json +share/passenger/node/vendor-copy/winston/node_modules/eyes/LICENSE +share/passenger/node/vendor-copy/winston/node_modules/eyes/lib/eyes.js +share/passenger/node/vendor-copy/winston/node_modules/eyes/package.json +share/passenger/node/vendor-copy/winston/node_modules/isstream/LICENSE.md +share/passenger/node/vendor-copy/winston/node_modules/isstream/isstream.js +share/passenger/node/vendor-copy/winston/node_modules/isstream/package.json +share/passenger/node/vendor-copy/winston/node_modules/pkginfo/LICENSE +share/passenger/node/vendor-copy/winston/node_modules/pkginfo/lib/pkginfo.js +share/passenger/node/vendor-copy/winston/node_modules/pkginfo/package.json +share/passenger/node/vendor-copy/winston/node_modules/stack-trace/License +share/passenger/node/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js +share/passenger/node/vendor-copy/winston/node_modules/stack-trace/package.json +share/passenger/node/vendor-copy/winston/package.json share/passenger/release.txt share/passenger/ruby_extension_source/extconf.rb share/passenger/ruby_extension_source/passenger_native_support.c @@ -244,10 +327,13 @@ share/passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.tx share/passenger/templates/apache2/config_snippets.txt.erb share/passenger/templates/apache2/deployment_example.txt.erb share/passenger/templates/apache2/installing_against_a_different_apache.txt.erb +share/passenger/templates/apache2/mpm_unknown.txt.erb share/passenger/templates/apache2/multiple_apache_installations_detected.txt.erb share/passenger/templates/apache2/notify_apache_module_installed.txt.erb share/passenger/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb share/passenger/templates/apache2/present_choice_for_no_update_config.txt.erb +share/passenger/templates/apache2/rpm_installation_recommended.txt.erb +share/passenger/templates/apache2/run_installer_as_root_for_apache_analysis.txt.erb share/passenger/templates/apache2/welcome.txt.erb share/passenger/templates/config/agent_compiler/confirm_enable_optimizations.txt.erb share/passenger/templates/config/installation_utils/cannot_create_user_support_binaries_dir.txt.erb @@ -283,5 +369,14 @@ share/passenger/templates/nginx/query_download_and_install.txt.erb share/passenger/templates/nginx/welcome.txt.erb share/passenger/templates/standalone/cannot_write_to_dir.txt.erb share/passenger/templates/standalone/config.erb +share/passenger/templates/standalone/footer.erb +share/passenger/templates/standalone/global.erb +share/passenger/templates/standalone/http.erb +share/passenger/templates/standalone/mass_deployment_default_server.erb +share/passenger/templates/standalone/rails_asset_pipeline.erb +share/passenger/templates/standalone/server.erb share/passenger/templates/undisclosed_error.html.template share/passenger/union_station_gateway.crt +share/passenger/update_check_client_cert.p12 +share/passenger/update_check_client_cert.pem +share/passenger/update_check_server_pubkey.pem diff --git a/ruby-passenger/TODO b/ruby-passenger/TODO deleted file mode 100644 index c058a43be5..0000000000 --- a/ruby-passenger/TODO +++ /dev/null @@ -1,5 +0,0 @@ -The passenger-status script doesn't work well on Illumos, possibly related -to non-portable file locking code implemented. - -This package has known vulnerabilities, please investigate and fix if possible: - CVE-2017-16355 diff --git a/ruby-passenger/buildlink3.mk b/ruby-passenger/buildlink3.mk new file mode 100644 index 0000000000..22bdc3c2e8 --- /dev/null +++ b/ruby-passenger/buildlink3.mk @@ -0,0 +1,17 @@ +# $NetBSD$ + +BUILDLINK_TREE+= passenger + +.if !defined(PASSENGER_BUILDLINK3_MK) +PASSENGER_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.passenger+= ${RUBY_PKGPREFIX}-passenger>=5.1 +BUILDLINK_PKGSRCDIR.passenger?= ../../wip/ruby-passenger + +BUILDLINK_INCDIRS.passenger+= share/passenger/include +BUILDLINK_INCDIRS.passenger+= share/passenger/ngx_http_passenger_module + +.include "../../lang/ruby/rubyversion.mk" +.endif # PASSENGER_BUILDLINK3_MK + +BUILDLINK_TREE+= -passenger diff --git a/ruby-passenger/distinfo b/ruby-passenger/distinfo index 39719647a1..af24e06b7e 100644 --- a/ruby-passenger/distinfo +++ b/ruby-passenger/distinfo @@ -1,11 +1,11 @@ $NetBSD: distinfo,v 1.10 2015/04/20 16:25:04 fhajny Exp $ -SHA1 (passenger-5.0.6.tar.gz) = 16e11fea28e73c751e56b38da029d71c05ca2abd -RMD160 (passenger-5.0.6.tar.gz) = bfb9bdfc096b3b96aca112176aa222ce98b2c306 -Size (passenger-5.0.6.tar.gz) = 4949137 bytes -SHA1 (patch-build_agents.rb) = 3fd7c890a645c2b2ac5b08262ccf8ab1d67434e3 -SHA1 (patch-build_common__library.rb) = 53585a496fcd2e6f3a83998984ee2947ef8acb17 -SHA1 (patch-build_packaging.rb) = 59dd7b015aa764b22764443129b3d143b1c64e61 -SHA1 (patch-lib_phusion__passenger.rb) = 09a2fb78fbd0bcecd916a94b513e1570c2276cc5 -SHA1 (patch-lib_phusion__passenger_packaging.rb) = e1469a94ac8a6b00836173c783e13c5d922e5807 -SHA1 (patch-lib_phusion__passenger_platform__info_cxx__portability.rb) = 2ae3e79e247a83f05caa720ed01a87584790a0fb +SHA1 (passenger-5.1.12.tar.gz) = 159827735577aac19526e73c0713a1312de1e7f9 +RMD160 (passenger-5.1.12.tar.gz) = 6ca2f21dc6f06617b5c2bd7e7b8b07c2b80be46c +SHA512 (passenger-5.1.12.tar.gz) = 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a +Size (passenger-5.1.12.tar.gz) = 4245993 bytes +SHA1 (patch-build_common__library.rb) = fc019cb2774245400e74741d34b43b87b4b8b0c8 +SHA1 (patch-build_packaging.rb) = b50c291c8e3989bbd8d128dab98c06f5e6a30e51 +SHA1 (patch-src_ruby__supportlib_phusion__passenger.rb) = b5bf22b8ef94f9c64e0f02ed97e4c104eddf7cb6 +SHA1 (patch-src_ruby__supportlib_phusion__passenger_packaging.rb) = 74134ef6c360bc65ffb4f74e7ebcc36bf7b6e9f7 +SHA1 (patch-src_ruby__supportlib_phusion__passenger_platform__info_cxx__portability.rb) = a3ad34fe1b5917c1971b49c8831d8aea9dbb090a diff --git a/ruby-passenger/inplace.mk b/ruby-passenger/inplace.mk deleted file mode 100644 index cadc2b941a..0000000000 --- a/ruby-passenger/inplace.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: inplace.mk,v 1.5 2015/04/02 15:40:14 fhajny Exp $ - -USE_LANGUAGES+= c c++ -USE_RAKE= yes - -MAKE_ENV+= EXTRA_LDFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib -MAKE_ENV+= USE_VENDORED_LIBEIO=no -MAKE_ENV+= USE_VENDORED_LIBEV=no - -post-extract: extract-inplace-passenger - -extract-inplace-passenger: - cd ../../wip/ruby-passenger && ${MAKE} WRKDIR=${WRKDIR}/.passenger EXTRACT_DIR=${WRKDIR} \ - WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' SKIP_DEPENDS=YES fetch patch clean - ${LN} -s ${WRKDIR}/passenger-* ${WRKDIR}/passenger - -BUILDLINK_DEPMETHOD.curl= build -BUILDLINK_DEPMETHOD.libeio= build - -.include "../../wip/libeio/buildlink3.mk" -.include "../../lang/ruby/modules.mk" -.include "../../www/curl/buildlink3.mk" diff --git a/ruby-passenger/patches/patch-build_agents.rb b/ruby-passenger/patches/patch-build_agents.rb deleted file mode 100644 index 6cf11796c8..0000000000 --- a/ruby-passenger/patches/patch-build_agents.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-build_agents.rb,v 1.1 2015/04/02 15:40:14 fhajny Exp $ - -Add a simple target to skip the Apache/Nginx binaries. ---- build/agents.rb.orig 2013-10-26 22:00:00.000000000 +0000 -+++ build/agents.rb -@@ -169,3 +169,9 @@ end - task 'common:clean' do - sh "rm -rf #{AGENT_OUTPUT_DIR}" - end -+ -+desc "Build just the agents" -+task :agents => [ -+ AGENT_OUTPUT_DIR + AGENT_EXE, -+ :native_support -+] diff --git a/ruby-passenger/patches/patch-build_common__library.rb b/ruby-passenger/patches/patch-build_common__library.rb index de301fac63..bfece49618 100644 --- a/ruby-passenger/patches/patch-build_common__library.rb +++ b/ruby-passenger/patches/patch-build_common__library.rb @@ -1,36 +1,15 @@ $NetBSD: patch-build_common__library.rb,v 1.5 2015/04/20 16:25:04 fhajny Exp $ -Fix pkgsrc libeio/libev support. ---- build/common_library.rb.orig 2013-10-26 22:00:00.000000000 +0000 +Fix libev configure on Illumos. + +--- build/common_library.rb.orig 2013-10-27 00:00:00.000000000 +0000 +++ build/common_library.rb -@@ -122,7 +122,7 @@ if USE_VENDORED_LIBEV +@@ -142,7 +142,7 @@ if USE_VENDORED_LIBEV "--disable-shared --enable-static " + # libev's configure script may select a different default compiler than we # do, so we force our compiler choice. -- "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1" -+ "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1 @LIBEV_EXTRA_ARGS@" +- "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}' orig_CFLAGS=1" ++ "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}' orig_CFLAGS=1 #{ENV['LIBEV_EXTRA_ARGS']}" end - libev_sources = Dir["ext/libev/{*.c,*.h}"] -@@ -141,8 +141,8 @@ if USE_VENDORED_LIBEV - - task :clean => 'libev:clean' - else -- LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '-I/usr/include/libev') -- LIBEV_LIBS = string_option('LIBEV_LIBS', '-lev') -+ LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '-I@PREFIX@/include/ev') -+ LIBEV_LIBS = string_option('LIBEV_LIBS', '-L@PREFIX@/lib/ev @COMPILER_RPATH_FLAG@@PREFIX@/lib/ev -lev') - LIBEV_TARGET = nil - task :libev # do nothing - end -@@ -200,8 +200,8 @@ if USE_VENDORED_LIBEIO - - task :clean => 'libeio:clean' - else -- LIBEIO_CFLAGS = string_option('LIBEIO_CFLAGS', '-I/usr/include/libeio') -- LIBEIO_LIBS = string_option('LIBEIO_LIBS', '-leio') -+ LIBEIO_CFLAGS = string_option('LIBEIO_CFLAGS', '-I@PREFIX@/include/eio') -+ LIBEIO_LIBS = string_option('LIBEIO_LIBS', '-L@PREFIX@/lib/eio @COMPILER_RPATH_FLAG@@PREFIX@/lib/eio -leio') - LIBEIO_TARGET = nil - task :libeio # do nothing - end + libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"] diff --git a/ruby-passenger/patches/patch-build_packaging.rb b/ruby-passenger/patches/patch-build_packaging.rb index ecef136011..42521cfbda 100644 --- a/ruby-passenger/patches/patch-build_packaging.rb +++ b/ruby-passenger/patches/patch-build_packaging.rb @@ -1,38 +1,50 @@ $NetBSD: patch-build_packaging.rb,v 1.1 2015/04/02 15:40:15 fhajny Exp $ Mangle faceroot support for our purposes. ---- build/packaging.rb.orig 2013-10-26 22:00:00.000000000 +0000 +Improve portability (xargs). + +--- build/packaging.rb.orig 2013-10-27 00:00:00.000000000 +0000 +++ build/packaging.rb -@@ -483,7 +483,7 @@ def change_shebang(filename, value) +@@ -115,7 +115,7 @@ def change_shebang(filename, value) end desc "Create a fakeroot, useful for building native packages" --task :fakeroot => [:apache2, :nginx, :doc] do -+task :fakeroot => [:agents] do +-task :fakeroot => [:apache2, :nginx, 'nginx:as_dynamic_module', :doc] do ++task :fakeroot => [] do require 'rbconfig' - require 'fileutils' include RbConfig -@@ -513,7 +513,7 @@ task :fakeroot => [:apache2, :nginx, :do - psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source" - psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module" -- fakeroot = "pkg/fakeroot" +@@ -146,7 +146,7 @@ task :fakeroot => [:apache2, :nginx, 'ng + psg_ruby = ENV['RUBY'] || "#{fs_bindir}/ruby" + psg_free_ruby = ENV['FREE_RUBY'] || "/usr/bin/env ruby" + +- fakeroot = "#{PKG_DIR}/fakeroot" + fakeroot = ENV['DESTDIR'].nil? ? '' : ENV['DESTDIR'] fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}" fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}" fake_libdir = "#{fakeroot}#{psg_libdir}" -@@ -622,10 +622,6 @@ task :fakeroot => [:apache2, :nginx, :do - end +@@ -164,9 +164,6 @@ task :fakeroot => [:apache2, :nginx, 'ng + + packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb" + +- sh "rm -rf #{fakeroot}" +- sh "mkdir -p #{fakeroot}" +- + # Ruby sources + sh "mkdir -p #{fake_rubylibdir}" + sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_rubylibdir}/" +@@ -261,10 +258,6 @@ task :fakeroot => [:apache2, :nginx, 'ng + change_shebang("#{fake_sbindir}/#{exe}", shebang) end - # Apache 2 module - sh "mkdir -p #{File.dirname(fake_apache2_module_path)}" -- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}" +- sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}" - # Ruby extension sources sh "mkdir -p #{fake_ruby_extension_source_dir}" sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}" -@@ -656,5 +652,5 @@ task :fakeroot => [:apache2, :nginx, :do +@@ -295,5 +288,5 @@ task :fakeroot => [:apache2, :nginx, 'ng end end diff --git a/ruby-passenger/patches/patch-lib_phusion__passenger_packaging.rb b/ruby-passenger/patches/patch-lib_phusion__passenger_packaging.rb deleted file mode 100644 index 354e8acfc5..0000000000 --- a/ruby-passenger/patches/patch-lib_phusion__passenger_packaging.rb +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-lib_phusion__passenger_packaging.rb,v 1.2 2015/04/02 15:40:15 fhajny Exp $ - -Disable upstream shebang handling, we deal with it ourselves. ---- lib/phusion_passenger/packaging.rb.orig 2013-10-26 22:00:00.000000000 +0000 -+++ lib/phusion_passenger/packaging.rb -@@ -62,7 +62,9 @@ module PhusionPassenger - 'passenger', - 'passenger-config', - 'passenger-install-apache2-module', -- 'passenger-install-nginx-module' -+ 'passenger-install-nginx-module', -+ 'passenger-memory-stats', -+ 'passenger-status' - ] - - # A list of globs which match all files that should be packaged diff --git a/ruby-passenger/patches/patch-lib_phusion__passenger.rb b/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger.rb similarity index 59% rename from ruby-passenger/patches/patch-lib_phusion__passenger.rb rename to ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger.rb index 84bfcebe43..db0c9c26f3 100644 --- a/ruby-passenger/patches/patch-lib_phusion__passenger.rb +++ b/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger.rb @@ -1,19 +1,20 @@ -$NetBSD: patch-lib_phusion__passenger.rb,v 1.1 2015/04/02 15:40:15 fhajny Exp $ +$NetBSD$ -Fix default paths. ---- lib/phusion_passenger.rb.orig 2013-10-26 22:00:00.000000000 +0000 -+++ lib/phusion_passenger.rb -@@ -51,8 +51,7 @@ module PhusionPassenger +Default paths. + +--- src/ruby_supportlib/phusion_passenger.rb.orig 2013-10-27 00:00:00.000000000 +0000 ++++ src/ruby_supportlib/phusion_passenger.rb +@@ -57,8 +57,7 @@ module PhusionPassenger # Directories in which to look for plugins. PLUGIN_DIRS = [ - "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins", - "/usr/local/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins", -+ "@PREFIX@/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins", ++ "@PREFIX@/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins", "~/#{USER_NAMESPACE_DIRNAME_}/plugins" ] -@@ -264,7 +263,7 @@ private +@@ -275,7 +274,7 @@ private return filename if File.exist?(filename) end diff --git a/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger_packaging.rb b/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger_packaging.rb new file mode 100644 index 0000000000..664b7eefd9 --- /dev/null +++ b/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger_packaging.rb @@ -0,0 +1,17 @@ +$NetBSD$ + +Avoid env based shebangs. + +--- src/ruby_supportlib/phusion_passenger/packaging.rb.orig 2013-10-27 00:00:00.000000000 +0000 ++++ src/ruby_supportlib/phusion_passenger/packaging.rb +@@ -47,10 +47,6 @@ module PhusionPassenger + # so that these executables can be run with any Ruby interpreter + # the user desires. + EXECUTABLES_WITH_FREE_RUBY = [ +- 'passenger', +- 'passenger-config', +- 'passenger-install-apache2-module', +- 'passenger-install-nginx-module' + ] + + # A list of globs which match all files that should be packaged diff --git a/ruby-passenger/patches/patch-lib_phusion__passenger_platform__info_cxx__portability.rb b/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_cxx__portability.rb similarity index 53% rename from ruby-passenger/patches/patch-lib_phusion__passenger_platform__info_cxx__portability.rb rename to ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_cxx__portability.rb index 2be147c097..e0a8cb8dcf 100644 --- a/ruby-passenger/patches/patch-lib_phusion__passenger_platform__info_cxx__portability.rb +++ b/ruby-passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_cxx__portability.rb @@ -1,9 +1,10 @@ -$NetBSD: patch-lib_phusion__passenger_platform__info_cxx__portability.rb,v 1.3 2015/04/02 15:40:15 fhajny Exp $ +$NetBSD$ -Fix default paths. ---- lib/phusion_passenger/platform_info/cxx_portability.rb.orig 2013-10-26 22:00:00.000000000 +0000 -+++ lib/phusion_passenger/platform_info/cxx_portability.rb -@@ -114,7 +114,7 @@ module PhusionPassenger +Default paths. + +--- src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb.orig 2013-10-27 00:00:00.000000000 +0000 ++++ src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb +@@ -115,7 +115,7 @@ module PhusionPassenger private_class_method :check_hash_map def self.default_extra_c_or_cxxflags(cc_or_cxx)