version bump as per bug #88090. Ebuilds thanks to Nico Baggus

(Portage version: 2.1.2_rc3)

8 files changed, 309 insertions, 1 deletions

diff --git a/app-admin/osiris/ChangeLog b/app-admin/osiris/ChangeLog
index 8522021924f4..18c60d2c3568 100644
--- a/app-admin/osiris/ChangeLog
+++ b/app-admin/osiris/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/osiris
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.12 2006/11/23 15:08:07 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.13 2006/12/12 07:38:10 dragonheart Exp $
+
+*osiris-4.2.2 (12 Dec 2006)
+
+  12 Dec 2006; Daniel Black <dragonheart@gentoo.org> +files/osirisd-4.2.2,
+  +files/osirisd_confd-4.2.2, +files/osirismd-4.2.2,
+  +files/osirismd_confd-4.2.2, +files/osiris-4.2.2-externaldb.patch,
+  +osiris-4.2.2.ebuild:
+  version bump as per bug #88090. Ebuilds thanks to Nico Baggus
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> osiris-1.5.2.ebuild,
   osiris-1.5.2-r1.ebuild:
diff --git a/app-admin/osiris/files/digest-osiris-4.2.2 b/app-admin/osiris/files/digest-osiris-4.2.2
new file mode 100644
index 000000000000..bda50ad6df8a
--- /dev/null
+++ b/app-admin/osiris/files/digest-osiris-4.2.2
@@ -0,0 +1,12 @@
+MD5 b29e17a142ec2135fc0625f5041f7d9a mod_dns.tar.gz 1835
+RMD160 83a96b7854fa3f8802663f82759bc77ca7c41fb0 mod_dns.tar.gz 1835
+SHA256 c0bf154d310dd39ac3ba3f3d8215b52a01d120831cec77a8c22fc6de66a7750b mod_dns.tar.gz 1835
+MD5 25db400c9eb933663b9b6612242fba5c mod_nvram.tar.gz 2065
+RMD160 6f5beab396bd2011b0db386999c19da9d83c3881 mod_nvram.tar.gz 2065
+SHA256 ab3b78b853ea4ce6b06ed4a143e61267076d1aa9255c87786ebd9861da85a189 mod_nvram.tar.gz 2065
+MD5 207086461914860c3a6416665503e311 mod_uptime.tar.gz 2143
+RMD160 7a626a37825a867a88eed2223f737dd5e521c69c mod_uptime.tar.gz 2143
+SHA256 9538ce2a41f55f9ea629a08f643e2ca9d1130428dc25b2cee006108fc087dc78 mod_uptime.tar.gz 2143
+MD5 6cbb3800007f7fcf3aed3d4db7765900 osiris-4.2.2.tar.gz 1923249
+RMD160 238296ab6a513ec43f570a3d5ecc3bc2e4189b57 osiris-4.2.2.tar.gz 1923249
+SHA256 5b0ccf24ad6e96618f23998d82b12f0e33df4c2bd8d9ae4cbf0eab8dd1e49920 osiris-4.2.2.tar.gz 1923249
diff --git a/app-admin/osiris/files/osiris-4.2.2-externaldb.patch b/app-admin/osiris/files/osiris-4.2.2-externaldb.patch
new file mode 100644
index 000000000000..b9b1947d687e
--- /dev/null
+++ b/app-admin/osiris/files/osiris-4.2.2-externaldb.patch
@@ -0,0 +1,78 @@
+--- ./osiris-4.2.2/src/osirismd/Makefile.am.orig	2006-12-12 06:38:09.000000000 +1100
++++ ./osiris-4.2.2/src/osirismd/Makefile.am	2006-12-12 06:39:25.000000000 +1100
+@@ -25,14 +25,14 @@
+                           -I$(top_srcdir)/src/libosirisctl \
+                           -I$(top_srcdir)/src/libosirisdb \
+                           -I$(top_srcdir)/src/libosirism \
+-                          -I$(top_srcdir)/src/db-4.2.52/build_unix
++                          -I/usr/include/db4.2
+ 
+ osirismd_LDADD 		= -L$(top_srcdir)/src/libfileapi -lfileapi \
+                           -L$(top_srcdir)/src/libosirisctl -losirisctl \
+                           -L$(top_srcdir)/src/libosirisdb -losirisdb \
+                           -L$(top_srcdir)/src/libosirism -losirism \
+                           -L$(top_srcdir)/src/libosiris -losiris \
+-                          -L$(top_srcdir)/src/db-4.2.52/build_unix -ldb
++                          -ldb-4.2
+ 
+ osirismd_DEPENDENCIES	= $(top_srcdir)/src/libosiris/libosiris.a \
+                           $(top_srcdir)/src/libfileapi/libfileapi.a \
+--- ./osiris-4.2.2/src/tools/Makefile.am.orig	2006-12-12 06:34:27.000000000 +1100
++++ ./osiris-4.2.2/src/tools/Makefile.am	2006-12-12 06:35:55.000000000 +1100
+@@ -6,7 +6,7 @@
+                                   -I$(top_srcdir)/src/libosiris \
+                                   -I$(top_srcdir)/src/libosirisctl \
+                                   -I$(top_srcdir)/src/libosirism \
+-                                  -I$(top_srcdir)/src/db-4.2.52/build_unix
++                                  -I/usr/include/db4.2/
+ 
+ printdb_SOURCES			= printdb.c 
+ 
+@@ -14,7 +14,7 @@
+                                   -L$(top_srcdir)/src/libfileapi -lfileapi \
+                                   -L$(top_srcdir)/src/libosirism -losirism \
+                                   -L$(top_srcdir)/src/libosiris -losiris \
+-                                  -L$(top_srcdir)/src/db-4.2.52/build_unix -ldb
++                                  -ldb-4.2
+ 
+ printdb_DEPENDENCIES            = $(top_srcdir)/src/libosiris/libosiris.a \
+                                   $(top_srcdir)/src/libfileapi/libfileapi.a \
+--- ./osiris-4.2.2/src/libosirisdb/Makefile.am.orig	2006-12-12 06:38:37.000000000 +1100
++++ ./osiris-4.2.2/src/libosirisdb/Makefile.am	2006-12-12 06:39:37.000000000 +1100
+@@ -7,5 +7,5 @@
+                           -I$(top_srcdir)/src/libosirisctl \
+                           -I$(top_srcdir)/src/libosirism \
+                           -I$(top_srcdir)/src/libfileapi \
+-                          -I$(top_srcdir)/src/db-4.2.52/build_unix
++                          -I/usr/include/db4.2
+ 
+--- ./osiris-4.2.2/src/cli/Makefile.am.orig	2006-12-12 06:36:13.000000000 +1100
++++ ./osiris-4.2.2/src/cli/Makefile.am	2006-12-12 06:36:45.000000000 +1100
+@@ -7,7 +7,7 @@
+                       -I$(top_srcdir)/src/libosirism \
+                       -I$(top_srcdir)/src/libosiris \
+                       -I$(top_srcdir)/src/libosirisdb \
+-                      -I$(top_srcdir)/src/db-4.2.52/build_unix
++                      -I/usr/include/db4.2/
+ 
+ 
+ osiris_SOURCES			= osiris.c osiris.h get_user_input.c
+@@ -17,7 +17,7 @@
+                                   -L$(top_srcdir)/src/libfileapi -lfileapi \
+                                   -L$(top_srcdir)/src/libosiris -losiris \
+                                   -L$(top_srcdir)/src/libosirisdb -losirisdb \
+-                                  -L$(top_srcdir)/src/db-4.2.52/build_unix -ldb @LIBREADLINE@
++                                  -ldb-4.2 @LIBREADLINE@
+ 
+ 
+ osiris_DEPENDENCIES             = $(top_srcdir)/src/libosiris/libosiris.a \
+--- ./osiris-4.2.2/src/Makefile.am.orig	2006-12-12 06:37:06.000000000 +1100
++++ ./osiris-4.2.2/src/Makefile.am	2006-12-12 06:37:17.000000000 +1100
+@@ -6,7 +6,6 @@
+                       libosirisdb \
+                       libosirisctl \
+                       libosirism \
+-                      db-4.2.52 \
+                       osirisd \
+                       osirismd \
+              		  cli 
diff --git a/app-admin/osiris/files/osirisd-4.2.2 b/app-admin/osiris/files/osirisd-4.2.2
new file mode 100644
index 000000000000..cfacae252a52
--- /dev/null
+++ b/app-admin/osiris/files/osirisd-4.2.2
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if [ ! -x /usr/sbin/osirisd ] ; then
+		eerror "Daemon image not found"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting osirisd"
+	checkconfig || ( eend $? "Config problems for osirisd daemon" || return 1 )
+	start-stop-daemon --start --exec /usr/sbin/osirisd -- -e /var/run/osiris/osirisd.pid ${OSIRISD_OPTS}
+	eend $? "Failed to start osirisd daemon"
+}
+
+stop() {
+	ebegin "Stop osirisd"
+	start-stop-daemon --stop --name osirisd --pidfile /var/run/osiris/osirisd.pid
+	eend $? "Failed to stop osirisd daemon"
+}
+
diff --git a/app-admin/osiris/files/osirisd_confd-4.2.2 b/app-admin/osiris/files/osirisd_confd-4.2.2
new file mode 100644
index 000000000000..87bc2c6b0266
--- /dev/null
+++ b/app-admin/osiris/files/osirisd_confd-4.2.2
@@ -0,0 +1,10 @@
+#
+# Add extra optionsfor the daemon
+# -e <pid-file> has been provided for in the start/stop procedures
+#
+# -n <nicelevel>  - change nicelevel
+# -p <port>	  - change port
+# -q              - quiet
+# -r              - Specify alternate root directory
+#
+OSIRISD_OPTS=""
diff --git a/app-admin/osiris/files/osirismd-4.2.2 b/app-admin/osiris/files/osirismd-4.2.2
new file mode 100644
index 000000000000..1136c0433554
--- /dev/null
+++ b/app-admin/osiris/files/osirismd-4.2.2
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if [ ! -x /usr/sbin/osirisd ] ; then
+		eerror "Daemon image not found"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting osirismd"
+	checkconfig || ( eend $? "Config problems for osirismd daemon" || return 1 )
+	start-stop-daemon --start --exec /usr/sbin/osirismd -- -e /var/run/osiris/osirismd.pid ${OSIRISMD_OPTS}
+	eend $? "Failed to start osirismd daemon"
+}
+
+stop() {
+	ebegin "Stop osirismd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/osiris/osirismd.pid
+	eend $? "Failed to stop osirismd daemon"
+}
diff --git a/app-admin/osiris/files/osirismd_confd-4.2.2 b/app-admin/osiris/files/osirismd_confd-4.2.2
new file mode 100644
index 000000000000..98f0bc930b00
--- /dev/null
+++ b/app-admin/osiris/files/osirismd_confd-4.2.2
@@ -0,0 +1,10 @@
+#
+# Extra options for the osirismd daemon
+# -e has been provided for in the start/stop process
+#
+# -r <dir>	-- alternate root directory
+# -f <file>	-- alternate config file
+#
+#
+OSIRISMD_OPTS=""
+
diff --git a/app-admin/osiris/osiris-4.2.2.ebuild b/app-admin/osiris/osiris-4.2.2.ebuild
new file mode 100644
index 000000000000..bae11bc04127
--- /dev/null
+++ b/app-admin/osiris/osiris-4.2.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-4.2.2.ebuild,v 1.1 2006/12/12 07:38:10 dragonheart Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="File integrity verification system"
+HOMEPAGE="http://osiris.shmoo.com/"
+SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz
+	http://osiris.shmoo.com/data/modules/mod_uptime.tar.gz
+	http://osiris.shmoo.com/data/modules/mod_dns.tar.gz
+	http://osiris.shmoo.com/data/modules/mod_nvram.tar.gz"
+#	http://osiris.shmoo.com/data/modules/mod_ports.tar.gz"
+
+LICENSE="OSIRIS"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+#IUSE="noagent console"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.8c
+	=sys-libs/db-4.2*"
+
+pkg_setup()
+{
+	enewgroup osiris
+	enewuser osiris -1 -1 /var/lib/osiris osiris
+}
+
+src_unpack()
+{
+	unpack ${P}.tar.gz
+	epatch "${FILESDIR}"/${P}-externaldb.patch
+	cd "${S}"
+	./bootstrap
+	#eautomake
+	cd "${WORKDIR}"
+	unpack mod_uptime.tar.gz
+	unpack mod_dns.tar.gz
+	unpack mod_nvram.tar.gz
+#	unpack mod_ports.tar.gz
+#	Add the above modules
+	mv "${S}"/../mod_* "${S}"/src/osirisd/modules/
+}
+
+src_compile()
+{
+	econf --prefix=/var/lib --enable-fancy-cli=yes || die "configure failed."
+#	if  ! use noagent ; then 
+		emake agent || die "agent build failed"
+#	fi
+#	if use console ; then
+		emake console || die "management build failed"
+#	fi
+}
+
+src_install() {
+	einfo "Osiris Scanning Daemon Version $VERSION for $SYSTEM"
+	einfo "Copyright (c) 2006 Brian Wotring. All Rights Reserved."
+	einfo ""
+	einfo ""
+	einfo "This installation was configured and built to run as osiris"
+	einfo "     agent user name: osiris"
+	einfo "management user name: osiris"
+	einfo ""
+	einfo "This installation was configured and built to use osiris"
+	einfo "     agent root directory: /var/lib/osiris"
+	einfo "management root directory: /var/lib/osiris"
+	einfo ""
+	einfo "The username and directory will be created during the"
+	einfo "installation process if they do not already exist."
+	einfo ""
+	einfo "By installing this product you agree that you have read the"
+	einfo "LICENSE file and will comply with its terms. "
+	einfo ""
+	einfo "---------------------------------------------------------------------"
+	einfo ""
+
+#	if ! use noagent ; then
+		dosbin src/osirisd/osirisd
+		fowners root:0 /usr/sbin/osirisd
+		fperms 0755 /usr/sbin/osirisd
+		newinitd "${FILESDIR}"/osirisd-${PV} osirisd
+		newconfd "${FILESDIR}"/osirisd_confd-${PV} osirisd
+#	fi
+
+#	if use console; then
+		dosbin src/cli/osiris
+		fowners root:0 /usr/sbin/osiris
+		fperms 0755 /usr/sbin/osiris
+
+		dosbin src/osirismd/osirismd
+		fowners osiris:osiris /usr/sbin/osirismd
+		fperms 4755 /usr/sbin/osirismd
+
+		newinitd "${FILESDIR}"/osirismd-${PV} osirismd
+		newconfd "${FILESDIR}"/osirismd_confd-${PV} osirismd
+#	fi
+
+	dodir /var/run
+	dodir /var/lib
+	diropts -o osiris -g osiris -m0750
+	dodir /var/lib/osiris
+	dodir /var/run/osiris
+	keepdir /var/run/osiris
+#	if use console ; then
+		cp -rf "${S}"/src/configs "${D}"/var/lib/osiris/
+		chown -R osiris:osiris "${D}"/var/lib/osiris/*
+		chmod -R 0750 "${D}"/var/lib/osiris/*
+#	fi
+}
+
+#pkg_postinst()
+#{
+#	if ! use console ; then
+#		einfo "By default, the osiris ebuild only installs the agent."
+#		einfo "To enable installing the console, please add the 'console' flag"
+#		einfo "to your USE variable and re-emerge osiris."
+#	fi
+#}
+
+pkg_postrm()
+{
+	# PID directory should not clutter the
+	# system
+	rm -rf /var/run/osiris
+
+	# Allow the user to decide if certs,
+	# configs, and other things should
+	# be
+	# removed.
+	einfo "The directory /var/lib/osiris will not be removed. You may remove"
+	einfo "it manually if you will not be reinstalling osiris at a later time."
+}
+