Index: head/www/rubygem-passenger/Makefile =================================================================== --- head/www/rubygem-passenger/Makefile (revision 512374) +++ head/www/rubygem-passenger/Makefile (revision 512375) @@ -1,110 +1,111 @@ # Created by: Jacob Atzen # $FreeBSD$ PORTNAME= passenger PORTVERSION= 6.0.4 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- MAINTAINER= osa@FreeBSD.org COMMENT= Modules for running Ruby on Rails and Rack applications LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rake:devel/rubygem-rake CPE_VENDOR= phusion CPE_PRODUCT= passenger FLAVORS= apache nginx FLAVOR?= ${FLAVORS:[1]} apache_PKGNAMESUFFIX= -apache nginx_PKGNAMESUFFIX= -nginx apache_CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}-nginx nginx_CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}-apache OPTIONS_DEFINE= DEBUG SYMLINK OPTIONS_EXCLUDE=DOCS SYMLINK_DESC= Create passenger symlink .if ${FLAVOR} == apache USES+= apache:2.2+ .endif USE_RUBY= yes RAKE_BIN= ${LOCALBASE}/bin/rake USES+= compiler:c++11-lang cpe gem libtool python:env shebangfix ssl SHEBANG_FILES= src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py LIB_DEPENDS+= libuv.so:devel/libuv \ libcurl.so:ftp/curl \ libapr-1.so:devel/apr1 BUILD_DEPENDS+= rubygem-rack>=0:www/rubygem-rack RUN_DEPENDS:= ${BUILD_DEPENDS} SUB_LIST+= GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY} SUB_FILES= pkg-message-${FLAVOR} PLIST_FILES= bin/passenger \ bin/passenger-config \ bin/passenger-install-apache2-module \ bin/passenger-memory-stats \ bin/passenger-status \ bin/passenger-install-nginx-module SYMLINK_PLIST_FILES= ${GEMS_DIR}/${PORTNAME} SYMLINK_SUB_LIST= PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}" SYMLINK_SUB_LIST_OFF= PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}" pre-patch: @${REINPLACE_CMD} \ 's!-Wall!!g; \ s!gcc!${CC}!g; \ s!g++!${CXX}!g; \ s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \ s!-O2!!g; \ s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \ 170s!true!false!' \ ${WRKSRC}/build/basics.rb @${REINPLACE_CMD} '1s:python:python2:' \ ${WRKSRC}/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py pre-patch-DEBUG-off: @${REINPLACE_CMD} \ 's!-DPASSENGER_DEBUG!-DNDEBUG!g' \ ${WRKSRC}/build/basics.rb post-build: .if ${FLAVOR} == apache (CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto) .endif .if ${FLAVOR} == nginx (cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx) .endif ${FIND} ${WRKSRC} -name '*.o' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete post-install: ( cd ${WRKSRC} && \ ${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} ) ${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/ruby/*/passenger_native_support.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/support-binaries/PassengerAgent ${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -empty -delete .if ${FLAVOR} == apache ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${LN} -sf ../../${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so @${ECHO} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST} .endif post-install-SYMLINK-on: ${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} .include Index: head/www/rubygem-passenger/files/patch-freebsd13 =================================================================== --- head/www/rubygem-passenger/files/patch-freebsd13 (nonexistent) +++ head/www/rubygem-passenger/files/patch-freebsd13 (revision 512375) @@ -0,0 +1,91 @@ +--- src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp.orig 2019-09-19 16:54:40.089339000 -0400 ++++ src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp 2019-09-19 16:54:58.167526000 -0400 +@@ -55,7 +55,7 @@ + self->garbageCollectionCond.timed_wait(lock, + posix_time::seconds(5)); + } +- while (!this_thread::interruption_requested()) { ++ while (!boost::this_thread::interruption_requested()) { + try { + UPDATE_TRACE_POINT(); + unsigned long long sleepTime = self->realGarbageCollect(); +--- src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp.orig 2019-09-19 16:53:35.309791000 -0400 ++++ src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp 2019-09-19 16:53:59.509027000 -0400 +@@ -305,7 +305,7 @@ + while (true) { + assert(detachedProcessesCheckerActive); + +- if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) { ++ if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) { + UPDATE_TRACE_POINT(); + P_DEBUG("Stopping detached processes checker"); + detachedProcessesCheckerActive = false; +--- src/cxx_supportlib/oxt/system_calls.cpp.orig 2019-09-19 17:00:06.903986000 -0400 ++++ src/cxx_supportlib/oxt/system_calls.cpp 2019-09-19 17:02:32.106158000 -0400 +@@ -132,15 +132,15 @@ + _my_errno = errno; \ + } while ((error_expression) \ + && _my_errno == EINTR \ +- && (!this_thread::syscalls_interruptable() \ +- || !(_intr_requested = this_thread::interruption_requested())) \ ++ && (!boost::this_thread::syscalls_interruptable() \ ++ || !(_intr_requested = boost::this_thread::interruption_requested())) \ + ); \ + if (OXT_LIKELY(ctx != NULL)) { \ + ctx->syscall_interruption_lock.lock(); \ + } \ + if ((error_expression) \ + && _my_errno == EINTR \ +- && this_thread::syscalls_interruptable() \ ++ && boost::this_thread::syscalls_interruptable() \ + && _intr_requested) { \ + throw thread_interrupted(); \ + } \ +@@ -284,8 +284,8 @@ + } + if (ret == -1 + && errno == EINTR +- && this_thread::syscalls_interruptable() +- && this_thread::interruption_requested()) { ++ && boost::this_thread::syscalls_interruptable() ++ && boost::this_thread::interruption_requested()) { + throw thread_interrupted(); + } else { + return ret; +@@ -662,8 +662,8 @@ + } + } while (ret == -1 + && e == EINTR +- && (!this_thread::syscalls_interruptable() +- || !(intr_requested = this_thread::interruption_requested())) ++ && (!boost::this_thread::syscalls_interruptable() ++ || !(intr_requested = boost::this_thread::interruption_requested())) + ); + + if (OXT_UNLIKELY(ctx != NULL)) { +@@ -672,7 +672,7 @@ + + if (ret == -1 + && e == EINTR +- && this_thread::syscalls_interruptable() ++ && boost::this_thread::syscalls_interruptable() + && intr_requested) { + throw thread_interrupted(); + } +@@ -748,14 +748,14 @@ + * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943 + * https://bugzilla.redhat.com/show_bug.cgi?id=731228 + */ +- __thread int this_thread::_syscalls_interruptable = 1; ++ __thread int boost::this_thread::_syscalls_interruptable = 1; + + bool + boost::this_thread::syscalls_interruptable() { + return _syscalls_interruptable; + } + #else +- boost::thread_specific_ptr this_thread::_syscalls_interruptable; ++ boost::thread_specific_ptr boost::this_thread::_syscalls_interruptable; + + bool + boost::this_thread::syscalls_interruptable() { Property changes on: head/www/rubygem-passenger/files/patch-freebsd13 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property