From f425d09b60aa74609c97e013ba314d47f6a6d6d0 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sun, 7 Mar 2010 10:43:38 +0000 Subject: [PATCH] rewrite ebuild for USE_EXPAND goodies. fixes #286772, #301513, #303205 and #305691 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- www-servers/nginx/ChangeLog | 9 +- www-servers/nginx/Manifest | 9 +- www-servers/nginx/files/nginx.conf-r4 | 78 +++--- .../nginx/files/passenger-CFLAGS.patch | 15 + www-servers/nginx/metadata.xml | 9 +- www-servers/nginx/nginx-0.8.34-r1.ebuild | 260 ++++++++++++++++++ 6 files changed, 334 insertions(+), 46 deletions(-) create mode 100644 www-servers/nginx/files/passenger-CFLAGS.patch create mode 100644 www-servers/nginx/nginx-0.8.34-r1.ebuild diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 3a41b231aaa8..1e11ceeaf9e1 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,13 @@ # 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.247 2010/03/04 16:56:07 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.248 2010/03/07 10:43:37 hollow Exp $ + +*nginx-0.8.34-r1 (07 Mar 2010) + + 07 Mar 2010; Benedikt Böhm +nginx-0.8.34-r1.ebuild, + files/nginx.conf-r4, +files/passenger-CFLAGS.patch, metadata.xml: + rewrite ebuild for USE_EXPAND goodies. fixes #286772, #301513, #303205 and + #305691 04 Mar 2010; Benedikt Böhm metadata.xml: take over maintainance wrt #303205 diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index c423c2739f5f..bd4c43942826 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,15 +1,18 @@ AUX nginx-r1 1645 RMD160 d032feec43e4ba31ac5b6fffec478ebbeb49db60 SHA1 49f0db3efaccd3cef545b8c68cfa557ca829352f SHA256 b263a663399d2897dfdf53226d45fc3707bc9230bd687b8003d075a48f60ecaf -AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836c85e98e3b2c633818c286992d32a68c0b5ff SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6 +AUX nginx.conf-r4 1359 RMD160 472f54bcca4a351ed7300bd7f31ceb8c64d6a866 SHA1 b87f5fc0daa61ffd27f112f29ccd1eb409681383 SHA256 50ddb332bd3374ac5879c58ed531c395e269523a3b8e1c950fe9bda4ce087c9c AUX nginx.init-r2 1657 RMD160 a42538ae12cccfad1108fe2fca387ec666f4fd85 SHA1 7a0706894bed322d8b5814de98bca56d48c458d0 SHA256 9fceee69794de55b6da24ff2d11c72f6bc86339e7088c644b165dc35a9d5afa1 AUX nginx.logrotate 332 RMD160 65314d1b78142f3653e98e0c2cdff9deec69fd77 SHA1 c6b218d9c4588eb8fd51fe32b9692c39d6138c2b SHA256 eec16aa176ade9d6c428ce5979f6bace1dd2ad5ba609ae22279a57f154e08497 +AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 SHA1 1f9e2df74069a8d863e850a0e7e13bd0e8fc8fcb SHA256 42b5221b418df055cd51d03057d92fb93c4f1bbca56a1ea35cc6f5c5d9e1953d DIST nginx-0.7.64.tar.gz 601601 RMD160 88c982dc88a91db3337c1ab74d7a41d503736366 SHA1 e4f71b9a908c23c3d7bfeb63e97c7f85c3d6eed7 SHA256 5705d08af78add2979f566981c86d59f854b0dd350ac09df87c1f55a6846fbcd DIST nginx-0.7.65.tar.gz 604451 RMD160 c03386b135ec4d72d2997b19ea70b28aeaa7a6da SHA1 f2dcc8e015903ff1277e6fa427f9b7911c4f35ce SHA256 c9f0ccaf5a09b01edf991f3adde8fced9361965838c0982112fa5c92aa2ec33a DIST nginx-0.8.33.tar.gz 620448 RMD160 3ab3ea6d07fcac74465dbf40af824fccfd7f5fdd SHA1 bf3e3ab90609a62e8896f49895c3f4b4fa308270 SHA256 4366fa657a31f841944498c55bed3f2d18abeaeee4114873f3087033d629074e DIST nginx-0.8.34.tar.gz 621534 RMD160 9472f7d2b7b456d54fdc8e4c8dcb35e6531d4a67 SHA1 bf9a291ee7c20ea6aca4e785af59c8b662ec1d24 SHA256 f7cf3bcd0dcd3473ebff76aeee12974112d035737a2fc7f38b0a190f3a2949f6 +DIST passenger-2.2.11.tar.gz 2058085 RMD160 54ee5ab25155adaf4b6be9dc0aee190a323254e5 SHA1 9c38d364f59cb72c14a2f4c22445252468f08c4e SHA256 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88 EBUILD nginx-0.7.64-r3.ebuild 3772 RMD160 4127fbd10f4da093a2a76498b00e708316a9f468 SHA1 19f5b4a4c27f3fbd7de8b97164a0fe805ad4718a SHA256 5593770c57b6b0eb19db70d142a93008037f96a8088026fd0beccde83d789f49 EBUILD nginx-0.7.64.ebuild 3245 RMD160 9580efc23f6e93cf2dcaef7829430f5bef7fba34 SHA1 9a037fadcc97933c686333fc573a5b6b38c26e9c SHA256 5a84ba4b1c435d77ad22ee60b2905afa91298e67c9e28585be1ad639349c97dd EBUILD nginx-0.7.65.ebuild 3769 RMD160 21659d016eec875f7d2071a9d4379347dc09a403 SHA1 6569d70d1cfecee192bc14eda6d68455c87a6886 SHA256 8231131d09cc5c86ad3f5fe4ca93c327298f9317d8425fa42f707c0c3d8939a6 EBUILD nginx-0.8.33.ebuild 4152 RMD160 d85478366d822eadebc13ed51d177dfae568568a SHA1 489c95051272d42251e515e7e1dd6f9170d41340 SHA256 d18facb0b50a4a847f4269dbe932281b0574ac273189f11adf43748457469805 +EBUILD nginx-0.8.34-r1.ebuild 7048 RMD160 e90e7603e2162ee63c25ad9b7a1e110ea01281c4 SHA1 88fc0d6b3a59b7feea8fc13e53d1c7ca63f7244c SHA256 6d203b1785de69c298c35f87e82f688ca2dfc112b1db91d4a3a1488d71999e29 EBUILD nginx-0.8.34.ebuild 4152 RMD160 ae12f98f0fd32e51eb8575e79b81c39ec20ca5f3 SHA1 5c901efda028acf5197584eca2d501dd50b2dad7 SHA256 c0dbfed1c5a99da10f8770aa88a69dfcdcca5151177e68e24c969dcea78265d9 -MISC ChangeLog 40159 RMD160 3f489bbd9be6739d5ae3cf41eeee65e4f8805085 SHA1 7515583cf49e6b1a4a9bd4f8a370f846f47fce6c SHA256 1804541f354fd0b830869b56e942e8b1c78ed6d536243ff43dd628301a615c21 -MISC metadata.xml 1052 RMD160 8f721efebf770f4545b7c5441e9adfccd64492f0 SHA1 d34d5bd8a2e4cc937ea322ec42e65b78fa667c19 SHA256 dd7227b9912c1ac73cf34436bcfefd2229b3fcc11e9e9cb0afc8efb4ba0e458a +MISC ChangeLog 40422 RMD160 6ef7575e79b89fa0d1a7985e387b5ce239b3190f SHA1 da5d4b7e00f0c30490cc52d82292e75a1d9c9eba SHA256 cbe1038c391f26617a47b6e729ed356b9cb101e9797f72b463b40c8f84b8d567 +MISC metadata.xml 1246 RMD160 baac8cab28c7b294177c196c561e2e4f8d2c68f6 SHA1 b3f56a79119971794a98bd203181beef1adeeb5a SHA256 f829823aa08d646458ef8c4426ba4d56cd8a8105497dfb663b0a448ca66efbd9 diff --git a/www-servers/nginx/files/nginx.conf-r4 b/www-servers/nginx/files/nginx.conf-r4 index 117c2e55345f..f8c10f27b50a 100644 --- a/www-servers/nginx/files/nginx.conf-r4 +++ b/www-servers/nginx/files/nginx.conf-r4 @@ -9,64 +9,64 @@ events { } http { - include /etc/nginx/mime.types; - default_type application/octet-stream; + include /etc/nginx/mime.types; + default_type application/octet-stream; log_format main '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $bytes_sent ' + '"$request" $status $bytes_sent ' '"$http_referer" "$http_user_agent" ' '"$gzip_ratio"'; - - client_header_timeout 10m; - client_body_timeout 10m; - send_timeout 10m; - connection_pool_size 256; - client_header_buffer_size 1k; - large_client_header_buffers 4 2k; - request_pool_size 4k; + client_header_timeout 10m; + client_body_timeout 10m; + send_timeout 10m; + + connection_pool_size 256; + client_header_buffer_size 1k; + large_client_header_buffers 4 2k; + request_pool_size 4k; gzip on; - gzip_min_length 1100; - gzip_buffers 4 8k; - gzip_types text/plain; + gzip_min_length 1100; + gzip_buffers 4 8k; + gzip_types text/plain; - output_buffers 1 32k; - postpone_output 1460; + output_buffers 1 32k; + postpone_output 1460; - sendfile on; - tcp_nopush on; - tcp_nodelay on; + sendfile on; + tcp_nopush on; + tcp_nodelay on; - keepalive_timeout 75 20; + keepalive_timeout 75 20; - ignore_invalid_headers on; + ignore_invalid_headers on; index index.html; server { - listen 127.0.0.1; - server_name localhost; + listen 127.0.0.1; + server_name localhost; - access_log /var/log/nginx/localhost.access_log main; - error_log /var/log/nginx/localhost.error_log info; + access_log /var/log/nginx/localhost.access_log main; + error_log /var/log/nginx/localhost.error_log info; root /var/www/localhost/htdocs; } - ##ssl portion - # server { - # listen 127.0.0.1:443; - # server_name localhost; - # - # ssl on; - # ssl_certificate /etc/ssl/nginx/nginx.pem; - # ssl_certificate_key /etc/ssl/nginx/nginx.key; - # - # access_log /var/log/nginx/localhost.ssl_access_log main; - # error_log /var/log/nginx/localhost.ssl_error_log info; - # - # root /var/www/localhost/htdocs; - # } + # SSL example + #server { + # listen 127.0.0.1:443; + # server_name localhost; + + # ssl on; + # ssl_certificate /etc/ssl/nginx/nginx.pem; + # ssl_certificate_key /etc/ssl/nginx/nginx.key; + + # access_log /var/log/nginx/localhost.ssl_access_log main; + # error_log /var/log/nginx/localhost.ssl_error_log info; + + # root /var/www/localhost/htdocs; + #} } diff --git a/www-servers/nginx/files/passenger-CFLAGS.patch b/www-servers/nginx/files/passenger-CFLAGS.patch new file mode 100644 index 000000000000..bdc848a3cd72 --- /dev/null +++ b/www-servers/nginx/files/passenger-CFLAGS.patch @@ -0,0 +1,15 @@ +--- Rakefile.org 2009-10-15 18:45:30.000000000 +0100 ++++ Rakefile 2009-10-16 12:17:25.000000000 +0100 +@@ -39,11 +39,7 @@ + CC = "gcc" + CXX = "g++" + LIBEXT = PlatformInfo.library_extension +-if OPTIMIZE +- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS" +-else +- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS" +-end ++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG -DBOOST_DISABLE_ASSERTS" + + # 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. diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml index 099201435771..6acb50871999 100644 --- a/www-servers/nginx/metadata.xml +++ b/www-servers/nginx/metadata.xml @@ -13,14 +13,17 @@ Enables HTTP addition filter module Enables file AIO support Enables special processing module for flv files - Enables support for gzipping static content + Enable HTTP core support + Enable HTTP cache support + Use libatomic instead of builtin atomic operations Enables POP3 proxy support Enables HTTP random index module - Enables SMTP proxy support + Enables realip module Enable HTTP secure link module + Enables SMTP proxy support + Enables support for gzipping static content Enables stub_status module Enables sub_filter module - Enables realip module Enable webdav support diff --git a/www-servers/nginx/nginx-0.8.34-r1.ebuild b/www-servers/nginx/nginx-0.8.34-r1.ebuild new file mode 100644 index 000000000000..be31c0397061 --- /dev/null +++ b/www-servers/nginx/nginx-0.8.34-r1.ebuild @@ -0,0 +1,260 @@ +# 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.34-r1.ebuild,v 1.1 2010/03/07 10:43:37 hollow Exp $ + +EAPI="2" + +USE_RUBY="ruby18" +RUBY_OPTIONAL="yes" +PASSENGER_PV="2.2.11" + +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/" +SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz + nginx_modules_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )" + +LICENSE="BSD" +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" + +IUSE="aio debug +http +http-cache ipv6 libatomic 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=">=dev-libs/libpcre-4.2 + arm? ( dev-libs/libatomic_ops ) + 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_perl? ( >=dev-lang/perl-5.8 ) + 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="${RDEPEND} ${CDEPEND}" +DEPEND="${DEPEND} ${CDEPEND} + 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 "Please do not file bug reports!" + fi + + if use nginx_modules_passenger; then + ruby-ng_pkg_setup + use debug && append-flags -DPASSENGER_DEBUG + 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_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" + + # 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 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 \ + --with-pcre \ + ${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{,.ru} README + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate nginx + + if use nginx_modules_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_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 +} -- 2.26.2