| 1 |
hollow 12/07/30 08:18:38 |
| 2 |
|
| 3 |
Modified: ChangeLog nginx-1.2.2.ebuild nginx-1.3.3.ebuild |
| 4 |
Log: |
| 5 |
add lua module + cleanup |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.330 www-servers/nginx/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.330&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.330&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.329&r2=1.330 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v |
| 19 |
retrieving revision 1.329 |
| 20 |
retrieving revision 1.330 |
| 21 |
diff -u -r1.329 -r1.330 |
| 22 |
--- ChangeLog 30 Jul 2012 06:29:23 -0000 1.329 |
| 23 |
+++ ChangeLog 30 Jul 2012 08:18:38 -0000 1.330 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for www-servers/nginx |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.329 2012/07/30 06:29:23 hollow Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.330 2012/07/30 08:18:38 hollow Exp $ |
| 29 |
+ |
| 30 |
+ 30 Jul 2012; Benedikt Böhm <hollow@g.o> nginx-1.2.2.ebuild, |
| 31 |
+ nginx-1.3.3.ebuild: |
| 32 |
+ add lua module + cleanup |
| 33 |
|
| 34 |
30 Jul 2012; Benedikt Böhm <hollow@g.o> nginx-1.2.1.ebuild, |
| 35 |
nginx-1.2.2.ebuild, -nginx-1.3.1.ebuild, nginx-1.3.3.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 www-servers/nginx/nginx-1.2.2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: nginx-1.2.2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- nginx-1.2.2.ebuild 30 Jul 2012 06:29:23 -0000 1.2 |
| 52 |
+++ nginx-1.2.2.ebuild 30 Jul 2012 08:18:38 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild,v 1.2 2012/07/30 06:29:23 hollow Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild,v 1.3 2012/07/30 08:18:38 hollow Exp $ |
| 58 |
|
| 59 |
EAPI="4" |
| 60 |
|
| 61 |
@@ -17,59 +17,78 @@ |
| 62 |
# prevent perl-module from adding automagic perl DEPENDs |
| 63 |
GENTOO_DEPEND_ON_PERL="no" |
| 64 |
|
| 65 |
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) |
| 66 |
+DEVEL_KIT_MODULE_PV="0.2.17" |
| 67 |
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" |
| 68 |
+DEVEL_KIT_MODULE_SHA1="bc97eea" |
| 69 |
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/tarball/v${DEVEL_KIT_MODULE_PV}" |
| 70 |
+DEVEL_KIT_MODULE_WD="${WORKDIR}/simpl-ngx_devel_kit-${DEVEL_KIT_MODULE_SHA1}" |
| 71 |
+ |
| 72 |
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) |
| 73 |
HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0" |
| 74 |
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" |
| 75 |
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" |
| 76 |
HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea" |
| 77 |
HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}" |
| 78 |
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}" |
| 79 |
|
| 80 |
# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license) |
| 81 |
-HTTP_HEADERS_MORE_MODULE_PV="0.17rc1" |
| 82 |
+HTTP_HEADERS_MORE_MODULE_PV="0.17" |
| 83 |
HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" |
| 84 |
-HTTP_HEADERS_MORE_MODULE_SHA1="3580526" |
| 85 |
+HTTP_HEADERS_MORE_MODULE_SHA1="b7c8cfc" |
| 86 |
HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}" |
| 87 |
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}" |
| 88 |
|
| 89 |
# http_push (http://pushmodule.slact.net/, MIT license) |
| 90 |
HTTP_PUSH_MODULE_PV="0.692" |
| 91 |
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" |
| 92 |
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz" |
| 93 |
+HTTP_PUSH_MODULE_P="ngx_http_push-${HTTP_PUSH_MODULE_PV}" |
| 94 |
+HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}.tar.gz" |
| 95 |
+HTTP_PUSH_MODULE_WD="${WORKDIR}/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" |
| 96 |
|
| 97 |
# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) |
| 98 |
-HTTP_CACHE_PURGE_MODULE_PV="1.5" |
| 99 |
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" |
| 100 |
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz" |
| 101 |
+HTTP_CACHE_PURGE_MODULE_PV="1.6" |
| 102 |
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" |
| 103 |
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" |
| 104 |
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" |
| 105 |
|
| 106 |
-# HTTP Upload module from Valery Kholodkov |
| 107 |
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license) |
| 108 |
+# http_upload (http://www.grid.net.ru/nginx/upload.en.html, BSD license) |
| 109 |
HTTP_UPLOAD_MODULE_PV="2.2.0" |
| 110 |
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" |
| 111 |
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz" |
| 112 |
+HTTP_UPLOAD_MODULE_P="ngx_http_upload-${HTTP_UPLOAD_MODULE_PV}" |
| 113 |
+HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}.tar.gz" |
| 114 |
+HTTP_UPLOAD_MODULE_WD="${WORKDIR}/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" |
| 115 |
|
| 116 |
# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) |
| 117 |
-HTTP_SLOWFS_CACHE_MODULE_PV="1.8" |
| 118 |
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" |
| 119 |
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz" |
| 120 |
+HTTP_SLOWFS_CACHE_MODULE_PV="1.9" |
| 121 |
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" |
| 122 |
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" |
| 123 |
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" |
| 124 |
|
| 125 |
-# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license) |
| 126 |
+# http_fancyindex (http://wiki.nginx.org/NgxFancyIndex, BSD license) |
| 127 |
HTTP_FANCYINDEX_MODULE_PV="0.3.1" |
| 128 |
-HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex" |
| 129 |
-# gitorious names the tarbell oddly, hence PNPN |
| 130 |
-HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex" |
| 131 |
-HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}" |
| 132 |
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}" |
| 133 |
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" |
| 134 |
+HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}" |
| 135 |
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-ngx-fancyindex" |
| 136 |
+ |
| 137 |
+# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license) |
| 138 |
+HTTP_LUA_MODULE_PV="0.5.10" |
| 139 |
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" |
| 140 |
+HTTP_LUA_MODULE_SHA1="db0bebe" |
| 141 |
+HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/tarball/v${HTTP_LUA_MODULE_PV}" |
| 142 |
+HTTP_LUA_MODULE_WD="${WORKDIR}/chaoslawful-lua-nginx-module-${HTTP_LUA_MODULE_SHA1}" |
| 143 |
|
| 144 |
inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user |
| 145 |
|
| 146 |
DESCRIPTION="Robust, small and high performance http and reverse proxy server" |
| 147 |
HOMEPAGE="http://nginx.org" |
| 148 |
SRC_URI="http://nginx.org/download/${P}.tar.gz |
| 149 |
+ ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz |
| 150 |
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) |
| 151 |
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) |
| 152 |
nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} ) |
| 153 |
nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} ) |
| 154 |
nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} ) |
| 155 |
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} ) |
| 156 |
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )" |
| 157 |
+ nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) |
| 158 |
+ nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )" |
| 159 |
|
| 160 |
LICENSE="as-is BSD BSD-2 GPL-2 MIT" |
| 161 |
SLOT="0" |
| 162 |
@@ -89,7 +108,8 @@ |
| 163 |
http_cache_purge |
| 164 |
http_upload |
| 165 |
http_slowfs_cache |
| 166 |
- http_fancyindex" |
| 167 |
+ http_fancyindex |
| 168 |
+ http_lua" |
| 169 |
|
| 170 |
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax" |
| 171 |
|
| 172 |
@@ -122,7 +142,8 @@ |
| 173 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) |
| 174 |
nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) |
| 175 |
nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) |
| 176 |
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )" |
| 177 |
+ nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) |
| 178 |
+ nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )" |
| 179 |
RDEPEND="${CDEPEND}" |
| 180 |
DEPEND="${CDEPEND} |
| 181 |
arm? ( dev-libs/libatomic_ops ) |
| 182 |
@@ -214,37 +235,43 @@ |
| 183 |
# third-party modules |
| 184 |
if use nginx_modules_http_upload_progress; then |
| 185 |
http_enabled=1 |
| 186 |
- myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}" |
| 187 |
+ myconf+=" --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD}" |
| 188 |
fi |
| 189 |
|
| 190 |
if use nginx_modules_http_headers_more; then |
| 191 |
http_enabled=1 |
| 192 |
- myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}" |
| 193 |
+ myconf+=" --add-module=${HTTP_HEADERS_MORE_MODULE_WD}" |
| 194 |
fi |
| 195 |
|
| 196 |
if use nginx_modules_http_push; then |
| 197 |
http_enabled=1 |
| 198 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}" |
| 199 |
+ myconf+=" --add-module=${HTTP_PUSH_MODULE_WD}" |
| 200 |
fi |
| 201 |
|
| 202 |
if use nginx_modules_http_cache_purge; then |
| 203 |
http_enabled=1 |
| 204 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}" |
| 205 |
+ myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}" |
| 206 |
fi |
| 207 |
|
| 208 |
if use nginx_modules_http_upload; then |
| 209 |
http_enabled=1 |
| 210 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}" |
| 211 |
+ myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}" |
| 212 |
fi |
| 213 |
|
| 214 |
if use nginx_modules_http_slowfs_cache; then |
| 215 |
http_enabled=1 |
| 216 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}" |
| 217 |
+ myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}" |
| 218 |
fi |
| 219 |
|
| 220 |
if use nginx_modules_http_fancyindex; then |
| 221 |
http_enabled=1 |
| 222 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}" |
| 223 |
+ myconf+=" --add-module=${HTTP_FANCYINDEX_MODULE_WD}" |
| 224 |
+ fi |
| 225 |
+ |
| 226 |
+ if use nginx_modules_http_lua; then |
| 227 |
+ http_enabled=1 |
| 228 |
+ myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}" |
| 229 |
+ myconf+=" --add-module=${HTTP_LUA_MODULE_WD}" |
| 230 |
fi |
| 231 |
|
| 232 |
if use http || use http-cache; then |
| 233 |
@@ -332,27 +359,32 @@ |
| 234 |
|
| 235 |
if use nginx_modules_http_push; then |
| 236 |
docinto ${HTTP_PUSH_MODULE_P} |
| 237 |
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README} |
| 238 |
+ dodoc "${HTTP_PUSH_MODULE_WD}"/{changelog.txt,protocol.txt,README} |
| 239 |
fi |
| 240 |
|
| 241 |
if use nginx_modules_http_cache_purge; then |
| 242 |
docinto ${HTTP_CACHE_PURGE_MODULE_P} |
| 243 |
- dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md} |
| 244 |
+ dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} |
| 245 |
fi |
| 246 |
|
| 247 |
if use nginx_modules_http_upload; then |
| 248 |
docinto ${HTTP_UPLOAD_MODULE_P} |
| 249 |
- dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README} |
| 250 |
+ dodoc "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README} |
| 251 |
fi |
| 252 |
|
| 253 |
if use nginx_modules_http_slowfs_cache; then |
| 254 |
docinto ${HTTP_SLOWFS_CACHE_MODULE_P} |
| 255 |
- dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md} |
| 256 |
+ dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} |
| 257 |
fi |
| 258 |
|
| 259 |
if use nginx_modules_http_fancyindex; then |
| 260 |
docinto ${HTTP_FANCYINDEX_MODULE_P} |
| 261 |
- dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst |
| 262 |
+ dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst |
| 263 |
+ fi |
| 264 |
+ |
| 265 |
+ if use nginx_modules_http_lua; then |
| 266 |
+ docinto ${HTTP_LUA_MODULE_P} |
| 267 |
+ dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} |
| 268 |
fi |
| 269 |
} |
| 270 |
|
| 271 |
|
| 272 |
|
| 273 |
|
| 274 |
1.3 www-servers/nginx/nginx-1.3.3.ebuild |
| 275 |
|
| 276 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild?rev=1.3&view=markup |
| 277 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild?rev=1.3&content-type=text/plain |
| 278 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild?r1=1.2&r2=1.3 |
| 279 |
|
| 280 |
Index: nginx-1.3.3.ebuild |
| 281 |
=================================================================== |
| 282 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild,v |
| 283 |
retrieving revision 1.2 |
| 284 |
retrieving revision 1.3 |
| 285 |
diff -u -r1.2 -r1.3 |
| 286 |
--- nginx-1.3.3.ebuild 30 Jul 2012 06:29:23 -0000 1.2 |
| 287 |
+++ nginx-1.3.3.ebuild 30 Jul 2012 08:18:38 -0000 1.3 |
| 288 |
@@ -1,6 +1,6 @@ |
| 289 |
# Copyright 1999-2012 Gentoo Foundation |
| 290 |
# Distributed under the terms of the GNU General Public License v2 |
| 291 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild,v 1.2 2012/07/30 06:29:23 hollow Exp $ |
| 292 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild,v 1.3 2012/07/30 08:18:38 hollow Exp $ |
| 293 |
|
| 294 |
EAPI="4" |
| 295 |
|
| 296 |
@@ -17,59 +17,78 @@ |
| 297 |
# prevent perl-module from adding automagic perl DEPENDs |
| 298 |
GENTOO_DEPEND_ON_PERL="no" |
| 299 |
|
| 300 |
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) |
| 301 |
+DEVEL_KIT_MODULE_PV="0.2.17" |
| 302 |
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" |
| 303 |
+DEVEL_KIT_MODULE_SHA1="bc97eea" |
| 304 |
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/tarball/v${DEVEL_KIT_MODULE_PV}" |
| 305 |
+DEVEL_KIT_MODULE_WD="${WORKDIR}/simpl-ngx_devel_kit-${DEVEL_KIT_MODULE_SHA1}" |
| 306 |
+ |
| 307 |
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) |
| 308 |
HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0" |
| 309 |
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" |
| 310 |
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" |
| 311 |
HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea" |
| 312 |
HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}" |
| 313 |
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}" |
| 314 |
|
| 315 |
# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license) |
| 316 |
-HTTP_HEADERS_MORE_MODULE_PV="0.17rc1" |
| 317 |
+HTTP_HEADERS_MORE_MODULE_PV="0.17" |
| 318 |
HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" |
| 319 |
-HTTP_HEADERS_MORE_MODULE_SHA1="3580526" |
| 320 |
+HTTP_HEADERS_MORE_MODULE_SHA1="b7c8cfc" |
| 321 |
HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}" |
| 322 |
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}" |
| 323 |
|
| 324 |
# http_push (http://pushmodule.slact.net/, MIT license) |
| 325 |
HTTP_PUSH_MODULE_PV="0.692" |
| 326 |
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" |
| 327 |
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz" |
| 328 |
+HTTP_PUSH_MODULE_P="ngx_http_push-${HTTP_PUSH_MODULE_PV}" |
| 329 |
+HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}.tar.gz" |
| 330 |
+HTTP_PUSH_MODULE_WD="${WORKDIR}/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" |
| 331 |
|
| 332 |
# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) |
| 333 |
-HTTP_CACHE_PURGE_MODULE_PV="1.5" |
| 334 |
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" |
| 335 |
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz" |
| 336 |
+HTTP_CACHE_PURGE_MODULE_PV="1.6" |
| 337 |
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" |
| 338 |
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" |
| 339 |
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" |
| 340 |
|
| 341 |
-# HTTP Upload module from Valery Kholodkov |
| 342 |
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license) |
| 343 |
+# http_upload (http://www.grid.net.ru/nginx/upload.en.html, BSD license) |
| 344 |
HTTP_UPLOAD_MODULE_PV="2.2.0" |
| 345 |
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" |
| 346 |
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz" |
| 347 |
+HTTP_UPLOAD_MODULE_P="ngx_http_upload-${HTTP_UPLOAD_MODULE_PV}" |
| 348 |
+HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}.tar.gz" |
| 349 |
+HTTP_UPLOAD_MODULE_WD="${WORKDIR}/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" |
| 350 |
|
| 351 |
# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) |
| 352 |
-HTTP_SLOWFS_CACHE_MODULE_PV="1.8" |
| 353 |
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" |
| 354 |
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz" |
| 355 |
+HTTP_SLOWFS_CACHE_MODULE_PV="1.9" |
| 356 |
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" |
| 357 |
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" |
| 358 |
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" |
| 359 |
|
| 360 |
-# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license) |
| 361 |
+# http_fancyindex (http://wiki.nginx.org/NgxFancyIndex, BSD license) |
| 362 |
HTTP_FANCYINDEX_MODULE_PV="0.3.1" |
| 363 |
-HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex" |
| 364 |
-# gitorious names the tarbell oddly, hence PNPN |
| 365 |
-HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex" |
| 366 |
-HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}" |
| 367 |
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}" |
| 368 |
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" |
| 369 |
+HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}" |
| 370 |
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-ngx-fancyindex" |
| 371 |
+ |
| 372 |
+# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license) |
| 373 |
+HTTP_LUA_MODULE_PV="0.5.10" |
| 374 |
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" |
| 375 |
+HTTP_LUA_MODULE_SHA1="db0bebe" |
| 376 |
+HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/tarball/v${HTTP_LUA_MODULE_PV}" |
| 377 |
+HTTP_LUA_MODULE_WD="${WORKDIR}/chaoslawful-lua-nginx-module-${HTTP_LUA_MODULE_SHA1}" |
| 378 |
|
| 379 |
inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user |
| 380 |
|
| 381 |
DESCRIPTION="Robust, small and high performance http and reverse proxy server" |
| 382 |
HOMEPAGE="http://nginx.org" |
| 383 |
SRC_URI="http://nginx.org/download/${P}.tar.gz |
| 384 |
+ ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz |
| 385 |
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) |
| 386 |
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) |
| 387 |
nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} ) |
| 388 |
nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} ) |
| 389 |
nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} ) |
| 390 |
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} ) |
| 391 |
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )" |
| 392 |
+ nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) |
| 393 |
+ nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )" |
| 394 |
|
| 395 |
LICENSE="as-is BSD BSD-2 GPL-2 MIT" |
| 396 |
SLOT="0" |
| 397 |
@@ -89,7 +108,8 @@ |
| 398 |
http_cache_purge |
| 399 |
http_upload |
| 400 |
http_slowfs_cache |
| 401 |
- http_fancyindex" |
| 402 |
+ http_fancyindex |
| 403 |
+ http_lua" |
| 404 |
|
| 405 |
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax" |
| 406 |
|
| 407 |
@@ -122,7 +142,8 @@ |
| 408 |
nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) |
| 409 |
nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) |
| 410 |
nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) |
| 411 |
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )" |
| 412 |
+ nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) |
| 413 |
+ nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )" |
| 414 |
RDEPEND="${CDEPEND}" |
| 415 |
DEPEND="${CDEPEND} |
| 416 |
arm? ( dev-libs/libatomic_ops ) |
| 417 |
@@ -214,37 +235,43 @@ |
| 418 |
# third-party modules |
| 419 |
if use nginx_modules_http_upload_progress; then |
| 420 |
http_enabled=1 |
| 421 |
- myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}" |
| 422 |
+ myconf+=" --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD}" |
| 423 |
fi |
| 424 |
|
| 425 |
if use nginx_modules_http_headers_more; then |
| 426 |
http_enabled=1 |
| 427 |
- myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}" |
| 428 |
+ myconf+=" --add-module=${HTTP_HEADERS_MORE_MODULE_WD}" |
| 429 |
fi |
| 430 |
|
| 431 |
if use nginx_modules_http_push; then |
| 432 |
http_enabled=1 |
| 433 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}" |
| 434 |
+ myconf+=" --add-module=${HTTP_PUSH_MODULE_WD}" |
| 435 |
fi |
| 436 |
|
| 437 |
if use nginx_modules_http_cache_purge; then |
| 438 |
http_enabled=1 |
| 439 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}" |
| 440 |
+ myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}" |
| 441 |
fi |
| 442 |
|
| 443 |
if use nginx_modules_http_upload; then |
| 444 |
http_enabled=1 |
| 445 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}" |
| 446 |
+ myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}" |
| 447 |
fi |
| 448 |
|
| 449 |
if use nginx_modules_http_slowfs_cache; then |
| 450 |
http_enabled=1 |
| 451 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}" |
| 452 |
+ myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}" |
| 453 |
fi |
| 454 |
|
| 455 |
if use nginx_modules_http_fancyindex; then |
| 456 |
http_enabled=1 |
| 457 |
- myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}" |
| 458 |
+ myconf+=" --add-module=${HTTP_FANCYINDEX_MODULE_WD}" |
| 459 |
+ fi |
| 460 |
+ |
| 461 |
+ if use nginx_modules_http_lua; then |
| 462 |
+ http_enabled=1 |
| 463 |
+ myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}" |
| 464 |
+ myconf+=" --add-module=${HTTP_LUA_MODULE_WD}" |
| 465 |
fi |
| 466 |
|
| 467 |
if use http || use http-cache; then |
| 468 |
@@ -332,27 +359,32 @@ |
| 469 |
|
| 470 |
if use nginx_modules_http_push; then |
| 471 |
docinto ${HTTP_PUSH_MODULE_P} |
| 472 |
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README} |
| 473 |
+ dodoc "${HTTP_PUSH_MODULE_WD}"/{changelog.txt,protocol.txt,README} |
| 474 |
fi |
| 475 |
|
| 476 |
if use nginx_modules_http_cache_purge; then |
| 477 |
docinto ${HTTP_CACHE_PURGE_MODULE_P} |
| 478 |
- dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md} |
| 479 |
+ dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} |
| 480 |
fi |
| 481 |
|
| 482 |
if use nginx_modules_http_upload; then |
| 483 |
docinto ${HTTP_UPLOAD_MODULE_P} |
| 484 |
- dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README} |
| 485 |
+ dodoc "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README} |
| 486 |
fi |
| 487 |
|
| 488 |
if use nginx_modules_http_slowfs_cache; then |
| 489 |
docinto ${HTTP_SLOWFS_CACHE_MODULE_P} |
| 490 |
- dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md} |
| 491 |
+ dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} |
| 492 |
fi |
| 493 |
|
| 494 |
if use nginx_modules_http_fancyindex; then |
| 495 |
docinto ${HTTP_FANCYINDEX_MODULE_P} |
| 496 |
- dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst |
| 497 |
+ dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst |
| 498 |
+ fi |
| 499 |
+ |
| 500 |
+ if use nginx_modules_http_lua; then |
| 501 |
+ docinto ${HTTP_LUA_MODULE_P} |
| 502 |
+ dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} |
| 503 |
fi |
| 504 |
} |
Archives