[rubygem-passenger/el6] Update to version 3.0.21 - Fix for CVE-2013-2119

Thu May 30 22:08:19 UTC 2013

commit c5fb7df68bcd8224cdebe13ecd8522156f9da0bc
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu May 30 17:08:01 2013 -0500

    Update to version 3.0.21 - Fix for CVE-2013-2119

 .gitignore                                         |    1 +
 rubygem-passenger-3.0.12-asciidoc-skip-html5.patch |   12 ----
 ...-passenger-3.0.12-gcc47-include-sys_types.patch |   55 --------------------
 rubygem-passenger-3.0.12-spoof-nginx-install.patch |   51 ------------------
 rubygem-passenger-3.0.19-requires-fix-ruby2.patch  |   30 +++++++++++
 rubygem-passenger.spec                             |   54 +++++++++++++++----
 sources                                            |    2 +-
 7 files changed, 74 insertions(+), 131 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1d52f61..5000504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /passenger-3.0.14.tar.gz
 /passenger-3.0.17.tar.gz
+/release-3.0.21.tar.gz
diff --git a/rubygem-passenger-3.0.19-requires-fix-ruby2.patch b/rubygem-passenger-3.0.19-requires-fix-ruby2.patch
new file mode 100644
index 0000000..aad83c0
--- /dev/null
+++ b/rubygem-passenger-3.0.19-requires-fix-ruby2.patch
@@ -0,0 +1,30 @@
+diff -ur passenger-release-3.0.19.orig/build/gempackagetask.rb passenger-release-3.0.19/build/gempackagetask.rb
+--- passenger-release-3.0.19.orig/build/gempackagetask.rb	2012-12-20 06:23:00.000000000 -0600
++++ passenger-release-3.0.19/build/gempackagetask.rb	2013-03-14 15:58:03.089000000 -0500
+@@ -9,7 +9,12 @@
+ require 'rake'
+ require 'build/packagetask'
+ require 'rubygems/user_interaction'
+-require 'rubygems/builder'
++
++if /^2\./ =~ RUBY_VERSION
++  require 'rubygems/package'
++else
++  require 'rubygems/builder'
++end
+ 
+ module Rake
+ 
+@@ -79,7 +84,11 @@
+       task 'package:gem' => ["#{package_dir}/#{gem_file}"]
+       file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
+         when_writing("Creating GEM") {
+-          Gem::Builder.new(gem_spec).build
++          if /^2\./ =~ RUBY_VERSION
++            Gem::Package.build(gem_spec)
++          else
++            Gem::Builder.new(gem_spec).build
++          end
+           verbose(true) {
+             mv gem_file, "#{package_dir}/#{gem_file}"
+           }
diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 9a8a8c7..26e35ad 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -9,8 +9,8 @@
 
 Summary: Passenger Ruby web application server
 Name: rubygem-%{gem_name}
-Version: 3.0.17
-Release: 2%{?dist}.1
+Version: 3.0.21
+Release: 1%{?dist}
 Group: System Environment/Daemons
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
@@ -22,7 +22,7 @@ License: Boost and BSD and BSD with advertising and MIT and zlib
 URL: http://www.modrails.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: http://rubyforge.org/frs/download.php/76329/%{gem_name}-%{version}.tar.gz
+Source: https://github.com/FooBarWidget/passenger/archive/release-%{version}.tar.gz
 Source1: passenger.logrotate
 Source2: rubygem-passenger.tmpfiles
 Source10: apache-passenger.conf.in
@@ -52,6 +52,11 @@ Patch103:       passenger_rspec2_helper.patch
 # Remove checking for fastthread on F17+
 Patch104:       passenger_fixdeps.patch
 
+# Fix gem-requires for ruby2
+# This is a hack until we move to passenger 4.x
+# https://github.com/FooBarWidget/passenger/pull/71
+Patch105:       rubygem-passenger-3.0.19-requires-fix-ruby2.patch
+
 # removes -Werror in upstream build scripts.  -Werror conflicts with
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
 #Patch200:       nginx-auto-cc-gcc.patch
@@ -61,7 +66,11 @@ Requires: rubygems
 # Requires: rubygem(daemon_controller) >= 1.0.0
 Requires: rubygem(rack)
 Requires: rubygem(rake)
-Requires: ruby(abi) = 1.8
+%if 0%{?fedora} >= 19
+Requires: ruby(release)
+%else
+Requires: ruby(abi) >= 1.8
+%endif
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires:  libcurl-devel
@@ -164,7 +173,7 @@ rebuilding this package.
 
 
 %prep
-%setup -q -n %{gem_name}-%{version}
+%setup -q -n %{gem_name}-release-%{version}
 
 %patch1   -p1 -b .force-native
 %patch2   -p1 -b .include-sys-types
@@ -178,6 +187,11 @@ rebuilding this package.
 %patch104 -p1 -b .fastthread
 %endif
 
+# fix requires for ruby2
+%if 0%{?fedora} >= 19
+%patch105 -p1 -b .requires
+%endif
+
 # Don't use bundled libev
 %{__rm} -rf ext/libev
 
@@ -188,7 +202,7 @@ rebuilding this package.
 %{__sed} -i \
     -e 's|%%%%GEM_INSTALL_DIR%%%%|%{gem_instdir}|g' \
     -e 's|%%%%APACHE_INSTALLED_MOD%%%%|%{_libdir}/httpd/modules/|g' \
-    -e 's|%%%%AGENTS_DIR%%%%|%{gem_extdir}/agents|g' \
+    -e 's|%%%%AGENTS_DIR%%%%|%{gem_instdir}/agents|g' \
     -e 's|%%%%NATIVE_SUPPORT_DIR%%%%|%{gem_extdir}/lib|g' \
     lib/phusion_passenger.rb \
     lib/phusion_passenger/native_support.rb \
@@ -244,8 +258,8 @@ rmdir %{buildroot}%{gem_instdir}/man
 
 # The agents aren't in the gem for some reason...
 %{__chmod} -R 0755 agents/*
-%{__mkdir_p} %{buildroot}%{gem_extdir}
-%{__cp} -a agents %{buildroot}%{gem_extdir}
+%{__mkdir_p} %{buildroot}%{gem_instdir}
+%{__cp} -a agents %{buildroot}%{gem_instdir}
 
 # Make our ghost log and run directories...
 %{__mkdir_p} %{buildroot}%{_localstatedir}/log/passenger-analytics
@@ -344,12 +358,11 @@ rake test --trace ||:
 
 %files -n mod_passenger
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/passenger.conf
-%doc doc/Users\ guide\ Apache.html
-%doc doc/Users\ guide\ Apache.txt
+%doc doc/Users?guide?Apache.txt
 %{_libdir}/httpd/modules/mod_passenger.so
 
 %files native
-%{gem_extdir}/agents
+%{gem_instdir}/agents
 %dir %{_localstatedir}/log/passenger-analytics
 %{_sysconfdir}/logrotate.d/passenger
 
@@ -358,6 +371,23 @@ rake test --trace ||:
 %{gem_extdir}/lib
 
 %changelog
+* Thu May 30 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-1
+- Update to version 3.0.21
+- Fix for CVE-2013-2119
+
+* Thu May 16 2013 Troy Dawson <tdawson at redhat.com> - 3.0.19-4
+- Fix to make agents work on F19+
+
+* Wed Mar 13 2013 Troy Dawson <tdawson at redhat.com> - 3.0.19-3
+- Fix to make it build/install on F19+
+- Added patch105
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jan 20 2013 Orion Poplawski <orion at cora.nwra.com> - 3.0.19-1
+- Update to 3.0.19
+
 * Wed Sep 19 2012 Orion Poplawski <orion at cora.nwra.com> - 3.0.17-2.1
 - Fix ruby(abi) for EL6
 - Drop dependency on rubygem(file-tail), no longer needed
@@ -442,5 +472,5 @@ rake test --trace ||:
 - Update to 3.0.12
 - Incorporate specfile changes from kanarip's version
 
-* Wed Apr 12 2012 Brett Lentz <blentz at redhat.com> - 3.0.11-1
+* Wed Apr 11 2012 Brett Lentz <blentz at redhat.com> - 3.0.11-1
 - Initial spec file
diff --git a/sources b/sources
index dd5d0f8..e713e50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ce8cac20e3c857bad621a6113d7268f  passenger-3.0.17.tar.gz
+7ad27dd8eb0235eddeea24e3bbba32fa  release-3.0.21.tar.gz
