[DRE-commits] [passenger] 05/06: Use bundled libjsoncpp as it's a modified version.
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 b984aff622cc921cb9f087397213c43965dc82ce
Author: Felix Geyer <fgeyer at debian.org>
Date: Mon Dec 7 22:25:14 2015 +0100
Use bundled libjsoncpp as it's a modified version.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/passenger.lintian-overrides | 1 +
debian/patches/series | 1 -
debian/patches/system_jsoncpp.patch | 202 ------------------------------------
5 files changed, 3 insertions(+), 204 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1b4f30..e0198fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ passenger (5.0.22-1) UNRELEASED; urgency=medium
- Fixes CVE-2015-7519: Header overwriting issue (Closes: #807354)
- Fixes incompatibility with Apache 2.4.17 (CLoses: #804195)
* Refresh patches.
+ * Use bundled libjsoncpp as it's a modified version.
-- Felix Geyer <fgeyer at debian.org> Mon, 07 Dec 2015 21:49:12 +0100
diff --git a/debian/control b/debian/control
index 8e170e5..84e0c6d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Micah Anderson <micah at debian.org>,
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~), apache2 (>= 2.4),
apache2-dev (>= 2.4), libapr1-dev, doxygen, asciidoc (>= 8.2), graphviz, rake,
source-highlight, libcurl4-openssl-dev, dh-autoreconf, ruby-mizuho,
- libjsoncpp-dev, zlib1g-dev
+ zlib1g-dev
Standards-Version: 3.9.6
Homepage: https://www.phusionpassenger.com/
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-passenger.git
diff --git a/debian/passenger.lintian-overrides b/debian/passenger.lintian-overrides
new file mode 100644
index 0000000..88d1ba2
--- /dev/null
+++ b/debian/passenger.lintian-overrides
@@ -0,0 +1 @@
+passenger: embedded-library usr/lib/passenger/support-binaries/PassengerAgent: libjsoncpp
diff --git a/debian/patches/series b/debian/patches/series
index e7cc9c9..5463f3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
fix_install_path.patch
-system_jsoncpp.patch
bin_load_path.patch
nodejs_bin_name.patch
fix_ftbfs_boost.patch
diff --git a/debian/patches/system_jsoncpp.patch b/debian/patches/system_jsoncpp.patch
deleted file mode 100644
index 54f9b6c..0000000
--- a/debian/patches/system_jsoncpp.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-Description: Use the system jsoncpp library.
-Author: Felix Geyer <fgeyer at debian.org>
-Last-Update: 2015-05-02
-
---- a/build/agents.rb
-+++ b/build/agents.rb
-@@ -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
-
- 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
-
-@@ -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 {
- 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/JsonUtils.h>
-
- namespace Passenger {
---- 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>
-
- 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>
-
- 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 <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>
-
- 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/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>
-
- 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>
- #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 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