Source: ruby-passenger Version: 3.0.13debian-1.1 Severity: wishlist Tags: patch
Dear Maintainers, Please package a new upstream version of ruby-passenger. Version 4.0 introduced support for multiple ruby versions. I'm not hugely familiar with ruby packaging but I prepared a diff in the hope that you'll find it useful. It adapts the package for upstream version 4.0.5, passes build flags to the build system and fixes bug #683511. Cheers, Felix
diff -Nur ruby-passenger-3.0.13debian/debian/changelog ruby-passenger-4.0.5/debian/changelog --- ruby-passenger-3.0.13debian/debian/changelog 2013-05-30 12:41:00.915466217 +0200 +++ ruby-passenger-4.0.5/debian/changelog 2013-06-10 21:29:53.586822497 +0200 @@ -1,3 +1,17 @@ +ruby-passenger (4.0.5-0.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * New upstream release. + * Refresh fix_install_path.patch. + * Drop fix_ftbfs_glibc217.patch and CVE-2013-2119.patch, applied upstream. + * Add fix_locations_ini.patch to fix the generated locations.ini. + * Point PassengerRoot to the locations.ini in passenger.conf. + * Pass CXXFLAGS, CPPFLAGS and LDFLAGS to the build system. + * Add ruby1.9.1 as an alternative dependency to rubygems. (Closes: #683511) + * Fix the watch file. + + -- Felix Geyer <fge...@debian.org> Thu, 06 Jun 2013 18:35:34 +0200 + ruby-passenger (3.0.13debian-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nur ruby-passenger-3.0.13debian/debian/control ruby-passenger-4.0.5/debian/control --- ruby-passenger-3.0.13debian/debian/control 2013-05-30 09:45:18.653940681 +0200 +++ ruby-passenger-4.0.5/debian/control 2013-06-10 21:20:40.075310128 +0200 @@ -15,7 +15,7 @@ Package: ruby-passenger Architecture: any XB-Ruby-Versions: ${ruby:Versions} -Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, rubygems (>= 1.2), ruby-rack +Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, rubygems | ruby1.9.1, ruby-rack Suggests: python, rails, ruby-passenger-doc Breaks: libapache2-mod-passenger (<< 3.0.11debian) Replaces: libapache2-mod-passenger (<< 3.0.11debian) diff -Nur ruby-passenger-3.0.13debian/debian/passenger.conf ruby-passenger-4.0.5/debian/passenger.conf --- ruby-passenger-3.0.13debian/debian/passenger.conf 2012-06-28 17:00:51.000000000 +0200 +++ ruby-passenger-4.0.5/debian/passenger.conf 2013-06-08 23:11:39.126441664 +0200 @@ -1,4 +1,4 @@ <IfModule mod_passenger.c> - PassengerRoot /usr - PassengerRuby /usr/bin/ruby + PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini + PassengerDefaultRuby /usr/bin/ruby </IfModule> diff -Nur ruby-passenger-3.0.13debian/debian/patches/CVE-2013-2119.patch ruby-passenger-4.0.5/debian/patches/CVE-2013-2119.patch --- ruby-passenger-3.0.13debian/debian/patches/CVE-2013-2119.patch 2013-05-30 09:31:09.491096286 +0200 +++ ruby-passenger-4.0.5/debian/patches/CVE-2013-2119.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,199 +0,0 @@ -From 0eaebb00f6b7327374069a7998064c68cc54e9f1 Mon Sep 17 00:00:00 2001 -From: "Hongli Lai (Phusion)" <hon...@phusion.nl> -Date: Tue, 28 May 2013 22:30:53 +0200 -Subject: [PATCH] Ensure that temporary files and directories didn't already - exist. - ---- - bin/passenger-install-nginx-module | 7 ++--- - lib/phusion_passenger/dependencies.rb | 32 ++++++++-------------- - lib/phusion_passenger/standalone/command.rb | 9 +++--- - .../standalone/runtime_installer.rb | 7 ++--- - 4 files changed, 23 insertions(+), 32 deletions(-) - -diff --git a/bin/passenger-install-nginx-module b/bin/passenger-install-nginx-module -index 629240c..450252c 100755 ---- a/bin/passenger-install-nginx-module -+++ b/bin/passenger-install-nginx-module -@@ -27,6 +27,7 @@ $LOAD_PATH.unshift("#{passenger_root}/lib") - require 'phusion_passenger' - require 'optparse' - require 'fileutils' -+require 'tmpdir' - require 'phusion_passenger/platform_info/ruby' - require 'phusion_passenger/dependencies' - require 'phusion_passenger/abstract_installer' -@@ -108,14 +109,12 @@ class Installer < PhusionPassenger::AbstractInstaller - def before_install - super - myself = `whoami`.strip -- @working_dir = "/tmp/#{myself}-passenger-#{Process.pid}" -- FileUtils.rm_rf(@working_dir) -- FileUtils.mkdir_p(@working_dir) -+ @working_dir = Dir.mktmpdir("passenger.") - end - - def after_install - super -- FileUtils.rm_rf(@working_dir) -+ FileUtils.remove_entry_secure(@working_dir) if @working_dir - end - - private -diff --git a/lib/phusion_passenger/dependencies.rb b/lib/phusion_passenger/dependencies.rb -index e37a212..685b37d 100644 ---- a/lib/phusion_passenger/dependencies.rb -+++ b/lib/phusion_passenger/dependencies.rb -@@ -22,6 +22,7 @@ - # THE SOFTWARE. - - require 'rbconfig' -+require 'tmpdir' - require 'phusion_passenger' - require 'phusion_passenger/packaging' - require 'phusion_passenger/platform_info' -@@ -117,6 +118,12 @@ def self.mizuho_required? - end - end - -+ def self.create_temp_files(name1, name2, dir = PlatformInfo.tmpexedir) -+ Dir.mktmpdir("passenger.", dir) do |subdir| -+ yield "#{subdir}/#{name1}", "#{subdir}/#{name2}" -+ end -+ end -+ - GCC = Dependency.new do |dep| - dep.name = "GNU C++ compiler" - dep.define_checker do |result| -@@ -456,9 +463,7 @@ def self.mizuho_required? - Curl_Dev = Dependency.new do |dep| - dep.name = "Curl development headers with SSL support" - dep.define_checker do |result| -- source_file = "#{PlatformInfo.tmpexedir}/passenger-curl-check.c" -- output_file = "#{PlatformInfo.tmpexedir}/passenger-curl-check" -- begin -+ Dependencies.create_temp_files("check.c", "check") do |source_file, output_file| - found = true - File.open(source_file, 'w') do |f| - f.puts("#include <curl/curl.h>") -@@ -482,9 +487,6 @@ def self.mizuho_required? - found = false - end - result.found(found) -- ensure -- File.unlink(source_file) rescue nil -- File.unlink(output_file) rescue nil - end - end - dep.install_instructions = "Please download Curl from <b>http://curl.haxx.se/libcurl</b> " + -@@ -514,22 +516,17 @@ def self.mizuho_required? - OpenSSL_Dev = Dependency.new do |dep| - dep.name = "OpenSSL development headers" - dep.define_checker do |result| -- source_file = "#{PlatformInfo.tmpexedir}/passenger-openssl-check.c" -- object_file = "#{PlatformInfo.tmpexedir}/passenger-openssl-check.o" -- begin -+ Dependencies.create_temp_files("check.c", "check.o") do |source_file, output_file| - File.open(source_file, 'w') do |f| - f.write("#include <openssl/ssl.h>") - end - Dir.chdir(File.dirname(source_file)) do -- if system("(gcc #{ENV['CFLAGS']} -c '#{source_file}') >/dev/null 2>/dev/null") -+ if system("(gcc #{ENV['CFLAGS']} -c '#{source_file}' -o '#{output_file}') >/dev/null 2>/dev/null") - result.found - else - result.not_found - end - end -- ensure -- File.unlink(source_file) rescue nil -- File.unlink(object_file) rescue nil - end - end - if RUBY_PLATFORM =~ /linux/ -@@ -546,22 +543,17 @@ def self.mizuho_required? - Zlib_Dev = Dependency.new do |dep| - dep.name = "Zlib development headers" - dep.define_checker do |result| -- source_file = "#{PlatformInfo.tmpexedir}/zlib-check.c" -- object_file = "#{PlatformInfo.tmpexedir}/zlib-check.o" -- begin -+ Dependencies.create_temp_files("check.c", "check.o") do |source_file, output_file| - File.open(source_file, 'w') do |f| - f.write("#include <zlib.h>") - end - Dir.chdir(File.dirname(source_file)) do -- if system("(g++ -c zlib-check.c) >/dev/null 2>/dev/null") -+ if system("(g++ -c '#{source_file}' -o '#{output_file}') >/dev/null 2>/dev/null") - result.found - else - result.not_found - end - end -- ensure -- File.unlink(source_file) rescue nil -- File.unlink(object_file) rescue nil - end - end - if RUBY_PLATFORM =~ /linux/ -diff --git a/lib/phusion_passenger/standalone/command.rb b/lib/phusion_passenger/standalone/command.rb -index 8810427..b84909f 100644 ---- a/lib/phusion_passenger/standalone/command.rb -+++ b/lib/phusion_passenger/standalone/command.rb -@@ -172,8 +172,11 @@ def determine_various_resource_locations(create_subdirs = true) - - def write_nginx_config_file - require 'phusion_passenger/platform_info/ruby' -- ensure_directory_exists(@temp_dir) -- -+ require 'tmpdir' -+ @temp_dir = Dir.mktmpdir("passenger.", "/tmp") -+ @config_filename = "#{@temp_dir}/config" -+ File.chmod(0755, @temp_dir) -+ - File.open(@config_filename, 'w') do |f| - f.chmod(0644) - template_filename = File.join(TEMPLATES_DIR, "standalone", "config.erb") -@@ -213,8 +216,6 @@ def nginx_ping_port - def create_nginx_controller(extra_options = {}) - require_daemon_controller - require 'socket' unless defined?(UNIXSocket) -- @temp_dir = "/tmp/passenger-standalone.#{$$}" -- @config_filename = "#{@temp_dir}/config" - if @options[:socket_file] - ping_spec = [:unix, @options[:socket_file]] - else -diff --git a/lib/phusion_passenger/standalone/runtime_installer.rb b/lib/phusion_passenger/standalone/runtime_installer.rb -index 730f776..31b6fd8 100644 ---- a/lib/phusion_passenger/standalone/runtime_installer.rb -+++ b/lib/phusion_passenger/standalone/runtime_installer.rb -@@ -23,6 +23,7 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - # THE SOFTWARE. - require 'fileutils' -+require 'tmpdir' - require 'phusion_passenger' - require 'phusion_passenger/abstract_installer' - require 'phusion_passenger/packaging' -@@ -164,16 +165,14 @@ def install! - def before_install - super - @plugin.call_hook(:runtime_installer_start, self) if @plugin -- @working_dir = "/tmp/#{myself}-passenger-standalone-#{Process.pid}" -- FileUtils.rm_rf(@working_dir) -- FileUtils.mkdir_p(@working_dir) -+ @working_dir = Dir.mktmpdir("passenger.") - @download_binaries = true if !defined?(@download_binaries) - @binaries_url_root ||= STANDALONE_BINARIES_URL_ROOT - end - - def after_install - super -- FileUtils.rm_rf(@working_dir) -+ FileUtils.remove_entry_secure(@working_dir) if @working_dir - @plugin.call_hook(:runtime_installer_cleanup) if @plugin - end - --- -1.8.1.6 - diff -Nur ruby-passenger-3.0.13debian/debian/patches/fix_ftbfs_glibc217.patch ruby-passenger-4.0.5/debian/patches/fix_ftbfs_glibc217.patch --- ruby-passenger-3.0.13debian/debian/patches/fix_ftbfs_glibc217.patch 2013-05-30 09:34:56.381710026 +0200 +++ ruby-passenger-4.0.5/debian/patches/fix_ftbfs_glibc217.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,164 +0,0 @@ -From 27894da4c7a5da30ef7ab4b03f914d1dec8531ac Mon Sep 17 00:00:00 2001 -From: "Hongli Lai (Phusion)" <hon...@phusion.nl> -Date: Sun, 26 Aug 2012 14:27:39 +0200 -Subject: [PATCH] Backport fix from - https://svn.boost.org/trac/boost/ticket/6940 This allows passenger to build - on Fedora 18/19. - ---- - ext/boost/config/suffix.hpp | 12 ++++++++++++ - ext/boost/src/pthread/thread.cpp | 4 ++-- - ext/boost/src/pthread/timeconv.inl | 16 ++++++++-------- - ext/boost/thread/locks.hpp | 6 +++--- - ext/boost/thread/xtime.hpp | 4 ++-- - ext/common/ApplicationPool/Pool.h | 2 +- - 7 files changed, 30 insertions(+), 16 deletions(-) - -diff --git a/ext/boost/config/suffix.hpp b/ext/boost/config/suffix.hpp -index 3408d22..6464f33 100644 ---- a/ext/boost/config/suffix.hpp -+++ b/ext/boost/config/suffix.hpp -@@ -103,6 +103,18 @@ - #endif - - // -+// constexpr workarounds -+// -+#if defined(BOOST_NO_CONSTEXPR) -+#define BOOST_CONSTEXPR -+#define BOOST_CONSTEXPR_OR_CONST const -+#else -+#define BOOST_CONSTEXPR constexpr -+#define BOOST_CONSTEXPR_OR_CONST constexpr -+#endif -+#define BOOST_STATIC_CONSTEXPR static BOOST_CONSTEXPR_OR_CONST -+ -+// - // if there is no __int64 then there is no specialisation - // for numeric_limits<__int64> either: - // -diff --git a/ext/boost/src/pthread/thread.cpp b/ext/boost/src/pthread/thread.cpp -index b5a0572..f90cfcd 100644 ---- a/ext/boost/src/pthread/thread.cpp -+++ b/ext/boost/src/pthread/thread.cpp -@@ -365,7 +365,7 @@ - cond.timed_wait(lock, xt); - # endif - xtime cur; -- xtime_get(&cur, TIME_UTC); -+ xtime_get(&cur, TIME_UTC_); - if (xtime_cmp(xt, cur) <= 0) - return; - } -@@ -380,7 +380,7 @@ - BOOST_VERIFY(!pthread_yield()); - # else - xtime xt; -- xtime_get(&xt, TIME_UTC); -+ xtime_get(&xt, TIME_UTC_); - sleep(xt); - # endif - } -diff --git a/ext/boost/src/pthread/timeconv.inl b/ext/boost/src/pthread/timeconv.inl -index b75a135..7c07802 100644 ---- a/ext/boost/src/pthread/timeconv.inl -+++ b/ext/boost/src/pthread/timeconv.inl -@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000; - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -- res = boost::xtime_get(&xt, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); -+ res = boost::xtime_get(&xt, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -@@ -57,8 +57,8 @@ inline void to_timespec_duration(const boost::xtime& xt, timespec& ts) - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - { -@@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds) - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -@@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds) - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -diff --git a/ext/boost/thread/locks.hpp b/ext/boost/thread/locks.hpp -index dd66a67..d77b145 100644 ---- a/ext/boost/thread/locks.hpp -+++ b/ext/boost/thread/locks.hpp -@@ -164,9 +164,9 @@ - struct adopt_lock_t - {}; - -- const defer_lock_t defer_lock={}; -- const try_to_lock_t try_to_lock={}; -- const adopt_lock_t adopt_lock={}; -+ BOOST_CONSTEXPR_OR_CONST defer_lock_t defer_lock={}; -+ BOOST_CONSTEXPR_OR_CONST try_to_lock_t try_to_lock={}; -+ BOOST_CONSTEXPR_OR_CONST adopt_lock_t adopt_lock={}; - - template<typename Mutex> - class shared_lock; -diff --git a/ext/boost/thread/xtime.hpp b/ext/boost/thread/xtime.hpp -index 7cc6272..f908298 100644 ---- a/ext/boost/thread/xtime.hpp -+++ b/ext/boost/thread/xtime.hpp -@@ -20,7 +20,7 @@ - - enum xtime_clock_types - { -- TIME_UTC=1 -+ TIME_UTC_=1 - // TIME_TAI, - // TIME_MONOTONIC, - // TIME_PROCESS, -@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_time const& abs_time) - - inline int xtime_get(struct xtime* xtp, int clock_type) - { -- if (clock_type == TIME_UTC) -+ if (clock_type == TIME_UTC_) - { - *xtp=get_xtime(get_system_time()); - return clock_type; -diff --git a/ext/common/ApplicationPool/Pool.h b/ext/common/ApplicationPool/Pool.h -index 8c87ad5..d26529d 100644 ---- a/ext/common/ApplicationPool/Pool.h -+++ b/ext/common/ApplicationPool/Pool.h -@@ -718,7 +718,7 @@ class Pool: public ApplicationPool::Interface { - } - } else { - xtime xt; -- xtime_get(&xt, TIME_UTC); -+ xtime_get(&xt, TIME_UTC_); - xt.sec += maxIdleTime + 1; - if (cleanerThreadSleeper.timed_wait(l, xt)) { - // Condition was woken up. --- -1.8.1.6 - diff -Nur ruby-passenger-3.0.13debian/debian/patches/fix_install_path.patch ruby-passenger-4.0.5/debian/patches/fix_install_path.patch --- ruby-passenger-3.0.13debian/debian/patches/fix_install_path.patch 2012-06-28 17:00:51.000000000 +0200 +++ ruby-passenger-4.0.5/debian/patches/fix_install_path.patch 2013-06-06 18:39:56.647012547 +0200 @@ -4,14 +4,12 @@ --- a/build/packaging.rb +++ b/build/packaging.rb -@@ -103,8 +103,8 @@ - # We don't use CONFIG['archdir'] and the like because we want - # the files to be installed to /usr, and the Ruby interpreter +@@ -103,7 +103,7 @@ # on the packaging machine might be in /usr/local. -- fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" + fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby" + fake_libdir = "#{fakeroot}/usr/lib/phusion-passenger" - fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}" -+ fake_libdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby" + fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/vendor_ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}" - fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}" - fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}" + fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents" + fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts" fake_resources_dir = "#{fakeroot}/usr/share/phusion-passenger" diff -Nur ruby-passenger-3.0.13debian/debian/patches/fix_locations_ini.patch ruby-passenger-4.0.5/debian/patches/fix_locations_ini.patch --- ruby-passenger-3.0.13debian/debian/patches/fix_locations_ini.patch 1970-01-01 01:00:00.000000000 +0100 +++ ruby-passenger-4.0.5/debian/patches/fix_locations_ini.patch 2013-06-08 22:55:50.802040552 +0200 @@ -0,0 +1,19 @@ +--- ruby-passenger-4.0.5.orig/build/packaging.rb ++++ ruby-passenger-4.0.5/build/packaging.rb +@@ -254,6 +254,7 @@ task :fakeroot => [:apache2, :nginx] + P + + puts "Creating #{fake_rubylibdir}/phusion_passenger/locations.ini" + File.open("#{fake_rubylibdir}/phusion_passenger/locations.ini", "w") do |f| ++ f.puts "[locations]" + f.puts "natively_packaged=true" + f.puts "bin=/usr/bin" + f.puts "agents=/usr/lib/phusion-passenger/agents" +@@ -262,7 +263,7 @@ task :fakeroot => [:apache2, :nginx] + P + f.puts "resources=/usr/share/phusion-passenger" + f.puts "includedir=/usr/share/phusion-passenger/include" + f.puts "doc=/usr/share/doc/phusion-passenger" +- f.puts "rubylibdir=/usr/lib/ruby/vendor_ruby" ++ f.puts "rubylib=/usr/lib/ruby/vendor_ruby" + f.puts "apache2_module=/usr/lib/apache2/modules/mod_passenger.so" + f.puts "ruby_extension_source=/usr/share/phusion-passenger/ruby_extension_source" + end diff -Nur ruby-passenger-3.0.13debian/debian/patches/series ruby-passenger-4.0.5/debian/patches/series --- ruby-passenger-3.0.13debian/debian/patches/series 2013-05-30 09:48:17.456481530 +0200 +++ ruby-passenger-4.0.5/debian/patches/series 2013-06-08 22:55:46.565984862 +0200 @@ -1,3 +1,2 @@ fix_install_path.patch -fix_ftbfs_glibc217.patch -CVE-2013-2119.patch +fix_locations_ini.patch diff -Nur ruby-passenger-3.0.13debian/debian/ruby-passenger.docs ruby-passenger-4.0.5/debian/ruby-passenger.docs --- ruby-passenger-3.0.13debian/debian/ruby-passenger.docs 2012-06-28 17:00:51.000000000 +0200 +++ ruby-passenger-4.0.5/debian/ruby-passenger.docs 2013-06-06 18:47:07.200695897 +0200 @@ -1,3 +1,2 @@ -DEVELOPERS.TXT -README +README.md debian/README.Debian diff -Nur ruby-passenger-3.0.13debian/debian/ruby-passenger.install ruby-passenger-4.0.5/debian/ruby-passenger.install --- ruby-passenger-3.0.13debian/debian/ruby-passenger.install 2012-06-28 17:00:51.000000000 +0200 +++ ruby-passenger-4.0.5/debian/ruby-passenger.install 2013-06-08 22:57:44.675538382 +0200 @@ -1,4 +1,4 @@ -usr/lib/phusion-passenger/ +usr/lib/phusion-passenger/agents/ usr/share/phusion-passenger/union_station_gateway.crt usr/share/phusion-passenger/mime.types usr/share/phusion-passenger/helper-scripts/ diff -Nur ruby-passenger-3.0.13debian/debian/ruby-passenger.manpages ruby-passenger-4.0.5/debian/ruby-passenger.manpages --- ruby-passenger-3.0.13debian/debian/ruby-passenger.manpages 2012-06-28 17:00:51.000000000 +0200 +++ ruby-passenger-4.0.5/debian/ruby-passenger.manpages 2013-06-10 21:22:46.877027901 +0200 @@ -1,3 +1,2 @@ -man/passenger-make-enterprisey.8 man/passenger-memory-stats.8 man/passenger-status.8 diff -Nur ruby-passenger-3.0.13debian/debian/rules ruby-passenger-4.0.5/debian/rules --- ruby-passenger-3.0.13debian/debian/rules 2013-05-30 09:23:28.017310157 +0200 +++ ruby-passenger-4.0.5/debian/rules 2013-06-10 21:24:28.378403038 +0200 @@ -1,6 +1,10 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +include /usr/share/dpkg/buildflags.mk +export EXTRA_CXXFLAGS=$(CXXFLAGS) $(CPPFLAGS) +export EXTRA_LDFLAGS=$(LDFLAGS) + export USE_VENDORED_LIBEV=false %: diff -Nur ruby-passenger-3.0.13debian/debian/watch ruby-passenger-4.0.5/debian/watch --- ruby-passenger-3.0.13debian/debian/watch 2012-06-28 17:00:51.000000000 +0200 +++ ruby-passenger-4.0.5/debian/watch 2013-06-10 21:29:38.982621815 +0200 @@ -1,3 +1,3 @@ version=3 options="dversionmangle=s/debian[0-9]*//" \ -http://rubyforge.org/frs/?group_id=5873 .*passenger-([\d.-]*)\.t.* debian debian/repack.sh +https://code.google.com/p/phusion-passenger/downloads/list //phusion-passenger.googlecode.com/files/passenger-([\d.-]*)\.t.* debian debian/repack.sh