From nobody Mon Aug 28 09:03:28 2023 X-Original-To: dev-commits-ports-all@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 4RZ4NJ57QJz4rKhD; Mon, 28 Aug 2023 09:03:28 +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 4RZ4NJ4c7Mz3NNR; Mon, 28 Aug 2023 09:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693213408; 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=elIRrSUljo869a7mmHHpW2NwZwD97m9W99fmMsQ1vyM=; b=VLt4htsCjDvJYdNljUArGvLAGdVQlR9F556BRy3xUY7B1n7iIsbLisHadzH7U5jKIzeBob 0WteBqdk50266USljzIFS5BIm58ysPn1U44kIqMJjyOetZENht+ydFL0+Hhl/eH0+maUsT EXGKfr/8loS1YpMVlv/KrVdwsRrPA5DvtnDpjxOQtEJMYcgHq1vbhXQCZZ+79N8Zde1FmK I11H2dUMIZ8/CwgrNMl+SVAhT9MPK2466A020syCSp7hxN+XH3ur2euZJszusotNSp1gLM D+h/n1T2UNz2rW9onPOK4+NThemut6vMR+THL7GhRhb2qUThP3Tju4zNTZCVcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693213408; 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=elIRrSUljo869a7mmHHpW2NwZwD97m9W99fmMsQ1vyM=; b=sHb5qVWTloncgTsNewtAComl6AeZySBAPifvKqzNBpP9z0E8WvSoFsJQSEWcPi+x3RYyVO yrJLOWa3Nz5MCA4qa+tQcNeUsfpEU6OLnwGyBvDRIR0xFwF0BLrB5I0ugyjo90h8io6mri gMomg0/Ec56QrqtzDOnKWksQzw3i2YhGBiIhEB22v/iQvHUEohWLNHHn884wfpRkVMd2Xx TUr00TqJttwyyFCB84oC41UyIT7rFUNmuyrEDCzSkBt4FHueqLYXnoUwZntPDYGumgaMAI IYcwTXhWzB6ldEw5tKRnR+SLEAAd0FqQmY0simW4ekVKcHgNBpdG8bIqTBUcKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693213408; a=rsa-sha256; cv=none; b=qAuJQWQp1S4O4I12XuTNWnAbjo/5zn1yobb8bX9zcX5xvWUTEy0RSFZ3PctqNsb2EdKeai lUWcC58XMUyJgJkyJHTuKHdE8MrICKRfADWCCMsIw2AeuGx5lrAsB4prybWkYm4EpOokv9 71O99cWdE/dBPK2ydX0z6N66/M4yGsdLHMllPKEENrsZD8WFwP6LFbQrq0xzv++LEFH5A7 w/mN+5ArP2NHTZAshHXCaBCQ5QdMPJSY9JrCmmo/VTiog6A5QjOJ+OWpr5tbqLNBD96Rz8 uFSU8bkJu3s0sf0dMAtMHsp39kQzApNzkm71oEWg96GQJa9Sek74hI6U9jF3Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RZ4NJ3gylz12sP; Mon, 28 Aug 2023 09:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37S93StG032726; Mon, 28 Aug 2023 09:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37S93SvK032723; Mon, 28 Aug 2023 09:03:28 GMT (envelope-from git) Date: Mon, 28 Aug 2023 09:03:28 GMT Message-Id: <202308280903.37S93SvK032723@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: d8073feba9e8 - main - security/pam-modules: upate to 2.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8073feba9e8db442c218b1e21273f0b609e23e6 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8073feba9e8db442c218b1e21273f0b609e23e6 commit d8073feba9e8db442c218b1e21273f0b609e23e6 Author: Rodrigo Osorio AuthorDate: 2023-08-28 08:51:11 +0000 Commit: Rodrigo Osorio CommitDate: 2023-08-28 09:02:59 +0000 security/pam-modules: upate to 2.5 Major changes in 2.3 * New module pam_innetgr (NIS) * The ldappubkey utility improved Major changes in 2.3.1 * Add missing symbol (pam_innetgr lacked pam_sm_setcred) Major changes in 2.4 * Major rewrite of memory allocation code * Bugfixes Major changes in 2.4.1 * Fix pam_mysql and pam_pgsql authentication Major changes in 2.5: * pam_fshadow: skip-password option Full changelog: https://git.gnu.org.ua/pam-modules.git/tree/NEWS Port changes: * Fix mysql build (optional) * Patch pam-modules to fix a naming collision with open ldap (fixed by upstream for upcoming releases) * Reorder Makefile to make linters happy --- security/pam-modules/Makefile | 42 ++++++++------- security/pam-modules/distinfo | 6 +-- .../files/patch-pam_ldaphome_pam_ldaphome.c | 59 ++++++++++++++++++++++ security/pam-modules/pkg-plist | 10 ++-- 4 files changed, 86 insertions(+), 31 deletions(-) diff --git a/security/pam-modules/Makefile b/security/pam-modules/Makefile index cfa01bc2a2c1..db1b98305174 100644 --- a/security/pam-modules/Makefile +++ b/security/pam-modules/Makefile @@ -1,6 +1,5 @@ PORTNAME= pam-modules -PORTVERSION= 2.2 -PORTREVISION= 1 +PORTVERSION= 2.5 CATEGORIES= security MASTER_SITES= ftp://download.gnu.org.ua/pub/release/pam-modules/ @@ -10,36 +9,35 @@ WWW= https://puszcza.gnu.org.ua/software/pam-modules/pam-modules.html LICENSE= GPLv3 -GNU_CONFIGURE= yes USES= libtool - USE_LDCONFIG= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-fshadow -OPTIONS_DEFINE= GROUPMEMBER MYSQL REGEX PGSQL SYSLOG +INFO= pam-modules + +OPTIONS_DEFINE= GROUPMEMBER MYSQL NIS PGSQL REGEX SYSLOG OPTIONS_DEFAULT= GROUPMEMBER REGEX SYSLOG -OPTIONS_SUB= yes +OPTIONS_SUB= yes -GROUPMEMBER_CONFIGURE_ENABLE= groupmember GROUPMEMBER_DESC= Build pam_groupmember +MYSQL_DESC= Build pam_mysql +NIS_DESC= Build pam_innetgr +PGSQL_DESC= Build pam_pgsql +REGEX_DESC= Build pam_regex +SYSLOG_DESC= Build pam_log -MYSQL_CONFIGURE_ENABLE= mysql -MYSQL_DESC= Build pam_mysql -MYSQL_USES= mysql - -PGSQL_CONFIGURE_ENABLE= pgsql -PGSQL_DESC= Build pam_pgsql -PGSQL_USES= pgsql -PGSQL_VARS= WANT_PGSQL=client - +GROUPMEMBER_CONFIGURE_ENABLE= groupmember +MYSQL_USES= mysql +MYSQL_CONFIGURE_ENABLE= mysql +MYSQL_CFLAGS+= -I${LOCALBASE}/include +NIS_CONFIGURE_ENABLE= NIS +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ENABLE= pgsql +PGSQL_VARS= WANT_PGSQL=client +REGEX_CONFIGURE_ENABLE= regex SYSLOG_CONFIGURE_ENABLE= log -SYSLOG_DESC= Build pam_log - -REGEX_CONFIGURE_ENABLE= regex -REGEX_DESC= Build pam_regex - -INFO= pam-modules .include diff --git a/security/pam-modules/distinfo b/security/pam-modules/distinfo index 997cfa98a9e2..f74a567c597d 100644 --- a/security/pam-modules/distinfo +++ b/security/pam-modules/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514909064 -SHA256 (pam-modules-2.2.tar.gz) = 4f56ae7ea7b12455d4d30864a44444d309cbc9d4a3789b2a19e8bbbb72659c70 -SIZE (pam-modules-2.2.tar.gz) = 655273 +TIMESTAMP = 1693212461 +SHA256 (pam-modules-2.5.tar.gz) = 48509a2465a8a35cdcc000ac7dacf0ab3fc49369a6dcdbbda58b9d94d6434231 +SIZE (pam-modules-2.5.tar.gz) = 704093 diff --git a/security/pam-modules/files/patch-pam_ldaphome_pam_ldaphome.c b/security/pam-modules/files/patch-pam_ldaphome_pam_ldaphome.c new file mode 100644 index 000000000000..3ab631b01198 --- /dev/null +++ b/security/pam-modules/files/patch-pam_ldaphome_pam_ldaphome.c @@ -0,0 +1,59 @@ +--- pam_ldaphome/pam_ldaphome.c.orig 2021-01-06 16:15:09 UTC ++++ pam_ldaphome/pam_ldaphome.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -306,7 +307,7 @@ + static void ldap_unbind(LDAP *ld); + + static LDAP * +-ldap_connect(struct gray_env *env) ++pam_ldap_connect(struct gray_env *env) + { + int rc; + char *ldapuri = NULL; +@@ -510,7 +511,7 @@ + } + + static int +-ldap_bind(LDAP *ld, struct gray_env *env) ++pam_ldap_bind(LDAP *ld, struct gray_env *env) + { + int msgid, err, rc; + LDAPMessage *result; +@@ -594,7 +595,7 @@ + } + + static void +-ldap_unbind(LDAP *ld) ++pam_ldap_unbind(LDAP *ld) + { + if (ld) { + ldap_set_option(ld, LDAP_OPT_SERVER_CONTROLS, NULL); +@@ -1579,10 +1580,10 @@ + if (!attr) + attr = "sshPublicKey"; + +- ld = ldap_connect(env); ++ ld = pam_ldap_connect(env); + if (!ld) + return PAM_SERVICE_ERR; +- if (ldap_bind(ld, env)) ++ if (pam_ldap_bind(ld, env)) + retval = PAM_SERVICE_ERR; + else { + char *filter; +@@ -1597,7 +1598,7 @@ + retval = PAM_SUCCESS; + } + } +- ldap_unbind(ld); ++ pam_ldap_unbind(ld); + return retval; + } + diff --git a/security/pam-modules/pkg-plist b/security/pam-modules/pkg-plist index 0a779ecddd32..62b4d488381f 100644 --- a/security/pam-modules/pkg-plist +++ b/security/pam-modules/pkg-plist @@ -1,21 +1,19 @@ bin/pamck -lib/libgraypam.a lib/libgraypam.so lib/libgraypam.so.0 lib/libgraypam.so.0.0.0 -%%GROUPMEMBER%%lib/security/pam_groupmember.a %%GROUPMEMBER%%lib/security/pam_groupmember.so -%%SYSLOG%%lib/security/pam_log.a +%%NIS%%lib/security/pam_innetgr.so %%SYSLOG%%lib/security/pam_log.so -%%MYSQL%%lib/security/pam_mysql.a %%MYSQL%%lib/security/pam_mysql.so -%%PGSQL%%lib/security/pam_pgsql.a %%PGSQL%%lib/security/pam_pgsql.so -%%REGEX%%lib/security/pam_regex.a %%REGEX%%lib/security/pam_regex.so +%%PGSQL%%lib/security/pam_ldaphome.so man/man1/pamck.1.gz %%GROUPMEMBER%%man/man8/pam_groupmember.8.gz +%%NIS%%man/man8/pam_innetgr.8.gz %%SYSLOG%%man/man8/pam_log.8.gz %%MYSQL%%man/man8/pam_mysql.8.gz %%PGSQL%%man/man8/pam_pgsql.8.gz %%REGEX%%man/man8/pam_regex.8.gz +%%PGSQL%%man/man8/pam_ldaphome.8.gz