ports/78713: Maintainer Update: security/osiris 4.1.2 -> 4.1.3
David Thiel
lx at redundancy.redundancy.org
Fri Mar 11 23:40:03 UTC 2005
>Number: 78713
>Category: ports
>Synopsis: Maintainer Update: security/osiris 4.1.2 -> 4.1.3
>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: Fri Mar 11 23:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: David Thiel
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 5.3-STABLE FreeBSD 5.3-STABLE #0: Sun Jan 9 21:41:16 PST 2005 root at redundancy.redundancy.org:/usr/obj/usr/src/sys/REDUNDANCY i386
>Description:
Updating the Osiris integrity checker from 4.1.2 to 4.1.3.
Code changes:
: fixed mod_ports record key value so address is included, as port number
may not be unique in the case of multiple interfaces.
: Date header for mail, and others now compliant with rfc2822.
: fixed bug with filters still generating email notifications.
Port changes:
Init scripts are now rcng. Added a message about enabling them. Added
a mirror site. Turned on "fancy cli" by default.
>How-To-Repeat:
>Fix:
diff -ruN osiris.old/Makefile osiris/Makefile
--- osiris.old/Makefile Fri Mar 11 14:06:34 2005
+++ osiris/Makefile Fri Mar 11 15:27:59 2005
@@ -6,9 +6,10 @@
#
PORTNAME= osiris
-PORTVERSION= 4.1.2
+PORTVERSION= 4.1.3
CATEGORIES= security
-MASTER_SITES= http://osiris.shmoo.com/data/
+MASTER_SITES= http://osiris.shmoo.com/data/ \
+ http://darkambient.net/
MAINTAINER= lx at redundancy.redundancy.org
COMMENT= The Shmoo client/server host integrity checker
@@ -18,8 +19,10 @@
CLI "Enable to build the management CLI" off
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
+ --enable-fancy-cli
USE_LIBTOOL_VER= 15
+USE_RC_SUBR= yes
.include <bsd.port.pre.mk>
@@ -46,17 +49,19 @@
${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
.endif
.if !defined(WITHOUT_OSIRISD)
- ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+ ${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
+ -e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
${WRKSRC}/src/install/freebsd/osirisd.in > \
- ${WRKSRC}/src/install/freebsd/osirisd.sh.sample
+ ${WRKSRC}/src/install/freebsd/osirisd.sh
${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh.sample \
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh \
${PREFIX}/etc/rc.d
.endif
.if defined(WITH_OSIRISMD)
- ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+ ${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
+ -e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
${WRKSRC}/src/install/freebsd/osirismd.in > \
- ${WRKSRC}/src/install/freebsd/osirismd.sh.sample
+ ${WRKSRC}/src/install/freebsd/osirismd.sh
@${MKDIR} ${PREFIX}/osiris/configs
.for os in aix bsdos darwin freebsd irix linux netbsd openbsd sunos \
unix-generic windows2000 windowsnt windowsserver2003 windowsxp \
@@ -66,9 +71,12 @@
.endfor
${INSTALL_PROGRAM} -m 4755 -o osiris -g osiris \
${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh.sample \
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh \
${PREFIX}/etc/rc.d
.endif
${CHOWN} -R osiris:osiris ${PREFIX}/osiris
+
+post-install:
+ @${CAT} pkg-message
.include <bsd.port.post.mk>
diff -ruN osiris.old/distinfo osiris/distinfo
--- osiris.old/distinfo Fri Mar 11 14:06:34 2005
+++ osiris/distinfo Fri Mar 11 14:06:47 2005
@@ -1,2 +1,2 @@
-MD5 (osiris-4.1.2.tar.gz) = 697836f441bf8336ae6688ba1961605a
-SIZE (osiris-4.1.2.tar.gz) = 1883059
+MD5 (osiris-4.1.3.tar.gz) = 1d3e250d1fcc3c654f5eda9d559c1f9a
+SIZE (osiris-4.1.3.tar.gz) = 1884877
diff -ruN osiris.old/files/patch-osirisd-in osiris/files/patch-osirisd-in
--- osiris.old/files/patch-osirisd-in Fri Mar 11 14:06:34 2005
+++ osiris/files/patch-osirisd-in Wed Dec 31 16:00:00 1969
@@ -1,16 +0,0 @@
---- src/install/freebsd/osirisd.in.old Wed Jul 7 15:40:50 2004
-+++ src/install/freebsd/osirisd.in Wed Jul 7 15:41:50 2004
-@@ -1,11 +1,11 @@
- #!/bin/sh
-
--OSIRISD=@INSTALLDIR@/osirisd
-+OSIRISD=%%PREFIX%%/sbin/osirisd
-
- case "$1" in
- start)
- if [ -x ${OSIRISD} ]; then
-- ${OSIRISD} -r @OSIRISDIR@ && echo -n ' osirisd'
-+ ${OSIRISD} -r %%PREFIX%%/osiris && echo -n ' osirisd'
- fi
- ;;
- stop)
diff -ruN osiris.old/files/patch-osirismd-in osiris/files/patch-osirismd-in
--- osiris.old/files/patch-osirismd-in Fri Mar 11 14:06:34 2005
+++ osiris/files/patch-osirismd-in Wed Dec 31 16:00:00 1969
@@ -1,17 +0,0 @@
---- src/install/freebsd/osirismd.in.old Wed Jul 7 15:43:07 2004
-+++ src/install/freebsd/osirismd.in Wed Jul 7 15:43:48 2004
-@@ -1,12 +1,12 @@
- #!/bin/sh
-
--OSIRISMD=@INSTALLDIR@/osirismd
-+OSIRISMD=%%PREFIX%%/sbin/osirismd
-
- case "$1" in
- start)
- if [ -f ${SUDO} ]; then
- if [ -x ${OSIRISMD} ]; then
-- ${OSIRISMD} -r @OSIRISDIR@ && echo -n ' osirismd'
-+ ${OSIRISMD} -r %%PREFIX%%/osiris && echo -n ' osirismd'
- fi
- else
- echo ""
diff -ruN osiris.old/files/patch-osirismd.in osiris/files/patch-osirismd.in
--- osiris.old/files/patch-osirismd.in Wed Dec 31 16:00:00 1969
+++ osiris/files/patch-osirismd.in Fri Mar 11 15:09:22 2005
@@ -0,0 +1,8 @@
+--- src/install/freebsd/osirismd.in.orig Fri Mar 11 15:05:42 2005
++++ src/install/freebsd/osirismd.in Fri Mar 11 15:06:03 2005
+@@ -25,4 +25,5 @@
+ rcvar=`set_rcvar`
+ command=@INSTALLDIR@/osirismd
+
++load_rc_config $name
+ run_rc_command "$1"
diff -ruN osiris.old/pkg-message osiris/pkg-message
--- osiris.old/pkg-message Wed Dec 31 16:00:00 1969
+++ osiris/pkg-message Fri Mar 11 15:12:40 2005
@@ -0,0 +1,15 @@
+
+###############################################################
+
+To start the osiris daemons at system boot, add:
+
+osirisd_enable="YES"
+
+and/or
+
+osirismd_enable="YES"
+
+to /etc/rc.conf.
+
+###############################################################
+
diff -ruN osiris.old/pkg-plist osiris/pkg-plist
--- osiris.old/pkg-plist Fri Mar 11 14:06:34 2005
+++ osiris/pkg-plist Fri Mar 11 14:21:14 2005
@@ -2,8 +2,8 @@
%%CLI%%sbin/osiris
%%OSIRISD%%sbin/osirisd
%%OSIRISMD%%sbin/osirismd
-%%OSIRISD%%etc/rc.d/osirisd.sh.sample
-%%OSIRISMD%%etc/rc.d/osirismd.sh.sample
+%%OSIRISD%%etc/rc.d/osirisd.sh
+%%OSIRISMD%%etc/rc.d/osirismd.sh
@exec mkdir -p %D/osiris
@exec chown osiris:osiris %D/osiris
%%OSIRISMD%%osiris/configs/default.aix
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list