From nobody Thu Feb 10 16:53:20 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 BE57D19B6973; Thu, 10 Feb 2022 16:53:20 +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 4JvjVm4r0yz4vZC; Thu, 10 Feb 2022 16:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644512000; 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=zKWJklIHbNmbCeaDv17NrFJDzKuNkzB0hbKckhesJec=; b=lnQ6r9F8RdHqlr9K0nCAQ3BMv08fxNAqmGPY2jBLlr2IQ29dAbWMN4aS2ikj2WsEkHiQ3X n/SVdvHQgciAoulNA2oNU53foeVJF1Yyw8mWgVi9Vq2Tu0lldedzlGzZsXZi23iGCkZzqj icbElH5NJRP1hd1MfBaP+OjyYadcqNUJdtXjuSv7DO2xjhutFfRLrSP338oC0mmI5Z1t8C LV/JKaGlW+YpyIbtMn/YkvphURWvr3EC9BXznHnhAGBbNmp9+0i5NdrjAEFoQWyu5yrFha 1PIiGuNdgez6HKRDkITwPPjfyazc/eJi9/dkG/q7FMW8vpKJQ9PCKv5wUXgt8g== 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 85E6C240E4; Thu, 10 Feb 2022 16:53:20 +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 21AGrK1C005992; Thu, 10 Feb 2022 16:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AGrKRk005991; Thu, 10 Feb 2022 16:53:20 GMT (envelope-from git) Date: Thu, 10 Feb 2022 16:53:20 GMT Message-Id: <202202101653.21AGrKRk005991@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: 7ab2abfa9d0a - main - www/nginx: update third-party spnego-http-auth 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: 7ab2abfa9d0a0c7efec47aafe89e2e1faf535be8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644512000; 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=zKWJklIHbNmbCeaDv17NrFJDzKuNkzB0hbKckhesJec=; b=E6P+shx0aCQgUh8yQod6e1GoU/1aYl9tKvUSif16Sgzu2BjGO3RJUshU2bEwLDrrVo3tDA RnP3hpjlw+lCToePyejongjhdKmomHVyBb3wjPXsS3W7xjy70qeLYLAkHVwC5juGcbAEOq 9JPm6cRSaFlOa4jaTuv52yMbYzoQ0w0QGCy2Pp0llfksVA9QMVHRFpssCLnfe5dokCXCS9 RL/Tj3XH/k9YCtCUtjtLY7g99V3BQP17eSpGwyfgto5IHl2TdYFob/lcbIoWRkQ9fkug9s J1wPwdF5c0094aV1j2AH5quSgLkJAZpC1cAL3V9XLOpQ8DDgw7v48Ns9vFFKvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644512000; a=rsa-sha256; cv=none; b=fYuC9AfVvE8UY7IlhlETLbQ1A3Xcj4erV+TOmOPmWzuRXks3CmEDQqWWFv5GYrpT2WzHAG XltFS5HC+pLvJpTQBymwaZ95ZQ3+jZBemfeLaVkbEQx6pOmlPDsZXFMAtIyDReMapCYfcY VXhbBxxuyA5BsWFy243CkJ2Vi5+ZkyzGP90HcFICukFS2ge+nzQpxxMD4fT7RU5AIaY5hQ yWRCxg0pnZo1QCC4QmZe1nGf3DTphlKDQJIPzE54jxg62zRE9GI6Mkg6fOdwO1VsET0+CF l84m/Hm5hxGLHgx1WmS1Pf8hbS3/B1HO7fbxCeE13azm+/19ZCZKghFIoWoI3w== 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=7ab2abfa9d0a0c7efec47aafe89e2e1faf535be8 commit 7ab2abfa9d0a0c7efec47aafe89e2e1faf535be8 Author: Jochen Neumeister AuthorDate: 2022-02-10 16:48:43 +0000 Commit: Jochen Neumeister CommitDate: 2022-02-10 16:53:14 +0000 www/nginx: update third-party spnego-http-auth module There was an error when loading the module in nginx.conf. This update also fixes this error: nginx: [emerg] dlopen() "/usr/local/libexec/nginx/ngx_http_auth_spnego_module.so" failed (/usr/local/libexec/nginx/ngx_http_auth_spnego_module.so: Undefined symbol "__gss_krb5_mechanism_oid_desc") in /usr/local/etc/nginx/nginx.conf:7 nginx: configuration file /usr/local/etc/nginx/nginx.conf test failed PR: 261810 Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 2 +- www/nginx/distinfo | 6 +++--- www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 046424cfa732..a6cd3399c6d5 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.20.2 -PORTREVISION?= 6 +PORTREVISION?= 7 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 4b7edbe4e9a5..0af2d63e5f7a 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -76,7 +76,7 @@ HTTP_AUTH_JWT_GH_TUPLE= TeslaGov:ngx-http-auth-jwt-module:80d89d9:http_auth_jwt HTTP_AUTH_JWT_VARS= DSO_EXTMODS+=http_auth_jwt HTTP_AUTH_JWT_LIB_DEPENDS= libjwt.so:www/libjwt libjansson.so:devel/jansson -HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:72c8ee0:auth_krb5 +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 diff --git a/www/nginx/distinfo b/www/nginx/distinfo index be8e76a93692..f59d9270a69c 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1641727913 +TIMESTAMP = 1644495863 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 @@ -51,8 +51,8 @@ SHA256 (atomx-nginx-http-auth-digest-cd86418_GH0.tar.gz) = 9858b202e5009da4047ac SIZE (atomx-nginx-http-auth-digest-cd86418_GH0.tar.gz) = 17869 SHA256 (TeslaGov-ngx-http-auth-jwt-module-80d89d9_GH0.tar.gz) = 1b71290a0eab6a0bb6ab75e1228a302cf76c82f3284ad0eb7e8b2bfa110582e7 SIZE (TeslaGov-ngx-http-auth-jwt-module-80d89d9_GH0.tar.gz) = 14674 -SHA256 (stnoonan-spnego-http-auth-nginx-module-72c8ee0_GH0.tar.gz) = df6be6e67a4a4a37db584effdf2326a7eca29891724363bd34d03967cc8e5c68 -SIZE (stnoonan-spnego-http-auth-nginx-module-72c8ee0_GH0.tar.gz) = 18502 +SHA256 (stnoonan-spnego-http-auth-nginx-module-c626163_GH0.tar.gz) = dac75d65453744ffe0f7af248f10f98fc89efca07303aa45a610805e57c588fc +SIZE (stnoonan-spnego-http-auth-nginx-module-c626163_GH0.tar.gz) = 24404 SHA256 (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 78d74697f89821a7ed31c6c672f6c06923bb53a681ebb203eabebb657bdafd80 SIZE (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 18455 SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7 diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config index 0d7aabe51d93..3afa4aaebd9c 100644 --- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,9 +1,9 @@ ---- ../spnego-http-auth-nginx-module-72c8ee0/config.orig 2020-10-17 22:35:57.676855000 +0200 -+++ ../spnego-http-auth-nginx-module-72c8ee0/config 2020-10-17 22:40:49.255324000 +0200 +--- ../spnego-http-auth-nginx-module-c626163/config.orig 2020-10-17 22:35:57.676855000 +0200 ++++ ../spnego-http-auth-nginx-module-c626163/config 2020-10-17 22:40:49.255324000 +0200 @@ -1,8 +1,10 @@ ngx_addon_name=ngx_http_auth_spnego_module -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" -+ngx_feature_libs="%%GSSAPILIBS%%" ++ngx_feature_libs="-L%%GSSAPILIBDIR%% %%GSSAPILIBS%%" +ngx_module_incs="%%GSSAPINCDIR%%" +