From owner-svn-ports-all@freebsd.org Mon Oct 19 15:02:16 2020 Return-Path: Delivered-To: svn-ports-all@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 4DCA742A060; Mon, 19 Oct 2020 15:02:16 +0000 (UTC) (envelope-from marcus@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFKjh1Ksmz3T4K; Mon, 19 Oct 2020 15:02:16 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 126B1251DA; Mon, 19 Oct 2020 15:02:16 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09JF2F5B073109; Mon, 19 Oct 2020 15:02:15 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09JF2FjH073104; Mon, 19 Oct 2020 15:02:15 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <202010191502.09JF2FjH073104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Mon, 19 Oct 2020 15:02:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552742 - in head/security/pam_ldap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: in head/security/pam_ldap: . files X-SVN-Commit-Revision: 552742 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 15:02:16 -0000 Author: marcus Date: Mon Oct 19 15:02:14 2020 New Revision: 552742 URL: https://svnweb.freebsd.org/changeset/ports/552742 Log: More cleanup. * Use the upstream 86 version instead of the artificial 1.8.6 [1] * Use @sample to handle the config file [2] Thanks to 0mp for the good suggestions. PR: 250341 [1] 250343 [2] Modified: head/security/pam_ldap/Makefile head/security/pam_ldap/distinfo head/security/pam_ldap/files/patch-Makefile.in head/security/pam_ldap/files/pkg-message.in head/security/pam_ldap/pkg-plist Modified: head/security/pam_ldap/Makefile ============================================================================== --- head/security/pam_ldap/Makefile Mon Oct 19 14:59:18 2020 (r552741) +++ head/security/pam_ldap/Makefile Mon Oct 19 15:02:14 2020 (r552742) @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= pam_ldap -PORTVERSION= 1.8.6 -PORTREVISION= 5 +PORTVERSION= 186 CATEGORIES= security net MASTER_SITES= http://www.padl.com/download/ \ ftp://ftp.padl.com/pub/ -DISTNAME= pam_ldap-${PORTVERSION:S/.//g} MAINTAINER= marcus@FreeBSD.org COMMENT= PAM module for authenticating with LDAP Modified: head/security/pam_ldap/distinfo ============================================================================== --- head/security/pam_ldap/distinfo Mon Oct 19 14:59:18 2020 (r552741) +++ head/security/pam_ldap/distinfo Mon Oct 19 15:02:14 2020 (r552742) @@ -1,2 +1,3 @@ +TIMESTAMP = 1603117469 SHA256 (pam_ldap-186.tar.gz) = c8fe22d559d5a3f528b24eb97175085f188c0f11ade337a868590ac0e0716453 SIZE (pam_ldap-186.tar.gz) = 163437 Modified: head/security/pam_ldap/files/patch-Makefile.in ============================================================================== --- head/security/pam_ldap/files/patch-Makefile.in Mon Oct 19 14:59:18 2020 (r552741) +++ head/security/pam_ldap/files/patch-Makefile.in Mon Oct 19 15:02:14 2020 (r552742) @@ -14,10 +14,10 @@ install-data-local: @$(NORMAL_INSTALL) - @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \ -+ @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.dist; then \ ++ @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.sample; then \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ - $(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \ -+ $(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.dist; \ ++ $(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.sample; \ fi uninstall-local: Modified: head/security/pam_ldap/files/pkg-message.in ============================================================================== --- head/security/pam_ldap/files/pkg-message.in Mon Oct 19 14:59:18 2020 (r552741) +++ head/security/pam_ldap/files/pkg-message.in Mon Oct 19 15:02:14 2020 (r552742) @@ -1,10 +1,8 @@ [ { type: install message: <