svn commit: r340428 - in head: . usr.sbin/ctm/ctm

[Stefan Esser]

Author: se
Date: Wed Nov 14 08:45:48 2018
New Revision: 340428
URL: https://svnweb.freebsd.org/changeset/base/340428

Log:
  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:	imp, rgrimes, bcr (man-page)
  MFC after:	3 days
  Relnotes:	yes
  Differential Revision:	https://reviews.freebsd.org/D17969

Modified:
  head/UPDATING
  head/usr.sbin/ctm/ctm/ctm.1
  head/usr.sbin/ctm/ctm/ctm.c

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Nov 14 06:46:44 2018	(r340427)
+++ head/UPDATING	Wed Nov 14 08:45:48 2018	(r340428)
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+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.  It is available as a package (ctm) for all supported
+	FreeBSD versions.
+
 20181110:
 	The default newsyslog.conf(5) file has been changed to only include
 	files in /etc/newsyslog.conf.d/ and /usr/local/etc/newsyslog.conf.d/ if

Modified: head/usr.sbin/ctm/ctm/ctm.1
==============================================================================
--- head/usr.sbin/ctm/ctm/ctm.1	Wed Nov 14 06:46:44 2018	(r340427)
+++ head/usr.sbin/ctm/ctm/ctm.1	Wed Nov 14 08:45:48 2018	(r340428)
@@ -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: head/usr.sbin/ctm/ctm/ctm.c
==============================================================================
--- head/usr.sbin/ctm/ctm/ctm.c	Wed Nov 14 06:46:44 2018	(r340427)
+++ head/usr.sbin/ctm/ctm/ctm.c	Wed Nov 14 08:45:48 2018	(r340428)
@@ -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;