From owner-svn-src-stable-12@freebsd.org Wed Nov 14 20:35:06 2018 Return-Path: Delivered-To: svn-src-stable-12@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09BF4113469B; Wed, 14 Nov 2018 20:35:06 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CF9F6B1D7; Wed, 14 Nov 2018 20:35:05 +0000 (UTC) (envelope-from se@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 5922C240BD; Wed, 14 Nov 2018 20:35:05 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAEKZ57U031856; Wed, 14 Nov 2018 20:35:05 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAEKZ4Jk031853; Wed, 14 Nov 2018 20:35:04 GMT (envelope-from se@FreeBSD.org) Message-Id: <201811142035.wAEKZ4Jk031853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Wed, 14 Nov 2018 20:35:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r340444 - in stable/12: . usr.sbin/ctm/ctm X-SVN-Group: stable-12 X-SVN-Commit-Author: se X-SVN-Commit-Paths: in stable/12: . usr.sbin/ctm/ctm X-SVN-Commit-Revision: 340444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7CF9F6B1D7 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2018 20:35:06 -0000 Author: se Date: Wed Nov 14 20:35:04 2018 New Revision: 340444 URL: https://svnweb.freebsd.org/changeset/base/340444 Log: MFC S340428: Prepare move of ctm from base to a port (misc/ctm) by: - Adding a note to UPDATING - Adding a note to the history section of the manpage ctm.1 - Adding a message printed to STDERR to the ctm program This version is meant for release in FreeBSD-12.0 and should remain in FreeBSD-12 over its life-time. A follow-up commit will remove ctm from -CURRENT after the MFC to 12 has happened. Approved by: re Relnotes: yes Differential Revision: https://reviews.freebsd.org/D17969 Modified: stable/12/UPDATING stable/12/usr.sbin/ctm/ctm/ctm.1 stable/12/usr.sbin/ctm/ctm/ctm.c Modified: stable/12/UPDATING ============================================================================== --- stable/12/UPDATING Wed Nov 14 19:10:35 2018 (r340443) +++ stable/12/UPDATING Wed Nov 14 20:35:04 2018 (r340444) @@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20181115: + The set of CTM commands (ctm, ctm_smail, ctm_rmail, ctm_dequeue) + has been converted to a port (misc/ctm) and will be removed from + FreeBSD-13. A depreciation warning will be printed to stderr by + the ctm command, but the functionality will remain in base for all + FreeBSD-12 releases. + 20181019: The stable/12 branch has been created in subversion from head revision r339432. Modified: stable/12/usr.sbin/ctm/ctm/ctm.1 ============================================================================== --- stable/12/usr.sbin/ctm/ctm/ctm.1 Wed Nov 14 19:10:35 2018 (r340443) +++ stable/12/usr.sbin/ctm/ctm/ctm.1 Wed Nov 14 20:35:04 2018 (r340444) @@ -12,7 +12,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 14, 2016 +.Dd November 15, 2018 .Dt CTM 1 .Os .Sh NAME @@ -321,6 +321,12 @@ The .Nm command appeared in .Fx 2.1 . +.Pp +The latest +.Nm +code has been made available as a port (misc/ctm) in preparation of removal +from base in +.Fx 13.0 . .Sh AUTHORS .An -nosplit The CTM system has been designed and implemented by Modified: stable/12/usr.sbin/ctm/ctm/ctm.c ============================================================================== --- stable/12/usr.sbin/ctm/ctm/ctm.c Wed Nov 14 19:10:35 2018 (r340443) +++ stable/12/usr.sbin/ctm/ctm/ctm.c Wed Nov 14 20:35:04 2018 (r340444) @@ -144,6 +144,9 @@ main(int argc, char **argv) warnx("%d errors during option processing",stat); return Exit_Pilot; } + fprintf(stderr, "CTM will be removed from FreeBSD-13, and will be " + "provided as a port (misc/ctm) or package (ctm).\n\n"); + stat = Exit_Done; argc -= optind; argv += optind;