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