Remove old versions. Add new revision with patch to use the hostname as the kismet server name by default

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

6 files changed, 49 insertions, 187 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 83789cfe6860..3c1c7430ba9c 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.114 2012/05/22 16:19:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.115 2012/06/11 01:17:06 steev Exp $
+
+*kismet-2011.03.2-r3 (11 Jun 2012)
+
+  11 Jun 2012; Steev Klimaszewski <steev@gentoo.org> -kismet-2007.10.1.ebuild,
+  -kismet-2010.01.1-r1.ebuild, -kismet-2011.03.2-r1.ebuild,
+  +kismet-2011.03.2-r3.ebuild, +files/use-hostname-by-default.patch:
+  Remove old versions. Add new revision with patch to use the hostname as the
+  kismet server name by default
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   kismet-2011.03.2-r1.ebuild, kismet-2011.03.2-r2.ebuild:
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 2169065f5b62..d97a48ddfebb 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bluechanfix_r3184.patch 452 RMD160 cc207c174d02c25f60f0e383f39435f35fa843e3 SHA1 a3c95e2cad5b105e2b875bec0631b85ec7e1018b SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0
 AUX gcc-4.3.patch 1221 RMD160 6c9c7da7c90367a363dd5d6a4e23eeee89791552 SHA1 2aff87ae336cb27d8e96831a7ab57d3f328ca78e SHA256 5e98a582f93169f5525338b9842c9196ff8d2764c69f4dc412acafb67e3b002b
 AUX header_alignment_r3326.patch 2031 RMD160 e6573980e79e9bfcaf91795b26709188d0daf021 SHA1 d17bd21180027f87aea6d8a7fdba4fe43eef7c06 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556
@@ -13,26 +10,13 @@ AUX kismet.confd 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39
 AUX kismet.initd 742 RMD160 f91c46a9a3d1cac2610659e65a1a3538af4f2772 SHA1 54aa3d489e2fade47cca11a036cb1237dab7786a SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624
 AUX makefile.patch 5112 RMD160 49a99899c1358c9f1ff37c03cb25166cd18ac61d SHA1 b9c195d0b72035c545fda2a19a8a487757f79710 SHA256 17f7074d0a6d3bf0f54278dd6d7a82a3fe1f2a935cd3dcef693b0177dc0ddd1a
 AUX plugins-ldflags.patch 385 RMD160 c6b1ff5adff82b6b5c42703ff322c95ef3c24ff7 SHA1 34cc545832db7ad8ed90a9d2a52e048487dc5548 SHA256 0cff39e40278880d4810569dc1a17c156a3e3a11579b0ce94ce394795aba1765
-DIST kismet-2007-10-R1.tar.gz 646452 RMD160 7cb62a3fd964c9ee7e4ec6bef050558c806ab495 SHA1 a1c682797ad6842b53f9e0f038254aa8326e0fb4 SHA256 023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
+AUX use-hostname-by-default.patch 1156 RMD160 dbe3090c3241e6a59f00b532e86386ce87140542 SHA1 112227fde8ab4a61ae437a3ccbc90abdc3c88d97 SHA256 34b7f8280549ab6022486b5e5744a6d7cebd54d727ebde4fbe5af8955d17d530
 DIST kismet-2008-05-R1.tar.gz 655362 RMD160 5613207b45f85fa72d146009434df984f721ccdc SHA1 8355aeb0374a39549dfdc0c73160125eadd7c6e2 SHA256 a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
 DIST kismet-2010-01-R1.tar.gz 887325 RMD160 fb77368ccf702971bb877d83d5c7e819daeecbb3 SHA1 4ac00edd8607196dffc450535487104edef76c1d SHA256 9d1d1eae686d546e2fb8d6b4b3dcc106b7de5bd2bf4cf36d123b74625a8ed880
 DIST kismet-2011-03-R2.tar.gz 924988 RMD160 58fcc5e8e438fa9d94959ea0c5b2c914ebf44081 SHA1 c01706b0441a3ea412386930bcbaf56187c66d27 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64
-EBUILD kismet-2007.10.1.ebuild 1419 RMD160 404a8e7728914df6ef7068f27defd4e5ec43f2b0 SHA1 8e24517a45032a0e751236c56d0c0b84924afc20 SHA256 03091b90c603852024258b63035840f3d1eb6f94772b07d76b24d153e32385c2
 EBUILD kismet-2008.05.1.ebuild 1574 RMD160 544efe108a3cde2c2da659b465d53e55149e23fb SHA1 78a0209330c2649cda6da1ace1f900dc7c1afe76 SHA256 61a51e9f1631fb853b0ee6ef4c63367b11b55c27d09ac8d252bd4607add9d3f0
-EBUILD kismet-2010.01.1-r1.ebuild 2445 RMD160 d8797a78b7522623de2f1748b1f6027901e7ecb7 SHA1 a55a3cf63cf3be85b609f7dd14d484d986c8018e SHA256 e89a80d4824437aedccf14c81d2d98377a12b5363c5e52d52193e4f0a3a01839
 EBUILD kismet-2010.01.1.ebuild 2372 RMD160 f8816b85feeb51890df45589c6b17a5969325079 SHA1 cb39f782a479ff46be637f0a1d0dadb4425d53ad SHA256 0a27a44ecee681b65c5db0a9d5fd0f5cc11c4473b7256c79d76e188ca5e126e8
-EBUILD kismet-2011.03.2-r1.ebuild 4453 RMD160 224d93e2c044b5a1d305e6aa9df5bd667de3883d SHA1 52ff82d0d721b7fa3fc27d3d8c96b992b9703927 SHA256 97d02526c93b9da709bcb4f924cecf5f9560340c9b4f36895a45a78c625ef1d1
 EBUILD kismet-2011.03.2-r2.ebuild 4297 RMD160 47e0215d5978f1dbb505870c2a4d9f19663294a7 SHA1 ede0f3ff2d1fefac8c95bff64bc80b77d95e098d SHA256 339a345ea483a8f619acbd429cc890fbf92be128b71929b93fa2b9f9b9a4fce3
-MISC ChangeLog 18527 RMD160 3cdc582f6c89b9d1ee0d99ab2fed5ff39b4e2905 SHA1 375238048112634b7da4e06f50aa4e85af4c331f SHA256 a4ba2aa20556326832a23dd7b4894857056ec558eef30eb9f96e9efd060781d1
+EBUILD kismet-2011.03.2-r3.ebuild 4345 RMD160 5f4a64c41b606931c4aaa92bc01fde783522cacf SHA1 36658d95b6e6ecccc451cbf383bb183ce59ede07 SHA256 0bac440a211a4ce7a094601d703104c43be517282a124bf15b4c406a32590e42
+MISC ChangeLog 18878 RMD160 a4c7751643564c09d8967cede337b962df631823 SHA1 ed62a8fb01f3258fb6e4152fd268ca68d270b597 SHA256 e59bdf732df5586c4e314e71daf538d5646fa20190553176a454e3e137d0e187
 MISC metadata.xml 1471 RMD160 fab31ad1b87137f94eea2d125743c88305b979fa SHA1 92ac5aef3b90f1a557311e39de094c0924447fc8 SHA256 74c18e6c799f8572c1376c44642ea65fd9ba19e4f10a4f755db30aff11c94c5b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPu7vjAAoJEEdUh39IaPFNIc8H/AoQ9bxwEMWbkxLiHoIzIhRN
-uKOq00leJOS26wgboH3eakstXzaDlrTrtOoJp5hqzCLyn6bBTNi+4AY7kNwDoFWa
-LSFPM7hjsRycapyMiPqvGZObdz0rdsXlbD6XjrEu3qAWllO/mRMCUbpF8TQo0t0H
-X2c/RcudRXpGzVdBF+Gm96V+C3WZIKjH4RGBSGOJXnCb6Bh65fJaqjoSnT6xqO+b
-58a8KcUg/kuzIuQsuRvLd0Nl4p44WzU7YWu/svJ8YKePzaDlODP50d6evUNPkaEn
-F05ms5Zb1tJ8LMfE3QxjZfYqS8gQrZRuztrwVy9kbr+W57SlMfStirZlIgLJ9q4=
-=rbhd
------END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/files/use-hostname-by-default.patch b/net-wireless/kismet/files/use-hostname-by-default.patch
new file mode 100644
index 000000000000..0f867da10d27
--- /dev/null
+++ b/net-wireless/kismet/files/use-hostname-by-default.patch
@@ -0,0 +1,29 @@
+diff -ruN kismet-2011-03-R2.orig/conf/kismet.conf.in kismet-2011-03-R2/conf/kismet.conf.in
+--- kismet-2011-03-R2.orig/conf/kismet.conf.in	2012-05-22 21:33:23.371718460 -0500
++++ kismet-2011-03-R2/conf/kismet.conf.in	2012-05-22 21:43:08.641691490 -0500
+@@ -7,7 +7,8 @@
+ version=2009-newcore
+ 
+ # Name of server (Purely for organizational purposes)
+-servername=Kismet_2009
++# If commented out, defaults to host name of system
++#servername=Kismet_Server
+ 
+ # Prefix of where we log (as used in the logtemplate later)
+ # logprefix=/some/path/to/logs
+diff -ruN kismet-2011-03-R2.orig/kismet_server.cc kismet-2011-03-R2/kismet_server.cc
+--- kismet-2011-03-R2.orig/kismet_server.cc	2011-03-03 23:34:42.000000000 -0600
++++ kismet-2011-03-R2/kismet_server.cc	2012-05-22 21:42:31.319693185 -0500
+@@ -897,7 +897,11 @@
+ 	}
+ 
+ 	if (conf->FetchOpt("servername") == "") {
+-		globalregistry->servername = "Kismet";
++		char hostname[64];
++		if (gethostname(hostname, 64) < 0)
++			globalregistry->servername = "Kismet";
++		else
++			globalregistry->servername = string(hostname);
+ 	} else {
+ 		globalregistry->servername = MungeToPrintable(conf->FetchOpt("servername"));
+ 	}
diff --git a/net-wireless/kismet/kismet-2007.10.1.ebuild b/net-wireless/kismet/kismet-2007.10.1.ebuild
deleted file mode 100644
index e31ae908d834..000000000000
--- a/net-wireless/kismet/kismet-2007.10.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2007.10.1.ebuild,v 1.4 2008/03/16 13:54:23 coldwind Exp $
-
-inherit toolchain-funcs linux-info eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses"
-
-DEPEND="${RDEPEND}"
-RDEPEND="net-wireless/wireless-tools
-	net-libs/libpcap
-	ncurses? ( sys-libs/ncurses )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch
-
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		"${S}"/conf/kismet.conf.in
-
-	# Remove -s from install options
-	sed -i -e 's| -s||g' "${S}"/Makefile.in
-}
-
-src_compile() {
-	# the configure script only honors '--disable-foo'
-	local myconf="--disable-gpsmap"
-
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-
-	econf ${myconf} \
-		--with-linuxheaders="${KV_DIR}" || die "econf failed"
-
-	emake dep || die "emake dep failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGELOG README TODO docs/*
-
-	newinitd "${FILESDIR}"/${P}-init.d kismet
-	newconfd "${FILESDIR}"/${P}-conf.d kismet
-}
diff --git a/net-wireless/kismet/kismet-2010.01.1-r1.ebuild b/net-wireless/kismet/kismet-2010.01.1-r1.ebuild
deleted file mode 100644
index 8db97b6ba80e..000000000000
--- a/net-wireless/kismet/kismet-2010.01.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2010.01.1-r1.ebuild,v 1.4 2012/05/04 06:41:54 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-# plugins have unresolved QA issues
-#KISMET_PLUGINS="autowep btscan ptw spectools"
-IUSE="+client kernel_linux +pcre +pcap +suid" # ${KISMET_PLUGINS}"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	kernel_linux? (	dev-libs/libnl:1.1
-		sys-libs/libcap	)
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )"
-#	btscan? ( net-wireless/bluez )
-#	ptw? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e 's:# *logprefix=.*:logprefix=/tmp:' conf/kismet.conf.in \
-		|| die "failed to change logprefix"
-}
-
-src_configure() {
-	econf --with-suidgroup=kismet \
-		$(use_enable client) \
-		$(use_enable kernel_linux linuxwext) \
-		$(use_enable pcre) \
-		$(use_enable pcap)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-#	for plugin in ${KISMET_PLUGINS}; do
-#		if use ${plugin}; then
-#			emake -C plugin-${plugin} KIS_SRC_DIR="${S}" \
-#				|| die "emake in plugin-${plugin} failed"
-#		fi
-#	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall || die "emake install failed"
-
-#	for plugin in ${KISMET_PLUGINS}; do
-#		if use ${plugin}; then
-#			emake -C plugin-${plugin} KIS_SRC_DIR="${S}" DESTDIR="${D}" install \
-#				|| die "emake install in plugin-${plugin} failed"
-#		fi
-#	done
-
-	dodoc README RELEASENOTES.txt docs/{DEVEL.client,README.newcore} || die
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf || die
-
-	newinitd "${FILESDIR}"/${PN}.initd kismet || die
-	newconfd "${FILESDIR}"/${PN}.confd kismet || die
-
-	if use suid; then
-		dobin kismet_capture || die
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture || die
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture || die
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2011.03.2-r1.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
index 6f743c4e3af6..4d26d4852ea8 100644
--- a/net-wireless/kismet/kismet-2011.03.2-r1.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r1.ebuild,v 1.3 2012/05/22 16:19:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.1 2012/06/11 01:17:06 steev Exp $
 
 EAPI=4
 
-inherit toolchain-funcs linux-info eutils
+inherit toolchain-funcs eutils
 
 MY_P=${P/\./-}
 MY_P=${MY_P/./-R}
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.kismetwireless.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+ncurses +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
+IUSE="+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
 
 # Bluez 4.98 breaks c++ building, so we choose to use -r2 which has the patch
 # or 4.96 which still builds properly.
@@ -34,7 +34,7 @@ RDEPEND="net-wireless/wireless-tools
 	net-libs/libpcap
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
-	ncurses? ( sys-libs/ncurses )
+	client? ( sys-libs/ncurses )
 	!arm? ( speech? ( app-accessibility/flite ) )
 	ruby? ( dev-lang/ruby )
 	plugin-btscan? ( || (
@@ -60,19 +60,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/bluechanfix_r3184.patch
 	epatch "${FILESDIR}"/kismet-console-scrolling-backport.patch
 	epatch "${FILESDIR}"/header_alignment_r3326.patch
+	epatch "${FILESDIR}"/use-hostname-by-default.patch
 }
 
 src_configure() {
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-
-	if ! use pcre; then
-		myconf="${myconf} --disable-pcre"
-	fi
-
-	econf ${myconf} \
-		--with-linuxheaders="${KV_DIR}"
+	econf \
+		$(use_enable client) \
+		$(use_enable pcre)
 }
 
 src_compile() {