[DRE-commits] [passenger] 04/06: Refresh patches.
Felix Geyer
fgeyer at moszumanska.debian.org
Sat May 2 20:56:25 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 075ceb77b781ed88a1b72a09a3c6fe650fdbcf62
Author: Felix Geyer <fgeyer at debian.org>
Date: Sat May 2 22:36:11 2015 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/bin_load_path.patch | 12 +-
debian/patches/fix_install_path.patch | 28 ++--
debian/patches/nodejs_bin_name.patch | 22 +--
debian/patches/system_jsoncpp.patch | 275 ++++++++++++++++++++--------------
5 files changed, 195 insertions(+), 143 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dfff9e8..9782fb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ passenger (5.0.7-1) UNRELEASED; urgency=medium
- Requested by upstream.
- passenger supports more than just ruby.
* New upstream release.
+ * Refresh patches.
-- Felix Geyer <fgeyer at debian.org> Sat, 02 May 2015 20:25:22 +0200
diff --git a/debian/patches/bin_load_path.patch b/debian/patches/bin_load_path.patch
index 7b6cacf..f98467f 100644
--- a/debian/patches/bin_load_path.patch
+++ b/debian/patches/bin_load_path.patch
@@ -11,7 +11,7 @@ Last-Update: 2014-01-16
-source_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-begin
-- require 'rubygems'
+- require 'rubygems'
-rescue LoadError
-end
require 'phusion_passenger'
@@ -26,7 +26,7 @@ Last-Update: 2014-01-16
-source_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-begin
-- require 'rubygems'
+- require 'rubygems'
-rescue LoadError
-end
require 'phusion_passenger'
@@ -41,7 +41,7 @@ Last-Update: 2014-01-16
-source_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-begin
-- require 'rubygems'
+- require 'rubygems'
-rescue LoadError
-end
require 'phusion_passenger'
@@ -56,7 +56,7 @@ Last-Update: 2014-01-16
-source_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-begin
-- require 'rubygems'
+- require 'rubygems'
-rescue LoadError
-end
require 'phusion_passenger'
@@ -71,7 +71,7 @@ Last-Update: 2014-01-16
-source_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-begin
-- require 'rubygems'
+- require 'rubygems'
-rescue LoadError
-end
require 'phusion_passenger'
@@ -86,7 +86,7 @@ Last-Update: 2014-01-16
-source_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-begin
-- require 'rubygems'
+- require 'rubygems'
-rescue LoadError
-end
require 'phusion_passenger'
diff --git a/debian/patches/fix_install_path.patch b/debian/patches/fix_install_path.patch
index 7f5ec4b..5b36967 100644
--- a/debian/patches/fix_install_path.patch
+++ b/debian/patches/fix_install_path.patch
@@ -1,19 +1,19 @@
Description: Install in vendor_ruby directory and install common files in non-versioned path
Author: Laurent Bigonville <bigon at debian.org>
-Last-Update: 2014-01-16
+Last-Update: 2015-05-02
--- a/build/packaging.rb
+++ b/build/packaging.rb
-@@ -406,10 +406,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.
-- psg_rubylibdir = ENV['RUBYLIBDIR'] || "#{fs_libdir}/ruby/vendor_ruby"
-+ psg_rubylibdir = ENV['RUBYLIBDIR'] || CONFIG['vendordir'].sub(/^\/usr/,fs_prefix)
- psg_nodelibdir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/node"
- psg_libdir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
-- psg_native_support_dir = ENV["RUBYARCHDIR"] || "#{fs_libdir}/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-+ psg_native_support_dir = ENV["RUBYARCHDIR"] || CONFIG['vendorarchdir'].sub(/^\/usr/,fs_prefix)
- psg_agents_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
- psg_helper_scripts_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
- psg_resources_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}"
+@@ -506,10 +506,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.
+- psg_rubylibdir = ENV['RUBYLIBDIR'] || "#{fs_libdir}/ruby/vendor_ruby"
++ psg_rubylibdir = ENV['RUBYLIBDIR'] || CONFIG['vendordir'].sub(/^\/usr/,fs_prefix)
+ psg_nodelibdir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/node"
+ psg_libdir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
+- psg_native_support_dir = ENV["RUBYARCHDIR"] || "#{fs_libdir}/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
++ psg_native_support_dir = ENV["RUBYARCHDIR"] || CONFIG['vendorarchdir'].sub(/^\/usr/,fs_prefix)
+ psg_support_binaries_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/support-binaries"
+ psg_helper_scripts_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+ psg_resources_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}"
diff --git a/debian/patches/nodejs_bin_name.patch b/debian/patches/nodejs_bin_name.patch
index b8f0063..c857c95 100644
--- a/debian/patches/nodejs_bin_name.patch
+++ b/debian/patches/nodejs_bin_name.patch
@@ -3,9 +3,9 @@ Author: Felix Geyer <fgeyer at debian.org>
--- a/ext/common/Constants.h
+++ b/ext/common/Constants.h
-@@ -58,7 +58,7 @@
+@@ -74,7 +74,7 @@
- #define DEFAULT_MAX_POOL_SIZE 6
+ #define DEFAULT_MBUF_CHUNK_SIZE 512
- #define DEFAULT_NODEJS "node"
+ #define DEFAULT_NODEJS "nodejs"
@@ -14,12 +14,12 @@ Author: Felix Geyer <fgeyer at debian.org>
--- a/lib/phusion_passenger/constants.rb
+++ b/lib/phusion_passenger/constants.rb
-@@ -37,7 +37,7 @@ module PhusionPassenger
- DEFAULT_LOG_LEVEL = 0
- 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
+@@ -46,7 +46,7 @@ module PhusionPassenger
+ DEFAULT_LOG_LEVEL = 3
+ 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
diff --git a/debian/patches/system_jsoncpp.patch b/debian/patches/system_jsoncpp.patch
index c72ff62..54f9b6c 100644
--- a/debian/patches/system_jsoncpp.patch
+++ b/debian/patches/system_jsoncpp.patch
@@ -1,151 +1,202 @@
Description: Use the system jsoncpp library.
Author: Felix Geyer <fgeyer at debian.org>
-Last-Update: 2014-08-24
+Last-Update: 2015-05-02
--- a/build/agents.rb
+++ b/build/agents.rb
-@@ -105,6 +105,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
- "#{EXTRA_PRE_CXX_LDFLAGS} " <<
- "#{LIBEV_LIBS} " <<
- "#{LIBEIO_LIBS} " <<
-+ "-ljsoncpp " <<
- "#{PlatformInfo.portability_cxx_ldflags} " <<
- "#{AGENT_LDFLAGS} " <<
- "#{EXTRA_CXX_LDFLAGS}")
-@@ -111,7 +111,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
+@@ -124,6 +124,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
+ "#{EXTRA_PRE_CXXFLAGS} " <<
+ "-Iext -Iext/common " <<
+ "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
++ "-I/usr/include/jsoncpp " <<
+ "#{EXTRA_CXXFLAGS}")
+ end
end
+@@ -161,6 +162,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
+ "#{LIBEIO_LIBS} " <<
+ "#{PlatformInfo.curl_libs} " <<
+ "#{PlatformInfo.zlib_libs} " <<
++ "-ljsoncpp " <<
+ "#{PlatformInfo.portability_cxx_ldflags} " <<
+ "#{AGENT_LDFLAGS} " <<
+ "#{EXTRA_CXX_LDFLAGS}")
+--- a/lib/phusion_passenger/common_library.rb
++++ b/lib/phusion_passenger/common_library.rb
+@@ -108,7 +108,7 @@ class CommonLibraryBuilder
+ end
- logging_agent_libs = COMMON_LIBRARY.only(:base, :logging_agent, 'AgentsBase.o',
-- 'Utils/Base64.o', 'Utils/MD5.o', 'Utils/jsoncpp.o')
-+ 'Utils/Base64.o', 'Utils/MD5.o')
- dependencies = [
- 'ext/common/agents/LoggingAgent/Main.cpp',
- 'ext/common/agents/LoggingAgent/AdminController.h',
-@@ -139,6 +139,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
- "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} " <<
- "#{PlatformInfo.curl_flags} " <<
- "#{PlatformInfo.zlib_flags} " <<
-+ "-I/usr/include/jsoncpp " <<
- "#{EXTRA_CXXFLAGS}")
- create_executable("#{AGENT_OUTPUT_DIR}PassengerLoggingAgent",
- "#{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o",
-@@ -148,6 +149,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
- "#{LIBEV_LIBS} " <<
- "#{PlatformInfo.curl_libs} " <<
- "#{PlatformInfo.zlib_libs} " <<
-+ "-ljsoncpp " <<
- "#{PlatformInfo.portability_cxx_ldflags} " <<
- "#{AGENT_LDFLAGS} " <<
- "#{EXTRA_CXX_LDFLAGS}")
---- a/ext/common/Utils/JsonUtils.h
-+++ b/ext/common/Utils/JsonUtils.h
-@@ -27,7 +27,7 @@
+ def define_tasks(extra_compiler_flags = nil)
+- flags = "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
++ flags = "-Iext -Iext/common #{LIBEV_CFLAGS} -I/usr/include/jsoncpp #{extra_compiler_flags} "
+ cflags = (flags + EXTRA_CFLAGS).strip
+ cxxflags = (flags + EXTRA_CXXFLAGS).strip
- #include <string>
- #include <StaticString.h>
+@@ -515,14 +515,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
+ :deps => %w(
+ Utils/Hasher.h
+ )
+- define_component 'Utils/jsoncpp.o',
+- :source => 'Utils/jsoncpp.cpp',
+- :category => :other,
+- :optimize => true,
+- :deps => %w(
+- Utils/json.h
+- Utils/json-forwards.h
+- )
+
+ #'BCrypt.o' => %w(
+ # BCrypt.cpp
+--- a/ext/common/InstanceDirectory.h
++++ b/ext/common/InstanceDirectory.h
+@@ -38,7 +38,7 @@
+ #include <RandomGenerator.h>
+ #include <Utils.h>
+ #include <Utils/IOUtils.h>
-#include <Utils/json.h>
+#include <json/json.h>
+
+ namespace Passenger {
+
+--- a/ext/common/ServerKit/Channel.h
++++ b/ext/common/ServerKit/Channel.h
+@@ -36,7 +36,7 @@
+ #include <MemoryKit/mbuf.h>
+ #include <Logging.h>
#include <Utils/StrIntUtils.h>
+-#include <Utils/json.h>
++#include <json/json.h>
namespace Passenger {
---- a/ext/common/agents/LoggingAgent/RemoteSender.h
-+++ b/ext/common/agents/LoggingAgent/RemoteSender.h
-@@ -45,7 +45,7 @@
- #include <Utils/SystemTime.h>
- #include <Utils/ScopeGuard.h>
- #include <Utils/Base64.h>
+ namespace ServerKit {
+--- a/ext/common/ServerKit/Context.h
++++ b/ext/common/ServerKit/Context.h
+@@ -32,7 +32,7 @@
+ #include <SafeLibev.h>
+ #include <Constants.h>
+ #include <Utils/StrIntUtils.h>
-#include <Utils/json.h>
+#include <json/json.h>
- #include <Utils/Curl.h>
+ #include <Utils/JsonUtils.h>
namespace Passenger {
---- a/lib/phusion_passenger/common_library.rb
-+++ b/lib/phusion_passenger/common_library.rb
-@@ -101,7 +101,7 @@ class CommonLibraryBuilder
- end
-
- def define_tasks(extra_compiler_flags = nil)
-- flags = "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
-+ flags = "-Iext -Iext/common #{LIBEV_CFLAGS} -I/usr/include/jsoncpp #{extra_compiler_flags} "
- cflags = (flags + EXTRA_CFLAGS).strip
- cxxflags = (flags + EXTRA_CXXFLAGS).strip
-
-@@ -439,13 +439,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
- Utils/fib.h
- Utils/fibpriv.h
- )
-- define_component 'Utils/jsoncpp.o',
-- :source => 'Utils/jsoncpp.cpp',
-- :category => :other,
-- :deps => %w(
-- Utils/json.h
-- Utils/json-forwards.h
-- )
-
- #'BCrypt.o' => %w(
- # BCrypt.cpp
---- a/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
-+++ b/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
-@@ -1,6 +1,6 @@
- #include <TestSupport.h>
- #include <ApplicationPool2/DirectSpawner.h>
+--- a/ext/common/ServerKit/FdSinkChannel.h
++++ b/ext/common/ServerKit/FdSinkChannel.h
+@@ -30,7 +30,7 @@
+ #include <unistd.h>
+ #include <ev.h>
+ #include <ServerKit/Channel.h>
-#include <Utils/json.h>
+#include <json/json.h>
- #include <fcntl.h>
- using namespace Passenger;
---- a/test/cxx/ApplicationPool2/PoolTest.cpp
-+++ b/test/cxx/ApplicationPool2/PoolTest.cpp
-@@ -2,7 +2,7 @@
- #include <ApplicationPool2/Pool.h>
- #include <Utils/IOUtils.h>
- #include <Utils/StrIntUtils.h>
+ namespace Passenger {
+ namespace ServerKit {
+--- a/ext/common/ServerKit/FdSourceChannel.h
++++ b/ext/common/ServerKit/FdSourceChannel.h
+@@ -33,7 +33,7 @@
+ #include <MemoryKit/mbuf.h>
+ #include <ServerKit/Context.h>
+ #include <ServerKit/Channel.h>
-#include <Utils/json.h>
+#include <json/json.h>
- #include <MessageReadersWriters.h>
- #include <map>
- #include <vector>
---- a/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp
-+++ b/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp
-@@ -1,7 +1,7 @@
- #include <TestSupport.h>
- #include <ApplicationPool2/SmartSpawner.h>
- #include <Logging.h>
+
+ namespace Passenger {
+ namespace ServerKit {
+--- a/ext/common/ServerKit/FileBufferedChannel.h
++++ b/ext/common/ServerKit/FileBufferedChannel.h
+@@ -43,7 +43,7 @@
+ #include <ServerKit/Context.h>
+ #include <ServerKit/Errors.h>
+ #include <ServerKit/Channel.h>
-#include <Utils/json.h>
+#include <json/json.h>
- #include <unistd.h>
- #include <climits>
- #include <signal.h>
---- a/test/cxx/CxxTestMain.cpp
-+++ b/test/cxx/CxxTestMain.cpp
-@@ -16,7 +16,7 @@
+ #include <Utils/JsonUtils.h>
+
+ namespace Passenger {
+--- a/ext/common/ServerKit/Server.h
++++ b/ext/common/ServerKit/Server.h
+@@ -56,7 +56,7 @@
#include <Utils.h>
+ #include <Utils/SmallVector.h>
+ #include <Utils/ScopeGuard.h>
+-#include <Utils/json.h>
++#include <json/json.h>
+ #include <Utils/StrIntUtils.h>
#include <Utils/IOUtils.h>
+
+--- a/ext/common/agents/HelperAgent/AdminServer.h
++++ b/ext/common/agents/HelperAgent/AdminServer.h
+@@ -41,7 +41,7 @@
+ #include <Constants.h>
#include <Utils/StrIntUtils.h>
+ #include <Utils/modp_b64.h>
-#include <Utils/json.h>
+#include <json/json.h>
- using namespace std;
+ namespace Passenger {
+ namespace ServerAgent {
+--- a/ext/common/agents/HelperAgent/Main.cpp
++++ b/ext/common/agents/HelperAgent/Main.cpp
+@@ -80,7 +80,7 @@
+ #include <Utils.h>
+ #include <Utils/Timer.h>
+ #include <Utils/IOUtils.h>
+-#include <Utils/json.h>
++#include <json/json.h>
+ #include <Utils/MessageIO.h>
+ #include <Utils/VariantMap.h>
---- a/test/cxx/RequestHandlerTest.cpp
-+++ b/test/cxx/RequestHandlerTest.cpp
-@@ -3,7 +3,7 @@
- #include <agents/HelperAgent/RequestHandler.cpp>
- #include <agents/HelperAgent/AgentOptions.h>
- #include <ApplicationPool2/Pool.h>
+--- a/ext/common/agents/LoggingAgent/AdminServer.h
++++ b/ext/common/agents/LoggingAgent/AdminServer.h
+@@ -35,7 +35,7 @@
+ #include <StaticString.h>
+ #include <Utils/StrIntUtils.h>
+ #include <Utils/modp_b64.h>
-#include <Utils/json.h>
+#include <json/json.h>
- #include <Utils/IOUtils.h>
+
+ namespace Passenger {
+ namespace LoggingAgent {
+--- a/ext/common/agents/LoggingAgent/RemoteSender.h
++++ b/ext/common/agents/LoggingAgent/RemoteSender.h
+@@ -45,7 +45,7 @@
+ #include <Utils/SystemTime.h>
+ #include <Utils/ScopeGuard.h>
+ #include <Utils/modp_b64.h>
+-#include <Utils/json.h>
++#include <json/json.h>
+ #include <Utils/Curl.h>
+
+ namespace Passenger {
+--- a/ext/common/agents/Watchdog/AdminServer.h
++++ b/ext/common/agents/Watchdog/AdminServer.h
+@@ -37,7 +37,7 @@
+ #include <Constants.h>
#include <Utils/StrIntUtils.h>
+ #include <Utils/modp_b64.h>
+-#include <Utils/json.h>
++#include <json/json.h>
+
+ namespace Passenger {
+ namespace WatchdogAgent {
+--- a/ext/common/agents/Watchdog/Main.cpp
++++ b/ext/common/agents/Watchdog/Main.cpp
+@@ -69,7 +69,7 @@
+ #include <Hooks.h>
+ #include <ResourceLocator.h>
+ #include <Utils.h>
+-#include <Utils/json.h>
++#include <json/json.h>
#include <Utils/Timer.h>
---- a/test/cxx/TestSupport.cpp
-+++ b/test/cxx/TestSupport.cpp
-@@ -8,7 +8,7 @@
- #include <BackgroundEventLoop.cpp>
- #include <Utils/IOUtils.h>
#include <Utils/ScopeGuard.h>
+ #include <Utils/StrIntUtils.h>
+--- a/ext/common/Utils/JsonUtils.h
++++ b/ext/common/Utils/JsonUtils.h
+@@ -29,7 +29,7 @@
+ #include <cstdio>
+ #include <cstddef>
+ #include <StaticString.h>
-#include <Utils/json.h>
+#include <json/json.h>
+ #include <Utils/StrIntUtils.h>
- namespace TestSupport {
-
+ namespace Passenger {
--
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