svn commit: r196926 - in stable/8: . etc libexec

[Remko Lodder]

Author: remko
Date: Mon Sep  7 14:10:55 2009
New Revision: 196926
URL: http://svn.freebsd.org/changeset/base/196926

Log:
  MFC r196787
  
    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
  
  Approved by:	re (kib), imp (mentor, implicit)

Modified:
  stable/8/ObsoleteFiles.inc   (contents, props changed)
  stable/8/etc/inetd.conf
  stable/8/libexec/Makefile

Modified: stable/8/ObsoleteFiles.inc
==============================================================================
--- stable/8/ObsoleteFiles.inc	Mon Sep  7 13:58:26 2009	(r196925)
+++ stable/8/ObsoleteFiles.inc	Mon Sep  7 14:10:55 2009	(r196926)
@@ -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
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0

Modified: stable/8/etc/inetd.conf
==============================================================================
--- stable/8/etc/inetd.conf	Mon Sep  7 13:58:26 2009	(r196925)
+++ stable/8/etc/inetd.conf	Mon Sep  7 14:10:55 2009	(r196926)
@@ -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: stable/8/libexec/Makefile
==============================================================================
--- stable/8/libexec/Makefile	Mon Sep  7 13:58:26 2009	(r196925)
+++ stable/8/libexec/Makefile	Mon Sep  7 14:10:55 2009	(r196926)
@@ -9,7 +9,6 @@ SUBDIR=	${_atrun} \
 	fingerd \
 	ftpd \
 	getty \
-	lukemftpd \
 	${_mail.local} \
 	${_mknetid} \
 	${_pppoed} \