[arch-commits] Commit in kismet/trunk (5 files)
Angel Velásquez
angvp at archlinux.org
Mon May 9 12:19:16 UTC 2011
Date: Monday, May 9, 2011 @ 08:19:16
Author: angvp
Revision: 123234
upgpkg: kismet 2011_03_R2-2
Applying several changes see changelog
Added:
kismet/trunk/kismet.changelog
kismet/trunk/kismet.install
Modified:
kismet/trunk/PKGBUILD
Deleted:
kismet/trunk/kismet-2008-05-R1-infinite-loop.diff
kismet/trunk/kismet-build.patch
--------------------------------------+
PKGBUILD | 63 ++++++++++++++++++++++-----------
kismet-2008-05-R1-infinite-loop.diff | 20 ----------
kismet-build.patch | 11 -----
kismet.changelog | 26 +++++++++++++
kismet.install | 34 +++++++++++++++++
5 files changed, 102 insertions(+), 52 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-09 11:06:52 UTC (rev 123233)
+++ PKGBUILD 2011-05-09 12:19:16 UTC (rev 123234)
@@ -1,38 +1,59 @@
# $Id$
-# Contributer: Jason Chu <jason at archlinux.org>
-# Maintainer: Juergen Hoetzel <jason at archlinux.org>
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+# Contributor: Juergen Hoetzel <jason at archlinux.org>
pkgname=kismet
pkgver=2011_03_R2
_realver="${pkgver//_/-}"
-pkgrel=1
-pkgdesc="802.11b sniffing software"
+pkgrel=2
+pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
arch=('i686' 'x86_64')
+url="http://www.kismetwireless.net/"
license=('GPL')
-depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus' 'libjpeg>=7')
-optdepends=(perl-libwww)
-url="http://www.kismetwireless.net/"
+depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
+makedepends=() # already in core: ('grep' 'gcc-libs')
+optdepends=('gpsd: log coordinates of detected networks'
+ 'wireshark: provide OUI files used to determine device manufacturer'
+ 'wireshark: mergecap, to merge multiple capture files'
+ 'sox: provide the default kismet sound playback binary'
+ 'festival: text-to-speech support'
+ 'flite: alternative/lightweight text-to-speech support'
+ 'mac80211-driver: full rfmon support'
+ 'ruby: ruby interface')
backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
-options=('!makeflags')
-source=(http://www.kismetwireless.net/code/kismet-${pkgver//_/-}.tar.gz)
+options=()
+install=kismet.install
+changelog=kismet.changelog
+source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz")
md5sums=('8bf077e8111e6dc8c12cadefdf40aadd')
build() {
- cd "$srcdir/kismet-$_realver"
+ cd "${srcdir}/${pkgname}-${_realver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var
+ make dep
+ make
- make dep
- make
- sed -i 's/prism2/wlanng/g' conf/kismet.conf
- make DESTDIR="$pkgdir" install
+ # Include plugins bundled with kismet
+ make plugins
+}
- chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
+package() {
+ cd "${srcdir}/${pkgname}-${_realver}"
- install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README"
+ # Install kismet
+ make DESTDIR="$pkgdir" install
- # Fix the *.conf unexpanded ${prefix} problems
- sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf
+ # Install plugins
+ make plugins-install DESTDIR="$pkgdir"
+
+ # the README is very comprehensive, a good idea to include it
+ install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README"
+
+ # Our own suid-install, first half (see kismet.install)
+ install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/"
}
+
Deleted: kismet-2008-05-R1-infinite-loop.diff
===================================================================
--- kismet-2008-05-R1-infinite-loop.diff 2011-05-09 11:06:52 UTC (rev 123233)
+++ kismet-2008-05-R1-infinite-loop.diff 2011-05-09 12:19:16 UTC (rev 123234)
@@ -1,20 +0,0 @@
---- gpsmap.cc
-+++ gpsmap.cc
-@@ -874,7 +874,7 @@
-
- // Break up the path to the gpsxml file and form a path based on that
- unsigned int lastslash = 0;
-- for (unsigned int x = origxmlfile.find('/'); x != string::npos;
-+ for (string::size_type x = origxmlfile.find('/'); x != string::npos;
- lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
- // We don't actually need to do anything...
- }
-@@ -882,7 +882,7 @@
- comp = origxmlfile.substr(0, lastslash);
-
- lastslash = 0;
-- for (unsigned int x = orignetfile.find('/'); x != string::npos;
-+ for (string::size_type x = orignetfile.find('/'); x != string::npos;
- lastslash = x, x = orignetfile.find('/', lastslash+1)) {
- // We don't actually need to do anything...
- }
Deleted: kismet-build.patch
===================================================================
--- kismet-build.patch 2011-05-09 11:06:52 UTC (rev 123233)
+++ kismet-build.patch 2011-05-09 12:19:16 UTC (rev 123234)
@@ -1,11 +0,0 @@
---- macaddr.h.orig 2009-07-08 02:29:38.000000000 -0400
-+++ macaddr.h 2009-07-08 02:37:54.000000000 -0400
-@@ -73,7 +73,7 @@
- longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8);
-
- // If it has a mask component, get that
-- char *in_mask = strchr(in, '/');
-+ const char *in_mask = strchr(in, '/');
- if (in_mask != NULL) {
- longmask = 0;
-
Added: kismet.changelog
===================================================================
--- kismet.changelog (rev 0)
+++ kismet.changelog 2011-05-09 12:19:16 UTC (rev 123234)
@@ -0,0 +1,26 @@
+2010-05-07 Angel Velasquez <angvp at archlinux.org>
+ * ChangeLog added
+
+ * Removed old patches from SVN
+
+ * Applied changes from FS#15746 thanks to people who worked on it.
+
+ * Files that are no longer shipped and so should not be backed up:
+ backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf')
+
+ * No longer needed; gpsmap is deprecated and being replaced with a tile-based
+ mapper, as of yet incomplete
+ optdepends=('perl-libwww: fetch maps for gpsmap')
+
+ * Configuration has completely changed, no longer containing
+ references to either prism2 or wlanng
+ sed -i 's/prism2/wlanng/g' conf/kismet.conf
+
+ * Ownership of man pages now defaults to "root" if the group "man" does not exist
+ chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
+
+ * Dependencies no longer needed
+ depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7')
+
+ * Options no longer needed
+ options=('!makeflags')
Added: kismet.install
===================================================================
--- kismet.install (rev 0)
+++ kismet.install 2011-05-09 12:19:16 UTC (rev 123234)
@@ -0,0 +1,34 @@
+## arg 1: the new package version
+post_install() {
+ post_upgrade
+
+ cat << EOP
+ If you have not done so already, read the README file and the FAQ file.
+ You MUST edit /etc/kismet.conf and configure Kismet for your system, or
+ it will NOT run properly!"
+
+ Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by
+ users in the group ' kismet '. This WILL ALLOW USERS IN THIS GROUP
+ TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running
+ all of Kismet as root. ONLY users in this group will be able to
+ run Kismet and capture from physical network devices.
+EOP
+}
+
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ # Add the group needed to use the limited-functionality binary "kismet_capture"
+ # Change group ownership of "kismet_capture" to this new group
+ # Preserve the file mode bits of "kismet_capture"
+ getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null
+ chown root:kismet "/usr/bin/kismet_capture"
+ chmod 4550 "/usr/bin/kismet_capture"
+}
+
+## arg 1: the old package version
+post_remove() {
+ getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list