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