svn commit: r196787 - in head: . etc libexec

[Remko Lodder]

Author: remko
Date: Thu Sep  3 16:34:20 2009
New Revision: 196787
URL: http://svn.freebsd.org/changeset/base/196787

Log:
  Do the first step in removing lukemftpd from the base system. Disconnect
  it from the build.
  
  If you are using the FTP daemon, please consider using the port ftp/tnftpd
  which is the same FTP server, but newer and might have more/better
  functionality.
  
  This results in us providing only one ftp daemon by default.
  
  Reviewed by:	bz
  Approved by:	imp (mentor, implicit)
  MFC after:	3 days
  Silence from:	obrien

Modified:
  head/ObsoleteFiles.inc
  head/etc/inetd.conf
  head/libexec/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Sep  3 16:31:11 2009	(r196786)
+++ head/ObsoleteFiles.inc	Thu Sep  3 16:34:20 2009	(r196787)
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090904: remove lukemftpd
+OLD_FILES+=usr/libexec/lukemftpd
+OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
+OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
+OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist

Modified: head/etc/inetd.conf
==============================================================================
--- head/etc/inetd.conf	Thu Sep  3 16:31:11 2009	(r196786)
+++ head/etc/inetd.conf	Thu Sep  3 16:34:20 2009	(r196787)
@@ -8,8 +8,6 @@
 #
 #ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
 #ftp	stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -l
-#ftp	stream	tcp	nowait	root	/usr/libexec/lukemftpd	ftpd -l -r
-#ftp	stream	tcp6	nowait	root	/usr/libexec/lukemftpd	ftpd -l -r
 #ssh	stream	tcp	nowait	root	/usr/sbin/sshd		sshd -i -4
 #ssh	stream	tcp6	nowait	root	/usr/sbin/sshd		sshd -i -6
 #telnet	stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd

Modified: head/libexec/Makefile
==============================================================================
--- head/libexec/Makefile	Thu Sep  3 16:31:11 2009	(r196786)
+++ head/libexec/Makefile	Thu Sep  3 16:34:20 2009	(r196787)
@@ -9,7 +9,6 @@ SUBDIR=	${_atrun} \
 	fingerd \
 	ftpd \
 	getty \
-	lukemftpd \
 	${_mail.local} \
 	${_mknetid} \
 	${_pppoed} \