From: Konstantin V. Arkhipov Date: Sat, 21 Apr 2007 14:54:04 +0000 (+0000) Subject: * bug #173209 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb05bd08cf856b34d422aa241511e91ce3ef3e15;p=gentoo.git * bug #173209 Package-Manager: portage-2.1.2.4 --- diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 034edbe78478..9535fbb53722 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.140 2007/04/20 21:27:21 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.141 2007/04/21 14:54:04 voxus Exp $ + +*nginx-0.5.18-r1 (21 Apr 2007) + + 21 Apr 2007; Konstantin V. Arkhipov + +files/nginx.conf-r4, -nginx-0.5.18.ebuild, +nginx-0.5.18-r1.ebuild: + Closing bug #173209. *nginx-0.5.18 (20 Apr 2007) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 85e9dea0dcdf..97ac432d8090 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -25,6 +25,10 @@ AUX nginx.conf-r3 1039 RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c SHA1 5ddb MD5 c0b0a2dd92028a9213557d5bec63de70 files/nginx.conf-r3 1039 RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c files/nginx.conf-r3 1039 SHA256 93c926f698a21946687340d553d584c47408359d5bb64651fc967274659662fc files/nginx.conf-r3 1039 +AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836c85e98e3b2c633818c286992d32a68c0b5ff SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6 +MD5 259c222a0dacdaff0be87d36e728d529 files/nginx.conf-r4 1410 +RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 files/nginx.conf-r4 1410 +SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6 files/nginx.conf-r4 1410 DIST nginx-0.1.45.tar.gz 322706 RMD160 625ba47cdcc8d15bdcfb195c3a96d40e13e48bb6 SHA1 d4edab196fcfb6f74a57fd9713b679f6bd662a3b SHA256 4e9977cac9ce7abf37fdccac2e20f0371309cef0fb97f96b1e3253c5da992846 DIST nginx-0.2.6.tar.gz 329236 RMD160 96387007cf325dd7fd78b020f4416431dccd50fa SHA1 0c12b23d201e621877a157960023e2c4db9aea9a SHA256 606e186ec7d6687a0c764ecea834bfeaa223066ed9774fd2f3819f942ec752a1 DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0 SHA1 a6202a19e82f8d1c82eec7c7ee754c61e450716b SHA256 19dbfb86c42e38c8ced641b6b8f808951a60003ff711c5f7cc68448a159df6b4 @@ -47,18 +51,18 @@ EBUILD nginx-0.4.14.ebuild 2293 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703 MD5 3420562d63f00c3389f2c1d091fce90f nginx-0.4.14.ebuild 2293 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703 nginx-0.4.14.ebuild 2293 SHA256 9243dc8e002ad9a28887fcc98df088ba3bbb50f5e8d46c02005c335d5a0f7426 nginx-0.4.14.ebuild 2293 -EBUILD nginx-0.5.18.ebuild 2562 RMD160 1172aa096814cd95d08f6400491952d8bff54d3f SHA1 e5fc3e0acb7a422789625ab8835fe816a0b5b27d SHA256 72e771ad47608202805cd62a67c7ded59097b8feb45968abca5604fc7c353841 -MD5 876ea428d1a9af9adf2019f9e416a400 nginx-0.5.18.ebuild 2562 -RMD160 1172aa096814cd95d08f6400491952d8bff54d3f nginx-0.5.18.ebuild 2562 -SHA256 72e771ad47608202805cd62a67c7ded59097b8feb45968abca5604fc7c353841 nginx-0.5.18.ebuild 2562 +EBUILD nginx-0.5.18-r1.ebuild 2746 RMD160 a007ff46baa618e8f9f725eb826b498d069fe590 SHA1 067587577e2a22d1711907e95f260e3830aca762 SHA256 75550dca351a2657c4cba139b8fed4c95bcda58b5fd103b2bc9c4bbb3772b35b +MD5 045230c2307ee223a9a1989dc2143862 nginx-0.5.18-r1.ebuild 2746 +RMD160 a007ff46baa618e8f9f725eb826b498d069fe590 nginx-0.5.18-r1.ebuild 2746 +SHA256 75550dca351a2657c4cba139b8fed4c95bcda58b5fd103b2bc9c4bbb3772b35b nginx-0.5.18-r1.ebuild 2746 EBUILD nginx-0.5.5.ebuild 2451 RMD160 50b1acf44cc06acf63e34ee377040f9964d84f8b SHA1 183a223b6e1a7a234a60683fd88eafbdeef737ef SHA256 3447da22b282d5e63bad691147fd3524d90d781eb374664b0d4bec9e64aa6a60 MD5 e64bf71e0b65efa7b59db3599ab36cb8 nginx-0.5.5.ebuild 2451 RMD160 50b1acf44cc06acf63e34ee377040f9964d84f8b nginx-0.5.5.ebuild 2451 SHA256 3447da22b282d5e63bad691147fd3524d90d781eb374664b0d4bec9e64aa6a60 nginx-0.5.5.ebuild 2451 -MISC ChangeLog 22529 RMD160 19ce81ee0f8235edb923217cfbe0b12697009b40 SHA1 5d5667da0ef8c8eaa90f829ecb228b9ae543a101 SHA256 e7b8cb27e8ee02eb835660e383e4a23c9783ee877b49c2b98f0e3702cc62119a -MD5 e8602807bfcc80333e4b81f6e1d33220 ChangeLog 22529 -RMD160 19ce81ee0f8235edb923217cfbe0b12697009b40 ChangeLog 22529 -SHA256 e7b8cb27e8ee02eb835660e383e4a23c9783ee877b49c2b98f0e3702cc62119a ChangeLog 22529 +MISC ChangeLog 22713 RMD160 fa7e45f04150eb0d6179fafdf36ec55556ee7c1f SHA1 451258687cc6b49531d4764a092b77e54ebcdf1c SHA256 b7049665c77b9ec3e3dd838e070e0e69980c22db95d3b10a88b368da0ed16d5c +MD5 c5418110219bdac66d58702fb1c24253 ChangeLog 22713 +RMD160 fa7e45f04150eb0d6179fafdf36ec55556ee7c1f ChangeLog 22713 +SHA256 b7049665c77b9ec3e3dd838e070e0e69980c22db95d3b10a88b368da0ed16d5c ChangeLog 22713 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220 @@ -75,16 +79,16 @@ SHA256 b9986770cfba3e18216bd9d8b27523acb6ecc9db6d0242ff9888d26cb1f6bbaf files/di MD5 778da60245fb2c740695d6f37a95b287 files/digest-nginx-0.4.14 238 RMD160 7344b7d31c270c82cb729ade82ad8e4c11ecb987 files/digest-nginx-0.4.14 238 SHA256 152d5b60ad4a168b813e02f5a6b2453aa7d232e3d3976ee706ea684bc26acc98 files/digest-nginx-0.4.14 238 -MD5 9ffa631a994cb898bfec3722e41aa228 files/digest-nginx-0.5.18 238 -RMD160 bebefdbeb9ada7ac62f06c06cdf43c515fd77bbf files/digest-nginx-0.5.18 238 -SHA256 ea30892083a08628442e239dcecdfd7d28e817f9ddbd51f90e50ebf86f9a2147 files/digest-nginx-0.5.18 238 +MD5 9ffa631a994cb898bfec3722e41aa228 files/digest-nginx-0.5.18-r1 238 +RMD160 bebefdbeb9ada7ac62f06c06cdf43c515fd77bbf files/digest-nginx-0.5.18-r1 238 +SHA256 ea30892083a08628442e239dcecdfd7d28e817f9ddbd51f90e50ebf86f9a2147 files/digest-nginx-0.5.18-r1 238 MD5 eced758d053c61df9be4d7fe48c5b679 files/digest-nginx-0.5.5 235 RMD160 e8586ad773d219495442fdbebe794c2cbbe52008 files/digest-nginx-0.5.5 235 SHA256 844d9a773d7139ecbc674b5603f900234227b658b928527e1e010effe5bb6b1c files/digest-nginx-0.5.5 235 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGKTBPbwxeDFj+ScoRAh6NAKDQCt7BrdieVO0nvywYx7agPJDrRQCglEHh -FtxpBcZZeKkWFsxZ/nqQlxI= -=Pqte +iD8DBQFGKiWVbwxeDFj+ScoRAkpOAKC3nkdBFzrYMnGL6aGHa+ZDRpkr8gCfb2BM +fAUiGvV8McPsHoBpC3l8tZc= +=EmvP -----END PGP SIGNATURE----- diff --git a/www-servers/nginx/files/digest-nginx-0.5.18 b/www-servers/nginx/files/digest-nginx-0.5.18-r1 similarity index 100% rename from www-servers/nginx/files/digest-nginx-0.5.18 rename to www-servers/nginx/files/digest-nginx-0.5.18-r1 diff --git a/www-servers/nginx/files/nginx.conf-r4 b/www-servers/nginx/files/nginx.conf-r4 new file mode 100644 index 000000000000..117c2e55345f --- /dev/null +++ b/www-servers/nginx/files/nginx.conf-r4 @@ -0,0 +1,72 @@ +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 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; + # } +} diff --git a/www-servers/nginx/nginx-0.5.18.ebuild b/www-servers/nginx/nginx-0.5.18-r1.ebuild similarity index 89% rename from www-servers/nginx/nginx-0.5.18.ebuild rename to www-servers/nginx/nginx-0.5.18-r1.ebuild index ca4839e4f7fb..1a42aabdc8ce 100644 --- a/www-servers/nginx/nginx-0.5.18.ebuild +++ b/www-servers/nginx/nginx-0.5.18-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.18.ebuild,v 1.1 2007/04/20 21:27:21 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.18-r1.ebuild,v 1.1 2007/04/21 14:54:04 voxus Exp $ -inherit eutils +inherit eutils ssl-cert DESCRIPTION="Robust, small and high performance http and reverse proxy server" @@ -74,7 +74,17 @@ src_install() { cp ${FILESDIR}/nginx-r1 ${T}/nginx doinitd ${T}/nginx - cp ${FILESDIR}/nginx.conf-r3 conf/nginx.conf + cp ${FILESDIR}/nginx.conf-r4 conf/nginx.conf + + use ssl && { + if [ ! -f /etc/ssl/${PN}/${PN}.key ]; then + dodir /etc/ssl/${PN} + insinto /etc/ssl/${PN} + docert ${PN} + fi + + sed -e 's:# ::' -i conf/nginx.conf + } dodir /etc/${PN} insinto /etc/${PN}