From owner-svn-ports-head@freebsd.org Thu Sep 19 15:57:54 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 459E8127203; Thu, 19 Sep 2019 15:57:54 +0000 (UTC) (envelope-from tobik@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 46Z1hf0xwPz3QM3; Thu, 19 Sep 2019 15:57:54 +0000 (UTC) (envelope-from tobik@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 F2764FC89; Thu, 19 Sep 2019 15:57:53 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8JFvrSn059834; Thu, 19 Sep 2019 15:57:53 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8JFvrch059833; Thu, 19 Sep 2019 15:57:53 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201909191557.x8JFvrch059833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 19 Sep 2019 15:57:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512354 - head/security/samhain X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/security/samhain X-SVN-Commit-Revision: 512354 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Sep 2019 15:57:54 -0000 Author: tobik Date: Thu Sep 19 15:57:53 2019 New Revision: 512354 URL: https://svnweb.freebsd.org/changeset/ports/512354 Log: security/samhain: Spell *_CONFIGURE_ON correctly While here - Put database options in a radio group since only one can be on at a time - Move implied options to *_IMPLIES - ODBC implies XML_LOGS too Modified: head/security/samhain/Makefile Modified: head/security/samhain/Makefile ============================================================================== --- head/security/samhain/Makefile Thu Sep 19 15:41:59 2019 (r512353) +++ head/security/samhain/Makefile Thu Sep 19 15:57:53 2019 (r512354) @@ -3,6 +3,7 @@ PORTNAME= samhain PORTVERSION= 4.3.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://la-samhna.de/archive/ DISTNAME= samhain_signed-${PORTVERSION} @@ -16,12 +17,16 @@ BROKEN_aarch64= fails to build: undefined reference t BROKEN_mips= fails to configure: error: Could not find the libwrap library BROKEN_mips64= fails to configure: error: Could not find the libwrap library -OPTIONS_DEFINE= ASM DB_RELOAD DEBUG DNMALLOC DOCS ENCRYPT GNUPG IPV6 KCHECK \ - LIBWRAP LOGFILE_MONITOR LOGIN_WATCH MAIL MOUNTS_CHECK MYSQL \ - ODBC PGSQL PORT_CHECK PROCESS_CHECK POSIX_ACL PRELUDE PTRACE \ - SRP STATIC SUIDCHECK UDP USERFILES XML_LOGS -OPTIONS_DEFAULT=ASM DNMALLOC ENCRYPT LIBWRAP MAIL SRP +OPTIONS_DEFINE= ASM DB_RELOAD DEBUG DNMALLOC DOCS ENCRYPT GNUPG IPV6 \ + KCHECK LIBWRAP LOGFILE_MONITOR LOGIN_WATCH MAIL \ + MOUNTS_CHECK PORT_CHECK POSIX_ACL PRELUDE PROCESS_CHECK \ + PTRACE SRP STATIC SUIDCHECK UDP USERFILES XML_LOGS +OPTIONS_DEFAULT= ASM DNMALLOC ENCRYPT LIBWRAP MAIL SRP +OPTIONS_RADIO= DB +OPTIONS_RADIO_DB= MYSQL ODBC PGSQL +OPTIONS_SUB= yes +DB_DESC= Database support DB_RELOAD_DESC= Enable database reload on SIGHUP DNMALLOC_DESC= Enable dnmalloc ENCRYPT_DESC= Enable client/server encryption @@ -41,8 +46,6 @@ UDP_DESC= Enable UDP server USERFILES_DESC= Enable check for users config files XML_LOGS_DESC= Enable XML-formatted logs -OPTIONS_SUB= yes - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes @@ -82,14 +85,17 @@ MAIL_CONFIGURE_ENABLE= mail MOUNTS_CHECK_CONFIGURE_ENABLE= mounts-check +MYSQL_IMPLIES= XML_LOGS MYSQL_USES= mysql -MYSQL_CONFIGURE_ARGS= --with-database=mysql +MYSQL_CONFIGURE_ON= --with-database=mysql -ODBC_CONFIGURE_ARGS= --with-database=odbc +ODBC_IMPLIES= XML_LOGS ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CONFIGURE_ON= --with-database=odbc +PGSQL_IMPLIES= XML_LOGS PGSQL_USES= pgsql -PGSQL_CONFIGURE_ARGS= --with-database=postgresql +PGSQL_CONFIGURE_ON= --with-database=postgresql PORT_CHECK_CONFIGURE_ENABLE= port-check @@ -166,14 +172,6 @@ IGNORE= can't build client and server at once @${ECHO_MSG} "and /dev/mem. If you're not building as root, please hit" @${ECHO_MSG} "Control-C and restart the build as root." @${ECHO_MSG} -.endif - -.if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MXML_LOGS} -IGNORE= xml logging is required to log to MySQL -.endif - -.if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MXML_LOGS} -IGNORE= xml logging is required to log to Postgres .endif post-extract: