From owner-svn-ports-all@freebsd.org Mon Nov 21 01:12:33 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C43AEC4B347; Mon, 21 Nov 2016 01:12:33 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id 7054B1259; Mon, 21 Nov 2016 01:12:33 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAL1CWUF074533; Mon, 21 Nov 2016 01:12:32 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAL1CW1c074530; Mon, 21 Nov 2016 01:12:32 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201611210112.uAL1CW1c074530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 21 Nov 2016 01:12:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426684 - in head/security: ossec-hids-local ossec-hids-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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, 21 Nov 2016 01:12:33 -0000 Author: marino Date: Mon Nov 21 01:12:32 2016 New Revision: 426684 URL: https://svnweb.freebsd.org/changeset/ports/426684 Log: security/security/ossec-hids-(server|local|client): SSL fix / stage QA Fix 1: Set LDFLAGS for SSL support Fix 2: Fix stage-QA failures in both -local and -server: Two log files were present in these stage directories that were not listed in the plist. One of them were registered by the -client port so rather than remove them from the stage, add them to the package list Fix 3: revbump after fix 2 Approved by: SSL and general blankets Modified: head/security/ossec-hids-local/Makefile head/security/ossec-hids-server/Makefile head/security/ossec-hids-server/pkg-plist Modified: head/security/ossec-hids-local/Makefile ============================================================================== --- head/security/ossec-hids-local/Makefile Sun Nov 20 23:56:41 2016 (r426683) +++ head/security/ossec-hids-local/Makefile Mon Nov 21 01:12:32 2016 (r426684) @@ -1,7 +1,7 @@ # Created by: Valerio Daelli # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Client and server (local) port of ossec-hids LOCAL_ONLY= yes Modified: head/security/ossec-hids-server/Makefile ============================================================================== --- head/security/ossec-hids-server/Makefile Sun Nov 20 23:56:41 2016 (r426683) +++ head/security/ossec-hids-server/Makefile Mon Nov 21 01:12:32 2016 (r426684) @@ -4,7 +4,7 @@ PORTNAME= ossec-hids PORTVERSION= 2.8.3 DISTVERSIONPREFIX= v -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= security PKGNAMESUFFIX= -server @@ -17,8 +17,7 @@ USE_RC_SUBR= ossec-hids CFLAGS+= -ferror-limit=0 -USES= readline -USE_OPENSSL= yes +USES= readline ssl .if defined(MAINTAINER_MODE) UID_FILES+= ../../UIDs @@ -89,6 +88,8 @@ post-patch: @${REINPLACE_CMD} -e 's|-DLUA_USE_LINUX|& ${CPPFLAGS}|' \ -e 's|-lreadline|& ${LDFLAGS}|' \ ${WRKSRC}/src/external/lua-5.2.3/src/Makefile + @${REINPLACE_CMD} -e 's|OPENSSLCMD=|OPENSSLCMD=-L${OPENSSLLIB} |' \ + ${WRKSRC}/src/Makeall do-build: .if defined(WITH_DB) Modified: head/security/ossec-hids-server/pkg-plist ============================================================================== --- head/security/ossec-hids-server/pkg-plist Sun Nov 20 23:56:41 2016 (r426683) +++ head/security/ossec-hids-server/pkg-plist Mon Nov 21 01:12:32 2016 (r426684) @@ -126,6 +126,8 @@ %%PORTNAME%%/agentless/ssh_pixconfig_diff %%PORTNAME%%/agentless/sshlogin.exp %%PORTNAME%%/agentless/su.exp +@(ossec,,) %%PORTNAME%%/logs/active-responses.log +@(ossec,,) %%PORTNAME%%/logs/ossec.log @mode 550 @dir %%PORTNAME%%/.ssh @dir %%PORTNAME%%/active-response/bin