From owner-svn-src-head@freebsd.org  Tue Mar 24 01:08:07 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 452E7275BB0;
 Tue, 24 Mar 2020 01:08:07 +0000 (UTC)
 (envelope-from manu@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)
 server-signature RSA-PSS (4096 bits)
 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 48mY5g12Y7z3LC4;
 Tue, 24 Mar 2020 01:08:07 +0000 (UTC)
 (envelope-from manu@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 152FD1F41A;
 Tue, 24 Mar 2020 01:08:07 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02O186TK085970;
 Tue, 24 Mar 2020 01:08:06 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02O186GN085969;
 Tue, 24 Mar 2020 01:08:06 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <202003240108.02O186GN085969@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Tue, 24 Mar 2020 01:08:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r359266 - head/lib/libpam/pam.d
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/lib/libpam/pam.d
X-SVN-Commit-Revision: 359266
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2020 01:08:07 -0000

Author: manu
Date: Tue Mar 24 01:08:06 2020
New Revision: 359266
URL: https://svnweb.freebsd.org/changeset/base/359266

Log:
  pkgbase: Move telnetd and ftpd pam file to the utilities package
  
  Both programs are in this package so put the pam.d file in there too.
  
  Reported by:	emaste
  Reviewed by:	emaste
  Differential Revision:	https://reviews.freebsd.org/D24161

Modified:
  head/lib/libpam/pam.d/Makefile

Modified: head/lib/libpam/pam.d/Makefile
==============================================================================
--- head/lib/libpam/pam.d/Makefile	Tue Mar 24 01:07:01 2020	(r359265)
+++ head/lib/libpam/pam.d/Makefile	Tue Mar 24 01:08:06 2020	(r359266)
@@ -26,7 +26,6 @@ ATPACKAGE+=	at
 .if ${MK_FTP} != "no"
 CONFGROUPS+=	FTP
 FTP+=	ftpd
-FTPPACKAGE+=	ftp
 
 afterinstallconfig:
 	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp
@@ -35,7 +34,6 @@ afterinstallconfig:
 .if ${MK_TELNET} != "no"
 CONFGROUPS+=	TELNET
 TELNET+=	telnetd
-TELNETPACKAGE+=	telnet
 .endif
 
 .include <bsd.prog.mk>