From 4e11be33ce181df880b67e1c1a70fc39a7c3262b Mon Sep 17 00:00:00 2001 From: "Konstantin V. Arkhipov" Date: Sun, 29 May 2005 14:30:28 +0000 Subject: 0.1.34 goes stable (Portage version: 2.0.51.22-r1) --- www-servers/nginx/ChangeLog | 7 ++- www-servers/nginx/Manifest | 17 ++--- www-servers/nginx/files/digest-nginx-0.1.28-r2 | 1 - www-servers/nginx/files/digest-nginx-0.1.33-r1 | 1 - www-servers/nginx/files/nginx | 5 +- www-servers/nginx/files/nginx.conf | 5 +- www-servers/nginx/nginx-0.1.28-r2.ebuild | 84 ------------------------- www-servers/nginx/nginx-0.1.33-r1.ebuild | 86 -------------------------- www-servers/nginx/nginx-0.1.34.ebuild | 4 +- 9 files changed, 18 insertions(+), 192 deletions(-) delete mode 100644 www-servers/nginx/files/digest-nginx-0.1.28-r2 delete mode 100644 www-servers/nginx/files/digest-nginx-0.1.33-r1 delete mode 100644 www-servers/nginx/nginx-0.1.28-r2.ebuild delete mode 100644 www-servers/nginx/nginx-0.1.33-r1.ebuild (limited to 'www-servers/nginx') diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 4a1ef1d5f3a8..ba5b517a3f2a 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.27 2005/05/27 07:33:58 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.28 2005/05/29 14:30:28 voxus Exp $ + + 29 May 2005; Konstantin Arkhipov -nginx-0.1.28-r2.ebuild, + -nginx-0.1.33-r1.ebuild, files/nginx, files/nginx.conf, nginx-0.1.34.ebuild: + Forcing 0.1.34 stable on x86 and amd64. Added checkconf to start/stop/reload + in init-script. Fixed default configuration. *nginx-0.1.34 (27 May 2005) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 8ef2395afbb1..ba5866bd0332 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,15 +1,6 @@ -MD5 14414925f8c45ff6c60b73e24052b87f nginx-0.1.33-r1.ebuild 2147 -MD5 0b612ee125685634d4e80df6e302d442 nginx-0.1.28-r2.ebuild 2082 -MD5 3211f0c2f030686ccd81a0ce26e985ed nginx-0.1.34.ebuild 2075 -MD5 9c4548378ef1a20683dfb3e1c3c5929d ChangeLog 4938 +MD5 7b488ae03c5e76fe0e266284b8a425a7 nginx-0.1.34.ebuild 2073 +MD5 de896bfd4783a284b4a48ec1b09a5ffe ChangeLog 5223 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220 MD5 b4e5149fed4a89f9561a32a8245dd1a7 files/digest-nginx-0.1.34 64 -MD5 8c7b8c93f0c4048d83df9cdc31d86e1b files/nginx 922 -MD5 97d5db2450a9a9c85ff02614b9352b9b files/nginx-0.1.33-large_ssi_includes.patch 949 -MD5 964b96268e483e663e4ea13d03320185 files/digest-nginx-0.1.28-r2 64 -MD5 583f1973d39fec70c44090b71125f1e2 files/digest-nginx-0.1.33-r1 64 -MD5 a7b2073cd531459fc68972b181018465 files/nginx-0.1.29-500_bytes_long.patch 402 -MD5 f836e5e56bd706ef144644e345f35c8a files/nginx-0.1.33-set_header_range.patch 473 -MD5 148b61099c94cfc02add671522699a48 files/nginx-0.1.28-bad_backend_header.patch 656 -MD5 b3342c18a1880b574cbe4458560019c6 files/nginx.conf 1445 -MD5 c7b08f10d672ae9fa9f09c4b7439b5be files/nginx-0.1.29-ignore_invalid_headers.patch 3579 +MD5 5c2115e59a63434caea0583991ee8145 files/nginx 994 +MD5 fecedd05099122b1f8169152e5bc9462 files/nginx.conf 1400 diff --git a/www-servers/nginx/files/digest-nginx-0.1.28-r2 b/www-servers/nginx/files/digest-nginx-0.1.28-r2 deleted file mode 100644 index a895eff9fe53..000000000000 --- a/www-servers/nginx/files/digest-nginx-0.1.28-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 48e44b94234ff04cc276f0814cee551d nginx-0.1.28.tar.gz 298412 diff --git a/www-servers/nginx/files/digest-nginx-0.1.33-r1 b/www-servers/nginx/files/digest-nginx-0.1.33-r1 deleted file mode 100644 index 47854ae75931..000000000000 --- a/www-servers/nginx/files/digest-nginx-0.1.33-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3139ab85d100cb3b46b5743419cbde0b nginx-0.1.33.tar.gz 294641 diff --git a/www-servers/nginx/files/nginx b/www-servers/nginx/files/nginx index 26fca0e76f82..7cafac89fb76 100644 --- a/www-servers/nginx/files/nginx +++ b/www-servers/nginx/files/nginx @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx,v 1.2 2005/03/02 17:34:40 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx,v 1.3 2005/05/29 14:30:28 voxus Exp $ opts="${opts} reload configtest" @@ -11,6 +11,7 @@ depend() { } start() { + configtest || return 1 ebegin "Starting nginx" start-stop-daemon --start --pidfile /var/run/nginx.pid \ --exec /usr/sbin/nginx -- -c /etc/nginx/nginx.conf @@ -18,6 +19,7 @@ start() { } stop() { + configtest || return 1 ebegin "Stopping nginx" start-stop-daemon --stop --pidfile /var/run/nginx.pid eend $? "Failed to stop nginx" @@ -25,6 +27,7 @@ stop() { } reload() { + configtest || return 1 ebegin "Refreshing nginx' configuration" kill -HUP `cat /var/run/nginx.pid` &>/dev/null eend $? "Failed to reload nginx" diff --git a/www-servers/nginx/files/nginx.conf b/www-servers/nginx/files/nginx.conf index 9b2b82a9a802..526dd2ef3ca1 100644 --- a/www-servers/nginx/files/nginx.conf +++ b/www-servers/nginx/files/nginx.conf @@ -2,7 +2,7 @@ user apache apache; worker_processes 5; -error_log /var/log/nginx/error_log; +error_log /var/log/nginx/error_log warn; events { connections 2048; @@ -13,8 +13,7 @@ http { default_type application/octet-stream; log_format main '%addr - - [%time] "%request" %status ' - '%length "%{Referer}i" "%{User-Agent}i" ' - '"%proxy" "%gzip_ratio"'; + '%length "%{Referer}i" "%{User-Agent}i" '; log_format download '%addr - - [%time] "%request" %status ' '%length "%{Referer}i" "%{User-Agent}i" ' diff --git a/www-servers/nginx/nginx-0.1.28-r2.ebuild b/www-servers/nginx/nginx-0.1.28-r2.ebuild deleted file mode 100644 index eed3ca2153f5..000000000000 --- a/www-servers/nginx/nginx-0.1.28-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.28-r2.ebuild,v 1.2 2005/05/13 10:41:07 voxus Exp $ - -inherit eutils - -DESCRIPTION="Robust, small and high performance http and reverse proxy server" - -HOMEPAGE="http://sysoev.ru/nginx/" -SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug fastcgi threads ssl zlib" - -DEPEND="dev-lang/perl - ssl? ( dev-libs/openssl ) - zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - cd ${S} && epatch ${FILESDIR}/${P}-bad_backend_header.patch -} - -src_compile() { - local myconf - - 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 fastcgi || myconf="${myconf} --without-http_fastcgi_module" - use zlib || myconf="${myconf} --without-http_gzip_module" - use debug && myconf="${myconf} --with-debug" - use ssl && myconf="${myconf} --with-http_ssl_module" - - cd ${S} && ./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 \ - ${myconf} || die "configure failed" - - emake || "failed to compile" -} - -src_install() { - cd ${S} || die - - dodir /var/log/${PN} - keepdir /var/log/${PN} - - dodir /var/tmp/${PN} - - dodir /var/tmp/${PN}/client - keepdir /var/tmp/${PN}/client - - dodir /var/tmp/${PN}/proxy - keepdir /var/tmp/${PN}/proxy - - dodir /var/tmp/${PN}/fastcgi - keepdir /var/tmp/${PN}/fastcgi - - dodir /etc/${PN} - - dosbin objs/nginx - doinitd ${FILESDIR}/nginx - - insinto /etc/${PN} - rm conf/nginx.conf - doins -r conf/* - doins ${FILESDIR}/nginx.conf - - dodoc CHANGES{,.ru} LICENSE README -} diff --git a/www-servers/nginx/nginx-0.1.33-r1.ebuild b/www-servers/nginx/nginx-0.1.33-r1.ebuild deleted file mode 100644 index fe09db819945..000000000000 --- a/www-servers/nginx/nginx-0.1.33-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.33-r1.ebuild,v 1.1 2005/05/26 16:00:17 voxus Exp $ - -inherit eutils - -DESCRIPTION="Robust, small and high performance http and reverse proxy server" - -HOMEPAGE="http://sysoev.ru/nginx/" -SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fastcgi pcre threads ssl zlib" - -DEPEND="dev-lang/perl - pcre? ( >=dev-libs/libpcre-4.2 ) - ssl? ( dev-libs/openssl ) - zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - cd ${S} && epatch ${FILESDIR}/${P}-* -} - -src_compile() { - local myconf - - 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 fastcgi || myconf="${myconf} --without-http_fastcgi_module" - use zlib || myconf="${myconf} --without-http_gzip_module" - use pcre || myconf="${myconf} --without-pcre" - use debug && myconf="${myconf} --with-debug" - use ssl && myconf="${myconf} --with-http_ssl_module" - - cd ${S} && ./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 \ - ${myconf} || die "configure failed" - - emake || "failed to compile" -} - -src_install() { - cd ${S} || die - - dodir /var/log/${PN} - keepdir /var/log/${PN} - - dodir /var/tmp/${PN} - - dodir /var/tmp/${PN}/client - keepdir /var/tmp/${PN}/client - - dodir /var/tmp/${PN}/proxy - keepdir /var/tmp/${PN}/proxy - - dodir /var/tmp/${PN}/fastcgi - keepdir /var/tmp/${PN}/fastcgi - - dodir /etc/${PN} - - dosbin objs/nginx - doinitd ${FILESDIR}/nginx - - insinto /etc/${PN} - rm conf/nginx.conf - doins -r conf/* - doins ${FILESDIR}/nginx.conf - - dodoc CHANGES{,.ru} LICENSE README -} diff --git a/www-servers/nginx/nginx-0.1.34.ebuild b/www-servers/nginx/nginx-0.1.34.ebuild index 89e9f5d1ac8f..a2c841f2dc99 100644 --- a/www-servers/nginx/nginx-0.1.34.ebuild +++ b/www-servers/nginx/nginx-0.1.34.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.34.ebuild,v 1.1 2005/05/27 07:33:58 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.34.ebuild,v 1.2 2005/05/29 14:30:28 voxus Exp $ inherit eutils @@ -10,7 +10,7 @@ HOMEPAGE="http://sysoev.ru/nginx/" SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug fastcgi pcre threads ssl zlib" DEPEND="dev-lang/perl -- cgit v1.2.3-65-gdbad