Revission bumped for security hole described in #53399. Converted to use the

5 files changed, 139 insertions, 3 deletions

diff --git a/net-analyzer/aimsniff/ChangeLog b/net-analyzer/aimsniff/ChangeLog
index 098ac46a295e..e8f0605a3e23 100644
--- a/net-analyzer/aimsniff/ChangeLog
+++ b/net-analyzer/aimsniff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/aimsniff
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.8 2004/06/24 21:55:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.9 2004/06/27 16:48:40 port001 Exp $
+
+*aimsniff-0.9-r1 (27 Jun 2004)
+
+  27 Jun 2004; Ian Leitch <port001@gentoo.org> metadata.xml,
+  +aimsniff-0.9-r1.ebuild:
+  Revission bumped for security hole described in #53399. Converted to use the
+  new webapp eclass, plus minor clean-ups. Added myself as new maintainer...
+  dammit.
 
   19 Jun 2004; David Holm <dholm@gentoo.org> aimsniff-0.9.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/aimsniff/Manifest b/net-analyzer/aimsniff/Manifest
index 5ab131c535b8..6dbc795a871c 100644
--- a/net-analyzer/aimsniff/Manifest
+++ b/net-analyzer/aimsniff/Manifest
@@ -1,6 +1,8 @@
 MD5 a8eb44bdf064d5983d99e0ea41b96442 aimsniff-0.9.ebuild 2400
 MD5 d0972eac51a127e69d34401095ad37ff aimsniff-0.8.ebuild 1811
-MD5 bbeedff5660de69a510775776e6ec546 ChangeLog 1081
-MD5 ba8ea9b0bfb3efa617d566ff07ce2eca metadata.xml 280
+MD5 c25354853e8adb2efcf1c196cb1f9267 aimsniff-0.9-r1.ebuild 3055
+MD5 4302849913e3d68c79c7d9c29d921fe0 ChangeLog 1368
+MD5 35f03d6f92cb85e235257b9e1aabe217 metadata.xml 373
+MD5 31171666587c48bf647abbddda0f9c91 files/digest-aimsniff-0.9-r1 125
 MD5 f62848279163f070089d6c81eb98260a files/digest-aimsniff-0.8 124
 MD5 f944a414fa37ffd69f00ccc18155a420 files/digest-aimsniff-0.9 125
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
new file mode 100644
index 000000000000..23ab164d9946
--- /dev/null
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.1 2004/06/27 16:48:40 port001 Exp $
+
+inherit webapp
+
+IUSE="samba mysql apache2"
+
+MY_P="${P}d"
+WAS_VER="0.1.2b"
+
+DESCRIPTION="Utility for monitoring and archiving AOL Instant Messenger messages across a network"
+HOMEPAGE="http://www.aimsniff.com/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	apache2? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
+
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/${MY_P}
+
+# We need >= perl-5.8.4 for GDBM_File
+DEPEND=">=dev-lang/perl-5.8.4
+	dev-perl/Net-Pcap
+	dev-perl/NetPacket
+	dev-perl/Unicode-String
+	dev-perl/FileHandle-Rollback
+	dev-perl/Proc-Daemon
+	dev-perl/Proc-Simple
+	dev-perl/DBI
+	dev-perl/Unix-Syslog
+	mysql? ( dev-db/mysql dev-perl/DBD-mysql )
+	samba? ( net-fs/samba )"
+
+pkg_setup() {
+	if [ `use apache2` ]
+	then
+		webapp_pkg_setup
+	fi
+}
+
+src_install() {
+	if [ `use apache2` ]
+	then
+		webapp_src_preinst
+	fi
+
+	newsbin aimSniff.pl aimsniff
+	insinto /etc/${PN}
+	doins aimsniff.config
+	insinto /usr/share/doc/${PF}
+	doins table.struct
+	dodoc README ChangeLog
+
+	if [ `use apache2` ]
+	then
+		cp ../was-${WAS_VER}/docs/README README.WAS
+		dodoc README.WAS
+
+		rm -rf ../was-${WAS_VER}/docs
+		mv ../was-${WAS_VER}/ ${D}${MY_HTDOCSDIR}/was
+
+		webapp_serverowned ${MY_HTDOCSDIR}/was
+
+		# This file needs to be serverowned as the server won't be able to write to it if it were
+		# webapp_configfile'ed. 
+		webapp_serverowned ${MY_HTDOCSDIR}/was/.config.php
+
+		for phpfile in `ls -a ${D}${MY_HTDOCSDIR}/was/ | grep ".php$"`; do
+			webapp_runbycgibin php ${MY_HTDOCSDIR}/was/${phpfile}
+		done
+
+		webapp_src_install
+	fi
+}
+
+pkg_postinst() {
+
+	if [ `use mysql` ]
+	then
+		echo
+		einfo "To create and enable the mysql database, please run: "
+		einfo "ebuild /var/db/pkg/net-analyzer/${P}/${P}.ebuild config"
+
+		if [ `use apache2` ]
+		then
+			echo "To create and enable the mysql database, please run:
+			ebuild /var/db/pkg/net-analyzer/${P}/${P}.ebuild config" > apache-postinst
+			webapp_postinst_txt en apache-postinst
+		fi
+	fi
+
+	if [ `use apache2` ]
+	then
+		echo
+		einfo "Go to http://${HOSTNAME}/was/admin.php to configure WAS."
+
+		echo "Go to http://${HOSTNAME}/was/admin.php to configure WAS." > was-postinst
+		webapp_postinst_txt en was-postinst
+	fi
+
+}
+
+pkg_config() {
+	echo
+	einfo "Creating mysql database aimsniff using /usr/share/doc/${PF}/table.struct:"
+	echo -n "Please enter your mysql root password: "
+	read mysql_root
+	/usr/bin/mysqladmin -p$mysql_root -u root create aimsniff
+	/usr/bin/mysql -p$mysql_root -u root aimsniff < /usr/share/doc/${PF}/table.struct
+	echo -n "Please enter your username that you want to connect to the database with: "
+	read user
+	echo -n "Please enter the password that you want to use for your database: "
+	read password
+	einfo "Granting permisions on database using 'GRANT ALL ON aimsniff.* TO $user IDENTIFIED BY '$password';'"
+	echo "GRANT ALL ON aimsniff.* TO $user@localhost IDENTIFIED BY '$password';" | /usr/bin/mysql -p$mysql_root -u root aimsniff
+	echo
+}
diff --git a/net-analyzer/aimsniff/files/digest-aimsniff-0.9-r1 b/net-analyzer/aimsniff/files/digest-aimsniff-0.9-r1
new file mode 100644
index 000000000000..a67c4a508857
--- /dev/null
+++ b/net-analyzer/aimsniff/files/digest-aimsniff-0.9-r1
@@ -0,0 +1,2 @@
+MD5 14030a37fb4a522c1dd5c51665ba2b21 aimsniff-0.9d.tar.gz 24044
+MD5 d2e558b9bb9befd019ce2c92416d270b was-0.1.2b.tar.gz 73651
diff --git a/net-analyzer/aimsniff/metadata.xml b/net-analyzer/aimsniff/metadata.xml
index d51a8479de49..882e38355276 100644
--- a/net-analyzer/aimsniff/metadata.xml
+++ b/net-analyzer/aimsniff/metadata.xml
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+    <email>port001@gentoo.org</email>
+    <name>Ian Leitch</name>
+</maintainer>
 <longdescription>aimsniff is a utility used for retrieving and storing AIM messages across a network.</longdescription>
 </pkgmetadata>