Replace call to docert by install_cert, bug #201672.

(Portage version: 2.1.4_rc11)

7 files changed, 19 insertions, 227 deletions

diff --git a/net-analyzer/sguil-server/ChangeLog b/net-analyzer/sguil-server/ChangeLog
index 42832b671a79..6d969c54abea 100644
--- a/net-analyzer/sguil-server/ChangeLog
+++ b/net-analyzer/sguil-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/sguil-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/ChangeLog,v 1.5 2007/05/01 22:34:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/ChangeLog,v 1.6 2007/12/30 20:08:38 ulm Exp $
+
+*sguil-server-0.6.1-r1 (30 Dec 2007)
+
+  30 Dec 2007; Ulrich Mueller <ulm@gentoo.org> -sguil-server-0.5.3.ebuild,
+  -sguil-server-0.6.0_p1.ebuild, -sguil-server-0.6.1.ebuild,
+  +sguil-server-0.6.1-r1.ebuild:
+  Replace call to docert by install_cert, bug #201672. Remove old.
 
   01 May 2007; Marius Mauch <genone@gentoo.org> sguil-server-0.5.3.ebuild,
   sguil-server-0.6.0_p1.ebuild, sguil-server-0.6.1.ebuild:
diff --git a/net-analyzer/sguil-server/files/digest-sguil-server-0.5.3 b/net-analyzer/sguil-server/files/digest-sguil-server-0.5.3
deleted file mode 100644
index e1d080ec0ccd..000000000000
--- a/net-analyzer/sguil-server/files/digest-sguil-server-0.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7270f457a36f45bd41866ebddcb45e45 sguil-server-0.5.3.tar.gz 62861
-RMD160 44944a7c3760a9d0cb13efd30e2453090d9f7274 sguil-server-0.5.3.tar.gz 62861
-SHA256 85b7ce48b3a463e834ef6503c99ade05c8584b43229ee2647c7b38487761bd43 sguil-server-0.5.3.tar.gz 62861
diff --git a/net-analyzer/sguil-server/files/digest-sguil-server-0.6.0_p1 b/net-analyzer/sguil-server/files/digest-sguil-server-0.6.0_p1
deleted file mode 100644
index 93ddb6d7a296..000000000000
--- a/net-analyzer/sguil-server/files/digest-sguil-server-0.6.0_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5fd4234f2c9bbfb5fadac2a81dcc6a4a sguil-server-0.6.0p1.tar.gz 92009
-RMD160 97d67259dc830f4361466bd24a7c2dd7af5de5b2 sguil-server-0.6.0p1.tar.gz 92009
-SHA256 7ed5d4762f0389258d0dfbe3a0806cc75e48d071993043b723e6c76885a78ebc sguil-server-0.6.0p1.tar.gz 92009
diff --git a/net-analyzer/sguil-server/files/digest-sguil-server-0.6.1 b/net-analyzer/sguil-server/files/digest-sguil-server-0.6.1-r1
index 89155854089e..89155854089e 100644
--- a/net-analyzer/sguil-server/files/digest-sguil-server-0.6.1
+++ b/net-analyzer/sguil-server/files/digest-sguil-server-0.6.1-r1
diff --git a/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild b/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild
deleted file mode 100644
index 62b03b153018..000000000000
--- a/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild,v 1.4 2007/05/01 22:34:07 genone Exp $
-
-inherit eutils ssl-cert
-
-DESCRIPTION="Daemon for Sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="mirror://sourceforge/sguil/sguil-server-${PV}.tar.gz"
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ssl"
-
-DEPEND=">=dev-lang/tcl-8.3
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tcllib
-	dev-tcltk/mysqltcl
-	ssl? ( >=dev-tcltk/tls-1.4.1 )"
-RDEPEND="${DEPEND}
-	net-analyzer/p0f
-	net-analyzer/tcpflow
-	net-misc/openssh"
-
-S=${WORKDIR}/sguil-${PV}
-
-pkg_setup() {
-	if built_with_use dev-lang/tcl threads ; then
-		eerror
-		eerror "Sguil does not run when tcl was built with threading enabled."
-		eerror "Please rebuild tcl without threads and reemerge this ebuild."
-		eerror
-		die
-	fi
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}/server
-	sed -i -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
-		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
-		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
-		sguild.conf || die "sed failed"
-}
-
-src_install(){
-	dodoc server/sql_scripts/*
-	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
-	doc/TODO doc/sguildb.dia
-
-	insopts -m640
-	insinto /etc/sguil
-	doins server/{sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
-
-	insinto /usr/lib/sguild
-	doins server/lib/*
-	dobin server/sguild
-	newinitd "${FILESDIR}/sguild.initd" sguild
-	newconfd "${FILESDIR}/sguild.confd" sguild
-
-	if use ssl
-	then
-		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
-
-		if ! [ -f ${ROOT}/etc/sguil/sguild.key ]; then
-			insinto /etc/sguil
-			docert sguild
-		fi
-	fi
-
-	diropts -g sguil -o sguil
-	keepdir /var/run/sguil \
-		/var/lib/sguil \
-		/var/lib/sguil/archive \
-		/var/lib/sguil/rules
-
-}
-
-pkg_postinst(){
-
-	if [ -d ${ROOT}/etc/snort/rules ] ; then
-		ln -s /etc/snort/rules ${ROOT}/var/lib/sguil/rules/${HOSTNAME}
-	fi
-
-	elog
-	elog "Please customize the sguild configuration files in /etc/sguild before"
-	elog "trying to run the daemon. Additionally you will need to setup the"
-	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
-	elog "Please note that it is STRONGLY recommended to mount a separate"
-	elog "filesystem at /var/lib/sguil for both space and performance reasons"
-	elog "as a large amount of data will be kept in the directory structure"
-	elog "underneath that top directory."
-	elog
-	elog "You should create the sguild db as per the instructions in"
-	elog "/usr/share/doc/${PF}/INSTALL.gz and use the appropriate"
-	elog "database setup script located in the same directory."
-
-	elog
-}
diff --git a/net-analyzer/sguil-server/sguil-server-0.6.0_p1.ebuild b/net-analyzer/sguil-server/sguil-server-0.6.0_p1.ebuild
deleted file mode 100644
index 1cb65622fea0..000000000000
--- a/net-analyzer/sguil-server/sguil-server-0.6.0_p1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/sguil-server-0.6.0_p1.ebuild,v 1.2 2007/05/01 22:34:07 genone Exp $
-
-inherit eutils ssl-cert
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Daemon for Sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="mirror://sourceforge/sguil/sguil-server-${MY_PV}.tar.gz"
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ssl"
-
-DEPEND=">=dev-lang/tcl-8.3
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tcllib
-	dev-tcltk/mysqltcl
-	ssl? ( >=dev-tcltk/tls-1.4.1 )"
-RDEPEND="${DEPEND}
-	net-analyzer/p0f
-	net-analyzer/tcpflow
-	net-misc/openssh"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	if built_with_use dev-lang/tcl threads ; then
-		eerror
-		eerror "Sguil does not run when tcl was built with threading enabled."
-		eerror "Please rebuild tcl without threads and reemerge this ebuild."
-		eerror
-		die
-	fi
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}/server
-	sed -i -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
-		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
-		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
-		sguild.conf || die "sed failed"
-	sed -i -e 's:set VERSION "SGUIL-0.6.0":set VERSION "SGUIL-0.6.0p1":' \
-		sguild || die "sed failed"
-}
-
-src_install(){
-	dodoc server/sql_scripts/*
-	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
-	doc/TODO doc/sguildb.dia
-
-	insopts -m640
-	insinto /etc/sguil
-	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
-
-	insinto /usr/lib/sguild
-	doins server/lib/*
-	dobin server/sguild
-	newinitd "${FILESDIR}/sguild.initd" sguild
-	newconfd "${FILESDIR}/sguild.confd" sguild
-
-	if use ssl
-	then
-		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
-
-		if ! [ -f ${ROOT}/etc/sguil/sguild.key ]; then
-			insinto /etc/sguil
-			docert sguild
-		fi
-	fi
-
-	diropts -g sguil -o sguil
-	keepdir /var/run/sguil \
-		/var/lib/sguil \
-		/var/lib/sguil/archive \
-		/var/lib/sguil/rules
-
-}
-
-pkg_postinst(){
-
-	if [ -d ${ROOT}/etc/snort/rules ] ; then
-		ln -s /etc/snort/rules ${ROOT}/var/lib/sguil/rules/${HOSTNAME}
-	fi
-
-	elog
-	elog "Please customize the sguild configuration files in /etc/sguild before"
-	elog "trying to run the daemon. Additionally you will need to setup the"
-	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
-	elog "Please note that it is STRONGLY recommended to mount a separate"
-	elog "filesystem at /var/lib/sguil for both space and performance reasons"
-	elog "as a large amount of data will be kept in the directory structure"
-	elog "underneath that top directory."
-	elog
-	elog "You should create the sguild db as per the instructions in"
-	elog "/usr/share/doc/${PF}/INSTALL.gz and use the appropriate"
-	elog "database setup script located in the same directory."
-
-	elog
-}
diff --git a/net-analyzer/sguil-server/sguil-server-0.6.1.ebuild b/net-analyzer/sguil-server/sguil-server-0.6.1-r1.ebuild
index 55edbde008c0..d6bc3f3c6694 100644
--- a/net-analyzer/sguil-server/sguil-server-0.6.1.ebuild
+++ b/net-analyzer/sguil-server/sguil-server-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/sguil-server-0.6.1.ebuild,v 1.2 2007/05/01 22:34:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/sguil-server-0.6.1-r1.ebuild,v 1.1 2007/12/30 20:08:38 ulm Exp $
 
 inherit eutils ssl-cert
 
@@ -39,7 +39,7 @@ pkg_setup() {
 
 src_unpack(){
 	unpack ${A}
-	cd ${S}/server
+	cd "${S}"/server
 	sed -i -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
 		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
 		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
@@ -64,14 +64,8 @@ src_install(){
 	newinitd "${FILESDIR}/sguild.initd" sguild
 	newconfd "${FILESDIR}/sguild.confd" sguild
 
-	if use ssl
-	then
+	if use ssl; then
 		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
-
-		if ! [ -f ${ROOT}/etc/sguil/sguild.key ]; then
-			insinto /etc/sguil
-			docert sguild
-		fi
 	fi
 
 	diropts -g sguil -o sguil
@@ -83,11 +77,15 @@ src_install(){
 }
 
 pkg_postinst(){
-	chown -R sguil:sguil /etc/sguil/sguild.*
-	chown -R sguil:sguil /usr/lib/sguild
+	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
+		install_cert /etc/sguil/sguild
+	fi
+
+	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
+	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
 
-	if [ -d ${ROOT}/etc/snort/rules ] ; then
-		ln -s /etc/snort/rules ${ROOT}/var/lib/sguil/rules/${HOSTNAME}
+	if [ -d "${ROOT}"/etc/snort/rules ] ; then
+		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
 	fi
 
 	elog