Attachment 50648 Details for Bug 77110 – file.diff

[patch] file.diff

file.diff (text/plain), 5.26 KB, created by David Thiel on 2005-02-04 23:00:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Thiel

Created: 2005-02-04 23:00:38 UTC

Size: 5.26 KB

patch

obsolete

>diff -ruN osiris/Makefile osiris.new/Makefile
>--- osiris/Makefile	Wed Jan 19 15:09:50 2005
>+++ osiris.new/Makefile	Fri Feb  4 14:30:05 2005
>@@ -6,55 +6,68 @@
> #
> 
> PORTNAME=	osiris
>-PORTVERSION=	4.0.8
>+PORTVERSION=	4.1.1
> CATEGORIES=	security
> MASTER_SITES=	http://osiris.shmoo.com/data/
> 
> MAINTAINER=	lx@redundancy.redundancy.org
> COMMENT=	The Shmoo client/server host integrity checker
> 
>+OPTIONS=	OSIRISMD "Enable to build the management daemon" off \
>+		OSIRISD "Enable to build the osirisd scan agent" on \
>+		CLI "Enable to build the management CLI" off
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> USE_LIBTOOL_VER=	15
> 
>+.include <bsd.port.pre.mk>
>+
> .if defined(WITH_OSIRISMD)
> PLIST_SUB+=	OSIRISMD=""
> .else
> PLIST_SUB+=	OSIRISMD="@comment "
> .endif
>+.if defined(WITH_OSIRISD)
>+PLIST_SUB+=	OSIRISD=""
>+.else
>+PLIST_SUB+=	OSIRISD="@comment "
>+.endif
>+.if defined(WITH_CLI)
>+PLIST_SUB+=	CLI=""
>+.else
>+PLIST_SUB+=	CLI="@comment "
>+.endif
> 
>-pre-everything::
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "Define WITH_OSIRISMD to enable build of the management daemon."
>-	@${ECHO_MSG}
>-
>-post-build:
>+do-install:
>+	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>+.if defined(WITH_CLI)
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
>+.endif
>+.if defined(WITH_OSIRISD)
> 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
> 		${WRKSRC}/src/install/freebsd/osirisd.in > \
> 		${WRKSRC}/src/install/freebsd/osirisd.sh.sample
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin
>+	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh.sample \
>+		${PREFIX}/etc/rc.d
>+.endif
> .if defined(WITH_OSIRISMD)
> 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
> 		${WRKSRC}/src/install/freebsd/osirismd.in > \
> 		${WRKSRC}/src/install/freebsd/osirismd.sh.sample
>-.endif
>-
>-do-install:
>-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> 	@${MKDIR} ${PREFIX}/osiris/configs
>-.for os in aix bsdos darwin freebsd irix linux openbsd sunos unix-generic \
>-	windows2000 windowsnt windowsserver2003 windowsxp
>+.for os in aix bsdos darwin freebsd irix linux netbsd openbsd sunos \
>+	unix-generic windows2000 windowsnt windowsserver2003 windowsxp \
>+	wrt54g
> 	${INSTALL_DATA} ${WRKSRC}/src/configs/default.${os} \
> 		${PREFIX}/osiris/configs
> .endfor
> 	${CHOWN} -R osiris:osiris ${PREFIX}/osiris
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${PREFIX}/sbin
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh.sample \
>-		${PREFIX}/etc/rc.d
>-.if defined(WITH_OSIRISMD)
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin
>+	${INSTALL_PROGRAM} -m 4755 -o osiris -g osiris \
>+		${WRKSRC}/src/osirismd/osirismd ${PREFIX}/sbin
> 	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh.sample \
> 		${PREFIX}/etc/rc.d
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN osiris/distinfo osiris.new/distinfo
>--- osiris/distinfo	Thu Jan 20 09:49:52 2005
>+++ osiris.new/distinfo	Fri Feb  4 12:57:33 2005
>@@ -1,2 +1,2 @@
>-MD5 (osiris-4.0.8.tar.gz) = 593eee1967a14e519e27de88f75c9cad
>-SIZE (osiris-4.0.8.tar.gz) = 1896413
>+MD5 (osiris-4.1.1.tar.gz) = ae7b255492320c9e37d73c8122fc4be9
>+SIZE (osiris-4.1.1.tar.gz) = 1882582
>diff -ruN osiris/pkg-install osiris.new/pkg-install
>--- osiris/pkg-install	Tue Apr 20 13:36:39 2004
>+++ osiris.new/pkg-install	Fri Feb  4 13:33:57 2005
>@@ -56,7 +56,7 @@
> 	echo "You need a user \"${u}\"."
> 	if which -s pw && yesno "Would you like me to create it" y
> 	then
>-	    pw useradd ${u} -g ${g} -h - -d /usr/local/etc/osiris -s /sbin/nologin -c "${gcos}" || exit
>+	    pw useradd ${u} -g ${g} -h - -d /nonexistent -s /sbin/nologin -c "${gcos}" || exit
> 	    echo "Done."
> 	else
> 	    echo "Please create it, and try again."
>diff -ruN osiris/pkg-plist osiris.new/pkg-plist
>--- osiris/pkg-plist	Fri Nov 26 22:01:29 2004
>+++ osiris.new/pkg-plist	Fri Feb  4 14:20:40 2005
>@@ -1,21 +1,23 @@
> @comment $FreeBSD: ports/security/osiris/pkg-plist,v 1.4 2004/11/27 06:01:29 edwin Exp $
>-sbin/osiris
>-sbin/osirisd
>+%%CLI%%sbin/osiris
>+%%OSIRISD%%sbin/osirisd
> %%OSIRISMD%%sbin/osirismd
>-etc/rc.d/osirisd.sh.sample
>+%%OSIRISD%%etc/rc.d/osirisd.sh.sample
> %%OSIRISMD%%etc/rc.d/osirismd.sh.sample
>-osiris/configs/default.aix
>-osiris/configs/default.bsdos
>-osiris/configs/default.darwin
>-osiris/configs/default.freebsd
>-osiris/configs/default.irix
>-osiris/configs/default.linux
>-osiris/configs/default.openbsd
>-osiris/configs/default.sunos
>-osiris/configs/default.unix-generic
>-osiris/configs/default.windows2000
>-osiris/configs/default.windowsnt
>-osiris/configs/default.windowsserver2003
>-osiris/configs/default.windowsxp
>-@dirrm osiris/configs
>+%%OSIRISMD%%osiris/configs/default.aix
>+%%OSIRISMD%%osiris/configs/default.bsdos
>+%%OSIRISMD%%osiris/configs/default.darwin
>+%%OSIRISMD%%osiris/configs/default.freebsd
>+%%OSIRISMD%%osiris/configs/default.irix
>+%%OSIRISMD%%osiris/configs/default.linux
>+%%OSIRISMD%%osiris/configs/default.netbsd
>+%%OSIRISMD%%osiris/configs/default.openbsd
>+%%OSIRISMD%%osiris/configs/default.sunos
>+%%OSIRISMD%%osiris/configs/default.unix-generic
>+%%OSIRISMD%%osiris/configs/default.windows2000
>+%%OSIRISMD%%osiris/configs/default.windowsnt
>+%%OSIRISMD%%osiris/configs/default.windowsserver2003
>+%%OSIRISMD%%osiris/configs/default.windowsxp
>+%%OSIRISMD%%osiris/configs/default.wrt54g
>+%%OSIRISMD%%@dirrm osiris/configs
> @dirrm osiris

Actions: View | Diff

Attachments on bug 77110: 50648