From nobody Sat Feb 19 21:04:17 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9EAA619CA0CA; Sat, 19 Feb 2022 21:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K1Lf9390dz4RHx; Sat, 19 Feb 2022 21:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645304657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiyxX8rXtK+Cx1JVvow0ngSyrmJhXlYI00jUcMTpRRA=; b=aQ8oMBhkY+0MGLN0jk0fl0yyxqH2nuj+EwkdT+yFNm8HiQyNDvHHz3AuDkO04r+G8hFE14 +RZ47LEGs3JVcLWmMY6Rb4GvF2WR7Xg1ovTRa0u8/NMz0CILdenKqvBAyy1OQ/pKQWZ91s 16Ik2SXuM3kuIiQQScsU7Xwod1orulGMf+oqG02N9NSncROPWX1NCogCqqlIR91CbN/It6 /IEjqZYCvvWa7L2C8FiaEyPHAf5kj4fn115mBt8cR0yrnxKAj4GFK8KmG4ISuKMusChIzU L86OLfdg/uA2fgepAuN3SztIBzbdTwQ8n0+SnNhDGmdIosfdWqQbyH1KkQUtpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B6081048C; Sat, 19 Feb 2022 21:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21JL4H4j007888; Sat, 19 Feb 2022 21:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21JL4HcJ007887; Sat, 19 Feb 2022 21:04:17 GMT (envelope-from git) Date: Sat, 19 Feb 2022 21:04:17 GMT Message-Id: <202202192104.21JL4HcJ007887@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 6c58c2274ed6 - main - www/nginx: update third-party ngx_fancyindex module List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c58c2274ed66612211ad75925eb27c3ae3853e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645304657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiyxX8rXtK+Cx1JVvow0ngSyrmJhXlYI00jUcMTpRRA=; b=D/EtbF/Wk5cBIgjWux4EtZFWkJGfsm6yn5je8l+XGGz4XlCVARuCSDDHwoZY03FhUvyofh +aqNYNqAcRrp44TIwES7bWYfaj4KlSQgzjspcjgI+/VoFXru8x/An2fRXL2xkfhJD6N+aq gW28D5glbHr6fFSsbf8wihIiNI2lu3GzVPfVORmX1mglLrNBz3cUXcihFldWG9KSbVbiOb 8sQXVC6g7qHTvTsT2slAwvnt3rJlEHoWp4iftfZd0/sm+B+aKv+jxXx3Y3lMV9HvulXl3i FDz5aLHofxoeCTcFY4MDw1aIzORfoFhiqlB1N4QtZyLZ69O45fv6UZhalnlg7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645304657; a=rsa-sha256; cv=none; b=Ae9wYPgTQxLNm0PcOmL35YRyDHE+QakZWeWK8Y3sIx7h24Cgdx7lrL3iYnzPhCp/+htumw OP4WnUrI5Ka+yVoIDK7Buv+rdyuDxNjb9jnVFE/KFjLVvgNhtC+cvL13Q/UCZxiKLMyZXU cDy28tS6+VaOq09ZurSTQjUEy2XO1MyKPFatPqocXYiUZyXJ07LIywyqd1iVEdvUJEIxXO +5vsZb6pZLYQwb6O1VYp+qIVLLUR3UnXUqGc66DCoLXJNijmNpHOV+p6a16FvOC9TTrqMH QtZZAhCBZCN9IvMtk/poSAUP47Jpql05Y2JpvwcS5K7D0yJuSmqHxrbYE5eHGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c58c2274ed66612211ad75925eb27c3ae3853e7 commit 6c58c2274ed66612211ad75925eb27c3ae3853e7 Author: Jochen Neumeister AuthorDate: 2022-02-19 21:01:48 +0000 Commit: Jochen Neumeister CommitDate: 2022-02-19 21:04:11 +0000 www/nginx: update third-party ngx_fancyindex module Update third-party ngx-fancyindex module from v0.5.1 to v0.5.2 Add patch to fix heimdal build (1) PR: 261810 (1) Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 5 ++- www/nginx/distinfo | 6 +-- .../extra-patch-ngx_http_auth_spnego_module.c | 49 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index a6cd3399c6d5..35a3388505b5 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.20.2 -PORTREVISION?= 7 +PORTREVISION?= 8 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 0af2d63e5f7a..e363c39b0d17 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -78,7 +78,8 @@ HTTP_AUTH_JWT_LIB_DEPENDS= libjwt.so:www/libjwt libjansson.so:devel/jansson HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:c626163:auth_krb5 HTTP_AUTH_KRB5_VARS= DSO_EXTMODS+=auth_krb5 -HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config +HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config \ + ${PATCHDIR}/extra-patch-ngx_http_auth_spnego_module.c HTTP_AUTH_LDAP_GH_TUPLE= kvspb:nginx-auth-ldap:42d195d:http_auth_ldap HTTP_AUTH_LDAP_VARS= DSO_EXTMODS+=http_auth_ldap @@ -96,7 +97,7 @@ HTTP_DAV_EXT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_dav_ext_module.c HTTP_EVAL_GH_TUPLE= openresty:nginx-eval-module:582bd25:eval HTTP_EVAL_VARS= DSO_EXTMODS+=eval -HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:v0.5.1:fancyindex +HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:v0.5.2:fancyindex HTTP_FANCYINDEX_VARS= DSO_EXTMODS+=fancyindex HTTP_FOOTER_GH_TUPLE= alibaba:nginx-http-footer-filter:1.2.2:footer diff --git a/www/nginx/distinfo b/www/nginx/distinfo index f59d9270a69c..67591357acda 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1644495863 +TIMESTAMP = 1645303393 SHA256 (nginx-1.20.2.tar.gz) = 958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42 SIZE (nginx-1.20.2.tar.gz) = 1062124 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -61,8 +61,8 @@ SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d79 SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558 SHA256 (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 014bedb2b334ba8e8e23b4c660590357f8055dbed7b9b017e4cc2937876a8822 SIZE (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 14849 -SHA256 (aperezdc-ngx-fancyindex-v0.5.1_GH0.tar.gz) = 238bd5521d6c9b55780e6871339a7ea79508b9a6758ad2fa4451f2dfe26d94c9 -SIZE (aperezdc-ngx-fancyindex-v0.5.1_GH0.tar.gz) = 28277 +SHA256 (aperezdc-ngx-fancyindex-v0.5.2_GH0.tar.gz) = c3dd84d8ba0b8daeace3041ef5987e3fb96e9c7c17df30c9ffe2fe3aa2a0ca31 +SIZE (aperezdc-ngx-fancyindex-v0.5.2_GH0.tar.gz) = 29052 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934 SHA256 (leev-ngx_http_geoip2_module-3.3_GH0.tar.gz) = 41378438c833e313a18869d0c4a72704b4835c30acaf7fd68013ab6732ff78a7 diff --git a/www/nginx/files/extra-patch-ngx_http_auth_spnego_module.c b/www/nginx/files/extra-patch-ngx_http_auth_spnego_module.c new file mode 100644 index 000000000000..b14fbe108fa2 --- /dev/null +++ b/www/nginx/files/extra-patch-ngx_http_auth_spnego_module.c @@ -0,0 +1,49 @@ +--- ../spnego-http-auth-nginx-module-c626163/ngx_http_auth_spnego_module.c.orig 2022-02-19 21:05:54.082252000 +0100 ++++ ../spnego-http-auth-nginx-module-c626163/ngx_http_auth_spnego_module.c 2022-02-19 21:12:17.316744000 +0100 +@@ -63,6 +63,11 @@ + #define spnego_log_error(fmt, args...) \ + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, fmt, ##args) + ++#ifndef krb5_realm_length ++#define krb5_realm_length(r) ((r).length) ++#define krb5_realm_data(r) ((r).data) ++#endif ++ + /* Module handler */ + static ngx_int_t ngx_http_auth_spnego_handler(ngx_http_request_t *); + +@@ -1195,12 +1200,12 @@ static krb5_error_code ngx_http_auth_spnego_verify_ser + } + + size_t tgs_principal_name_size = +- (ngx_strlen(KRB5_TGS_NAME) + (principal->realm.length * 2) + 2) + 1; ++ (ngx_strlen(KRB5_TGS_NAME) + (krb5_realm_length(principal->realm) * 2) + 2) + 1; + tgs_principal_name = (char *)ngx_pcalloc(r->pool, tgs_principal_name_size); + ngx_snprintf((u_char *)tgs_principal_name, tgs_principal_name_size, +- "%s/%*s@%*s", KRB5_TGS_NAME, principal->realm.length, +- principal->realm.data, principal->realm.length, +- principal->realm.data); ++ "%s/%*s@%*s", KRB5_TGS_NAME, krb5_realm_length(principal->realm), ++ krb5_realm_data(principal->realm), krb5_realm_length(principal->realm), ++ krb5_realm_data(principal->realm)); + + if ((kerr = krb5_parse_name(kcontext, tgs_principal_name, + &match_creds.server))) { +@@ -1341,13 +1346,13 @@ static ngx_int_t ngx_http_auth_spnego_obtain_server_cr + krb5_get_init_creds_opt_set_forwardable(&gicopts, 1); + + size_t tgs_principal_name_size = +- (ngx_strlen(KRB5_TGS_NAME) + (principal->realm.length * 2) + 2) + 1; ++ (ngx_strlen(KRB5_TGS_NAME) + (krb5_realm_length(principal->realm) * 2) + 2) + 1; + tgs_principal_name = (char *)ngx_pcalloc(r->pool, tgs_principal_name_size); + + ngx_snprintf((u_char *)tgs_principal_name, tgs_principal_name_size, +- "%s/%*s@%*s", KRB5_TGS_NAME, principal->realm.length, +- principal->realm.data, principal->realm.length, +- principal->realm.data); ++ "%s/%*s@%*s", KRB5_TGS_NAME, krb5_realm_length(principal->realm), ++ krb5_realm_data(principal->realm), krb5_realm_length(principal->realm), ++ krb5_realm_data(principal->realm)); + + kerr = krb5_get_init_creds_keytab(kcontext, &creds, principal, keytab, 0, + tgs_principal_name, &gicopts);