[rubygem-passenger/f21: 9/9] Merge from f20

[Orion Poplawski]

commit c24de4b0a2a38def66e0853c2fec2bc1cf5a439a
Merge: 22a0609 7a65059
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Mar 10 16:16:31 2015 -0600

    Merge from f20

 .gitignore                                       |   1 +
 apache-passenger.conf.in                         |   9 +-
 config.json                                      |  30 ++
 rubygem-passenger-4.0.18-correct_docs.patch      |  22 +-
 rubygem-passenger-4.0.38-libeio.patch            |  26 ++
 rubygem-passenger-4.0.38-load_from_lib_dir.patch |  31 ++
 rubygem-passenger-4.0.50-agents_dir.patch        |  13 +
 rubygem-passenger.spec                           | 425 +++++++++--------------
 sources                                          |   2 +-
 9 files changed, 287 insertions(+), 272 deletions(-)
---
diff --cc rubygem-passenger.spec
index 4bc0ea2,deccf31..d57cfd8
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@@ -53,37 -38,16 +38,19 @@@ Patch2:         rubygem-passenger-4.0.5
  # Until rubygem-bluecloth is in Fedora, don't use it
  Patch201:       rubygem-passenger-4.0.18-correct_docs.patch
  
 +# Load native library from proper directory
 +Patch202:       rubygem-passenger-4.0.18_native_dir.patch
 +
  Requires: rubygems
  # XXX: Needed to run passenger standalone
- Requires: rubygem(daemon_controller) >= 1.0.0
+ Requires: rubygem(daemon_controller) >= 1.1.0
  Requires: rubygem(rack)
  Requires: rubygem(rake)
- %if 0%{?fedora} >= 19
  Requires: ruby(release)
- %else
- Requires: ruby(abi) = 1.9.1
- %endif
- 
- %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
- BuildRequires:  libcurl-devel
- %else
- BuildRequires:  curl-devel
- %endif
- 
- %if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
- Requires: rubygem(fastthread) >= 1.0.1
- BuildRequires:  rubygem(fastthread) >= 1.0.1
- %endif
  
- BuildRequires: asciidoc
- BuildRequires: boost-devel
- BuildRequires: doxygen
- BuildRequires: graphviz
+ BuildRequires: libcurl-devel
  BuildRequires: httpd-devel
- BuildRequires: libev-devel
+ BuildRequires: libev-devel >= 4.0.0
  BuildRequires: ruby
  BuildRequires: ruby-devel
  BuildRequires: rubygems
@@@ -182,29 -110,10 +113,11 @@@ This package contains documentation fil
  
  # Until bluecloth is in Fedora, don't use it
  %patch201 -p1 -b .docs
 +%patch202 -p1 -b .nativedir
  
- # Don't use bundled libev
- %{__rm} -rf ext/libev
- 
- # asciidoc 8.4.x doesn't have an html5 backend
- %{__sed} -i 's/-b html5/-b html4/' build/documentation.rb
- 
- # fix up install paths
- %{__sed} -i \
-     -e 's|%%%%GEM_INSTALL_DIR%%%%|%{gem_instdir}|g' \
-     -e 's|%%%%APACHE_INSTALLED_MOD%%%%|%{_httpd_moddir}|g' \
-     -e 's|%%%%AGENTS_DIR%%%%|%{gem_extdir}/agents|g' \
-     -e 's|%%%%NATIVE_SUPPORT_DIR%%%%|%{gem_extdir}/lib|g' \
-     lib/phusion_passenger.rb \
-     lib/phusion_passenger/native_support.rb \
-     ext/common/ResourceLocator.h
- 
- # Fix anything executable that does not have a hash-bang
- # Why are there executable header files? WTF.
- for script in `find . -type f -perm /a+x -name "*.rb" -o -perm /a+x -name "*.h"`; do
-     [ -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 644 $script
- done
+ # Don't use bundled libev and libeio
+ rm -rf ext/libev
+ rm -rf ext/libeio
  
  # Find files with a hash-bang that do not have executable permissions
  for script in `find . -type f ! -perm /a+x -name "*.rb"`; do
@@@ -377,28 -261,34 +265,37 @@@ rake test:cxx || tru
  %doc doc/Users?guide?Apache.txt
  %{_httpd_moddir}/mod_passenger.so
  
- %files native
- %{gem_extdir}/agents
- %dir %{_localstatedir}/log/passenger-analytics
- %{_sysconfdir}/logrotate.d/passenger
+ %changelog
+ * Fri Feb 13 2015 Orion Poplawski <orion at cora.nwra.com> - 4.0.53-3.1
+ - Add needed obsoletes on rubygem-passenger-native{,-libs} for upgrade (bug #1189188)
+ - Remove duplicate provides
  
- %files native-libs
- %dir %{gem_extdir}
- %{gem_extdir}/lib
+ * Mon Dec 15 2014 Brett Lentz <blentz at redhat.com> - 4.0.53-3
+ - build for f20 (#1058993)
+ 
+ * Thu Nov 20 2014 Jan Kaluza <jkaluza at redhat.com> - 4.0.53-2
+ - get agents_dir from locations.ini
+ 
+ * Fri Oct 03 2014 Jan Kaluza <jkaluza at redhat.com> - 4.0.53-1
+ - update to version 4.0.53
 -
 -* Wed Sep 24 2014 Jan Kaluza <jkaluza at redhat.com> - 4.0.50-2
+ - remove old BuildRequires and tmpfiles.d conditions
 -
 -* Mon Sep 15 2014 Jan Kaluza <jkaluza at redhat.com> - 4.0.50-1
 -- update to new version 4.0.50
 -
 -* Tue May 13 2014 Jan Kaluza <jkaluza at redhat.com> - 4.0.38-1
 -- renamed from rubygem-passenger to passenger
+ - changed the packaging structure to be closer to upstream
 -- update to 4.0.38 (#1060106)
+ - fix for CVE-2014-1831 and CVE-2014-1832
+ - use real commands without macros
+ - do not bundle libeio
  
- %changelog
 +* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.18-9
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
 +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.18-8
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* Fri May 23 2014 Petr Machata <pmachata at redhat.com> - 4.0.18-7
 +- Rebuild for boost 1.55.0
 +
 +* Fri May 02 2014 Jan Kaluza <jkaluza at redhat.com> - 4.0.18-6
 +- rebuild because of new ruby
 +
  * Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 4.0.18-5
  - fix _httpd_mmn expansion in absence of httpd-devel