diff options
Diffstat (limited to 'www-servers/nginx')
| -rw-r--r-- | www-servers/nginx/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/nginx/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.0.0.ebuild | 309 |
3 files changed, 318 insertions, 2 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 6ab4f76b1ee4..659a1b0c128b 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.275 2011/04/08 08:32:19 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.276 2011/04/12 11:32:57 hollow Exp $ + +*nginx-1.0.0 (12 Apr 2011) + + 12 Apr 2011; Benedikt Böhm <hollow@gentoo.org> +nginx-1.0.0.ebuild: + version bump *nginx-0.9.7 (08 Apr 2011) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index b299c7d59a14..18a203f180a8 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -7,6 +7,7 @@ AUX passenger-3.0.1-missing-include.patch 340 RMD160 5e314c6ec809a37c898eed9166a AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 SHA1 1f9e2df74069a8d863e850a0e7e13bd0e8fc8fcb SHA256 42b5221b418df055cd51d03057d92fb93c4f1bbca56a1ea35cc6f5c5d9e1953d DIST nginx-0.8.53.tar.gz 649835 RMD160 2af0c8e108a68a3936aeca646d33ceaf0f1d56c8 SHA1 9bf78f55ef41aa54ab1c5caad94756d8e3e13aec SHA256 8ab8a87beb555d9ea09fe61d0de86a71ea4e90ef7970df0d38f7acfb9bed6dcf DIST nginx-0.9.7.tar.gz 654522 RMD160 21f6fde8da9c1a2e59210736fe0af6305a131a90 SHA1 f15de07a3aa59705f47828e958191fd5a0c8009e SHA256 2feb0acee473cc360a620ee862907b9570a4121956c40cbd27da35f5b0a96045 +DIST nginx-1.0.0.tar.gz 654760 RMD160 66a4c62163143c8f12a8e71119efc27e4862862e SHA1 1fc6e4b9ac0c709b6c1269dc44080b512aecd3e7 SHA256 3de3d6caeed56751c24ebc5cfb03475620b9eb0fa999c766a01d44dca674c001 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe DIST nginx_upload_module-2.2.0.tar.gz 25796 RMD160 5734af837be3fe8ec444a7e5e7f6707118594098 SHA1 93d6e83e613a0ce2ed057a434b344fa1b6609b47 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 DIST ngx-http-headers-more-0.13.tar.gz 76271 RMD160 b11fbdf8e6fba5327fedd22e517da36340ec2473 SHA1 29def6aa44faf906d3c400b6379d6dd65d959590 SHA256 52e2cb3b81327e9225cfa87291b93dd96b798702f8e3b0f20f06d38850fc2629 @@ -16,5 +17,6 @@ DIST passenger-3.0.1.tar.gz 2958200 RMD160 abf9d25c1d91ba44e6468f186d0e9d2569428 EBUILD nginx-0.8.53-r1.ebuild 10606 RMD160 64a2971e97c42a1168bb1885a4745d51e29fa624 SHA1 26fbe692b561528e4fe8264ac2091a0c203a259d SHA256 c9f6d6f7e087b5624e073acc70fd7b64c3351483d0ecd28429b2a980fa70f5f6 EBUILD nginx-0.8.53.ebuild 9995 RMD160 28f8c8fdf47322ecd0bceab07804a1d2f0f4a433 SHA1 7111e7a41e5aba26ae31e854747982be77487e8c SHA256 a9eb0c9e7c0e9020a78645b119287807b4af8aae55d8097d9e74702fd690217f EBUILD nginx-0.9.7.ebuild 9745 RMD160 e7b5422521b541ecabf93f131a035613a42456cd SHA1 a43f4efc0d78b1649f786cb668658ed256d84aeb SHA256 4d12a5949402396ff5e1cbbb6147d6085f9ef8f34b289d97ae75309a541e3c05 -MISC ChangeLog 45081 RMD160 a4d820b7c0a769f850a8177864d029a3ea3bb10a SHA1 a70b8932ec215ca316d2c9ccc4317e730b076ec8 SHA256 f93ba0bca74795098c42481e2bfe7b7599643e99b5ff7b20b213ac4cb181a8e5 +EBUILD nginx-1.0.0.ebuild 9745 RMD160 33c952be70ae5c93a57a3dbf5daa49b8c2467a9e SHA1 1f44c5aa2d9bdd9e92ad8fe582682fefbbdea8b8 SHA256 845d5464d4280cd598f3906b0fce53db640e188e0e2d715c2deb003eaeac1c77 +MISC ChangeLog 45196 RMD160 0d29eec232c5fb4f11e8aa27a2256348aeebdf5b SHA1 5dc00d0374be768f315fc0da7ef3fbf1da495d1d SHA256 6c2a572fa954ab3d05556a71ce7906498ca14c34cfbc97bcf095cd360bc396b0 MISC metadata.xml 2073 RMD160 dd8f21a8f94ca8b389ebb2b83d013eb83fe67306 SHA1 79ac4df824bff0fcd19d88ebe240a9298252013f SHA256 0183071f017364c24b37714a7e5fa4e10c5d55384815e3df2fd96130046b09c3 diff --git a/www-servers/nginx/nginx-1.0.0.ebuild b/www-servers/nginx/nginx-1.0.0.ebuild new file mode 100644 index 000000000000..5c61da021734 --- /dev/null +++ b/www-servers/nginx/nginx-1.0.0.ebuild @@ -0,0 +1,309 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0.ebuild,v 1.1 2011/04/12 11:32:57 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_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_push (http://pushmodule.slact.net/, MIT license) +HTTP_PUSH_MODULE_PV="0.692" +HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" + +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="1.2" +HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" + +# HTTP Upload module from Valery Kholodkov +# (http://www.grid.net.ru/nginx/upload.en.html, BSD license) +HTTP_UPLOAD_MODULE_PV="2.2.0" +HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" + +inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="http://nginx.net/ + 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_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 ) + nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_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 +http_upload" + +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 )" +RDEPEND="${CDEPEND}" +DEPEND="${CDEPEND} + arm? ( dev-libs/libatomic_ops ) + libatomic? ( dev-libs/libatomic_ops )" +PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" + +pkg_setup() { + if use nginx_modules_http_passenger; then + einfo + einfo "Passenger support has been removed from the nginx ebuild to" + einfo "get rid of file collisions, its broken build system and" + einfo "incompatibilities between passenger 2 and 3." + einfo + einfo "Please switch to passenger-3 standalone or use the" + einfo "unicorn gem which provides a sane nginx-like architecture" + einfo "out of the box." + einfo + einfo "For more information on sane ruby deployments with" + einfo "passenger-3/unicorn go to:" + einfo + einfo "https://rvm.beginrescueend.com" + einfo + die "nginx_modules_http_passenger still in IUSE" + fi + + 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 !http; then + ewarn "To actually disable all http-functionality you also have to disable" + ewarn "all nginx http modules." + fi +} + +src_prepare() { + sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make +} + +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_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 nginx_modules_http_upload; then + http_enabled=1 + myconf="${myconf} --add-module=${WORKDIR}/${HTTP_UPLOAD_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 + + # https://bugs.gentoo.org/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() { + # https://bugs.gentoo.org/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/* + + doman man/nginx.8 + 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_upload; then + docinto ${HTTP_UPLOAD_MODULE_P} + dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README} + 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 +} |