Version bump wrt bug #178477

Package-Manager: portage-2.1.2.7

4 files changed, 241 insertions, 9 deletions

diff --git a/net-analyzer/base/ChangeLog b/net-analyzer/base/ChangeLog
index cc9b09b972fb..38ab3ee07b27 100644
--- a/net-analyzer/base/ChangeLog
+++ b/net-analyzer/base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/base
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.10 2007/05/01 17:42:04 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.11 2007/05/23 07:15:31 jokey Exp $
+
+*base-1.3.6 (23 May 2007)
+
+  23 May 2007; Markus Ullmann <jokey@gentoo.org> +base-1.3.6.ebuild:
+  Version bump wrt bug #178477
 
   01 May 2007; Marius Mauch <genone@gentoo.org> base-1.2.7-r2.ebuild:
   Replacing einfo with elog
diff --git a/net-analyzer/base/Manifest b/net-analyzer/base/Manifest
index ec9aec655029..0dd4042dcbc6 100644
--- a/net-analyzer/base/Manifest
+++ b/net-analyzer/base/Manifest
@@ -2,15 +2,20 @@
 Hash: SHA1
 
 DIST base-1.2.7.tar.gz 364282 RMD160 a078acf49da55a957f659e52f4e37f978bb1246c SHA1 6ce7af6f010d2e32f903758508987069ecb03b93 SHA256 615bdc6cd3cfb45143bff5f23d3edfed025702d572086e473506acdd745d132f
+DIST base-1.3.6.tar.gz 363397 RMD160 0ea139d65a071eeb6ce3080854d8d26f2344d359 SHA1 817bdb0d42f21e5ffe3ae30794ecad2681e85135 SHA256 086ad829c2bac9e808c76790338950d14759c3f03319d7f63ccbe959d15b32ba
 DIST snortrules-pr-2.4.tar.gz 789097 RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 SHA1 b8b59754ccb59b1dcf324d2faa399326117a60e9 SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504
 EBUILD base-1.2.7-r2.ebuild 6958 RMD160 36a6fb3502daf176c24341ba80dd562216400828 SHA1 6b6a204e117dff272f551e7586e17ce17f0ed4e1 SHA256 183ddf60c03c7131e320d0d44f0b9588e307e226f603db92cf08a66a8236c27c
 MD5 5811f9cb228a19ef824f7b13db8f5bbc base-1.2.7-r2.ebuild 6958
 RMD160 36a6fb3502daf176c24341ba80dd562216400828 base-1.2.7-r2.ebuild 6958
 SHA256 183ddf60c03c7131e320d0d44f0b9588e307e226f603db92cf08a66a8236c27c base-1.2.7-r2.ebuild 6958
-MISC ChangeLog 1838 RMD160 1a00f1b8c50892acf46e1c9cba0ec5d8d42d53d5 SHA1 02e1e5746fe2f2cd2a8ec3c3135b3e511921a215 SHA256 09ae785476ada9a1e8431ddfa4561e81a8accb6b7a3253a3f8c9fdcad7bda688
-MD5 a3f900abbdc01daa39803709f95367a5 ChangeLog 1838
-RMD160 1a00f1b8c50892acf46e1c9cba0ec5d8d42d53d5 ChangeLog 1838
-SHA256 09ae785476ada9a1e8431ddfa4561e81a8accb6b7a3253a3f8c9fdcad7bda688 ChangeLog 1838
+EBUILD base-1.3.6.ebuild 6954 RMD160 a16a77f85730a450eb3f934faaf751ba6bd8f0ab SHA1 f4b7a46e988c694b6c8f14f883d0fd3b3f13e70e SHA256 7f8ea6532eeee2da7ec835967091d681aa525de6d31a075652d8eac80812ebe6
+MD5 c8c1eda06c1ea3ecb41285c16ca5557c base-1.3.6.ebuild 6954
+RMD160 a16a77f85730a450eb3f934faaf751ba6bd8f0ab base-1.3.6.ebuild 6954
+SHA256 7f8ea6532eeee2da7ec835967091d681aa525de6d31a075652d8eac80812ebe6 base-1.3.6.ebuild 6954
+MISC ChangeLog 1965 RMD160 1b1be124ea60dc4ebf30b7b131e6084c6a727e05 SHA1 677d730e6356c7d32857ed53c1ede3f52b4e4272 SHA256 dbd7b0f9d2040ef41975bbc4927071fa2f629373d62afb9bcf8fca2e27c060f8
+MD5 d9913eaa3ad951c3a6eed0e11d2c7507 ChangeLog 1965
+RMD160 1b1be124ea60dc4ebf30b7b131e6084c6a727e05 ChangeLog 1965
+SHA256 dbd7b0f9d2040ef41975bbc4927071fa2f629373d62afb9bcf8fca2e27c060f8 ChangeLog 1965
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
@@ -18,10 +23,13 @@ SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata
 MD5 fcbd1c8f5298e555a06344920b9dd090 files/digest-base-1.2.7-r2 485
 RMD160 f8e39e91ff71a118a9463c6b0fc643966a4ae894 files/digest-base-1.2.7-r2 485
 SHA256 a154b677e7e9ad994c63e952369da2a9edd4d4c4872aeb63dd72676f68a3fdf2 files/digest-base-1.2.7-r2 485
+MD5 79887c0c0479685d3595119395624e69 files/digest-base-1.3.6 485
+RMD160 6082a777618b40386fa8be84a6ebb032f23114ef files/digest-base-1.3.6 485
+SHA256 d4724d99e2c5b162e63e8ff9e9085a23d584ed0ff828aa38bf74d0adc11a0fc5 files/digest-base-1.3.6 485
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGN3w06J2i8a8J4okRAu/TAKDUrImpwsa99oYx+qYCl1aPDOpm+gCeJqjZ
-IA9tlvwaCfAjDS/wa6wPvBY=
-=ca53
+iD4DBQFGU+odz974XjDVpbkRAsmzAJdUjbkGn6N+x3sIwyMfhUfEqhEJAJ9+S1WV
+2Nf4e72Thj7egZ0jgNuDLQ==
+=VO5u
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/base/base-1.3.6.ebuild b/net-analyzer/base/base-1.3.6.ebuild
new file mode 100644
index 000000000000..71a831d6c84a
--- /dev/null
+++ b/net-analyzer/base/base-1.3.6.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.3.6.ebuild,v 1.1 2007/05/23 07:15:31 jokey 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=">=app-arch/tar-1.14
+	>=sys-libs/zlib-1.2.1-r3
+	>=app-arch/gzip-1.3.5-r4
+	>=sys-apps/coreutils-5.2.1-r2
+	>=sys-apps/sed-4.0.9"
+RDEPEND="${DEPEND}
+	>=dev-php/adodb-4.68
+	gd? ( || ( >=dev-php4/jpgraph-1.19 >=dev-php5/jpgraph-2.0_beta )
+		>=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
+		>=media-libs/gd-2.0.32 )"
+	# 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_php
+
+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 || use apache; 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.
+	require_php_with_use session
+	useq gd && require_gd
+	useq mssql && require_php_with_use mssql
+	useq mysql && require_php_with_use mysql
+	useq postgres && require_php_with_use postgres
+	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
+}
+
+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/php/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"
+	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/${P}/README"
+	elog "There is a guide at http://gentoo-wiki.com/HOWTO_Apache2_with_BASE"
+	elog ""
+}
diff --git a/net-analyzer/base/files/digest-base-1.3.6 b/net-analyzer/base/files/digest-base-1.3.6
new file mode 100644
index 000000000000..2a3d3c8f8ec2
--- /dev/null
+++ b/net-analyzer/base/files/digest-base-1.3.6
@@ -0,0 +1,6 @@
+MD5 5a4f7420f59302cb32640cd26577dc17 base-1.3.6.tar.gz 363397
+RMD160 0ea139d65a071eeb6ce3080854d8d26f2344d359 base-1.3.6.tar.gz 363397
+SHA256 086ad829c2bac9e808c76790338950d14759c3f03319d7f63ccbe959d15b32ba base-1.3.6.tar.gz 363397
+MD5 35d9a2486f8c0280bb493aa03c011927 snortrules-pr-2.4.tar.gz 789097
+RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 snortrules-pr-2.4.tar.gz 789097
+SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504 snortrules-pr-2.4.tar.gz 789097