Date: Sat, 20 Sep 2014 06:34:34 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271895 - in head: etc/rc.d tools/build/mk Message-ID: <201409200634.s8K6YYee007965@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Sep 20 06:34:34 2014 New Revision: 271895 URL: http://svnweb.freebsd.org/changeset/base/271895 Log: Don't install /etc/rc.d/ftp-proxy unless MK_PF == yes MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/etc/rc.d/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Sat Sep 20 06:27:37 2014 (r271894) +++ head/etc/rc.d/Makefile Sat Sep 20 06:34:34 2014 (r271895) @@ -44,7 +44,6 @@ FILES= DAEMON \ dumpon \ faith \ fsck \ - ftp-proxy \ ftpd \ gbde \ geli \ @@ -191,6 +190,10 @@ _opensm= opensm _sshd= sshd .endif +.if ${MK_PF} != "no" +FILES+= ftp-proxy +.endif + .if ${MK_RCMDS} != "no" FILES+= rwho .endif Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Sep 20 06:27:37 2014 (r271894) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Sep 20 06:34:34 2014 (r271895) @@ -3606,6 +3606,7 @@ OLD_DIRS+=usr/share/examples/pc-sysinsta .if ${MK_PF} == no OLD_FILES+=etc/periodic/security/520.pfdenied OLD_FILES+=etc/pf.os +OLD_FILES+=etc/rc.d/ftp-proxy OLD_FILES+=sbin/pfctl OLD_FILES+=sbin/pflogd OLD_FILES+=usr/libexec/tftp-proxy
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409200634.s8K6YYee007965>