Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Konstantin Arkhipov (voxus)" <voxus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/nginx: ChangeLog nginx-0.5.35.ebuild nginx-0.6.25.ebuild
Date: Thu, 10 Jan 2008 10:26:53
Message-Id: E1JCucc-0008MN-6m@stork.gentoo.org
1 voxus 08/01/10 10:26:50
2
3 Modified: ChangeLog
4 Added: nginx-0.5.35.ebuild nginx-0.6.25.ebuild
5 Log:
6 * bumps
7 (Portage version: 2.1.4_rc14)
8
9 Revision Changes Path
10 1.172 www-servers/nginx/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.172&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.172&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.171&r2=1.172
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v
19 retrieving revision 1.171
20 retrieving revision 1.172
21 diff -u -r1.171 -r1.172
22 --- ChangeLog 3 Jan 2008 20:35:50 -0000 1.171
23 +++ ChangeLog 10 Jan 2008 10:26:49 -0000 1.172
24 @@ -1,6 +1,13 @@
25 # ChangeLog for www-servers/nginx
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.171 2008/01/03 20:35:50 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.172 2008/01/10 10:26:49 voxus Exp $
29 +
30 +*nginx-0.6.25 (10 Jan 2008)
31 +*nginx-0.5.35 (10 Jan 2008)
32 +
33 + 10 Jan 2008; Konstantin V. Arkhipov <voxus@g.o>
34 + +nginx-0.5.35.ebuild, +nginx-0.6.25.ebuild:
35 + Version bumps.
36
37 03 Jan 2008; Ulrich Mueller <ulm@g.o> -nginx-0.5.26.ebuild:
38 Remove vulnerable version wrt security bugs #174759 and #201691.
39
40
41
42 1.1 www-servers/nginx/nginx-0.5.35.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.5.35.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.5.35.ebuild?rev=1.1&content-type=text/plain
46
47 Index: nginx-0.5.35.ebuild
48 ===================================================================
49 # Copyright 1999-2008 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.35.ebuild,v 1.1 2008/01/10 10:26:49 voxus Exp $
52
53 inherit eutils ssl-cert
54
55 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
56
57 HOMEPAGE="http://sysoev.ru/nginx/"
58 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
59 LICENSE="BSD"
60 SLOT="0"
61 KEYWORDS="~amd64 ~ppc ~x86"
62 IUSE="debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
63
64 DEPEND="dev-lang/perl
65 pcre? ( >=dev-libs/libpcre-4.2 )
66 ssl? ( dev-libs/openssl )
67 zlib? ( sys-libs/zlib )
68 perl? ( >=dev-lang/perl-5.8 )"
69
70 pkg_setup() {
71 ebegin "Creating nginx user and group"
72 enewgroup nginx
73 enewuser nginx -1 -1 /dev/null nginx
74 eend ${?}
75 }
76
77 src_compile() {
78 local myconf
79
80 # threads support is broken atm.
81 #
82 # if use threads; then
83 # einfo
84 # ewarn "threads support is experimental at the moment"
85 # ewarn "do not use it on production systems - you've been warned"
86 # einfo
87 # myconf="${myconf} --with-threads"
88 # fi
89
90 use fastcgi || myconf="${myconf} --without-http_fastcgi_module"
91 use fastcgi && myconf="${myconf} --with-http_realip_module"
92 use flv && myconf="${myconf} --with-http_flv_module"
93 use zlib || myconf="${myconf} --without-http_gzip_module"
94 use pcre || {
95 myconf="${myconf} --without-pcre --without-http_rewrite_module"
96 }
97 use debug && myconf="${myconf} --with-debug"
98 use ssl && myconf="${myconf} --with-http_ssl_module"
99 use imap && myconf="${myconf} --with-imap" # pop3/imap4 proxy support
100 use perl && myconf="${myconf} --with-http_perl_module"
101 use status && myconf="${myconf} --with-http_stub_status_module"
102 use webdav && myconf="${myconf} --with-http_dav_module"
103 use sub && myconf="${myconf} --with-http_sub_module"
104
105 ./configure \
106 --prefix=/usr \
107 --conf-path=/etc/${PN}/${PN}.conf \
108 --http-log-path=/var/log/${PN}/access_log \
109 --error-log-path=/var/log/${PN}/error_log \
110 --pid-path=/var/run/${PN}.pid \
111 --http-client-body-temp-path=/var/tmp/${PN}/client \
112 --http-proxy-temp-path=/var/tmp/${PN}/proxy \
113 --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
114 --with-md5-asm --with-md5=/usr/include \
115 ${myconf} || die "configure failed"
116
117 emake || die "failed to compile"
118 }
119
120 src_install() {
121 keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
122
123 dosbin objs/nginx
124 cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
125 doinitd "${T}"/nginx
126
127 cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
128
129 dodir "${ROOT}"/etc/${PN}
130 insinto "${ROOT}"/etc/${PN}
131 doins conf/*
132
133 dodoc CHANGES{,.ru} LICENSE README
134
135 use perl && {
136 cd "${S}"/objs/src/http/modules/perl/
137 einstall DESTDIR="${D}"|| die "failed to install perl stuff"
138 }
139 }
140
141 pkg_postinst() {
142 use ssl && {
143 if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
144 dodir "${ROOT}"/etc/ssl/${PN}
145 insinto "${ROOT}"etc/ssl/${PN}/
146 insopts -m0644 -o nginx -g nginx
147 install_cert /etc/ssl/nginx/nginx
148 fi
149 }
150 }
151
152
153
154 1.1 www-servers/nginx/nginx-0.6.25.ebuild
155
156 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.6.25.ebuild?rev=1.1&view=markup
157 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.6.25.ebuild?rev=1.1&content-type=text/plain
158
159 Index: nginx-0.6.25.ebuild
160 ===================================================================
161 # Copyright 1999-2008 Gentoo Foundation
162 # Distributed under the terms of the GNU General Public License v2
163 # $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.25.ebuild,v 1.1 2008/01/10 10:26:49 voxus Exp $
164
165 inherit eutils ssl-cert
166
167 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
168
169 HOMEPAGE="http://nginx.net/"
170 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
171 LICENSE="BSD"
172 SLOT="0"
173 KEYWORDS="~amd64 ~ppc ~x86"
174 IUSE="addition debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
175
176 DEPEND="dev-lang/perl
177 pcre? ( >=dev-libs/libpcre-4.2 )
178 ssl? ( dev-libs/openssl )
179 zlib? ( sys-libs/zlib )
180 perl? ( >=dev-lang/perl-5.8 )"
181
182 pkg_setup() {
183 ebegin "Creating nginx user and group"
184 enewgroup nginx
185 enewuser nginx -1 -1 /dev/null nginx
186 eend ${?}
187 }
188
189 src_compile() {
190 local myconf
191
192 # threads support is broken atm.
193 #
194 # if use threads; then
195 # einfo
196 # ewarn "threads support is experimental at the moment"
197 # ewarn "do not use it on production systems - you've been warned"
198 # einfo
199 # myconf="${myconf} --with-threads"
200 # fi
201
202 use addition && myconf="${myconf} --with-http_addition_module"
203 use fastcgi || myconf="${myconf} --without-http_fastcgi_module"
204 use fastcgi && myconf="${myconf} --with-http_realip_module"
205 use flv && myconf="${myconf} --with-http_flv_module"
206 use zlib || myconf="${myconf} --without-http_gzip_module"
207 use pcre || {
208 myconf="${myconf} --without-pcre --without-http_rewrite_module"
209 }
210 use debug && myconf="${myconf} --with-debug"
211 use ssl && myconf="${myconf} --with-http_ssl_module"
212 use imap && myconf="${myconf} --with-imap" # pop3/imap4 proxy support
213 use perl && myconf="${myconf} --with-http_perl_module"
214 use status && myconf="${myconf} --with-http_stub_status_module"
215 use webdav && myconf="${myconf} --with-http_dav_module"
216 use sub && myconf="${myconf} --with-http_sub_module"
217
218 ./configure \
219 --prefix=/usr \
220 --conf-path=/etc/${PN}/${PN}.conf \
221 --http-log-path=/var/log/${PN}/access_log \
222 --error-log-path=/var/log/${PN}/error_log \
223 --pid-path=/var/run/${PN}.pid \
224 --http-client-body-temp-path=/var/tmp/${PN}/client \
225 --http-proxy-temp-path=/var/tmp/${PN}/proxy \
226 --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
227 --with-md5-asm --with-md5=/usr/include \
228 --with-sha1-asm --with-sha1=/usr/include \
229 ${myconf} || die "configure failed"
230
231 emake || die "failed to compile"
232 }
233
234 src_install() {
235 keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
236
237 dosbin objs/nginx
238 cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
239 doinitd "${T}"/nginx
240
241 cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
242
243 dodir "${ROOT}"/etc/${PN}
244 insinto "${ROOT}"/etc/${PN}
245 doins conf/*
246
247 dodoc CHANGES{,.ru} LICENSE README
248
249 use perl && {
250 cd "${S}"/objs/src/http/modules/perl/
251 einstall DESTDIR="${D}"|| die "failed to install perl stuff"
252 }
253 }
254
255 pkg_postinst() {
256 use ssl && {
257 if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
258 dodir "${ROOT}"/etc/ssl/${PN}
259 insinto "${ROOT}"etc/ssl/${PN}/
260 insopts -m0644 -o nginx -g nginx
261 install_cert /etc/ssl/nginx/nginx
262 fi
263 }
264 }
265
266
267
268 --
269 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups