Version bump. Fix for heartbleed in passenger standalone version.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 125 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index e2a770f1b12a..51dbba9f23ba 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.87 2014/03/22 08:20:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.88 2014/04/09 05:53:31 graaff Exp $
+
+*passenger-4.0.41 (09 Apr 2014)
+
+  09 Apr 2014; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.41.ebuild:
+  Version bump. Fix for heartbleed in passenger standalone version.
 
 *passenger-4.0.40 (22 Mar 2014)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 9aa65ba8fb95..e55b36ae37e4 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -17,15 +17,17 @@ AUX passenger-4.0.33-gentoo.patch 1066 SHA256 f1eb0799b3b1dfbc35985aed4b4f972d7a
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.37.tar.gz 4052133 SHA256 37146232602f4f579e12e97221638eea88b9c4b6b27970ac5ad5a13a6144c80f SHA512 ad3073ed59c088e71171c06970e1caaad9f0b99611417b698cebb70c3e8e470cc88f1627e4f736b316805b82fffe8b1ad0f8e5b45a418887140c1742d466c6cc WHIRLPOOL c65943f874083cd579fc19458a3bd28949fa6c78c69d7d38b1b518ea8a8347c10dcdf89fcc9ba1d5bdbaee4c83c28fcaf915c533fbce09436583a404431b56c4
 DIST passenger-4.0.40.tar.gz 4060206 SHA256 b1525235ea447068d39a1ee940cb209bfa4384d0d477da7220c8fb59778f3407 SHA512 832c81fac9ad488fa29204dc2e360a5c455aa36298bf8ca7018b8f0300fe190a83ed4d81a02ab68e882b1670f53cb600c4835662799131e53b9f69852eac2966 WHIRLPOOL fb91b6f77b2dcf85216c433194a891c9c07ecf0bdbfc192294b12d0f0401a8792417ea5744be22a92cf8dadc9ce457aaf113a974a8af7e1455a6d9e44d4d6e49
+DIST passenger-4.0.41.tar.gz 4060645 SHA256 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259 SHA512 a65c1a2b3ef14d9ea03f0dab0588f96dc3edcc9752cc00d7ea9f8b5839d000e9a993dc9ce93cf9f3a94a7565aae338835041efbaf5272506e4adabf393078fd0 WHIRLPOOL def6f3ac303895f9d807a5a559f6debe682a5a7e661abaac4fc5cfaf5d56d968b9059e47e1966f56039a91c47230b1fdda98df2fb36f4cdad3627f2edb5fc1fe
 EBUILD passenger-3.0.21-r1.ebuild 3253 SHA256 19b231560cbfe3b4a4bc8303fab0da874927a5f30ad897187fe4028cfaa76bf6 SHA512 4ae46a34d9aa5b5756949380bc6a8a2ebd475852052c374059ec072a5e03c97724a13fbdb9e0b40cadff438c527c8034b3c5293e9c165b4a0360f6190ec5562c WHIRLPOOL f9b99a8e94a842ff2b61eb3b7f57d4d3b264072b95c73c64dcca9482e6c9013396be0ea4310bfa804e07f171340af7df8289c0eee50bc6ed840ce41a7d61292f
 EBUILD passenger-4.0.37.ebuild 3628 SHA256 5e0746ae1cbdbb2d9cb645f43487ccd789d7bc1e802b26c704fa43b210519231 SHA512 860243261f2f9bec05010d3a2f0d121c5594e1c705d9e0632c4a6f18b9fd670704a0c38cad06fbec6f6b04134439d7db42c6e80952055e6f3e457d0c54f92080 WHIRLPOOL a71d52556500888a1b6b7d4c6ff5b422b311c43141bdfb1a4981133fd9d0447118ab7be6733dcaa0820c104654e0a23c8c59cdeb74996951998ca4f6782aa767
 EBUILD passenger-4.0.40.ebuild 3621 SHA256 de9699ae7a36b8e42565fe7d34928ea80b44152702685d4a21e8fa38a48d3348 SHA512 e5eb4adcd024425943009838d83f0d4f9eb3575f9d0faca3d02c2446103f36680b073a4e275e5306b3b984f478057c23d3e4b446f39f12e4dac78969ec0fbf26 WHIRLPOOL bf4bc2cd6d1a12b6ec4e6784342808f63a853731e8c4702840dcb120df4ecdd929da15e2a9b1812b2a6364909ccb608da64eb061304936092628ed728db3aba1
-MISC ChangeLog 13545 SHA256 c3dd6597246d6f764d2fe9ae93ac0ebf204a0c0ae843ae5c9f4000e589630f42 SHA512 1fc6f1ffbf482574b808b3cd92dd178c70a90889fb12c8d86ab91a7282a77380c91e7dd283f1ee228ae55774df2486ccd5ff37a980acd1882fd164cab7b6fb47 WHIRLPOOL 2ab33cceb336b98a19febcb00cbd8d36cd8108ec4b1d73a40ef9feb34e913dcab8dbd1c0f72f6ad794d5d5bcddff1aeafab975dcfe6162ff7085184e1381b559
+EBUILD passenger-4.0.41.ebuild 3628 SHA256 2ca87cf4e4e2f5fc313691b5b4bc1295fd9865dbc3b275ba258c17099a0c59aa SHA512 62d7b6334e77d20d98cd4e48522fc61f01f61e6dd504ffdb44577169628ec1c4e7309c90f218a08a8603c5763a38efe6ecfa75449678de8666fa704129734e5c WHIRLPOOL f537cda016bd9e2da42e58a9d7c7a7fc3c6ce3b9ec532fcb67539b81e673f381cb672738bd628f6ea4b63f307d7e09eca28eb29b433e9bdb73a06fad8891fe3d
+MISC ChangeLog 13723 SHA256 12f39b99eaef5baa35e89a2453caf264e6172f3d739bb4c7152b3395f9b91322 SHA512 7efa9062484d5867f33f9e0d406972779a5e35c0f1d745fd5425253e241b9db961c2b41adcdc9443c2e4d9e2617c6895c3931daa6e8001e0e7a57b7005840bb7 WHIRLPOOL 9d82bf1693574c9502ab1d0e62043926568aafb43ede56eb6201f1cd4f43c7d51098070653cfd994de03cb388ea2f0040aea212baa95302d5923b1b2c1d6749c
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMtR8sACgkQiIP6VqMIqNe71AD/cyG5/yxun0poDbcC6eMyDbZS
-Zc5qU3kx89DwI7pT54MA/iQnlSocNhD8wlG+mc4SfgYmDwVu51QJrJ9qgnJ/GK06
-=h4p3
+iF4EAREIAAYFAlNE4FwACgkQiIP6VqMIqNcjqwD+Ikmsd8MuyLdVjZJK9DQsUW4U
+qv2wEBJ/TfFEbqooW6MA/3jdqCuVPsI4m0reZdcxB+dqRNtZF9HaQ9TjRn1id2xM
+=upYS
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.41.ebuild b/www-apache/passenger/passenger-4.0.41.ebuild
new file mode 100644
index 000000000000..40ae89ec9c21
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.41.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.41.ebuild,v 1.1 2014/04/09 05:53:31 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="http://modrails.com/"
+SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-1.1.0
+	>=dev-ruby/rack-1.0.0"
+
+CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0.33-gentoo.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "s/gcc/$(tc-getCC)/" \
+		-e "s/g++/$(tc-getCXX)/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		lib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version.
+	rm -rf ext/libev || die "Unable to remove vendored libev."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Use the correct arch-specific lib directory
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
+
+pkg_postint() {
+	einfo "The apache module is compiled for the currently eselected ruby."
+	einfo" If you eselect another ruby you must recompile passenger as well."
+}