From e0e352e8155763325c55d517e65014083715bde6 Mon Sep 17 00:00:00 2001 From: "Konstantin V. Arkhipov" Date: Sun, 23 Aug 2009 13:55:52 +0000 Subject: * bump Package-Manager: portage-2.2_rc39/cvs/Linux x86_64 --- www-servers/nginx/ChangeLog | 8 ++- www-servers/nginx/Manifest | 12 ++-- www-servers/nginx/nginx-0.8.8.ebuild | 116 ----------------------------------- www-servers/nginx/nginx-0.8.9.ebuild | 116 +++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 123 deletions(-) delete mode 100644 www-servers/nginx/nginx-0.8.8.ebuild create mode 100644 www-servers/nginx/nginx-0.8.9.ebuild (limited to 'www-servers/nginx') diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 6c81e8988e9f..3815c3f1ffc0 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.221 2009/08/10 09:47:56 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.222 2009/08/23 13:55:52 voxus Exp $ + +*nginx-0.8.9 (23 Aug 2009) + + 23 Aug 2009; Konstantin V. Arkhipov + -nginx-0.8.8.ebuild, +nginx-0.8.9.ebuild: + Version bump. *nginx-0.8.8 (10 Aug 2009) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 8b50bbfa2c77..7025341d4302 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -17,7 +17,7 @@ DIST nginx-0.5.37.tar.gz 490028 RMD160 7314477c63d8fecb0b81a97230afe0e47dde7978 DIST nginx-0.6.38.tar.gz 528956 RMD160 9ecb90e31b9576b597786bfdfb8906a1a662ea9b SHA1 9857211846200b2edc3461f6621c659e249c7a7c SHA256 4e391b79021a94c9866c30601d8d4d3a4d86a937b5db806c20a412e09177a737 DIST nginx-0.7.61.tar.gz 594817 RMD160 dfc1a8e03789cd85314ceacb1cd99f277b7ec0af SHA1 4d9b3ac6c108ab00723272dc455647c8c2486526 SHA256 60cb23f38bda93e3bdaa554826b06bc0abf807d2e4352d856c49bd802a3f05d1 DIST nginx-0.8.4.tar.gz 595288 RMD160 0c2332c8d0680bd04b6af427e3cbccc42d1876d0 SHA1 828ebb4ef1e7f9b80cbe6a6a42adaf180cd777ec SHA256 ffabf25ac25f8d871c7d6034baad1e991a36223fd755436547e59239621732ed -DIST nginx-0.8.8.tar.gz 598267 RMD160 86b6abaac64af8afbd0da453e83c92667ad50813 SHA1 915c6aa3d7044bb60da54b3b214cf1fdb521d57a SHA256 29b0d44de637a6a5584a59bcabf0cd3cd0bb7fd8a58cc40120e43a00cea3586e +DIST nginx-0.8.9.tar.gz 598789 RMD160 d3ce660d5c8b9e99c41c3792ea715f723f71a34a SHA1 30fd8c28684df3bf7194c9efa5144d7884c3b77b SHA256 3f94f8aa86796765a50c42a3a338e504bbc25434063d7b87fd26772a568e6a58 EBUILD nginx-0.1.45.ebuild 1935 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f SHA1 bf8840d9be7e7f824d86bfca8846e227a40810ba SHA256 f81dfd0f45c9ba301b5f9ebffab11508d3dcdb468ab1b023270a74ee1a1c0217 EBUILD nginx-0.2.6.ebuild 1934 RMD160 72631cd248e54aec3dfb527bf024675703e1d1d5 SHA1 ceb626e76f4af89bc6ffbe840f0ba21366274449 SHA256 ec4a8c3fa5f8917e96042d464ee1ed55420a78e69b0ee98f69e796712aadbc78 EBUILD nginx-0.3.61.ebuild 2293 RMD160 c69d8e9a62080102ba1de7c1118f19a7c7534085 SHA1 d8ae1bb493c0a5b985b2f182ccdec034483f6008 SHA256 3628f10c208261db081487f8e05442bba48feaaa0df2c15766bcd32148ff568c @@ -27,13 +27,13 @@ EBUILD nginx-0.6.38.ebuild 3060 RMD160 56a00c95e0b45093147d11e188fdc0c16b2f1ff2 EBUILD nginx-0.7.61.ebuild 3261 RMD160 b12e46480f3a1fe714db5270a2a95376cb0684c3 SHA1 da46085272c864c2c23b7fda160033ddd4208d77 SHA256 429de38daad8cfcc32662e4737a481975ada406d8e628194e9f975ad4174b98e EBUILD nginx-0.8.4-r1.ebuild 3647 RMD160 c612f9fbbed9fd8402d95ba4a36d1b40f6eb31f4 SHA1 d7b6f7ede7cb6a9086d147f92e4ceaac75688a8c SHA256 7b3ae9527f2875b1e70ce7d7bcde2fa853aa3bdf90d541e67b39032a2dce2971 EBUILD nginx-0.8.4.ebuild 3262 RMD160 28ea88d2decadf55ffb12bf0a6688788f666dec4 SHA1 e9f51f17b406e3ae41cdae698c16b0a479071c77 SHA256 1efb4f0aa40c6d7c5b26efe165d16ff39f4692e7b762125375c8011211d8cf33 -EBUILD nginx-0.8.8.ebuild 3592 RMD160 eda9df6fcf3b315f0a819b74361f0647db0ac11a SHA1 19077ce4fff17fb1febbd03f58e991fea831c43c SHA256 5b4db864f929ba2fe41a3a16d161a85de857d6a773c5e55806ac4fb3b9915c39 -MISC ChangeLog 35781 RMD160 25d0a1c72ecabefc08038ab30714c368e1a8096e SHA1 6b7c370817bf6c1db9eaee4cec8f7c1042a4446e SHA256 e4defe57a21f37b8d3746c969194b14a392e353fcf9a376ccb5f74a1cdf4b16d +EBUILD nginx-0.8.9.ebuild 3592 RMD160 c01b8748f0b70bf138521f9b78acd27e265b9bb8 SHA1 5b75d3405ebb29499b9edc71ada4c7d52c281a90 SHA256 1fd97043d24953b469a01ee8a5e6101e4d56574202112da982ce76914c3a4b96 +MISC ChangeLog 35927 RMD160 31e7fc76fe3e54b19afa64bc50a4ebb84e179b15 SHA1 42055bde204c4c61fc5b5539dab3b5272dd78343 SHA256 d79f7f46e8ea328f14999be6025f290dbe88cd2b8f02bd58af78ec5d2c5e8e45 MISC metadata.xml 658 RMD160 7294560d00411e37fcc73d1d93f0582f7991b380 SHA1 85d04bdf906447f68042f21c12b18016059c0371 SHA256 e73d513e05935ab2dceb674477ff4ff70e39e48171782e0882a2a44993f01ce8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkqBg04ACgkQbwxeDFj+ScovxQCgsvm5PoMJphF6/fTDNkb8LRTB -d6YAoI2sKXM9VIuLtos+fLcEgn6pesB9 -=5QUV +iEYEARECAAYFAkqRSnQACgkQbwxeDFj+ScqilgCfQsO6RpxYGha1JEEhpvA6NI+U +BVwAn2ZJ9JkWM9eKyjfQgyC86pJi8if6 +=XRKG -----END PGP SIGNATURE----- diff --git a/www-servers/nginx/nginx-0.8.8.ebuild b/www-servers/nginx/nginx-0.8.8.ebuild deleted file mode 100644 index 04dc888e1c3a..000000000000 --- a/www-servers/nginx/nginx-0.8.8.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.8.ebuild,v 1.2 2009/08/11 14:42:12 voxus Exp $ - -inherit eutils ssl-cert toolchain-funcs - -DESCRIPTION="Robust, small and high performance http and reverse proxy server" - -HOMEPAGE="http://nginx.net/" -SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib" - -DEPEND="dev-lang/perl - pcre? ( >=dev-libs/libpcre-4.2 ) - ssl? ( dev-libs/openssl ) - zlib? ( sys-libs/zlib ) - perl? ( >=dev-lang/perl-5.8 )" - -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 -} - -src_unpack() { - unpack ${A} - sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die -} - -src_compile() { - local myconf - - # threads support is broken atm. - # - # if use threads; then - # einfo - # ewarn "threads support is experimental at the moment" - # ewarn "do not use it on production systems - you've been warned" - # einfo - # myconf="${myconf} --with-threads" - # fi - - use addition && myconf="${myconf} --with-http_addition_module" - use ipv6 && myconf="${myconf} --with-ipv6" - use fastcgi || myconf="${myconf} --without-http_fastcgi_module" - use fastcgi && myconf="${myconf} --with-http_realip_module" - use flv && myconf="${myconf} --with-http_flv_module" - use zlib || myconf="${myconf} --without-http_gzip_module" - use pcre || { - myconf="${myconf} --without-pcre --without-http_rewrite_module" - } - use debug && myconf="${myconf} --with-debug" - use ssl && myconf="${myconf} --with-http_ssl_module" - use imap && myconf="${myconf} --with-imap" # pop3/imap4 proxy support - use perl && myconf="${myconf} --with-http_perl_module" - use status && myconf="${myconf} --with-http_stub_status_module" - use webdav && myconf="${myconf} --with-http_dav_module" - use sub && myconf="${myconf} --with-http_sub_module" - use random-index && myconf="${myconf} --with-http_random_index_module" - use securelink && myconf="${myconf} --with-http_secure_link_module" - - tc-export CC - ./configure \ - --prefix=/usr \ - --conf-path=/etc/${PN}/${PN}.conf \ - --http-log-path=/var/log/${PN}/access_log \ - --error-log-path=/var/log/${PN}/error_log \ - --pid-path=/var/run/${PN}.pid \ - --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-md5-asm --with-md5=/usr/include \ - --with-sha1-asm --with-sha1=/usr/include \ - ${myconf} || die "configure failed" - - emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile" -} - -src_install() { - keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} - - dosbin objs/nginx - cp "${FILESDIR}"/nginx-r1 "${T}"/nginx - doinitd "${T}"/nginx - - cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf - - dodir /etc/${PN} - insinto /etc/${PN} - doins conf/* - - dodoc CHANGES{,.ru} README - - use perl && { - cd "${S}"/objs/src/http/modules/perl/ - einstall DESTDIR="${D}"|| die "failed to install perl stuff" - } -} - -pkg_postinst() { - use ssl && { - 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 - } -} diff --git a/www-servers/nginx/nginx-0.8.9.ebuild b/www-servers/nginx/nginx-0.8.9.ebuild new file mode 100644 index 000000000000..716955e5648a --- /dev/null +++ b/www-servers/nginx/nginx-0.8.9.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.9.ebuild,v 1.1 2009/08/23 13:55:52 voxus Exp $ + +inherit eutils ssl-cert toolchain-funcs + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" + +HOMEPAGE="http://nginx.net/" +SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib" + +DEPEND="dev-lang/perl + pcre? ( >=dev-libs/libpcre-4.2 ) + ssl? ( dev-libs/openssl ) + zlib? ( sys-libs/zlib ) + perl? ( >=dev-lang/perl-5.8 )" + +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 +} + +src_unpack() { + unpack ${A} + sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die +} + +src_compile() { + local myconf + + # threads support is broken atm. + # + # if use threads; then + # einfo + # ewarn "threads support is experimental at the moment" + # ewarn "do not use it on production systems - you've been warned" + # einfo + # myconf="${myconf} --with-threads" + # fi + + use addition && myconf="${myconf} --with-http_addition_module" + use ipv6 && myconf="${myconf} --with-ipv6" + use fastcgi || myconf="${myconf} --without-http_fastcgi_module" + use fastcgi && myconf="${myconf} --with-http_realip_module" + use flv && myconf="${myconf} --with-http_flv_module" + use zlib || myconf="${myconf} --without-http_gzip_module" + use pcre || { + myconf="${myconf} --without-pcre --without-http_rewrite_module" + } + use debug && myconf="${myconf} --with-debug" + use ssl && myconf="${myconf} --with-http_ssl_module" + use imap && myconf="${myconf} --with-imap" # pop3/imap4 proxy support + use perl && myconf="${myconf} --with-http_perl_module" + use status && myconf="${myconf} --with-http_stub_status_module" + use webdav && myconf="${myconf} --with-http_dav_module" + use sub && myconf="${myconf} --with-http_sub_module" + use random-index && myconf="${myconf} --with-http_random_index_module" + use securelink && myconf="${myconf} --with-http_secure_link_module" + + tc-export CC + ./configure \ + --prefix=/usr \ + --conf-path=/etc/${PN}/${PN}.conf \ + --http-log-path=/var/log/${PN}/access_log \ + --error-log-path=/var/log/${PN}/error_log \ + --pid-path=/var/run/${PN}.pid \ + --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-md5-asm --with-md5=/usr/include \ + --with-sha1-asm --with-sha1=/usr/include \ + ${myconf} || die "configure failed" + + emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile" +} + +src_install() { + keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} + + dosbin objs/nginx + cp "${FILESDIR}"/nginx-r1 "${T}"/nginx + doinitd "${T}"/nginx + + cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf + + dodir /etc/${PN} + insinto /etc/${PN} + doins conf/* + + dodoc CHANGES{,.ru} README + + use perl && { + cd "${S}"/objs/src/http/modules/perl/ + einstall DESTDIR="${D}"|| die "failed to install perl stuff" + } +} + +pkg_postinst() { + use ssl && { + 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 + } +} -- cgit v1.2.3-65-gdbad