From owner-svn-src-head@freebsd.org Tue Jul 31 16:39:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 988E6105E673; Tue, 31 Jul 2018 16:39:39 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ED77716ED; Tue, 31 Jul 2018 16:39:39 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 309F316223; Tue, 31 Jul 2018 16:39:39 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6VGdcKP094640; Tue, 31 Jul 2018 16:39:38 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6VGdcCr094637; Tue, 31 Jul 2018 16:39:38 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201807311639.w6VGdcCr094637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 31 Jul 2018 16:39:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336977 - in head: etc usr.sbin/blacklistd X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc usr.sbin/blacklistd X-SVN-Commit-Revision: 336977 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2018 16:39:39 -0000 Author: brd Date: Tue Jul 31 16:39:38 2018 New Revision: 336977 URL: https://svnweb.freebsd.org/changeset/base/336977 Log: Move blacklistd.conf to usr.sbin/blacklistd/ This is prep for pkging base and helps tag and install config files with the correct packages. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D16493 Added: head/usr.sbin/blacklistd/blacklistd.conf - copied unchanged from r336976, head/etc/blacklistd.conf Deleted: head/etc/blacklistd.conf Modified: head/etc/Makefile head/usr.sbin/blacklistd/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Jul 31 16:08:38 2018 (r336976) +++ head/etc/Makefile Tue Jul 31 16:39:38 2018 (r336977) @@ -74,10 +74,6 @@ BIN1+= amd.map BIN1+= auto_master .endif -.if ${MK_BLACKLIST} != "no" -BIN1+= blacklistd.conf -.endif - .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif Modified: head/usr.sbin/blacklistd/Makefile ============================================================================== --- head/usr.sbin/blacklistd/Makefile Tue Jul 31 16:08:38 2018 (r336976) +++ head/usr.sbin/blacklistd/Makefile Tue Jul 31 16:39:38 2018 (r336977) @@ -3,6 +3,7 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +CONFS= blacklistd.conf PROG= blacklistd SRCS= blacklistd.c conf.c run.c state.c support.c internal.c \ sockaddr_snprintf.c pidfile.c strtoi.c popenve.c Copied: head/usr.sbin/blacklistd/blacklistd.conf (from r336976, head/etc/blacklistd.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/blacklistd/blacklistd.conf Tue Jul 31 16:39:38 2018 (r336977, copy of r336976, head/etc/blacklistd.conf) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# +# Blacklist rule +# adr/mask:port type proto owner name nfail disable +[local] +ssh stream * * * 3 24h +ftp stream * * * 3 24h +smtp stream * * * 3 24h +submission stream * * * 3 24h +#6161 stream tcp6 christos * 2 10m +* * * * * 3 60 + +# adr/mask:port type proto owner name nfail disable +[remote] +#129.168.0.0/16 * * * = * * +#6161 = = = =/24 = = +#* stream tcp * = = =