Version bump, bug #246181 thank Nico Schlömer for report. Dropped jpgraph dependency, bug #207865, thank Toralf Förster for report.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

3 files changed, 226 insertions, 2 deletions

diff --git a/net-analyzer/base/ChangeLog b/net-analyzer/base/ChangeLog
index cae062983461..4d4738e2d3b9 100644
--- a/net-analyzer/base/ChangeLog
+++ b/net-analyzer/base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/base
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.15 2008/08/04 19:16:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.16 2008/11/16 19:47:20 pva Exp $
+
+*base-1.4.1 (16 Nov 2008)
+
+  16 Nov 2008; Peter Volkov <pva@gentoo.org> +base-1.4.1.ebuild:
+  Version bump, bug #246181 thank Nico Schlömer for report. Dropped jpgraph
+  dependency, bug #207865, thank Toralf Förster for report.
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/base/Manifest b/net-analyzer/base/Manifest
index 82d9123ff518..40a4c71aceb6 100644
--- a/net-analyzer/base/Manifest
+++ b/net-analyzer/base/Manifest
@@ -1,5 +1,7 @@
 DIST base-1.4.0.tar.gz 921006 RMD160 61635079cbd90ca58761bbc5becb783b90aba76f SHA1 461edc4d7ce86df30da7754c444de907f025d9dd SHA256 6438d020eec493ae4b1c264bc16694cf86a69ba58479ec531ba92f3a76bb3d05
+DIST base-1.4.1.tar.gz 954823 RMD160 dec378e107843baba75545d161607f8506740b2a SHA1 cc779ac3fea50d9b5bbb806cd7f6aa5a09b39b9a SHA256 3d5ac560d62610f71fa9978a81ee391e6c4dcd33b5c15316e0eb1b4449a49b54
 DIST snortrules-pr-2.4.tar.gz 789097 RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 SHA1 b8b59754ccb59b1dcf324d2faa399326117a60e9 SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504
 EBUILD base-1.4.0.ebuild 7154 RMD160 38dd2cbac3836114e5716c46612f7537acfd9fec SHA1 2257f8f00fa3bd60cb5581e92aad282ba3b7b96f SHA256 713ca15079d32b4ed514b5c2429685c1034c06ae97f883d204abb0bbc530bf35
-MISC ChangeLog 2908 RMD160 75dfcf165bc60fb69ca165fe0ea1ca67bb3a2af0 SHA1 0e2d3c627720e164295df398c7260b9729535f7d SHA256 adbde22a61895e42239a1ada4295bd2fc96009d4890a520d5483aa80e1944b82
+EBUILD base-1.4.1.ebuild 7124 RMD160 c42374ed9551b1f09ebf6c2b8496c808cd84a1b0 SHA1 5b917a868923eea458cd747036db9673ed8952af SHA256 95090981676dac04e04b85a3e4dc2b04dcf96d45b3e7139a23271fa835bc8e64
+MISC ChangeLog 3139 RMD160 80db21948e70dafbbcd85ac1b33a7f5f66e48961 SHA1 fd2a114cbdedba1cb3603760bd62a9e97944a342 SHA256 eebec1540228f7e751ed7187787ad5ddc57e1cb5a7cfba65d45fa362a179a198
 MISC metadata.xml 267 RMD160 c913a59512630e220806726ec79210152b7f8121 SHA1 51cec405577f36038414fc3824a31361c9b4aa4e SHA256 2b41d49c3358e9cd93369ec863bae1056a515f613d9555617e501930b05b07ba
diff --git a/net-analyzer/base/base-1.4.1.ebuild b/net-analyzer/base/base-1.4.1.ebuild
new file mode 100644
index 000000000000..18cea7ea08ee
--- /dev/null
+++ b/net-analyzer/base/base-1.4.1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.1.ebuild,v 1.1 2008/11/16 19:47:20 pva Exp $
+
+inherit webapp versionator eutils depend.apache depend.php
+
+CONF_DIR="/etc/${PN}"
+CONF_OLD="base_conf.php.dist"
+CONF_NEW="base_conf.php"
+MIDDLEMAN="base_path.php"
+DBTYPES="mssql mysql oracle postgres"
+
+DESCRIPTION="A web-based front-end to the Snort IDS."
+HOMEPAGE="http://base.secureideas.net"
+SRC_URI="mirror://sourceforge/secureideas/${P}.tar.gz
+	signatures? ( http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz )"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+# SLOT is intentionally omitted because this package uses webapp-config
+IUSE="gd signatures ${DBTYPES}"
+
+# BASE *should* work with any php-driven web server, so only require Apache
+# when the user has an apache use-flag set.
+want_apache
+
+DEPEND=">=sys-libs/zlib-1.2.1-r3"
+RDEPEND="${DEPEND}
+	dev-php/adodb
+	gd? ( >=dev-php/PEAR-PEAR-1.3.6-r1
+		>=dev-php/PEAR-Image_Color-1.0.2
+		>=dev-php/PEAR-Log-1.9.3
+		>=dev-php/PEAR-Numbers_Roman-0.2.0
+		>=dev-php/PEAR-Numbers_Words-0.14.0
+		>=dev-php/PEAR-Image_Canvas-0.2.4
+		>=dev-php/PEAR-Image_Graph-0.7.1 )"
+	# A local database isn't necessary, so only require one when the user
+	# has use-flags set for one of the supported DBs.
+	# Snort can also be installed on a remote system, so don't require it.
+
+# Require PHP.
+need_php5
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# Set the group ownership for /etc/base/base_conf.php so it can be read by
+	# the user's web server.
+	if use apache2 ; then
+		HTTPD_GROUP="apache"
+	else
+		# Set a safe default group.
+		HTTPD_GROUP="root"
+	fi
+
+	# Check and setup selected DB type
+	dbtypecnt=0
+	for db in ${DBTYPES}; do
+		if use ${db}; then
+			if [ ${dbtypecnt} -eq 0 ]; then
+				BASE_DBTYPE=${db}
+				let dbtypecnt++
+			elif [ ${dbtypecnt} -ge 1 ]; then
+				ewarn "You set multiple database types in your USE flags."
+				ewarn "You will have to setup DBtype configuration manually."
+			fi
+		fi
+	done
+
+	if [ ${dbtypecnt} -eq 0 ]; then
+		ewarn "No database type selected in your USE flags."
+		ewarn "You will have to setup DBtype manually."
+	fi
+
+	# Make sure php was built with the necessary USE flags.
+	local flags=session
+	for f in mssql mysql postgres ; do
+		use ${f} && flags="${flags} ${f}"
+	done
+
+	if use oracle && ! built_with_use virtual/php oci8-instant-client ; then
+		ewarn "PHP with oci8-instant-client support not found!"
+		ewarn "It is your responsibility to ensure that PHP will work"
+		ewarn "with commercial Oracle implementation."
+	fi
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+		( use gd && ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ) ; then
+			eerror "Re-emerge ${PHP_PKG} with ${flags} USE flags enabled"
+			use gd && eerror "as well as with either gd or gd-external USE flag enabled."
+			die "Re-emerge ${PHP_PKG} with the above USE flags."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Help the user configure /etc/base/base_conf.php so BASE works out of the
+	# box in most environments. The user will still be warned to edit the
+	# file manually at the pkg_postinst() stage.
+	sed -i -e 's:$BASE_urlpath.*:$BASE_urlpath = "/base";:g' \
+		${CONF_OLD}
+
+	sed -i -e 's:$DBlib_path.*:$DBlib_path = "/usr/share/php5/adodb";:g' \
+			${CONF_OLD}
+
+	if [[ "${BASE_DBTYPE}" == "postgres" ]]; then
+		sed -i -e 's:$DBtype.*:$DBtype = "postgres";:g' \
+			${CONF_OLD}
+	fi
+	if [[ "${BASE_DBTYPE}" == "mssql" ]]; then
+		sed -i -e 's:$DBtype.*:$DBtype = "mssql";:g' \
+			${CONF_OLD}
+	fi
+	if [[ "${BASE_DBTYPE}" == "oracle" ]]; then
+		sed -i -e 's:$DBtype.*:$DBtype = "oci8";:g' \
+			${CONF_OLD}
+	fi
+
+	# Install the configuration files in the usual /etc/${PN} location so that
+	# etc-update functions properly (it also improves security somewhat, since
+	# the config file contains plain-text passwords and should not be located
+	# inside the web-root). This requires changing the BASE source a tad to
+	# recognize the new location for base_conf.php.
+	for PHP in *.php */*.php; do
+		sed -i -e "s:${CONF_NEW}:${MIDDLEMAN}:g" \
+			${CONF_OLD} "${PHP}"
+	done
+
+	# Create the file ${MIDDLEMAN} to determine the web-root and to change
+	# the location of "include" to /etc/base/base_conf.php.
+	echo "<?php" > ${MIDDLEMAN}
+	echo '  $BASE_path = dirname(__FILE__);' >> ${MIDDLEMAN}
+	echo "  include(\"${CONF_DIR}/${CONF_NEW}\");" >> ${MIDDLEMAN}
+	echo "?>" >> ${MIDDLEMAN}
+
+	# Delete the $BASE_path variable from the config file because we
+	# now handle it with ${MIDDLEMAN} created above.
+	sed -i -e 's:$BASE_path =.*::g' ${CONF_OLD}
+
+	# Modify the HTML headers so search engines don't index BASE.
+	sed -i -e \
+		's:<HEAD>:<HEAD>\n  <META name="robots" content="noindex,nofollow">:g' \
+			index.php
+	sed -i -e \
+		's:<HEAD>:<HEAD>\n  <META name="robots" content="noindex,nofollow">:g' \
+			base_main.php
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# Install the docs once in the standard /usr/share/doc/${PF}/DOCDESTREE
+	# location instead of installing them in every virtual host directory.
+	cd docs
+	dodoc *
+	if use signatures ; then
+		cd "${WORKDIR}"
+		insinto ${MY_HTDOCSDIR}/signatures
+		doins doc/signatures/*
+	fi
+	cd "${S}"
+	rm -rf docs
+
+	# Install the config files in the normal location (/etc/${PN}).
+	insinto ${CONF_DIR} || die "Unable to insinto ${CONF_DIR}"
+	doins ${CONF_OLD} || die "Unable to doins ${CONF_OLD}"
+	newins ${CONF_OLD} ${CONF_NEW} || die "Unable to create ${CONF_NEW}"
+
+	# Install BASE for webapp-config
+	insinto ${MY_HTDOCSDIR} || die "Unable to insinto ${MY_HTDOCSDIR}"
+	doins -r *
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	# Set the proper permissions on /etc/base/base_conf.php
+	chmod 640 ${CONF_DIR}/${CONF_NEW} || FPERMS="FALSE"
+	chown root:${HTTPD_GROUP} ${CONF_DIR}/${CONF_NEW} || FOWNERS="FALSE"
+
+	# Notify the user of any problems at the very end.
+	if [ "${HTTPD_GROUP}" == "root" ]; then
+			ewarn ""
+			ewarn "It looks like you are not using Apache"
+			ewarn "as your web server. For BASE to work properly, you will"
+			ewarn "need to change the ownership of ${CONF_DIR}/${CONF_NEW} to"
+			ewarn "root:[www user] To use Apache, add \"apache2\" to"
+			ewarn "your USE flags and re-emerge BASE."
+	fi
+	if [ "${FPERMS}" == "FALSE" ]; then
+			ewarn ""
+			ewarn "Unable to change the permissions on ${CONF_DIR}/${CONF_NEW}".
+			ewarn "Please change them manually by issuing:"
+			ewarn "chmod 640 ${CONF_DIR}/${CONF_NEW}"
+	fi
+	if [ "${FOWNERS}" == "FALSE" ]; then
+			ewarn ""
+			ewarn "Unable to change the group ownership of the file:"
+			ewarn "${CONF_DIR}/${CONF_NEW}"
+			ewarn "Please change this manually by issuing:"
+			ewarn "chown root:${HTTPD_GROUP} ${CONF_DIR}/${CONF_NEW}"
+	fi
+
+	elog ""
+	elog "You should edit \"${CONF_DIR}/${CONF_NEW}\" before using BASE."
+	elog ""
+	elog "To setup your initial database, direct your web browser to the"
+	elog "location you installed BASE/base_db_setup.php"
+	elog "You can find instructions in /usr/share/doc/${PF}/README"
+	elog "There is a guide at http://gentoo-wiki.com/HOWTO_Apache2_with_BASE"
+	elog ""
+}