From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-907226-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B5CDF13855A
for <garchives@archives.gentoo.org>; Thu, 20 Oct 2016 14:04:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 34021E08D2;
Thu, 20 Oct 2016 14:03:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 09248E08D2
for <gentoo-commits@lists.gentoo.org>; Thu, 20 Oct 2016 14:03:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7FFF4341646
for <gentoo-commits@lists.gentoo.org>; Thu, 20 Oct 2016 14:03:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CFCF2F4
for <gentoo-commits@lists.gentoo.org>; Thu, 20 Oct 2016 14:03:54 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1476972219.1ff623f132f68b98061ac2d0ff9695920041a336.whissi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/, www-servers/nginx/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch www-servers/nginx/files/http_uploadprogress-issue_50.patch www-servers/nginx/nginx-1.10.2-r1.ebuild www-servers/nginx/nginx-1.11.5-r1.ebuild
X-VCS-Directories: www-servers/nginx/ www-servers/nginx/files/
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 1ff623f132f68b98061ac2d0ff9695920041a336
X-VCS-Branch: master
Date: Thu, 20 Oct 2016 14:03:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 51ea40ca-480f-4635-9c28-ad1406469ad7
X-Archives-Hash: 3c06824cea3ee41d7038e953e64d8e66
commit: 1ff623f132f68b98061ac2d0ff9695920041a336
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 14:03:39 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 14:03:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff623f1
www-servers/nginx: Patch for uploadprogress module updated
The previous patch worked however upstream merged an updated PR
so I updated the patch to stay in sync.
Package-Manager: portage-2.3.2
.../files/http_uploadprogress-issue_50-r1.patch | 31 +++++++++++++++++++++
.../nginx/files/http_uploadprogress-issue_50.patch | 32 ----------------------
www-servers/nginx/nginx-1.10.2-r1.ebuild | 2 +-
www-servers/nginx/nginx-1.11.5-r1.ebuild | 2 +-
4 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch b/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch
new file mode 100644
index 00000000..42cbd77
--- /dev/null
+++ b/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch
@@ -0,0 +1,31 @@
+From dd138546b16a01e9c09613d02211373baf1cac02 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@whissi.de>
+Date: Thu, 20 Oct 2016 03:09:37 +0200
+Subject: [PATCH] config: Fix ngx_module_type
+
+Since commit 37182ce2f3b6 the module was not present in static builds
+because due to an invalid "ngx_module_type" the module was not added to
+objs/ngx_modules.c.
+
+This commit will fix the problem by setting the correct module type
+"HTTP_FILTER" [Link 1].
+
+Link 1: https://www.nginx.com/resources/wiki/extending/new_config/#key-ngx_module_type
+Gentoo-Bug: https://bugs.gentoo.org/593450
+Fixes: https://github.com/masterzen/nginx-upload-progress-module/issues/50
+---
+ config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config b/config
+index 364af8c..5f4ade1 100644
+--- a/config
++++ b/config
+@@ -1,6 +1,6 @@
+ ngx_addon_name=ngx_http_uploadprogress_module
+ if test -n "$ngx_module_link"; then
+- ngx_module_type=FILTER
++ ngx_module_type=HTTP_FILTER
+ ngx_module_name=ngx_http_uploadprogress_module
+ ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"
+
diff --git a/www-servers/nginx/files/http_uploadprogress-issue_50.patch b/www-servers/nginx/files/http_uploadprogress-issue_50.patch
deleted file mode 100644
index 3347c5b..00000000
--- a/www-servers/nginx/files/http_uploadprogress-issue_50.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From edd7e026fa992f58b04ea9d00b56239f37b3e320 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Wed, 19 Oct 2016 15:05:27 +0200
-Subject: [PATCH] config: Only build as dynamic module when really requested
-
-Since commit 37182ce2f3b6 the module was always build as dynamic module.
-Probably because following a bad skeleton [1].
-
-With this change we will only build a dynamic module when requested. Otherwise
-we will fall back to static build.
-
-Link: https://trac.nginx.org/nginx/ticket/1115
-Gentoo-Bug: https://bugs.gentoo.org/593450
-Fixes: https://github.com/masterzen/nginx-upload-progress-module/issues/50
----
- config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config b/config
-index 364af8c..d704460 100644
---- a/config
-+++ b/config
-@@ -1,5 +1,5 @@
- ngx_addon_name=ngx_http_uploadprogress_module
--if test -n "$ngx_module_link"; then
-+if [ $ngx_module_link = DYNAMIC ] ; then
- ngx_module_type=FILTER
- ngx_module_name=ngx_http_uploadprogress_module
- ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"
---
-2.10.1
-
diff --git a/www-servers/nginx/nginx-1.10.2-r1.ebuild b/www-servers/nginx/nginx-1.10.2-r1.ebuild
index c649333..8690da9 100644
--- a/www-servers/nginx/nginx-1.10.2-r1.ebuild
+++ b/www-servers/nginx/nginx-1.10.2-r1.ebuild
@@ -354,7 +354,7 @@ src_prepare() {
if use nginx_modules_http_upload_progress; then
cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
- eapply "${FILESDIR}"/http_uploadprogress-issue_50.patch
+ eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
cd "${S}" || die
fi
diff --git a/www-servers/nginx/nginx-1.11.5-r1.ebuild b/www-servers/nginx/nginx-1.11.5-r1.ebuild
index 46c24d3..5aae3ae 100644
--- a/www-servers/nginx/nginx-1.11.5-r1.ebuild
+++ b/www-servers/nginx/nginx-1.11.5-r1.ebuild
@@ -362,7 +362,7 @@ src_prepare() {
if use nginx_modules_http_upload_progress; then
cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
- eapply "${FILESDIR}"/http_uploadprogress-issue_50.patch
+ eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
cd "${S}" || die
fi