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