diff options
author | Dirkjan Ochtman <djc@gentoo.org> | 2010-01-03 20:07:50 +0000 |
---|---|---|
committer | Dirkjan Ochtman <djc@gentoo.org> | 2010-01-03 20:07:50 +0000 |
commit | dc3c134d853c9d0a6f8010e60afd109bbfa843db (patch) | |
tree | 776cf1336760c9dbe4fe2bd84181957c07d0a9a6 /www-servers/nginx | |
parent | Automated update of use.local.desc (diff) | |
download | gentoo-2-dc3c134d853c9d0a6f8010e60afd109bbfa843db.tar.gz gentoo-2-dc3c134d853c9d0a6f8010e60afd109bbfa843db.tar.bz2 gentoo-2-dc3c134d853c9d0a6f8010e60afd109bbfa843db.zip |
Clean up cruft in www-servers/nginx.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'www-servers/nginx')
-rw-r--r-- | www-servers/nginx/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/nginx/files/nginx | 40 | ||||
-rw-r--r-- | www-servers/nginx/files/nginx-secure-link-timeout.patch | 131 | ||||
-rw-r--r-- | www-servers/nginx/files/nginx.conf | 66 | ||||
-rw-r--r-- | www-servers/nginx/files/nginx.conf-r1 | 55 | ||||
-rw-r--r-- | www-servers/nginx/files/nginx.conf-r2 | 58 | ||||
-rw-r--r-- | www-servers/nginx/files/nginx.conf-r3 | 57 | ||||
-rw-r--r-- | www-servers/nginx/nginx-0.7.64-r1.ebuild | 117 | ||||
-rw-r--r-- | www-servers/nginx/nginx-0.8.17.ebuild | 116 |
9 files changed, 7 insertions, 641 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 6a88ea415fe2..8d1fa65cd594 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,12 @@ # 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.237 2010/01/03 19:51:40 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.238 2010/01/03 20:07:38 djc Exp $ + + 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.7.64-r1.ebuild, + -nginx-0.8.17.ebuild, -files/nginx, -files/nginx.conf, + -files/nginx.conf-r1, -files/nginx.conf-r2, -files/nginx.conf-r3, + -files/nginx-secure-link-timeout.patch: + Clean up all kinds of old, unused cruft. *nginx-0.7.64-r2 (03 Jan 2010) diff --git a/www-servers/nginx/files/nginx b/www-servers/nginx/files/nginx deleted file mode 100644 index 7cafac89fb76..000000000000 --- a/www-servers/nginx/files/nginx +++ /dev/null @@ -1,40 +0,0 @@ -#!/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.3 2005/05/29 14:30:28 voxus Exp $ - -opts="${opts} reload configtest" - -depend() { - need net - use dns logger -} - -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 - eend $? "Failed to start nginx" -} - -stop() { - configtest || return 1 - ebegin "Stopping nginx" - start-stop-daemon --stop --pidfile /var/run/nginx.pid - eend $? "Failed to stop nginx" - rm -f /var/run/nginx.pid -} - -reload() { - configtest || return 1 - ebegin "Refreshing nginx' configuration" - kill -HUP `cat /var/run/nginx.pid` &>/dev/null - eend $? "Failed to reload nginx" -} - -configtest() { - ebegin "Checking nginx' configuration" - /usr/sbin/nginx -c /etc/nginx/nginx.conf -t - eend $? "failed, please correct errors above" -} diff --git a/www-servers/nginx/files/nginx-secure-link-timeout.patch b/www-servers/nginx/files/nginx-secure-link-timeout.patch deleted file mode 100644 index e178cfffd861..000000000000 --- a/www-servers/nginx/files/nginx-secure-link-timeout.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -Naur nginx-0.8.4.orig/src/http/modules/ngx_http_secure_link_module.c nginx-0.8.4/src/http/modules/ngx_http_secure_link_module.c ---- nginx-0.8.4.orig/src/http/modules/ngx_http_secure_link_module.c 2009-05-13 14:44:15.000000000 +0200 -+++ nginx-0.8.4/src/http/modules/ngx_http_secure_link_module.c 2009-05-13 15:00:49.000000000 +0200 -@@ -12,6 +12,7 @@ - - typedef struct { - ngx_str_t secret; -+ time_t timeout; - } ngx_http_secure_link_conf_t; - - -@@ -30,6 +31,12 @@ - offsetof(ngx_http_secure_link_conf_t, secret), - NULL }, - -+ { ngx_string("secure_link_timeout"), -+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, -+ ngx_conf_set_sec_slot, -+ NGX_HTTP_LOC_CONF_OFFSET, -+ offsetof(ngx_http_secure_link_conf_t, timeout), -+ NULL }, - ngx_null_command - }; - -@@ -67,22 +74,36 @@ - - static ngx_str_t ngx_http_secure_link = ngx_string("secure_link"); - -+static u_char -+ngx_hex2int(u_char hex) -+{ -+ hex = hex - '0'; -+ if (hex > 9) { -+ hex = (hex + '0' - 1) | 0x20; -+ hex = hex - 'a' + 11; -+ } -+ if (hex > 15) -+ hex = 0xFF; -+ -+ return hex; -+} - - static ngx_int_t - ngx_http_secure_link_variable(ngx_http_request_t *r, - ngx_http_variable_value_t *v, uintptr_t data) - { -- u_char *p, *start, *end, *last; -- size_t len; -+ u_char *p, *start, *end, *last, *tss, *tse; -+ size_t len, tslen; - ngx_int_t n; - ngx_uint_t i; - ngx_md5_t md5; -+ time_t ts; - ngx_http_secure_link_conf_t *conf; - u_char hash[16]; - - conf = ngx_http_get_module_loc_conf(r, ngx_http_secure_link_module); - -- if (conf->secret.len == 0) { -+ if (conf->secret.len == 0 || conf->timeout == 0) { - goto not_found; - } - -@@ -103,22 +124,46 @@ - while (p < last) { - if (*p++ == '/') { - end = p - 1; -- goto url_start; -+ goto tstamp_start; - } - } - - goto not_found; - -+ tstamp_start: -+ -+ tss = p; -+ -+ while (p < last) { -+ if (*p++ == '/') { -+ tse = p - 1; -+ goto url_start; -+ } -+ } -+ -+ goto not_found; -+ - url_start: - -+ tslen = tse - tss; - len = last - p; - -- if (end - start != 32 || len == 0) { -+ if (end - start != 32 || len == 0 || tslen != 8) { - goto not_found; - } - -+ ts = 0; -+ for (i = 0; i < 8; i++) { -+ ts = (ts << 4) + ngx_hex2int(tss[i]); -+ } -+ -+ if (ts < r->start_sec - conf->timeout) { -+ goto not_found; -+ } -+ - ngx_md5_init(&md5); - ngx_md5_update(&md5, p, len); -+ ngx_md5_update(&md5, tss, tslen); - ngx_md5_update(&md5, conf->secret.data, conf->secret.len); - ngx_md5_final(hash, &md5); - -@@ -160,7 +205,8 @@ - * - * conf->secret = { 0, NULL } - */ -- -+ -+ conf->timeout = NGX_CONF_UNSET; - return conf; - } - -@@ -172,6 +218,7 @@ - ngx_http_secure_link_conf_t *conf = child; - - ngx_conf_merge_str_value(conf->secret, prev->secret, ""); -+ ngx_conf_merge_sec_value(conf->timeout, prev->timeout, 3600); - - return NGX_CONF_OK; - } diff --git a/www-servers/nginx/files/nginx.conf b/www-servers/nginx/files/nginx.conf deleted file mode 100644 index 526dd2ef3ca1..000000000000 --- a/www-servers/nginx/files/nginx.conf +++ /dev/null @@ -1,66 +0,0 @@ -user apache apache; - -worker_processes 5; - -error_log /var/log/nginx/error_log warn; - -events { - connections 2048; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '%addr - - [%time] "%request" %status ' - '%length "%{Referer}i" "%{User-Agent}i" '; - - log_format download '%addr - - [%time] "%request" %status ' - '%length "%{Referer}i" "%{User-Agent}i" ' - '"%{Range}i" "%{Content-Range}o"'; - - post_accept_timeout 60; - client_header_timeout 3m; - client_body_timeout 3m; - send_timeout 3m; - - 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; - - output_buffers 1 32k; - postpone_output 1460; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - server { - listen 80; - - charset on; - source_charset koi8-r; - - access_log /var/log/nginx/access_log main; - - location / { - root /var/www/localhost/htdocs; - index index.html; - allow all; - } - - location ~* ^.+\.(jpg|jpeg|gif)$ { - root /var/www/localhost/htdocs; - access_log off; - expires 30d; - } - } -} diff --git a/www-servers/nginx/files/nginx.conf-r1 b/www-servers/nginx/files/nginx.conf-r1 deleted file mode 100644 index 4ad6a3c13387..000000000000 --- a/www-servers/nginx/files/nginx.conf-r1 +++ /dev/null @@ -1,55 +0,0 @@ -user apache apache; - -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 8192; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main - '$remote_addr - $remote_user [$time_local] ' - '"$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; - - gzip on; - gzip_min_length 1100; - gzip_buffers 4 8k; - gzip_types text/plain; - - output_buffers 1 32k; - postpone_output 1460; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - server { - listen 127.0.0.1; - server_name localhost; - - access_log /var/log/nginx/access_log info; - - root /var/www/localhost/htdocs; - } -} diff --git a/www-servers/nginx/files/nginx.conf-r2 b/www-servers/nginx/files/nginx.conf-r2 deleted file mode 100644 index 913e98f35fdc..000000000000 --- a/www-servers/nginx/files/nginx.conf-r2 +++ /dev/null @@ -1,58 +0,0 @@ -user apache apache; - -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 8192; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main - '$remote_addr - $remote_user [$time_local] ' - '"$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; - - gzip on; - gzip_min_length 1100; - gzip_buffers 4 8k; - gzip_types text/plain; - - output_buffers 1 32k; - postpone_output 1460; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.html; - - server { - 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; - - root /var/www/localhost/htdocs; - } -} diff --git a/www-servers/nginx/files/nginx.conf-r3 b/www-servers/nginx/files/nginx.conf-r3 deleted file mode 100644 index a924424b77a2..000000000000 --- a/www-servers/nginx/files/nginx.conf-r3 +++ /dev/null @@ -1,57 +0,0 @@ -user nginx nginx; -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 8192; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main - '$remote_addr - $remote_user [$time_local] ' - '"$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; - - gzip on; - gzip_min_length 1100; - gzip_buffers 4 8k; - gzip_types text/plain; - - output_buffers 1 32k; - postpone_output 1460; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.html; - - server { - 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; - - root /var/www/localhost/htdocs; - } -} diff --git a/www-servers/nginx/nginx-0.7.64-r1.ebuild b/www-servers/nginx/nginx-0.7.64-r1.ebuild deleted file mode 100644 index 63774aeb2ebf..000000000000 --- a/www-servers/nginx/nginx-0.7.64-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# 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.7.64-r1.ebuild,v 1.1 2010/01/03 19:05:39 djc Exp $ - -inherit eutils ssl-cert toolchain-funcs perl-module - -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 pcre perl pop random-index smtp ssl status sub webdav zlib" - -DEPEND="dev-lang/perl - dev-libs/openssl - pcre? ( >=dev-libs/libpcre-4.2 ) - 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 ${?} -} - -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 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 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" - - if use smtp || use pop || use imap; then - myconf="${myconf} --with-mail" - use ssl && myconf="${myconf} --with-mail_ssl_module" - fi - use imap || myconf="${myconf} --without-mail_imap_module" - use pop || myconf="${myconf} --without-mail_pop3_module" - use smtp || myconf="${myconf} --without-mail_smtp_module" - - tc-export CC - ./configure \ - --prefix=/usr \ - --with-cc-opt="-I${ROOT}/usr/include" \ - --with-ld-opt="-L${ROOT}/usr/lib" \ - --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 \ - ${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}" INSTALLDIRS=vendor || die "failed to install perl stuff" - fixlocalpod - } -} - -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.17.ebuild b/www-servers/nginx/nginx-0.8.17.ebuild deleted file mode 100644 index b7e8ab6b44ac..000000000000 --- a/www-servers/nginx/nginx-0.8.17.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.17.ebuild,v 1.1 2009/09/28 15:37: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 - } -} |