Date: Mon, 12 Dec 2005 23:00:15 GMT From: David Thiel <lx@redundancy.redundancy.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/90305: Update: security/samhain 2.0.10 -> 2.1.0 Message-ID: <200512122300.jBCN0F5G019369@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/90305; it has been noted by GNATS. From: David Thiel <lx@redundancy.redundancy.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: Subject: Re: ports/90305: Update: security/samhain 2.0.10 -> 2.1.0 Date: Mon, 12 Dec 2005 14:59:25 -0800 Ok, here is the diff for the update: diff -ruN samhain.old/Makefile samhain/Makefile --- samhain.old/Makefile Mon Oct 31 13:28:04 2005 +++ samhain/Makefile Mon Oct 31 15:58:00 2005 @@ -3,23 +3,9 @@ # Whom: lx # # $FreeBSD: ports/security/samhain/Makefile,v 1.30 2005/09/22 07:15:29 vsevolod Exp $ -# -# -# This port recognizes the following non-boolean tunables: -# -# WITH_RUNAS_USER: -# Whe building with "WITH_SERVER" defined, the username of the -# account Yule will run as. Defaults to "yule". If using -# WITH_GPG, ensure that this user exists and has a pgp -# keypair before installing. -# -# WITH_LOG_SERVER, WITH_ALT_LOG_SERVER. When "WITH_CLIENT" is defined, -# these specify what server the client will fetch configuration -# and database files from. This can also be defined at runtime. -# PORTNAME= samhain -PORTVERSION= 2.0.10 +PORTVERSION= 2.1.0 CATEGORIES= security MASTER_SITES= http://la-samhna.de/archive/ \ http://cold.darkambient.net/ @@ -33,12 +19,12 @@ MYSQL "Enable MySQL logging" off \ POSTGRESQL "Enable PostgreSQL logging" off \ XML_LOGS "Enable XML-formatted logs" on \ - LIBWRAP "Enable TCP wrapper support" on \ - CLIENT "Build as Samhain network client" off \ - SERVER "Build as Yule network server" off + LIBWRAP "Enable TCP wrapper support" on WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +CONFLICTS= samhain-client-2* + .include <bsd.port.pre.mk> .if defined(WITH_GPG) @@ -105,10 +91,10 @@ .if !defined(WITH_CLIENT) && !defined(WITH_SERVER) @${ECHO_MSG} - @${ECHO_MSG} "Building in standalone mode." + @${ECHO_MSG} "Building Samhain in standalone mode." @${ECHO_MSG} "If you wish to enable networked mode, please hit CTRL-C" - @${ECHO_MSG} "now, review the options in the Makefile, and make" - @${ECHO_MSG} "with WITH_SERVER=yes or WITH_CLIENT=yes." + @${ECHO_MSG} "now, and build samhain from the samhain-client and" + @${ECHO_MSG} "samhain-server ports." @${ECHO_MSG} .endif diff -ruN samhain.old/distinfo samhain/distinfo --- samhain.old/distinfo Mon Oct 31 13:28:04 2005 +++ samhain/distinfo Mon Oct 31 13:33:41 2005 @@ -1,2 +1,2 @@ -MD5 (samhain_signed-2.0.10.tar.gz) = 30fa821fdeb674b57aa7db0b66ed3af2 -SIZE (samhain_signed-2.0.10.tar.gz) = 1298443 +MD5 (samhain_signed-2.1.0.tar.gz) = 295eae6715c9c3e6af3dcafad52f761e +SIZE (samhain_signed-2.1.0.tar.gz) = 1312114 --- end diff --- Here is the shar for the two new slave ports: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # samhain-client # samhain-client/Makefile # samhain-server # samhain-server/Makefile # echo c - samhain-client mkdir -p samhain-client > /dev/null 2>&1 echo x - samhain-client/Makefile sed 's/^X//' >samhain-client/Makefile << 'END-of-samhain-client/Makefile' X# New ports collection makefile for: samhain-client X# Date created: 2005-10-31 X# Whom: David Thiel X# X# $FreeBSD$ X# X# X# This port recognizes the following non-boolean tunables: X# X# WITH_LOG_SERVER, WITH_ALT_LOG_SERVER. When "WITH_CLIENT" is defined, X# these specify what server the client will fetch configuration X# and database files from. This can also be defined at runtime. X# X XPKGNAMESUFFIX= -client X XCOMMENT= Client daemon for the Samhain IDS X XWITH_CLIENT= yes XNOPORTDOCS= yes X XMASTERDIR= ${.CURDIR}/../samhain X XCONFLICTS= samhain-2* X X.include "${MASTERDIR}/Makefile" END-of-samhain-client/Makefile echo c - samhain-server mkdir -p samhain-server > /dev/null 2>&1 echo x - samhain-server/Makefile sed 's/^X//' >samhain-server/Makefile << 'END-of-samhain-server/Makefile' X# New ports collection makefile for: samhain-server X# Date created: 2005-10-31 X# Whom: David Thiel X# X# $FreeBSD$ X# X X# This port recognizes the following non-boolean tunables: X# X# WITH_RUNAS_USER: X# Whe building with "WITH_SERVER" defined, the username of the X# account Yule will run as. Defaults to "yule". If using X# WITH_GPG, ensure that this user exists and has a pgp X# keypair before installing. X X XPKGNAMESUFFIX= -server X XCOMMENT= Log server for the Samhain IDS X XWITH_SERVER= yes X XMASTERDIR= ${.CURDIR}/../samhain X X.include "${MASTERDIR}/Makefile" END-of-samhain-server/Makefile exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512122300.jBCN0F5G019369>