1 |
djc 10/01/03 20:56:46 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: nginx-0.8.31.ebuild |
5 |
Log: |
6 |
Bump www-servers/nginx to 0.8.31, add a requested use flag. |
7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 www-servers/nginx/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/metadata.xml?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/metadata.xml?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/metadata.xml?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/metadata.xml,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- metadata.xml 3 Jan 2010 20:29:40 -0000 1.7 |
23 |
+++ metadata.xml 3 Jan 2010 20:56:46 -0000 1.8 |
24 |
@@ -10,6 +10,7 @@ |
25 |
</maintainer> |
26 |
<use> |
27 |
<flag name='addition'>Enables HTTP addition filter module</flag> |
28 |
+ <flag name='aio'>Enables file AIO support</flag> |
29 |
<flag name='flv'>Enables special processing module for flv files</flag> |
30 |
<flag name='static-gzip'>Enables support for gzipping static content</flag> |
31 |
<flag name='pop'>Enables POP3 proxy support</flag> |
32 |
|
33 |
|
34 |
|
35 |
1.240 www-servers/nginx/ChangeLog |
36 |
|
37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.240&view=markup |
38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.240&content-type=text/plain |
39 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.239&r2=1.240 |
40 |
|
41 |
Index: ChangeLog |
42 |
=================================================================== |
43 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v |
44 |
retrieving revision 1.239 |
45 |
retrieving revision 1.240 |
46 |
diff -u -r1.239 -r1.240 |
47 |
--- ChangeLog 3 Jan 2010 20:29:40 -0000 1.239 |
48 |
+++ ChangeLog 3 Jan 2010 20:56:46 -0000 1.240 |
49 |
@@ -1,6 +1,12 @@ |
50 |
# ChangeLog for www-servers/nginx |
51 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
52 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.239 2010/01/03 20:29:40 djc Exp $ |
53 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.240 2010/01/03 20:56:46 djc Exp $ |
54 |
+ |
55 |
+*nginx-0.8.31 (03 Jan 2010) |
56 |
+ |
57 |
+ 03 Jan 2010; Dirkjan Ochtman <djc@g.o> +nginx-0.8.31.ebuild, |
58 |
+ metadata.xml: |
59 |
+ Bump to 0.8.31, adding the aio use flag. |
60 |
|
61 |
*nginx-0.7.64-r3 (03 Jan 2010) |
62 |
|
63 |
|
64 |
|
65 |
|
66 |
1.1 www-servers/nginx/nginx-0.8.31.ebuild |
67 |
|
68 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.31.ebuild?rev=1.1&view=markup |
69 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.31.ebuild?rev=1.1&content-type=text/plain |
70 |
|
71 |
Index: nginx-0.8.31.ebuild |
72 |
=================================================================== |
73 |
# Copyright 1999-2010 Gentoo Foundation |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.31.ebuild,v 1.1 2010/01/03 20:56:46 djc Exp $ |
76 |
|
77 |
inherit eutils ssl-cert toolchain-funcs perl-module |
78 |
|
79 |
DESCRIPTION="Robust, small and high performance http and reverse proxy server" |
80 |
|
81 |
HOMEPAGE="http://nginx.net/" |
82 |
SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz" |
83 |
LICENSE="BSD" |
84 |
SLOT="0" |
85 |
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" |
86 |
IUSE="addition aio debug fastcgi flv imap ipv6 pcre perl pop random-index realip securelink smtp ssl static-gzip status sub webdav zlib" |
87 |
|
88 |
DEPEND="dev-lang/perl |
89 |
dev-libs/openssl |
90 |
pcre? ( >=dev-libs/libpcre-4.2 ) |
91 |
zlib? ( sys-libs/zlib ) |
92 |
perl? ( >=dev-lang/perl-5.8 )" |
93 |
|
94 |
pkg_setup() { |
95 |
ebegin "Creating nginx user and group" |
96 |
enewgroup ${PN} |
97 |
enewuser ${PN} -1 -1 -1 ${PN} |
98 |
eend ${?} |
99 |
if use ipv6; then |
100 |
ewarn "Note that ipv6 support in nginx is still experimental." |
101 |
ewarn "Be sure to read comments on gentoo bug #274614" |
102 |
ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614" |
103 |
fi |
104 |
} |
105 |
|
106 |
src_unpack() { |
107 |
unpack ${A} |
108 |
sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die |
109 |
} |
110 |
|
111 |
src_compile() { |
112 |
local myconf |
113 |
|
114 |
# threads support is broken atm. |
115 |
# |
116 |
# if use threads; then |
117 |
# einfo |
118 |
# ewarn "threads support is experimental at the moment" |
119 |
# ewarn "do not use it on production systems - you've been warned" |
120 |
# einfo |
121 |
# myconf="${myconf} --with-threads" |
122 |
# fi |
123 |
|
124 |
use addition && myconf="${myconf} --with-http_addition_module" |
125 |
use aio && myconf="${myconf} --with-file-aio" |
126 |
use ipv6 && myconf="${myconf} --with-ipv6" |
127 |
use fastcgi || myconf="${myconf} --without-http_fastcgi_module" |
128 |
use fastcgi && myconf="${myconf} --with-http_realip_module" |
129 |
use flv && myconf="${myconf} --with-http_flv_module" |
130 |
use zlib || myconf="${myconf} --without-http_gzip_module" |
131 |
use pcre || { |
132 |
myconf="${myconf} --without-pcre --without-http_rewrite_module" |
133 |
} |
134 |
use debug && myconf="${myconf} --with-debug" |
135 |
use ssl && myconf="${myconf} --with-http_ssl_module" |
136 |
use perl && myconf="${myconf} --with-http_perl_module" |
137 |
use status && myconf="${myconf} --with-http_stub_status_module" |
138 |
use webdav && myconf="${myconf} --with-http_dav_module" |
139 |
use sub && myconf="${myconf} --with-http_sub_module" |
140 |
use realip && myconf="${myconf} --with-http_realip_module" |
141 |
use static-gzip && myconf="${myconf} --with-http_gzip_static_module" |
142 |
use random-index && myconf="${myconf} --with-http_random_index_module" |
143 |
use securelink && myconf="${myconf} --with-http_secure_link_module" |
144 |
|
145 |
if use smtp || use pop || use imap; then |
146 |
myconf="${myconf} --with-mail" |
147 |
use ssl && myconf="${myconf} --with-mail_ssl_module" |
148 |
fi |
149 |
use imap || myconf="${myconf} --without-mail_imap_module" |
150 |
use pop || myconf="${myconf} --without-mail_pop3_module" |
151 |
use smtp || myconf="${myconf} --without-mail_smtp_module" |
152 |
|
153 |
tc-export CC |
154 |
./configure \ |
155 |
--prefix=/usr \ |
156 |
--with-cc-opt="-I${ROOT}/usr/include" \ |
157 |
--with-ld-opt="-L${ROOT}/usr/lib" \ |
158 |
--conf-path=/etc/${PN}/${PN}.conf \ |
159 |
--http-log-path=/var/log/${PN}/access_log \ |
160 |
--error-log-path=/var/log/${PN}/error_log \ |
161 |
--pid-path=/var/run/${PN}.pid \ |
162 |
--http-client-body-temp-path=/var/tmp/${PN}/client \ |
163 |
--http-proxy-temp-path=/var/tmp/${PN}/proxy \ |
164 |
--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \ |
165 |
${myconf} || die "configure failed" |
166 |
|
167 |
emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile" |
168 |
} |
169 |
|
170 |
src_install() { |
171 |
keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} |
172 |
|
173 |
dosbin objs/nginx |
174 |
newinitd "${FILESDIR}"/nginx.init-r2 nginx || die |
175 |
|
176 |
cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf |
177 |
|
178 |
dodir /etc/${PN} |
179 |
insinto /etc/${PN} |
180 |
doins conf/* |
181 |
|
182 |
dodoc CHANGES{,.ru} README |
183 |
|
184 |
# logrotate |
185 |
insinto /etc/logrotate.d |
186 |
newins "${FILESDIR}"/nginx.logrotate nginx || die |
187 |
|
188 |
use perl && { |
189 |
cd "${S}"/objs/src/http/modules/perl/ |
190 |
einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff" |
191 |
fixlocalpod |
192 |
} |
193 |
} |
194 |
|
195 |
pkg_postinst() { |
196 |
use ssl && { |
197 |
if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then |
198 |
install_cert /etc/ssl/${PN}/${PN} |
199 |
chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} |
200 |
fi |
201 |
} |
202 |
} |