(non maintainer commit) Version bump for bug #170498

(Portage version: 2.2_rc13/cvs/Linux 2.6.27.4 x86_64)

9 files changed, 39 insertions, 227 deletions

diff --git a/app-admin/osiris/ChangeLog b/app-admin/osiris/ChangeLog
index 5e8402eb1ec8..3ec5389bb872 100644
--- a/app-admin/osiris/ChangeLog
+++ b/app-admin/osiris/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/osiris
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.16 2008/06/04 16:52:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.17 2008/11/11 03:28:28 darkside Exp $
+
+*osiris-4.2.3 (11 Nov 2008)
+
+  11 Nov 2008; Jeremy Olexa <darkside@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,
+  +files/osirisd-4.2.3, +files/osirisd_confd-4.2.3, +files/osirismd-4.2.3,
+  +files/osirismd_confd-4.2.3, -osiris-1.5.2.ebuild,
+  -osiris-1.5.2-r1.ebuild, -osiris-4.2.2.ebuild, +osiris-4.2.3.ebuild:
+  (non maintainer commit) Version bump for bug #170498
 
   04 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> osiris-4.2.2.ebuild:
   Use eautoreconf, not the bootstrap script.
diff --git a/app-admin/osiris/files/osiris-4.2.2-externaldb.patch b/app-admin/osiris/files/osiris-4.2.2-externaldb.patch
deleted file mode 100644
index b9b1947d687e..000000000000
--- a/app-admin/osiris/files/osiris-4.2.2-externaldb.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- ./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.3
index cfacae252a52..cfacae252a52 100644
--- a/app-admin/osiris/files/osirisd-4.2.2
+++ b/app-admin/osiris/files/osirisd-4.2.3
diff --git a/app-admin/osiris/files/osirisd_confd-4.2.2 b/app-admin/osiris/files/osirisd_confd-4.2.3
index 87bc2c6b0266..87bc2c6b0266 100644
--- a/app-admin/osiris/files/osirisd_confd-4.2.2
+++ b/app-admin/osiris/files/osirisd_confd-4.2.3
diff --git a/app-admin/osiris/files/osirismd-4.2.2 b/app-admin/osiris/files/osirismd-4.2.3
index 1136c0433554..1136c0433554 100644
--- a/app-admin/osiris/files/osirismd-4.2.2
+++ b/app-admin/osiris/files/osirismd-4.2.3
diff --git a/app-admin/osiris/files/osirismd_confd-4.2.2 b/app-admin/osiris/files/osirismd_confd-4.2.3
index 98f0bc930b00..98f0bc930b00 100644
--- a/app-admin/osiris/files/osirismd_confd-4.2.2
+++ b/app-admin/osiris/files/osirismd_confd-4.2.3
diff --git a/app-admin/osiris/osiris-1.5.2-r1.ebuild b/app-admin/osiris/osiris-1.5.2-r1.ebuild
deleted file mode 100644
index 48b64e40d2c5..000000000000
--- a/app-admin/osiris/osiris-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2-r1.ebuild,v 1.3 2007/01/24 14:46:42 genone Exp $
-
-DESCRIPTION="File integrity verification system"
-HOMEPAGE="http://osiris.shmoo.com/"
-SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz"
-
-LICENSE="OSIRIS"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="mysql doc"
-
-DEPEND="mysql? ( virtual/mysql )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-O3 -fomit-frame-pointer:${CFLAGS}:" \
-		src/crypto/*/Makefile || die "sed"
-}
-
-src_compile() {
-	# Osiris provides the necessary gdbm source so that gdbm does not
-	# need to be installed to use Osiris. If mysql is set as a USE
-	# variable, Osiris will use mysql instead of gdbm.
-	elog "Osiris uses gdbm by default, and will use MySQL if \"mysql\""
-	elog "is set as a USE variable; it cannot be configured to use both."
-
-	local myconf
-	use mysql \
-		&& myconf="${myconf} --enable-module=mysql" \
-		&& sed -i -e "s:mysql.h:mysql/mysql.h:" ${S}/src/modules/module_mysql.c
-	econf ${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	if use doc
-	then
-		insinto /usr/share/doc/${PF}
-		dohtml docs/manual.html
-		dodoc docs/manual.txt
-		doins -r configs
-	fi
-}
diff --git a/app-admin/osiris/osiris-1.5.2.ebuild b/app-admin/osiris/osiris-1.5.2.ebuild
deleted file mode 100644
index 5ef7ac27d1c8..000000000000
--- a/app-admin/osiris/osiris-1.5.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2.ebuild,v 1.13 2007/01/24 14:46:42 genone Exp $
-
-DESCRIPTION="File integrity verification system"
-HOMEPAGE="http://osiris.shmoo.com/"
-SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz"
-
-LICENSE="OSIRIS"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="mysql"
-
-DEPEND="mysql? ( virtual/mysql )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-O3 -fomit-frame-pointer:${CFLAGS}:" \
-		src/crypto/*/Makefile || die "sed"
-}
-
-src_compile() {
-	# Osiris provides the necessary gdbm source so that gdbm does not
-	# need to be installed to use Osiris. If mysql is set as a USE
-	# variable, Osiris will use mysql instead of gdbm.
-	elog "Osiris uses gdbm by default, and will use MySQL if \"mysql\""
-	elog "is set as a USE variable; it cannot be configured to use both."
-
-	local myconf
-	use mysql \
-		&& myconf="${myconf} --enable-module=mysql" \
-		&& sed -i -e "s:mysql.h:mysql/mysql.h:" ${S}/src/modules/module_mysql.c
-	econf ${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-}
diff --git a/app-admin/osiris/osiris-4.2.2.ebuild b/app-admin/osiris/osiris-4.2.3.ebuild
index d5ab295c7708..1a22dce1798f 100644
--- a/app-admin/osiris/osiris-4.2.2.ebuild
+++ b/app-admin/osiris/osiris-4.2.3.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2008 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.5 2008/06/04 16:52:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-4.2.3.ebuild,v 1.1 2008/11/11 03:28:28 darkside Exp $
 
-inherit eutils autotools
+inherit eutils
 
 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"
+	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"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.8c
-	=sys-libs/db-4.2*"
+	>=sys-libs/db-4.3"
 
 pkg_setup()
 {
@@ -30,27 +29,20 @@ pkg_setup()
 src_unpack()
 {
 	unpack ${P}.tar.gz
-	epatch "${FILESDIR}"/${P}-externaldb.patch
-	cd "${S}"
-	eautoreconf
 	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
+	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
+	econf --prefix=/var/lib --enable-fancy-cli=yes
+	emake agent || die "agent build failed"
+	emake console || die "management build failed"
 }
 
 src_install() {
@@ -75,26 +67,22 @@ src_install() {
 	elog "---------------------------------------------------------------------"
 	elog ""
 
-#	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
+	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
 
-#	if use console; then
-		dosbin src/cli/osiris
-		fowners root:0 /usr/sbin/osiris
-		fperms 0755 /usr/sbin/osiris
+	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
+	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
+	newinitd "${FILESDIR}"/osirismd-${PV} osirismd
+	newconfd "${FILESDIR}"/osirismd_confd-${PV} osirismd
 
 	dodir /var/run
 	dodir /var/lib
@@ -102,32 +90,16 @@ src_install() {
 	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
-#		elog "By default, the osiris ebuild only installs the agent."
-#		elog "To enable installing the console, please add the 'console' flag"
-#		elog "to your USE variable and re-emerge osiris."
-#	fi
-#}
+	cp -rf "${S}"/src/configs "${D}"/var/lib/osiris/
+	chown -R osiris:osiris "${D}"/var/lib/osiris/*
+	chmod -R 0750 "${D}"/var/lib/osiris/*
+}
 
 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.
 	elog "The directory /var/lib/osiris will not be removed. You may remove"
 	elog "it manually if you will not be reinstalling osiris at a later time."
 }