From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 08:39:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49294B3E; Tue, 25 Nov 2014 08:39:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34DF2305; Tue, 25 Nov 2014 08:39:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP8dmn0021736; Tue, 25 Nov 2014 08:39:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP8dkcX021727; Tue, 25 Nov 2014 08:39:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411250839.sAP8dkcX021727@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 08:39:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275019 - in projects/building-blocks: etc etc/rc.d share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 08:39:48 -0000 Author: ngie Date: Tue Nov 25 08:39:46 2014 New Revision: 275019 URL: https://svnweb.freebsd.org/changeset/base/275019 Log: Make inetd optional via MK_INETD Added: projects/building-blocks/tools/build/options/WITHOUT_INETD (contents, props changed) Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/etc/Makefile Tue Nov 25 08:39:46 2014 (r275019) @@ -25,7 +25,6 @@ BIN1= auto_master \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -95,6 +94,10 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/etc/rc.d/Makefile Tue Nov 25 08:39:46 2014 (r275019) @@ -56,7 +56,7 @@ FILES= DAEMON \ hostid \ hostid_save \ hostname \ - inetd \ + ${_inetd} \ ip6addrctl \ ipfilter \ ipfs \ @@ -175,6 +175,10 @@ _ubthidhci= ubthidhci _casperd= casperd .endif +.if ${MK_INETD} != "no" +_inetd= inetd +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 08:39:46 2014 (r275019) @@ -95,6 +95,7 @@ __DEFAULT_YES_OPTIONS = \ ICONV \ INET \ INET6 \ + INETD \ IPFILTER \ IPFW \ JAIL \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 08:39:46 2014 (r275019) @@ -2013,6 +2013,13 @@ OLD_FILES+=usr/share/man/man8/traceroute OLD_FILES+=rescue/ping6 .endif +.if ${MK_INETD} == no +OLD_FILES+=etc/rc.d/inetd +OLD_FILES+=usr/sbin/inetd +OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz +OLD_FILES+=usr/share/man/man8/inetd.8.gz +.endif + .if ${MK_INFO} == no OLD_FILES+=usr/bin/info OLD_FILES+=usr/bin/infokey Added: projects/building-blocks/tools/build/options/WITHOUT_INETD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_INETD Tue Nov 25 08:39:46 2014 (r275019) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr inetd 8 . Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Tue Nov 25 08:04:32 2014 (r275018) +++ projects/building-blocks/usr.sbin/Makefile Tue Nov 25 08:39:46 2014 (r275019) @@ -34,7 +34,6 @@ SUBDIR= adduser \ gstat \ i2c \ ifmcstat \ - inetd \ iostat \ iscsid \ kldxref \ @@ -175,6 +174,10 @@ SUBDIR+= rtsold SUBDIR+= traceroute6 .endif +.if ${MK_INETD} != "no" +SUBDIR+= inetd +.endif + .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif