From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 5 19:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A780316A4DF for ; Tue, 5 Sep 2006 19:40:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAFFB43D4C for ; Tue, 5 Sep 2006 19:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k85JeIZh093078 for ; Tue, 5 Sep 2006 19:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k85JeI5J093077; Tue, 5 Sep 2006 19:40:18 GMT (envelope-from gnats) Resent-Date: Tue, 5 Sep 2006 19:40:18 GMT Resent-Message-Id: <200609051940.k85JeI5J093077@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Thiel Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2190E16A4EA for ; Tue, 5 Sep 2006 19:34:20 +0000 (UTC) (envelope-from lx@redundancy.redundancy.org) Received: from redundancy.redundancy.org (redundancy.redundancy.org [64.147.160.152]) by mx1.FreeBSD.org (Postfix) with SMTP id 6001643D49 for ; Tue, 5 Sep 2006 19:34:18 +0000 (GMT) (envelope-from lx@redundancy.redundancy.org) Received: (qmail 26632 invoked by uid 1001); 5 Sep 2006 19:34:41 -0000 Message-Id: <20060905193441.26631.qmail@redundancy.redundancy.org> Date: 5 Sep 2006 19:34:41 -0000 From: David Thiel To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102915: Maintainer update: security/samhain 2.2.1 -> 2.2.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: David Thiel List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Sep 2006 19:40:22 -0000 >Number: 102915 >Category: ports >Synopsis: Maintainer update: security/samhain 2.2.1 -> 2.2.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Sep 05 19:40:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: David Thiel >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD redundancy.redundancy.org 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386 >Description: Updating the samhain integrity checking system to 2.2.4. This is primarily a bugfix release, but also adds updated RCng scripts. >How-To-Repeat: >Fix: diff -ruN samhain.old/Makefile samhain/Makefile --- samhain.old/Makefile Tue Sep 5 12:14:17 2006 +++ samhain/Makefile Tue Sep 5 12:31:41 2006 @@ -5,7 +5,7 @@ # $FreeBSD: ports/security/samhain/Makefile,v 1.36 2006/06/18 20:14:43 itetcu Exp $ PORTNAME= samhain -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.4 CATEGORIES= security MASTER_SITES= http://la-samhna.de/archive/ \ http://redundancy.redundancy.org/mirror/ @@ -35,6 +35,7 @@ .endif GNU_CONFIGURE= yes +USE_RC_SUBR= yes CONFIGURE_ARGS= --enable-login-watch --localstatedir=/var \ --mandir=${PREFIX}/man --enable-suidcheck @@ -136,11 +137,11 @@ post-install: .if !defined(WITH_SERVER) - @${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/samhain.sh.sample + @${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/samhain.sh @${CP} ${WRKSRC}/samhainrc ${PREFIX}/etc/samhainrc.sample @${CHGRP} wheel ${PREFIX}/etc/samhainrc.sample .else - @${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/yule.sh.sample + @${CP} ${WRKSRC}/init/samhain.startFreeBSD ${PREFIX}/etc/rc.d/yule.sh @${CP} ${WRKSRC}/yulerc ${PREFIX}/etc/yulerc.sample .endif .if !defined(NOPORTDOCS) @@ -158,4 +159,5 @@ ${INSTALL_MAN} ${WRKSRC}/docs/sh_userfiles.txt ${DOCSDIR} .endif + @${CAT} ${PKGMESSAGE} .include diff -ruN samhain.old/distinfo samhain/distinfo --- samhain.old/distinfo Tue Sep 5 12:14:17 2006 +++ samhain/distinfo Tue Sep 5 12:15:12 2006 @@ -1,3 +1,3 @@ -MD5 (samhain_signed-2.2.1.tar.gz) = 24d9f7b5043266bed81cb66fd8786212 -SHA256 (samhain_signed-2.2.1.tar.gz) = 822efb7c8c8025ed11e2296d1b2c204af1aece264c0f49e1ee4c457728fcbd14 -SIZE (samhain_signed-2.2.1.tar.gz) = 1506866 +MD5 (samhain_signed-2.2.4.tar.gz) = e6b981dd4d8f91f1fd73f2b011a3468c +SHA256 (samhain_signed-2.2.4.tar.gz) = 298ed40bb7115883e974ebcd677f6b5a3901c99b64a10c9a4f5eedb15a4207cf +SIZE (samhain_signed-2.2.4.tar.gz) = 1520568 diff -ruN samhain.old/files/patch-src__sh_extern.c samhain/files/patch-src__sh_extern.c --- samhain.old/files/patch-src__sh_extern.c Tue Sep 5 12:14:17 2006 +++ samhain/files/patch-src__sh_extern.c Wed Dec 31 16:00:00 1969 @@ -1,16 +0,0 @@ ---- src/sh_extern.c.orig Fri Apr 7 20:07:53 2006 -+++ src/sh_extern.c Mon May 22 08:18:29 2006 -@@ -1067,9 +1067,11 @@ - */ - int sh_ext_add_default (const char * dummy) - { -- (void) dummy; -- char * p = NULL; -+ char * p; - int i; -+ (void) dummy; -+ -+ p = NULL; - - SL_ENTER(_("sh_ext_add_default")); - if (dummy[0] == 'n' || dummy[0] == 'N' || diff -ruN samhain.old/pkg-message samhain/pkg-message --- samhain.old/pkg-message Wed Dec 31 16:00:00 1969 +++ samhain/pkg-message Tue Sep 5 12:23:57 2006 @@ -0,0 +1,15 @@ + +############################################################### + +To start the samhain daemon at system boot, add: + +samhain_enable="YES" + +and/or + +yule_enable="YES" + +to /etc/rc.conf. + +############################################################### + diff -ruN samhain.old/pkg-plist samhain/pkg-plist --- samhain.old/pkg-plist Tue Sep 5 12:14:17 2006 +++ samhain/pkg-plist Tue Sep 5 12:26:30 2006 @@ -3,11 +3,11 @@ %%YULE%%sbin/yule_setpwd %%YULE%%sbin/yule %%YULE%%sbin/yulectl -%%YULE%%etc/rc.d/yule.sh.sample -%%YULE%%@unexec echo To delete the yule user permanently, use 'pw userdel ${USER}'" +%%YULE%%etc/rc.d/yule.sh +%%YULE%%@unexec echo "To delete the yule user permanently, use 'pw userdel ${USER}'" %%YULE%%@unexec rmdir /var/lib/yule 2>/dev/null || true %%SAMHAIN%%sbin/samhain -%%SAMHAIN%%etc/rc.d/samhain.sh.sample +%%SAMHAIN%%etc/rc.d/samhain.sh %%SAMHAIN%%etc/samhainrc.sample %%SAMHAIN%%@unexec rmdir /var/lib/samhain 2>/dev/null || true %%SETPWD%%sbin/samhain_setpwd >Release-Note: >Audit-Trail: >Unformatted: