diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-apache/passenger/files/passenger-4.0.10-gentoo.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-apache/passenger/files/passenger-4.0.10-gentoo.patch')
-rw-r--r-- | www-apache/passenger/files/passenger-4.0.10-gentoo.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch b/www-apache/passenger/files/passenger-4.0.10-gentoo.patch new file mode 100644 index 000000000000..808f988c7a72 --- /dev/null +++ b/www-apache/passenger/files/passenger-4.0.10-gentoo.patch @@ -0,0 +1,48 @@ +--- build/packaging.rb.~1~ 2013-07-09 10:10:02.000000000 +0200 ++++ build/packaging.rb 2013-07-17 10:25:33.287663252 +0200 +@@ -184,7 +184,7 @@ + require 'rbconfig' + require 'fileutils' + include RbConfig +- fakeroot = "pkg/fakeroot" ++ fakeroot = ENV['DISTDIR'] + + # We don't use CONFIG['archdir'] and the like because we want + # the files to be installed to /usr, and the Ruby interpreter +--- build/packaging.rb.~1~ 2013-07-17 13:06:40.199882060 +0200 ++++ build/packaging.rb 2013-07-17 13:18:31.444209611 +0200 +@@ -189,9 +189,9 @@ + # 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. +- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby" ++ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}" + fake_libdir = "#{fakeroot}/usr/lib/passenger" +- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}" ++ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}" + 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/passenger" +--- build/packaging.rb.~1~ 2013-07-17 13:19:21.434826846 +0200 ++++ build/packaging.rb 2013-07-17 13:21:42.954912287 +0200 +@@ -276,10 +276,6 @@ + sh "cp bin/#{exe} #{fake_sbindir}/" + end + +- # Apache 2 module +- sh "mkdir -p #{fake_apache2_module_dir}" +- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/" +- + # Ruby extension sources + sh "mkdir -p #{fake_ruby_extension_source_dir}" + sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}" +--- build/packaging.rb.~1~ 2013-07-17 13:25:51.440038844 +0200 ++++ build/packaging.rb 2013-07-17 13:33:30.151365870 +0200 +@@ -203,7 +203,6 @@ + fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so" + fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/passenger/ruby_extension_source" + +- sh "rm -rf #{fakeroot}" + sh "mkdir -p #{fakeroot}" + + # Ruby sources |