Add USE_EXPAND descriptions for nginx' auth_request and push_stream modules. Mask nginx mainline version bump.

3 files changed, 14 insertions, 3 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ada61f1e5f93..549a5d7c00f7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8322 2013/10/23 13:06:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8323 2013/10/24 06:25:02 dev-zero Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  24 Oct 2013; Tiziano Müller <dev-zero@gentoo.org>
+  desc/nginx_modules_http.desc, package.mask:
+  Add USE_EXPAND descriptions for nginx' auth_request and push_stream modules.
+  Mask nginx mainline version bump.
+
   23 Oct 2013; Davide Pesavento <pesa@gentoo.org> package.mask:
   Mask qt-creator 3.0 beta.
 
diff --git a/profiles/desc/nginx_modules_http.desc b/profiles/desc/nginx_modules_http.desc
index db6c30184a6c..b43a0b0c394b 100644
--- a/profiles/desc/nginx_modules_http.desc
+++ b/profiles/desc/nginx_modules_http.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/nginx_modules_http.desc,v 1.18 2013/09/27 13:29:20 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/nginx_modules_http.desc,v 1.19 2013/10/24 06:25:03 dev-zero Exp $
 
 # This file contains descriptions of NGINX_MODULES_HTTP USE_EXPAND flags.
 
@@ -9,6 +9,7 @@ access - This module provides a simple host-based access control.
 addition - This module adds contents of other locations before and after the current location's content.
 auth_basic - This module protects your site or parts of it with username and password based on HTTP Basic Authentication.
 auth_pam - This module provides authentication via PAM.
+auth_request - Module implementing client authorization based on the result of a subrequest.
 autoindex - This module provides automatic directory listings.
 browser - This module creates variables, the values of which depend on the request header "User-agent".
 cache_purge - External module adding ability to purge content from nginx's FastCGI and proxy caches.
@@ -42,6 +43,7 @@ passenger - Passenger makes deployment of Ruby web applications a breeze.
 perl - This module makes it possible to execute Perl directly within Nginx and call Perl via SSI.
 proxy - This module makes it possible to transfer requests to another server.
 push - External module turning Nginx into an adept HTTP Push and Comet server.
+push_stream - Push Stream module, supporting EventSource, WebSocket, Long Polling, and Forever Iframe.
 random_index - Pick a random directory index from a directory.
 realip - This module allows to change the client's IP address to value from request header (e. g. X-Real-IP or X-Forwarded-For).
 referer - This module makes it possible to block access to the site with the incorrect values of line "Referer" in the request header.
diff --git a/profiles/package.mask b/profiles/package.mask
index f6db247844d5..868341a7086d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
 ####################################################################
 
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15178 2013/10/23 13:06:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15179 2013/10/24 06:25:02 dev-zero Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Tiziano Müller <dev-zero@gentoo.org> (24 Oct 2013)
+# Mask mainline version branch
+=www-servers/nginx-1.5*
+
 # Davide Pesavento <pesa@gentoo.org> (23 Oct 2013)
 # Some features require Qt 5.2, which is not in tree yet.
 =dev-qt/qt-creator-3*