From owner-svn-ports-all@freebsd.org Mon Jan 7 19:40:54 2019 Return-Path: Delivered-To: svn-ports-all@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 C1433149D61B; Mon, 7 Jan 2019 19:40:54 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 697BA75B3B; Mon, 7 Jan 2019 19:40:54 +0000 (UTC) (envelope-from zi@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 5FDDC1C7D7; Mon, 7 Jan 2019 19:40:54 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x07JesVO015187; Mon, 7 Jan 2019 19:40:54 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x07JesUW015185; Mon, 7 Jan 2019 19:40:54 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201901071940.x07JesUW015185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Mon, 7 Jan 2019 19:40:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489611 - in head/security/snort: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in head/security/snort: . files X-SVN-Commit-Revision: 489611 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 697BA75B3B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2019 19:40:55 -0000 Author: zi Date: Mon Jan 7 19:40:53 2019 New Revision: 489611 URL: https://svnweb.freebsd.org/changeset/ports/489611 Log: - Add CONFLICTS for security/snort3 - Pet portlint PR: 234699 Requested by: Vinícius Zavam Modified: head/security/snort/Makefile head/security/snort/files/patch-etc__snort.conf Modified: head/security/snort/Makefile ============================================================================== --- head/security/snort/Makefile Mon Jan 7 19:39:36 2019 (r489610) +++ head/security/snort/Makefile Mon Jan 7 19:40:53 2019 (r489611) @@ -3,6 +3,7 @@ PORTNAME= snort PORTVERSION= 2.9.12 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://snort.org/downloads/snort/ \ ZI @@ -15,13 +16,27 @@ COMMENT= Lightweight network intrusion detection syste LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= daq>=2.0.0:net/daq LIB_DEPENDS= libpcre.so:devel/pcre \ libdnet.so:net/libdnet \ libpcap.so:net/libpcap - -BUILD_DEPENDS= daq>=2.0.0:net/daq RUN_DEPENDS= daq>=2.0.0:net/daq +USES= cpe libtool pathfix shebangfix ssl +USE_RC_SUBR= snort +USE_LDCONFIG= yes + +SUB_FILES= pkg-message +SHEBANG_FILES= tools/appid_detector_builder.sh +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE= yes + +RULES_DIR= ${ETCDIR}/rules +PREPROC_RULE_DIR= ${ETCDIR}/preproc_rules +LOGS_DIR= /var/log/snort + +CONFLICTS_INSTALL= snort3-3.* + OPTIONS_DEFINE= IPV6 GRE HA NORMALIZER DOCS APPID \ PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \ FILEINSPECT @@ -69,19 +84,6 @@ APPID_CONFIGURE_ENV+= luajit_CFLAGS="-I${LOCALBASE}/in luajit_LIBS="-L${LOCALBASE}/lib -lluajit-5.1" .include - -USE_RC_SUBR= snort -SUB_FILES= pkg-message - -USES= cpe libtool pathfix shebangfix ssl -SHEBANG_FILES= tools/appid_detector_builder.sh -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -MAKE_JOBS_UNSAFE= yes - -RULES_DIR= ${ETCDIR}/rules -PREPROC_RULE_DIR= ${ETCDIR}/preproc_rules -LOGS_DIR= /var/log/snort CONFIG_FILES= classification.config gen-msg.map reference.config \ snort.conf threshold.conf unicode.map file_magic.conf Modified: head/security/snort/files/patch-etc__snort.conf ============================================================================== --- head/security/snort/files/patch-etc__snort.conf Mon Jan 7 19:39:36 2019 (r489610) +++ head/security/snort/files/patch-etc__snort.conf Mon Jan 7 19:40:53 2019 (r489611) @@ -1,5 +1,5 @@ ---- ./etc/snort.conf.orig 2010-03-19 20:41:00.000000000 +0100 -+++ ./etc/snort.conf 2010-04-27 22:26:53.000000000 +0200 +--- ./etc/snort.conf.orig 2010-03-19 21:41:00 UTC ++++ ./etc/snort.conf @@ -57,9 +57,9 @@ # Path to your rules files (this can be a relative path) # Note for Windows users: You are advised to make this an absolute path,