summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2010-12-13 10:38:57 +0000
committerTiziano Müller <dev-zero@gentoo.org>2010-12-13 10:38:57 +0000
commite9ce93c58dc22968772682f63cb2296fc949e6aa (patch)
tree1818df4c3a889921ceaf9d0e3c3476a41be223d7 /www-servers
parentAdded mask for nginx-0.8.53-r1 to test the passenger-3.0.1 module (diff)
downloadgentoo-2-e9ce93c58dc22968772682f63cb2296fc949e6aa.tar.gz
gentoo-2-e9ce93c58dc22968772682f63cb2296fc949e6aa.tar.bz2
gentoo-2-e9ce93c58dc22968772682f63cb2296fc949e6aa.zip
Revision bump to bump passenger to 3.0.1 (currently p.masked for testing). Removed old versions.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/nginx/ChangeLog12
-rw-r--r--www-servers/nginx/files/passenger-3.0.1-cflags.patch24
-rw-r--r--www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch16
-rw-r--r--www-servers/nginx/files/passenger-3.0.1-missing-include.patch12
-rw-r--r--www-servers/nginx/nginx-0.8.46.ebuild313
-rw-r--r--www-servers/nginx/nginx-0.8.47.ebuild313
-rw-r--r--www-servers/nginx/nginx-0.8.48.ebuild328
-rw-r--r--www-servers/nginx/nginx-0.8.53-r1.ebuild (renamed from www-servers/nginx/nginx-0.8.49.ebuild)41
8 files changed, 87 insertions, 972 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index f5f982d6c983..3373b1e6ccbd 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for www-servers/nginx
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.270 2010/11/28 21:21:35 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.271 2010/12/13 10:38:57 dev-zero Exp $
+
+*nginx-0.8.53-r1 (13 Dec 2010)
+
+ 13 Dec 2010; Tiziano Müller <dev-zero@gentoo.org> -nginx-0.8.46.ebuild,
+ -nginx-0.8.47.ebuild, -nginx-0.8.48.ebuild, -nginx-0.8.49.ebuild,
+ +nginx-0.8.53-r1.ebuild, +files/passenger-3.0.1-cflags.patch,
+ +files/passenger-3.0.1-missing-auto-feature.patch,
+ +files/passenger-3.0.1-missing-include.patch:
+ Revision bump to bump passenger to 3.0.1 (currently p.masked for testing).
+ Removed old versions.
*nginx-0.8.53 (28 Nov 2010)
diff --git a/www-servers/nginx/files/passenger-3.0.1-cflags.patch b/www-servers/nginx/files/passenger-3.0.1-cflags.patch
new file mode 100644
index 000000000000..ff798fe26c4a
--- /dev/null
+++ b/www-servers/nginx/files/passenger-3.0.1-cflags.patch
@@ -0,0 +1,24 @@
+diff --git a/build/config.rb b/build/config.rb
+index 8905bd8..64199fb 100644
+--- a/build/config.rb
++++ b/build/config.rb
+@@ -24,11 +24,7 @@
+ OPTIMIZE = boolean_option("OPTIMIZE")
+ CC = string_option("CC", "gcc")
+ CXX = string_option("CXX", "g++")
+-if OPTIMIZE
+- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
+-else
+- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
+-end
++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG -DBOOST_DISABLE_ASSERTS".strip
+
+ # Extra compiler flags that should always be passed to the C/C++ compiler.
+ # Should be included last in the command string, even after PlatformInfo.portability_cflags.
+@@ -39,4 +35,4 @@ EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}".strip
+ EXTRA_LDFLAGS = ""
+
+ # Whether to use the vendored libev or the system one.
+-USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
+\ No newline at end of file
++USE_VENDORED_LIBEV = false
diff --git a/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch b/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch
new file mode 100644
index 000000000000..c4c6cae6f191
--- /dev/null
+++ b/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch
@@ -0,0 +1,16 @@
+from http://code.google.com/p/phusion-passenger/issues/detail?id=595
+
+--- ../passenger-3.0.1/ext/nginx/config.orig 2010-12-08 13:48:23.964424406 +0000
++++ ../passenger-3.0.1/ext/nginx/config 2010-12-08 13:49:12.078865225 +0000
+@@ -2,10 +2,7 @@
+ ! test -f "$ngx_addon_dir/../common/libboost_oxt.a"; then
+ echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
+ echo "*** Running 'rake nginx RELEASE=yes' in $ngx_addon_dir... ***"
+- if ! cd $ngx_addon_dir; then
+- exit 1
+- fi
+- if ! rake nginx RELEASE=yes; then
++ if ! (cd $ngx_addon_dir && rake nginx RELEASE=yes) then
+ exit 1
+ fi
+ echo "*** Phusion Passenger support files have been successfully compiled. ***"
diff --git a/www-servers/nginx/files/passenger-3.0.1-missing-include.patch b/www-servers/nginx/files/passenger-3.0.1-missing-include.patch
new file mode 100644
index 000000000000..3f0223b31f47
--- /dev/null
+++ b/www-servers/nginx/files/passenger-3.0.1-missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/ext/common/RandomGenerator.h b/ext/common/RandomGenerator.h
+index 4a72a5e..836bf66 100644
+--- a/ext/common/RandomGenerator.h
++++ b/ext/common/RandomGenerator.h
+@@ -26,6 +26,7 @@
+ #define _PASSENGER_RANDOM_GENERATOR_H_
+
+ #include <string>
++#include <cerrno>
+
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
diff --git a/www-servers/nginx/nginx-0.8.46.ebuild b/www-servers/nginx/nginx-0.8.46.ebuild
deleted file mode 100644
index 17dd121ef7ac..000000000000
--- a/www-servers/nginx/nginx-0.8.46.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.46.ebuild,v 1.1 2010/07/20 20:46:44 dev-zero Exp $
-
-EAPI="2"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following 3 requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# http_passenger (http://www.modrails.com/, MIT license)
-# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="2.2.15"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
-
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
- http://www.modrails.com/
- http://pushmodule.slact.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
- nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
- nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )"
-
-LICENSE="BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_headers_more http_passenger http_push"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
- pcre? ( >=dev-libs/libpcre-4.2 )
- ssl? ( dev-libs/openssl )
- http-cache? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_geo? ( dev-libs/geoip )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
- nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
- nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
- nginx_modules_http_passenger? (
- $(ruby_implementation_depend ruby18)
- >=dev-ruby/rubygems-0.9.0
- >=dev-ruby/rake-0.8.1
- >=dev-ruby/fastthread-1.0.1
- >=dev-ruby/rack-1.0.0
- )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
- arm? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend ${?}
-
- if use ipv6; then
- ewarn "Note that ipv6 support in nginx is still experimental."
- ewarn "Be sure to read comments on gentoo bug #274614"
- ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
- fi
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use nginx_modules_http_passenger; then
- ruby-ng_pkg_setup
- use debug && append-flags -DPASSENGER_DEBUG
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-}
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
-}
-
-src_prepare() {
- sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
- if use nginx_modules_http_passenger; then
- cd "${WORKDIR}"/passenger-${PASSENGER_PV}
- epatch "${FILESDIR}"/passenger-CFLAGS.patch
- fi
-}
-
-src_configure() {
- local myconf= http_enabled= mail_enabled=
-
- use aio && myconf="${myconf} --with-file-aio --with-aio_module"
- use debug && myconf="${myconf} --with-debug"
- use ipv6 && myconf="${myconf} --with-ipv6"
- use libatomic && myconf="${myconf} --with-libatomic"
- use pcre && myconf="${myconf} --with-pcre"
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf="${myconf} --without-http_${mod}_module"
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf="${myconf} --with-http_${mod}_module"
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf="${myconf} --with-http_realip_module"
- fi
-
- # third-party modules
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
- fi
-
- if use nginx_modules_http_passenger; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
- fi
-
- if use nginx_modules_http_push; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
- fi
-
- if use http || use http-cache; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf="${myconf} --without-http-cache"
- use ssl && myconf="${myconf} --with-http_ssl_module"
- else
- myconf="${myconf} --without-http --without-http-cache"
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf="${myconf} --without-mail_${mod}_module"
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf="${myconf} --with-mail"
- use ssl && myconf="${myconf} --with-mail_ssl_module"
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf="${myconf} --add-module=${mod}"
- done
-
- # http://bugs.gentoo.org/show_bug.cgi?id=286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- ./configure \
- --prefix=/usr \
- --sbin-path=/usr/sbin/nginx \
- --conf-path=/etc/${PN}/${PN}.conf \
- --error-log-path=/var/log/${PN}/error_log \
- --pid-path=/var/run/${PN}.pid \
- --lock-path=/var/lock/nginx.lock \
- --user=${PN} --group=${PN} \
- --with-cc-opt="-I${ROOT}usr/include" \
- --with-ld-opt="-L${ROOT}usr/lib" \
- --http-log-path=/var/log/${PN}/access_log \
- --http-client-body-temp-path=/var/tmp/${PN}/client \
- --http-proxy-temp-path=/var/tmp/${PN}/proxy \
- --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
- --http-scgi-temp-path=/var/tmp/${PN}/scgi \
- --http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
- ${myconf} || die "configure failed"
-}
-
-src_compile() {
- # http://bugs.gentoo.org/show_bug.cgi?id=286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
- keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-
- dosbin objs/nginx
- newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
- cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
- rm conf/win-utf conf/koi-win conf/koi-utf
-
- dodir /etc/${PN}
- insinto /etc/${PN}
- doins conf/*
-
- dodoc CHANGES* README
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/
- einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
- fixlocalpod
- fi
-
- if use nginx_modules_http_push; then
- docinto ${HTTP_PUSH_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
- fi
-
- if use nginx_modules_http_passenger; then
- # passengers Rakefile is so horribly broken that we have to do it
- # manually
- cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
- export RUBY="ruby18"
-
- insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
- insopts -m 0755
- doins ext/phusion_passenger/*.so
- doruby -r lib/phusion_passenger
-
- exeinto /usr/bin
- doexe bin/passenger-memory-stats bin/passenger-status
-
- exeinto /usr/libexec/passenger/bin
- doexe bin/passenger-spawn-server
-
- exeinto /usr/libexec/passenger/ext/nginx
- doexe ext/nginx/HelperServer
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
- install_cert /etc/ssl/${PN}/${PN}
- chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
- fi
- fi
-}
diff --git a/www-servers/nginx/nginx-0.8.47.ebuild b/www-servers/nginx/nginx-0.8.47.ebuild
deleted file mode 100644
index acd6abf2ea59..000000000000
--- a/www-servers/nginx/nginx-0.8.47.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.47.ebuild,v 1.1 2010/07/30 07:18:58 dev-zero Exp $
-
-EAPI="2"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following 3 requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# http_passenger (http://www.modrails.com/, MIT license)
-# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="2.2.15"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
-
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
- http://www.modrails.com/
- http://pushmodule.slact.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
- nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
- nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )"
-
-LICENSE="BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_headers_more http_passenger http_push"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
- pcre? ( >=dev-libs/libpcre-4.2 )
- ssl? ( dev-libs/openssl )
- http-cache? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_geo? ( dev-libs/geoip )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
- nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
- nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
- nginx_modules_http_passenger? (
- $(ruby_implementation_depend ruby18)
- >=dev-ruby/rubygems-0.9.0
- >=dev-ruby/rake-0.8.1
- >=dev-ruby/fastthread-1.0.1
- >=dev-ruby/rack-1.0.0
- )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
- arm? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend ${?}
-
- if use ipv6; then
- ewarn "Note that ipv6 support in nginx is still experimental."
- ewarn "Be sure to read comments on gentoo bug #274614"
- ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
- fi
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use nginx_modules_http_passenger; then
- ruby-ng_pkg_setup
- use debug && append-flags -DPASSENGER_DEBUG
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-}
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
-}
-
-src_prepare() {
- sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
- if use nginx_modules_http_passenger; then
- cd "${WORKDIR}"/passenger-${PASSENGER_PV}
- epatch "${FILESDIR}"/passenger-CFLAGS.patch
- fi
-}
-
-src_configure() {
- local myconf= http_enabled= mail_enabled=
-
- use aio && myconf="${myconf} --with-file-aio --with-aio_module"
- use debug && myconf="${myconf} --with-debug"
- use ipv6 && myconf="${myconf} --with-ipv6"
- use libatomic && myconf="${myconf} --with-libatomic"
- use pcre && myconf="${myconf} --with-pcre"
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf="${myconf} --without-http_${mod}_module"
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf="${myconf} --with-http_${mod}_module"
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf="${myconf} --with-http_realip_module"
- fi
-
- # third-party modules
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
- fi
-
- if use nginx_modules_http_passenger; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
- fi
-
- if use nginx_modules_http_push; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
- fi
-
- if use http || use http-cache; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf="${myconf} --without-http-cache"
- use ssl && myconf="${myconf} --with-http_ssl_module"
- else
- myconf="${myconf} --without-http --without-http-cache"
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf="${myconf} --without-mail_${mod}_module"
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf="${myconf} --with-mail"
- use ssl && myconf="${myconf} --with-mail_ssl_module"
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf="${myconf} --add-module=${mod}"
- done
-
- # http://bugs.gentoo.org/show_bug.cgi?id=286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- ./configure \
- --prefix=/usr \
- --sbin-path=/usr/sbin/nginx \
- --conf-path=/etc/${PN}/${PN}.conf \
- --error-log-path=/var/log/${PN}/error_log \
- --pid-path=/var/run/${PN}.pid \
- --lock-path=/var/lock/nginx.lock \
- --user=${PN} --group=${PN} \
- --with-cc-opt="-I${ROOT}usr/include" \
- --with-ld-opt="-L${ROOT}usr/lib" \
- --http-log-path=/var/log/${PN}/access_log \
- --http-client-body-temp-path=/var/tmp/${PN}/client \
- --http-proxy-temp-path=/var/tmp/${PN}/proxy \
- --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
- --http-scgi-temp-path=/var/tmp/${PN}/scgi \
- --http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
- ${myconf} || die "configure failed"
-}
-
-src_compile() {
- # http://bugs.gentoo.org/show_bug.cgi?id=286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
- keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-
- dosbin objs/nginx
- newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
- cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
- rm conf/win-utf conf/koi-win conf/koi-utf
-
- dodir /etc/${PN}
- insinto /etc/${PN}
- doins conf/*
-
- dodoc CHANGES* README
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/
- einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
- fixlocalpod
- fi
-
- if use nginx_modules_http_push; then
- docinto ${HTTP_PUSH_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
- fi
-
- if use nginx_modules_http_passenger; then
- # passengers Rakefile is so horribly broken that we have to do it
- # manually
- cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
- export RUBY="ruby18"
-
- insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
- insopts -m 0755
- doins ext/phusion_passenger/*.so
- doruby -r lib/phusion_passenger
-
- exeinto /usr/bin
- doexe bin/passenger-memory-stats bin/passenger-status
-
- exeinto /usr/libexec/passenger/bin
- doexe bin/passenger-spawn-server
-
- exeinto /usr/libexec/passenger/ext/nginx
- doexe ext/nginx/HelperServer
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
- install_cert /etc/ssl/${PN}/${PN}
- chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
- fi
- fi
-}
diff --git a/www-servers/nginx/nginx-0.8.48.ebuild b/www-servers/nginx/nginx-0.8.48.ebuild
deleted file mode 100644
index fb42254097c8..000000000000
--- a/www-servers/nginx/nginx-0.8.48.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.48.ebuild,v 1.1 2010/08/06 12:57:56 dev-zero Exp $
-
-EAPI="2"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following 3 requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# http_passenger (http://www.modrails.com/, MIT license)
-# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="2.2.15"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-1.1"
-
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
- http://www.modrails.com/
- http://pushmodule.slact.net/
- http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
- nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
- nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
- nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )"
-
-LICENSE="BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
- pcre? ( >=dev-libs/libpcre-4.2 )
- ssl? ( dev-libs/openssl )
- http-cache? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_geo? ( dev-libs/geoip )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
- nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
- nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
- nginx_modules_http_passenger? (
- $(ruby_implementation_depend ruby18)
- >=dev-ruby/rubygems-0.9.0
- >=dev-ruby/rake-0.8.1
- >=dev-ruby/fastthread-1.0.1
- >=dev-ruby/rack-1.0.0
- )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
- arm? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend ${?}
-
- if use ipv6; then
- ewarn "Note that ipv6 support in nginx is still experimental."
- ewarn "Be sure to read comments on gentoo bug #274614"
- ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
- fi
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use nginx_modules_http_passenger; then
- ruby-ng_pkg_setup
- use debug && append-flags -DPASSENGER_DEBUG
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-}
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
-}
-
-src_prepare() {
- sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
- if use nginx_modules_http_passenger; then
- cd "${WORKDIR}"/passenger-${PASSENGER_PV}
- epatch "${FILESDIR}"/passenger-CFLAGS.patch
- fi
-}
-
-src_configure() {
- local myconf= http_enabled= mail_enabled=
-
- use aio && myconf="${myconf} --with-file-aio --with-aio_module"
- use debug && myconf="${myconf} --with-debug"
- use ipv6 && myconf="${myconf} --with-ipv6"
- use libatomic && myconf="${myconf} --with-libatomic"
- use pcre && myconf="${myconf} --with-pcre"
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf="${myconf} --without-http_${mod}_module"
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf="${myconf} --with-http_${mod}_module"
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf="${myconf} --with-http_realip_module"
- fi
-
- # third-party modules
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
- fi
-
- if use nginx_modules_http_passenger; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
- fi
-
- if use nginx_modules_http_push; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
- fi
-
- if use nginx_modules_http_cache_purge; then
- http_enabled=1
- myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
- fi
-
- if use http || use http-cache; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf="${myconf} --without-http-cache"
- use ssl && myconf="${myconf} --with-http_ssl_module"
- else
- myconf="${myconf} --without-http --without-http-cache"
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf="${myconf} --without-mail_${mod}_module"
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf="${myconf} --with-mail"
- use ssl && myconf="${myconf} --with-mail_ssl_module"
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf="${myconf} --add-module=${mod}"
- done
-
- # http://bugs.gentoo.org/show_bug.cgi?id=286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- ./configure \
- --prefix=/usr \
- --sbin-path=/usr/sbin/nginx \
- --conf-path=/etc/${PN}/${PN}.conf \
- --error-log-path=/var/log/${PN}/error_log \
- --pid-path=/var/run/${PN}.pid \
- --lock-path=/var/lock/nginx.lock \
- --user=${PN} --group=${PN} \
- --with-cc-opt="-I${ROOT}usr/include" \
- --with-ld-opt="-L${ROOT}usr/lib" \
- --http-log-path=/var/log/${PN}/access_log \
- --http-client-body-temp-path=/var/tmp/${PN}/client \
- --http-proxy-temp-path=/var/tmp/${PN}/proxy \
- --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
- --http-scgi-temp-path=/var/tmp/${PN}/scgi \
- --http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
- ${myconf} || die "configure failed"
-}
-
-src_compile() {
- # http://bugs.gentoo.org/show_bug.cgi?id=286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
- keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-
- dosbin objs/nginx
- newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
- cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
- rm conf/win-utf conf/koi-win conf/koi-utf
-
- dodir /etc/${PN}
- insinto /etc/${PN}
- doins conf/*
-
- dodoc CHANGES* README
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/
- einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
- fixlocalpod
- fi
-
- if use nginx_modules_http_push; then
- docinto ${HTTP_PUSH_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
- fi
-
- if use nginx_modules_http_cache_purge; then
- docinto ${HTTP_CACHE_PURGE_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README}
- fi
-
- if use nginx_modules_http_passenger; then
- # passengers Rakefile is so horribly broken that we have to do it
- # manually
- cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
- export RUBY="ruby18"
-
- insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
- insopts -m 0755
- doins ext/phusion_passenger/*.so
- doruby -r lib/phusion_passenger
-
- exeinto /usr/bin
- doexe bin/passenger-memory-stats bin/passenger-status
-
- exeinto /usr/libexec/passenger/bin
- doexe bin/passenger-spawn-server
-
- exeinto /usr/libexec/passenger/ext/nginx
- doexe ext/nginx/HelperServer
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
- install_cert /etc/ssl/${PN}/${PN}
- chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
- fi
- fi
-}
diff --git a/www-servers/nginx/nginx-0.8.49.ebuild b/www-servers/nginx/nginx-0.8.53-r1.ebuild
index bf56dae1c162..e43f9e026a2d 100644
--- a/www-servers/nginx/nginx-0.8.49.ebuild
+++ b/www-servers/nginx/nginx-0.8.53-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.49.ebuild,v 1.1 2010/08/10 07:45:19 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.53-r1.ebuild,v 1.1 2010/12/13 10:38:57 dev-zero Exp $
EAPI="2"
@@ -23,7 +23,7 @@ HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
# http_passenger (http://www.modrails.com/, MIT license)
# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="2.2.15"
+PASSENGER_PV="3.0.1"
USE_RUBY="ruby18"
RUBY_OPTIONAL="yes"
@@ -31,7 +31,7 @@ RUBY_OPTIONAL="yes"
HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-1.1"
+HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-1.2"
inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
@@ -48,7 +48,7 @@ SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
LICENSE="BSD BSD-2 GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
@@ -94,6 +94,7 @@ CDEPEND="
>=dev-ruby/rake-0.8.1
>=dev-ruby/fastthread-1.0.1
>=dev-ruby/rack-1.0.0
+ dev-libs/libev
)"
RDEPEND="${CDEPEND}"
DEPEND="${CDEPEND}
@@ -135,12 +136,6 @@ pkg_setup() {
ewarn "To actually disable all http-functionality you also have to disable"
ewarn "all nginx http modules."
fi
-
- if use nginx_modules_http_cache_purge && (use !nginx_modules_http_fastcgi || use !nginx_modules_http_uwsgi); then
- eerror "The module cache_purge currently requires fastcgi and uwsgi modules to be built."
- eerror "It will otherwise fail while linking."
- die "Insufficient use-flags"
- fi
}
src_unpack() {
@@ -153,7 +148,16 @@ src_prepare() {
if use nginx_modules_http_passenger; then
cd "${WORKDIR}"/passenger-${PASSENGER_PV}
- epatch "${FILESDIR}"/passenger-CFLAGS.patch
+ epatch \
+ "${FILESDIR}/passenger-3.0.1-cflags.patch" \
+ "${FILESDIR}/passenger-3.0.1-missing-include.patch" \
+ "${FILESDIR}/passenger-3.0.1-missing-auto-feature.patch"
+
+ sed -i \
+ -e 's|/usr/lib/phusion-passenger/agents|/usr/libexec/passenger/agents|' \
+ -e 's|/usr/share/phusion-passenger/helper-scripts|/usr/libexec/passenger/bin|' \
+ -e "s|/usr/share/doc/phusion-passenger|/usr/share/doc/${PF}|" \
+ lib/phusion_passenger.rb ext/common/ResourceLocator.h || die "sed failed"
fi
}
@@ -308,19 +312,22 @@ src_install() {
export RUBY="ruby18"
- insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
+ insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')
insopts -m 0755
- doins ext/phusion_passenger/*.so
- doruby -r lib/phusion_passenger
+ doins ext/ruby/*/passenger_native_support.so
+ doruby -r lib/phusion_passenger lib/phusion_passenger.rb
exeinto /usr/bin
doexe bin/passenger-memory-stats bin/passenger-status
exeinto /usr/libexec/passenger/bin
- doexe bin/passenger-spawn-server
+ doexe helper-scripts/passenger-spawn-server
+
+ exeinto /usr/libexec/passenger/agents
+ doexe agents/Passenger{LoggingAgent,Watchdog}
- exeinto /usr/libexec/passenger/ext/nginx
- doexe ext/nginx/HelperServer
+ exeinto /usr/libexec/passenger/agents/nginx
+ doexe agents/nginx/PassengerHelperAgent
fi
}