commit: e3bd72e8a4c33582860aa2ebcb578af80c5fcbb2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Aug 14 00:07:12 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Aug 14 00:07:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bd72e8
www-servers/nginx: drop http_auth_pam patch ...now included in upstream release. Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...just-loglevel-for-authentication-failures.patch | 22 ---------------- .../nginx/files/http_brotli-detect-brotli-r2.patch | 30 ---------------------- www-servers/nginx/nginx-1.18.0-r2.ebuild | 6 ----- www-servers/nginx/nginx-1.19.2-r1.ebuild | 6 ----- 4 files changed, 64 deletions(-) diff --git a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch deleted file mode 100644 index 632dcdee50e..00000000000 --- a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/sto/ngx_http_auth_pam_module/pull/18 - ---- a/ngx_http_auth_pam_module.c -+++ b/ngx_http_auth_pam_module.c -@@ -348,7 +348,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r, - /* try to authenticate user, log error on failure */ - if ((rc = pam_authenticate(pamh, - PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { -- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "PAM: user '%s' - not authenticated: %s", - ainfo.username.data, pam_strerror(pamh, rc)); - pam_end(pamh, PAM_SUCCESS); -@@ -357,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r, - - /* check that the account is healthy */ - if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { -- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "PAM: user '%s' - invalid account: %s", - ainfo.username.data, pam_strerror(pamh, rc)); - pam_end(pamh, PAM_SUCCESS); diff --git a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch b/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch deleted file mode 100644 index 8774fa60d1c..00000000000 --- a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/config -+++ b/config -@@ -59,13 +59,7 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated - ngx_module_type=HTTP_FILTER - ngx_module_name=ngx_http_brotli_filter_module - --brotli="/usr/local" -- --if [ -f "/usr/include/brotli/encode.h" ]; then -- --brotli="/usr" -- --fi -+brotli=$(pkg-config --variable=prefix libbrotlienc) - - if [ ! -f "$brotli/include/brotli/encode.h" ]; then - -@@ -75,11 +69,7 @@ if [ ! -f "$brotli/include/brotli/encode.h" ]; then - cat << END - - $0: error: \ --Brotli library is missing from the $brotli directory. -- --Please make sure that the git submodule has been checked out: -- -- cd $ngx_addon_dir && git submodule update --init && cd $PWD -+Brotli library not found. Don't you have app-arch/brotli installed? - - END - exit 1 diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild b/www-servers/nginx/nginx-1.18.0-r2.ebuild index e69e9dc9c5d..c4aa1254fc9 100644 --- a/www-servers/nginx/nginx-1.18.0-r2.ebuild +++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild @@ -385,12 +385,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" - if use nginx_modules_http_auth_pam; then - cd "${HTTP_AUTH_PAM_MODULE_WD}" || die - eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch - cd "${S}" || die - fi - if use nginx_modules_http_brotli; then cd "${HTTP_BROTLI_MODULE_WD}" || die eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch diff --git a/www-servers/nginx/nginx-1.19.2-r1.ebuild b/www-servers/nginx/nginx-1.19.2-r1.ebuild index 541a05f9b06..a23f3375b04 100644 --- a/www-servers/nginx/nginx-1.19.2-r1.ebuild +++ b/www-servers/nginx/nginx-1.19.2-r1.ebuild @@ -385,12 +385,6 @@ src_prepare() { eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" - if use nginx_modules_http_auth_pam; then - cd "${HTTP_AUTH_PAM_MODULE_WD}" || die - eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch - cd "${S}" || die - fi - if use nginx_modules_http_brotli; then cd "${HTTP_BROTLI_MODULE_WD}" || die eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
