From owner-dev-commits-ports-main@freebsd.org Mon Jun 7 13:27:31 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D8FC64DE4C; Mon, 7 Jun 2021 13:27:31 +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 4FzDgl13k6z4tVD; Mon, 7 Jun 2021 13:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0CFEC1654B; Mon, 7 Jun 2021 13:27:31 +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 157DRUTi053176; Mon, 7 Jun 2021 13:27:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 157DRUV4053175; Mon, 7 Jun 2021 13:27:30 GMT (envelope-from git) Date: Mon, 7 Jun 2021 13:27:30 GMT Message-Id: <202106071327.157DRUV4053175@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jesper Schmitz Mouridsen Subject: git: e5e4475fb7f0 - main - security/pam-mysql: Update to 0.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jsm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5e4475fb7f0d2692f668c23014e4aedcd7acff2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2021 13:27:31 -0000 The branch main has been updated by jsm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5e4475fb7f0d2692f668c23014e4aedcd7acff2 commit e5e4475fb7f0d2692f668c23014e4aedcd7acff2 Author: Jesper Schmitz Mouridsen AuthorDate: 2021-06-07 13:22:19 +0000 Commit: Jesper Schmitz Mouridsen CommitDate: 2021-06-07 13:27:24 +0000 security/pam-mysql: Update to 0.8.2 Old upstream is unmaintained and taken over by github.com/NigelCunningham/pam-MySQL This version supports newer versions of MySQL and MariaDB, that do not define make_scrambled_password(). Since pam now looks in LOCALBASE for modules change pkg-message accordingly PR: 254731 Reviewed_by: koobs (ports) Differential_Revision: 30646 --- security/pam-mysql/Makefile | 31 +++++++++++++++++------------ security/pam-mysql/distinfo | 5 +++-- security/pam-mysql/files/patch-acinclude.m4 | 10 ---------- security/pam-mysql/files/pkg-message.in | 8 -------- security/pam-mysql/pkg-descr | 2 +- 5 files changed, 22 insertions(+), 34 deletions(-) diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile index 70d44db6acd7..b8082a2b05f7 100644 --- a/security/pam-mysql/Makefile +++ b/security/pam-mysql/Makefile @@ -1,32 +1,37 @@ # Created by: Anders Nordby PORTNAME= pam_mysql -PORTVERSION= 0.7.r1 -PORTREVISION= 6 +DISTVERSIONPREFIX= v +DISTVERSION= 0.8.2 CATEGORIES= security databases -MASTER_SITES= SF/pam-mysql/pam-mysql/0.7RC1 -DISTNAME= ${PORTNAME}-0.7RC1${DISTVERSIONSUFFIX} -MAINTAINER= ports@FreeBSD.org -COMMENT= Pam module for authenticating with MySQL +MAINTAINER= jsm@FreeBSD.org +COMMENT= PAM module for authenticating with MySQL LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c11 libtool:keepla mysql +USES= autoreconf compiler:c11 libtool:keepla mysql pkgconfig + +USE_GITHUB= yes +GH_ACCOUNT= NigelCunningham +GH_PROJECT= pam-MySQL GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \ - --with-pam-mods-dir=${PREFIX}/lib \ - --with-pam=/usr +CONFIGURE_ARGS= --with-pam=/usr/lib --with-pam-mods-dir=${LOCALBASE}/lib SUB_FILES= pkg-message PORTDOCS= * PLIST_FILES= lib/pam_mysql.so lib/pam_mysql.la -OPTIONS_DEFINE= DOCS SSL -SSL_DESC= Build with OpenSSL support (non-crypt()ish MD5 hash) -SSL_CONFIGURE_WITH= openssl +OPTIONS_DEFINE= DOCS SSL +OPTIONS_DEFAULT= DOCS SSL + +SSL_DESC= Build with OpenSSL support (non-crypt()ish MD5 and SHA1 hash) +SSL_CONFIGURE_ENV= openssl_CFLAGS="${OPENSSLINC}" \ + openssl_LIBS="${OPENSSLLIB}" +SSL_CONFIGURE_WITH=openssl +SSL_USES= ssl post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pam_mysql.so diff --git a/security/pam-mysql/distinfo b/security/pam-mysql/distinfo index 9f722f9bc0a5..b4b3a6080332 100644 --- a/security/pam-mysql/distinfo +++ b/security/pam-mysql/distinfo @@ -1,2 +1,3 @@ -SHA256 (pam_mysql-0.7RC1.tar.gz) = cb3cf89b9b51cb196ee8d731f85acbab72b4878a3a7c4183c5534161d4385ce7 -SIZE (pam_mysql-0.7RC1.tar.gz) = 335240 +TIMESTAMP = 1622744756 +SHA256 (NigelCunningham-pam-MySQL-v0.8.2_GH0.tar.gz) = 012529868418bcb23b22d466ca7e526a6a08f42736cd67d41118151e285c777b +SIZE (NigelCunningham-pam-MySQL-v0.8.2_GH0.tar.gz) = 55023 diff --git a/security/pam-mysql/files/patch-acinclude.m4 b/security/pam-mysql/files/patch-acinclude.m4 deleted file mode 100644 index b506fcb9a7bb..000000000000 --- a/security/pam-mysql/files/patch-acinclude.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- acinclude.m4.orig 2006-01-09 10:35:59 UTC -+++ acinclude.m4 -@@ -445,6 +445,7 @@ md5_calc(0, 0, 0); - AC_MSG_RESULT([no]) - - AC_CHECK_HEADERS([md5.h]) -+ AC_CHECK_LIB([md],[MD5Data]) - AC_CHECK_FUNCS([MD5Data]) - ]) - ]) diff --git a/security/pam-mysql/files/pkg-message.in b/security/pam-mysql/files/pkg-message.in index c908f2d7c8b5..345ede86f1a9 100644 --- a/security/pam-mysql/files/pkg-message.in +++ b/security/pam-mysql/files/pkg-message.in @@ -2,14 +2,6 @@ { type: install message: <