add uWSGI module wrt bug #314931
authorBenedikt Boehm <hollow@gentoo.org>
Mon, 3 May 2010 19:34:36 +0000 (19:34 +0000)
committerBenedikt Boehm <hollow@gentoo.org>
Mon, 3 May 2010 19:34:36 +0000 (19:34 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux i686

www-servers/nginx/ChangeLog
www-servers/nginx/Manifest
www-servers/nginx/nginx-0.8.36-r1.ebuild [new file with mode: 0644]

index 9a3e7075d55cbe6d951e7f32eb75045eb3fbda0c..54d5b4769516ed75ac02a4aa35bdfae28330223c 100644 (file)
@@ -1,6 +1,11 @@
 # 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.256 2010/04/26 09:50:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.257 2010/05/03 19:34:36 hollow Exp $
+
+*nginx-0.8.36-r1 (03 May 2010)
+
+  03 May 2010; Benedikt Böhm <hollow@gentoo.org> +nginx-0.8.36-r1.ebuild:
+  add uWSGI module wrt bug #314931
 
 *nginx-0.8.36 (26 Apr 2010)
 
index d0f25c3e3b3f9a2cd734b22aaa1c5c24e5f96d42..d2bc054335b2acf0e70fead423623121260a1476 100644 (file)
@@ -8,10 +8,12 @@ DIST nginx-0.8.35.tar.gz 622870 RMD160 577da44315860a4f5351a0e2e28f757a8bbcb608
 DIST nginx-0.8.36.tar.gz 623359 RMD160 b29ce2c60ea77f7bad5672939cc16ea39ff1ceac SHA1 4068aca8626892840dce670c5c158d2f8c72663d SHA256 d1b8a54d2d646ff21deaa1e3ec48cca5c143da5d4390e9b3dd001eaa4c9992d9
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 DIST passenger-2.2.11.tar.gz 2058085 RMD160 54ee5ab25155adaf4b6be9dc0aee190a323254e5 SHA1 9c38d364f59cb72c14a2f4c22445252468f08c4e SHA256 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88
+DIST uwsgi-0.9.5.tar.gz 118203 RMD160 c6ffd2661dd623e848002604798e4a18402f7d76 SHA1 264572059254e2cca771908050d7534aaafff1a8 SHA256 49e88485b9f91693409c255738bc6a6f2a6f856a8a0f04b07dccf5ab7e3de0bd
 EBUILD nginx-0.7.65-r1.ebuild 7227 RMD160 cdc11640c8defc4893422e6cf3c600f79e159dce SHA1 b050d2657a94ee23a24f04b5fcba576fb466bdc9 SHA256 9d0c72bfc4d7d0bd22681ff6d67fa89d4b8718fb10305a54ac285c3b7d3155c8
 EBUILD nginx-0.7.65.ebuild 3769 RMD160 623f00383af982d7dc7634a4f2b803084dd14dec SHA1 8c6d67684b42c7260944cb1ae35e8df0c7381fde SHA256 d4fa545438c2ea57a7cc5c843abd20e8f75dbe29e19d4c82382a80f75a2d951f
 EBUILD nginx-0.8.34-r1.ebuild 7227 RMD160 f81908ba1f3f4f334c5da43dfbdeb4d5c0ebe421 SHA1 f0ad3f22ce22f7185b4f9e29265de4cffb04fe7a SHA256 01ef8d8282b95f74d8340f3caf63c658e8578675a97967aa44b4338bbaa0bcf8
 EBUILD nginx-0.8.35.ebuild 8353 RMD160 21203866c733b75c9578d67bd86ef1e026fe6b18 SHA1 de8e4cc27eba6ecf2c4b45e893732004875128ff SHA256 be9f71df13a05c6019943293dc7a306b38a22852f0cb0d9ea4b696a0f9031939
+EBUILD nginx-0.8.36-r1.ebuild 9092 RMD160 819596840a405170d281d811c4e22670b44bf918 SHA1 41778d2ac58019b9054a4b0c4dfedcdd6cb18b98 SHA256 9692b90cf9395701fc8947f05540101f85adf8a91ed6bbca8acf6022c7e3ce8f
 EBUILD nginx-0.8.36.ebuild 8379 RMD160 58ef3558e93df3f6c6a2158a96c3fe5064a8ab42 SHA1 3aeb573bebd53697d5c2798623b153532b9ab7dd SHA256 421651bd64002f90fd8f48a80c08829706ed5bb2c44d1c4056d232c34f43d1cd
-MISC ChangeLog 41748 RMD160 43b41725cef0f822db513d0311dbbfcc58b8c26c SHA1 131a9090038e1c6fcaee8d5e8c53c300ffb05bba SHA256 949b20035e0ccb639a193bafef441bc5c38a1ad97a04b9bbdd9bad52fddbd57e
+MISC ChangeLog 41889 RMD160 e9057eb1e312efe9d3d66fe67c324b5b05bd7fbb SHA1 175de7bd86b1f577c4bb11d81a939d7f4351d357 SHA256 d57d1fa7baa6e1ac672c85123323aac0a53780094e53e6127f95ab7e7bdc7661
 MISC metadata.xml 1357 RMD160 d83e1c10ab29f088e5fe9bfe1cec707247f8abde SHA1 c07f6abb803f7a568e74cbcc8423b570730c9314 SHA256 31ed49b4b5c7f93eb0d4be1cd254542fbcf517b243ac4f8393c0aa8ccf05cdcf
diff --git a/www-servers/nginx/nginx-0.8.36-r1.ebuild b/www-servers/nginx/nginx-0.8.36-r1.ebuild
new file mode 100644 (file)
index 0000000..6d5f7cd
--- /dev/null
@@ -0,0 +1,313 @@
+# 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.36-r1.ebuild,v 1.1 2010/05/03 19:34:35 hollow 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_passenger (http://www.modrails.com/, MIT license)
+# TODO: currently builds some stuff in src_configure
+PASSENGER_PV="2.2.11"
+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_uwsgi (http://projects.unbit.it/uwsgi/, GPL-2 license)
+HTTP_UWSGI_MODULE_PV="0.9.5"
+
+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://projects.unbit.it/uwsgi/"
+SRC_URI="http://sysoev.ru/nginx/${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_uwsgi? ( http://projects.unbit.it/downloads/uwsgi-${HTTP_UWSGI_MODULE_PV}.tar.gz )"
+
+LICENSE="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 ssi
+upstream_ip_hash userid"
+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_passenger http_push http_uwsgi"
+
+IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl"
+
+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 )"
+
+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
+
+       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_uwsgi; then
+               http_enabled=1
+               myconf="${myconf} --add-module=${WORKDIR}/uwsgi-${HTTP_UWSGI_MODULE_PV}/nginx"
+       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 \
+               ${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}
+
+       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_uwsgi; then
+               insinto /etc/nginx
+               doins "${WORKDIR}"/uwsgi-${HTTP_UWSGI_MODULE_PV}/nginx/uwsgi_params
+       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
+}