[DRE-commits] [passenger] 04/06: Refresh patches.

Felix Geyer fgeyer at moszumanska.debian.org
Mon Dec 7 21:39:15 UTC 2015


This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository passenger.

commit 5ae1d75d436b25ae84250d3bc6d077fa864d695c
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Dec 7 22:23:47 2015 +0100

    Refresh patches.
---
 debian/changelog                      |  1 +
 debian/patches/bin_load_path.patch    | 24 ++++++++++++------------
 debian/patches/fix_ftbfs_boost.patch  |  8 ++++----
 debian/patches/fix_install_path.patch |  2 +-
 debian/patches/nodejs_bin_name.patch  | 14 +++++++-------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a253afa..d1b4f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ passenger (5.0.22-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Fixes CVE-2015-7519: Header overwriting issue (Closes: #807354)
     - Fixes incompatibility with Apache 2.4.17 (CLoses: #804195)
+  * Refresh patches.
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 07 Dec 2015 21:49:12 +0100
 
diff --git a/debian/patches/bin_load_path.patch b/debian/patches/bin_load_path.patch
index f98467f..c010e6d 100644
--- a/debian/patches/bin_load_path.patch
+++ b/debian/patches/bin_load_path.patch
@@ -4,12 +4,12 @@ Last-Update: 2014-01-16
 
 --- a/bin/passenger
 +++ b/bin/passenger
-@@ -23,12 +23,6 @@
+@@ -24,12 +24,6 @@
  #  THE SOFTWARE.
  
  ## Magic comment: begin bootstrap ##
 -source_root = File.expand_path("..", File.dirname(__FILE__))
--$LOAD_PATH.unshift("#{source_root}/lib")
+-$LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
 -begin
 -  require 'rubygems'
 -rescue LoadError
@@ -19,12 +19,12 @@ Last-Update: 2014-01-16
  
 --- a/bin/passenger-config
 +++ b/bin/passenger-config
-@@ -23,12 +23,6 @@
+@@ -24,12 +24,6 @@
  #  THE SOFTWARE.
  
  ## Magic comment: begin bootstrap ##
 -source_root = File.expand_path("..", File.dirname(__FILE__))
--$LOAD_PATH.unshift("#{source_root}/lib")
+-$LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
 -begin
 -  require 'rubygems'
 -rescue LoadError
@@ -34,12 +34,12 @@ Last-Update: 2014-01-16
  
 --- a/bin/passenger-install-apache2-module
 +++ b/bin/passenger-install-apache2-module
-@@ -24,12 +24,6 @@
+@@ -25,12 +25,6 @@
  #  THE SOFTWARE.
  
  ## Magic comment: begin bootstrap ##
 -source_root = File.expand_path("..", File.dirname(__FILE__))
--$LOAD_PATH.unshift("#{source_root}/lib")
+-$LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
 -begin
 -  require 'rubygems'
 -rescue LoadError
@@ -49,12 +49,12 @@ Last-Update: 2014-01-16
  
 --- a/bin/passenger-install-nginx-module
 +++ b/bin/passenger-install-nginx-module
-@@ -23,12 +23,6 @@
+@@ -24,12 +24,6 @@
  #  THE SOFTWARE.
  
  ## Magic comment: begin bootstrap ##
 -source_root = File.expand_path("..", File.dirname(__FILE__))
--$LOAD_PATH.unshift("#{source_root}/lib")
+-$LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
 -begin
 -  require 'rubygems'
 -rescue LoadError
@@ -64,12 +64,12 @@ Last-Update: 2014-01-16
  
 --- a/bin/passenger-memory-stats
 +++ b/bin/passenger-memory-stats
-@@ -23,12 +23,6 @@
+@@ -24,12 +24,6 @@
  #  THE SOFTWARE.
  
  ## Magic comment: begin bootstrap ##
 -source_root = File.expand_path("..", File.dirname(__FILE__))
--$LOAD_PATH.unshift("#{source_root}/lib")
+-$LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
 -begin
 -  require 'rubygems'
 -rescue LoadError
@@ -79,12 +79,12 @@ Last-Update: 2014-01-16
  
 --- a/bin/passenger-status
 +++ b/bin/passenger-status
-@@ -23,12 +23,6 @@
+@@ -24,12 +24,6 @@
  #  THE SOFTWARE.
  
  ## Magic comment: begin bootstrap ##
 -source_root = File.expand_path("..", File.dirname(__FILE__))
--$LOAD_PATH.unshift("#{source_root}/lib")
+-$LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
 -begin
 -  require 'rubygems'
 -rescue LoadError
diff --git a/debian/patches/fix_ftbfs_boost.patch b/debian/patches/fix_ftbfs_boost.patch
index 52958d3..3218876 100644
--- a/debian/patches/fix_ftbfs_boost.patch
+++ b/debian/patches/fix_ftbfs_boost.patch
@@ -1,8 +1,8 @@
 Description: Fix FTBFS with gcc 5 on freebsd.
 Origin: upstream, https://svn.boost.org/trac/boost/ticket/10125
 
---- a/ext/boost/thread/pthread/once.hpp
-+++ b/ext/boost/thread/pthread/once.hpp
+--- a/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once.hpp
++++ b/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once.hpp
 @@ -42,7 +42,7 @@ namespace boost
    }
  
@@ -30,8 +30,8 @@ Origin: upstream, https://svn.boost.org/trac/boost/ticket/10125
  
  
    template<typename Function, class ...ArgTypes>
---- a/ext/boost/thread/pthread/once_atomic.hpp
-+++ b/ext/boost/thread/pthread/once_atomic.hpp
+--- a/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once_atomic.hpp
++++ b/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once_atomic.hpp
 @@ -115,7 +115,7 @@ namespace boost
  #endif
  
diff --git a/debian/patches/fix_install_path.patch b/debian/patches/fix_install_path.patch
index 5b36967..d79cee1 100644
--- a/debian/patches/fix_install_path.patch
+++ b/debian/patches/fix_install_path.patch
@@ -4,7 +4,7 @@ Last-Update: 2015-05-02
 
 --- a/build/packaging.rb
 +++ b/build/packaging.rb
-@@ -506,10 +506,10 @@
+@@ -559,10 +559,10 @@
    # We don't use CONFIG['archdir'] and the like because we want
    # the files to be installed to /usr, and the Ruby interpreter
    # on the packaging machine might be in /usr/local.
diff --git a/debian/patches/nodejs_bin_name.patch b/debian/patches/nodejs_bin_name.patch
index c857c95..5b6fb01 100644
--- a/debian/patches/nodejs_bin_name.patch
+++ b/debian/patches/nodejs_bin_name.patch
@@ -1,9 +1,9 @@
 Description: The node.js binary is called nodejs in Debian.
 Author: Felix Geyer <fgeyer at debian.org>
 
---- a/ext/common/Constants.h
-+++ b/ext/common/Constants.h
-@@ -74,7 +74,7 @@
+--- a/src/cxx_supportlib/Constants.h
++++ b/src/cxx_supportlib/Constants.h
+@@ -73,7 +73,7 @@
  
  	#define DEFAULT_MBUF_CHUNK_SIZE 512
  
@@ -12,14 +12,14 @@ Author: Felix Geyer <fgeyer at debian.org>
  
  	#define DEFAULT_POOL_IDLE_TIME 300
  
---- a/lib/phusion_passenger/constants.rb
-+++ b/lib/phusion_passenger/constants.rb
+--- a/src/ruby_supportlib/phusion_passenger/constants.rb
++++ b/src/ruby_supportlib/phusion_passenger/constants.rb
 @@ -46,7 +46,7 @@ module PhusionPassenger
-     DEFAULT_LOG_LEVEL = 3
+     DEFAULT_INTEGRATION_MODE = "standalone"
      DEFAULT_RUBY = "ruby"
      DEFAULT_PYTHON = "python"
 -    DEFAULT_NODEJS = "node"
 +    DEFAULT_NODEJS = "nodejs"
      DEFAULT_MAX_POOL_SIZE = 6
      DEFAULT_POOL_IDLE_TIME = 300
-     DEFAULT_START_TIMEOUT = 90_000
+     DEFAULT_MAX_PRELOADER_IDLE_TIME = 5 * 60

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/passenger.git



More information about the Pkg-ruby-extras-commits mailing list