1 |
djc 10/02/02 08:39:22 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: nginx-0.7.65.ebuild nginx-0.8.33.ebuild |
5 |
Log: |
6 |
Version bump nginx. |
7 |
(Portage version: 2.1.7.16/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.244 www-servers/nginx/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.244&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.244&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.243&r2=1.244 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v |
19 |
retrieving revision 1.243 |
20 |
retrieving revision 1.244 |
21 |
diff -u -r1.243 -r1.244 |
22 |
--- ChangeLog 1 Feb 2010 19:40:59 -0000 1.243 |
23 |
+++ ChangeLog 2 Feb 2010 08:39:21 -0000 1.244 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for www-servers/nginx |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.243 2010/02/01 19:40:59 maekke Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.244 2010/02/02 08:39:21 djc Exp $ |
29 |
+ |
30 |
+*nginx-0.8.33 (02 Feb 2010) |
31 |
+*nginx-0.7.65 (02 Feb 2010) |
32 |
+ |
33 |
+ 02 Feb 2010; Dirkjan Ochtman <djc@g.o> +nginx-0.7.65.ebuild, |
34 |
+ +nginx-0.8.33.ebuild: |
35 |
+ Version bump 0.7.x and 0.8.x branches. |
36 |
|
37 |
01 Feb 2010; Markus Meier <maekke@g.o> nginx-0.7.64.ebuild: |
38 |
amd64 stable, bug #293785 |
39 |
|
40 |
|
41 |
|
42 |
1.1 www-servers/nginx/nginx-0.7.65.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.65.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.65.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: nginx-0.7.65.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2010 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.65.ebuild,v 1.1 2010/02/02 08:39:21 djc Exp $ |
52 |
|
53 |
inherit eutils ssl-cert toolchain-funcs perl-module |
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 ~x86-fbsd" |
62 |
IUSE="addition debug fastcgi flv imap pcre perl pop random-index realip smtp ssl static-gzip status sub webdav zlib" |
63 |
|
64 |
DEPEND="dev-lang/perl |
65 |
dev-libs/openssl |
66 |
pcre? ( >=dev-libs/libpcre-4.2 ) |
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 ${PN} |
73 |
enewuser ${PN} -1 -1 -1 ${PN} |
74 |
eend ${?} |
75 |
} |
76 |
|
77 |
src_unpack() { |
78 |
unpack ${A} |
79 |
sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die |
80 |
} |
81 |
|
82 |
src_compile() { |
83 |
local myconf |
84 |
|
85 |
# threads support is broken atm. |
86 |
# |
87 |
# if use threads; then |
88 |
# einfo |
89 |
# ewarn "threads support is experimental at the moment" |
90 |
# ewarn "do not use it on production systems - you've been warned" |
91 |
# einfo |
92 |
# myconf="${myconf} --with-threads" |
93 |
# fi |
94 |
|
95 |
use addition && myconf="${myconf} --with-http_addition_module" |
96 |
use fastcgi || myconf="${myconf} --without-http_fastcgi_module" |
97 |
use fastcgi && myconf="${myconf} --with-http_realip_module" |
98 |
use flv && myconf="${myconf} --with-http_flv_module" |
99 |
use zlib || myconf="${myconf} --without-http_gzip_module" |
100 |
use pcre || { |
101 |
myconf="${myconf} --without-pcre --without-http_rewrite_module" |
102 |
} |
103 |
use debug && myconf="${myconf} --with-debug" |
104 |
use ssl && myconf="${myconf} --with-http_ssl_module" |
105 |
use perl && myconf="${myconf} --with-http_perl_module" |
106 |
use status && myconf="${myconf} --with-http_stub_status_module" |
107 |
use webdav && myconf="${myconf} --with-http_dav_module" |
108 |
use sub && myconf="${myconf} --with-http_sub_module" |
109 |
use realip && myconf="${myconf} --with-http_realip_module" |
110 |
use static-gzip && myconf="${myconf} --with-http_gzip_static_module" |
111 |
use random-index && myconf="${myconf} --with-http_random_index_module" |
112 |
|
113 |
if use smtp || use pop || use imap; then |
114 |
myconf="${myconf} --with-mail" |
115 |
use ssl && myconf="${myconf} --with-mail_ssl_module" |
116 |
fi |
117 |
use imap || myconf="${myconf} --without-mail_imap_module" |
118 |
use pop || myconf="${myconf} --without-mail_pop3_module" |
119 |
use smtp || myconf="${myconf} --without-mail_smtp_module" |
120 |
|
121 |
tc-export CC |
122 |
./configure \ |
123 |
--prefix=/usr \ |
124 |
--with-cc-opt="-I${ROOT}/usr/include" \ |
125 |
--with-ld-opt="-L${ROOT}/usr/lib" \ |
126 |
--conf-path=/etc/${PN}/${PN}.conf \ |
127 |
--http-log-path=/var/log/${PN}/access_log \ |
128 |
--error-log-path=/var/log/${PN}/error_log \ |
129 |
--pid-path=/var/run/${PN}.pid \ |
130 |
--http-client-body-temp-path=/var/tmp/${PN}/client \ |
131 |
--http-proxy-temp-path=/var/tmp/${PN}/proxy \ |
132 |
--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \ |
133 |
${myconf} || die "configure failed" |
134 |
|
135 |
emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile" |
136 |
} |
137 |
|
138 |
src_install() { |
139 |
keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} |
140 |
|
141 |
dosbin objs/nginx |
142 |
newinitd "${FILESDIR}"/nginx.init-r2 nginx || die |
143 |
|
144 |
cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf |
145 |
|
146 |
dodir /etc/${PN} |
147 |
insinto /etc/${PN} |
148 |
doins conf/* |
149 |
|
150 |
dodoc CHANGES{,.ru} README |
151 |
|
152 |
# logrotate |
153 |
insinto /etc/logrotate.d |
154 |
newins "${FILESDIR}"/nginx.logrotate nginx || die |
155 |
|
156 |
use perl && { |
157 |
cd "${S}"/objs/src/http/modules/perl/ |
158 |
einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff" |
159 |
fixlocalpod |
160 |
} |
161 |
} |
162 |
|
163 |
pkg_postinst() { |
164 |
use ssl && { |
165 |
if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then |
166 |
install_cert /etc/ssl/${PN}/${PN} |
167 |
chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} |
168 |
fi |
169 |
} |
170 |
} |
171 |
|
172 |
|
173 |
|
174 |
1.1 www-servers/nginx/nginx-0.8.33.ebuild |
175 |
|
176 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.33.ebuild?rev=1.1&view=markup |
177 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.33.ebuild?rev=1.1&content-type=text/plain |
178 |
|
179 |
Index: nginx-0.8.33.ebuild |
180 |
=================================================================== |
181 |
# Copyright 1999-2010 Gentoo Foundation |
182 |
# Distributed under the terms of the GNU General Public License v2 |
183 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.33.ebuild,v 1.1 2010/02/02 08:39:21 djc Exp $ |
184 |
|
185 |
inherit eutils ssl-cert toolchain-funcs perl-module |
186 |
|
187 |
DESCRIPTION="Robust, small and high performance http and reverse proxy server" |
188 |
|
189 |
HOMEPAGE="http://nginx.net/" |
190 |
SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" |
191 |
LICENSE="BSD" |
192 |
SLOT="0" |
193 |
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" |
194 |
IUSE="addition aio debug fastcgi flv imap ipv6 pcre perl pop random-index realip securelink smtp ssl static-gzip status sub webdav zlib" |
195 |
|
196 |
DEPEND="dev-lang/perl |
197 |
dev-libs/openssl |
198 |
pcre? ( >=dev-libs/libpcre-4.2 ) |
199 |
zlib? ( sys-libs/zlib ) |
200 |
perl? ( >=dev-lang/perl-5.8 )" |
201 |
|
202 |
pkg_setup() { |
203 |
ebegin "Creating nginx user and group" |
204 |
enewgroup ${PN} |
205 |
enewuser ${PN} -1 -1 -1 ${PN} |
206 |
eend ${?} |
207 |
if use ipv6; then |
208 |
ewarn "Note that ipv6 support in nginx is still experimental." |
209 |
ewarn "Be sure to read comments on gentoo bug #274614" |
210 |
ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614" |
211 |
fi |
212 |
} |
213 |
|
214 |
src_unpack() { |
215 |
unpack ${A} |
216 |
sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die |
217 |
} |
218 |
|
219 |
src_compile() { |
220 |
local myconf |
221 |
|
222 |
# threads support is broken atm. |
223 |
# |
224 |
# if use threads; then |
225 |
# einfo |
226 |
# ewarn "threads support is experimental at the moment" |
227 |
# ewarn "do not use it on production systems - you've been warned" |
228 |
# einfo |
229 |
# myconf="${myconf} --with-threads" |
230 |
# fi |
231 |
|
232 |
use addition && myconf="${myconf} --with-http_addition_module" |
233 |
use aio && myconf="${myconf} --with-file-aio" |
234 |
use ipv6 && myconf="${myconf} --with-ipv6" |
235 |
use fastcgi || myconf="${myconf} --without-http_fastcgi_module" |
236 |
use fastcgi && myconf="${myconf} --with-http_realip_module" |
237 |
use flv && myconf="${myconf} --with-http_flv_module" |
238 |
use zlib || myconf="${myconf} --without-http_gzip_module" |
239 |
use pcre || { |
240 |
myconf="${myconf} --without-pcre --without-http_rewrite_module" |
241 |
} |
242 |
use debug && myconf="${myconf} --with-debug" |
243 |
use ssl && myconf="${myconf} --with-http_ssl_module" |
244 |
use perl && myconf="${myconf} --with-http_perl_module" |
245 |
use status && myconf="${myconf} --with-http_stub_status_module" |
246 |
use webdav && myconf="${myconf} --with-http_dav_module" |
247 |
use sub && myconf="${myconf} --with-http_sub_module" |
248 |
use realip && myconf="${myconf} --with-http_realip_module" |
249 |
use static-gzip && myconf="${myconf} --with-http_gzip_static_module" |
250 |
use random-index && myconf="${myconf} --with-http_random_index_module" |
251 |
use securelink && myconf="${myconf} --with-http_secure_link_module" |
252 |
|
253 |
if use smtp || use pop || use imap; then |
254 |
myconf="${myconf} --with-mail" |
255 |
use ssl && myconf="${myconf} --with-mail_ssl_module" |
256 |
fi |
257 |
use imap || myconf="${myconf} --without-mail_imap_module" |
258 |
use pop || myconf="${myconf} --without-mail_pop3_module" |
259 |
use smtp || myconf="${myconf} --without-mail_smtp_module" |
260 |
|
261 |
tc-export CC |
262 |
./configure \ |
263 |
--prefix=/usr \ |
264 |
--with-cc-opt="-I${ROOT}/usr/include" \ |
265 |
--with-ld-opt="-L${ROOT}/usr/lib" \ |
266 |
--conf-path=/etc/${PN}/${PN}.conf \ |
267 |
--http-log-path=/var/log/${PN}/access_log \ |
268 |
--error-log-path=/var/log/${PN}/error_log \ |
269 |
--pid-path=/var/run/${PN}.pid \ |
270 |
--http-client-body-temp-path=/var/tmp/${PN}/client \ |
271 |
--http-proxy-temp-path=/var/tmp/${PN}/proxy \ |
272 |
--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \ |
273 |
${myconf} || die "configure failed" |
274 |
|
275 |
emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile" |
276 |
} |
277 |
|
278 |
src_install() { |
279 |
keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} |
280 |
|
281 |
dosbin objs/nginx |
282 |
newinitd "${FILESDIR}"/nginx.init-r2 nginx || die |
283 |
|
284 |
cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf |
285 |
|
286 |
dodir /etc/${PN} |
287 |
insinto /etc/${PN} |
288 |
doins conf/* |
289 |
|
290 |
dodoc CHANGES{,.ru} README |
291 |
|
292 |
# logrotate |
293 |
insinto /etc/logrotate.d |
294 |
newins "${FILESDIR}"/nginx.logrotate nginx || die |
295 |
|
296 |
use perl && { |
297 |
cd "${S}"/objs/src/http/modules/perl/ |
298 |
einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff" |
299 |
fixlocalpod |
300 |
} |
301 |
} |
302 |
|
303 |
pkg_postinst() { |
304 |
use ssl && { |
305 |
if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then |
306 |
install_cert /etc/ssl/${PN}/${PN} |
307 |
chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} |
308 |
fi |
309 |
} |
310 |
} |