rpms/kismet/devel .cvsignore, 1.4, 1.5 kismet.spec, 1.23, 1.24 lastver, 1.3, 1.4 sources, 1.5, 1.6

Sun Aug 9 15:01:09 UTC 2009

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1870

Modified Files:
	.cvsignore kismet.spec lastver sources 
Log Message:
- updated to 2009-06-R1
- reworked large parts of the package due to major upstream changes:
  * there is no separate user anymore but a kismet_capture consolehelper wrapper
  * a lot of the old filesystem layout has been changed/removed
  * removed -extras subpackage; added -plugins one



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	21 Jun 2008 17:05:08 -0000	1.4
+++ .cvsignore	9 Aug 2009 15:01:08 -0000	1.5
@@ -1,2 +1,2 @@
-kismet-2008-05-R1.tar.gz
-kismet-2008-05-R1.tar.gz.asc
+kismet-2009-06-R1.tar.gz
+kismet-2009-06-R1.tar.gz.asc


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kismet.spec	25 Jul 2009 04:38:10 -0000	1.23
+++ kismet.spec	9 Aug 2009 15:01:08 -0000	1.24
@@ -1,14 +1,6 @@
-%global _version	2008-05-R1
-
-## Fedora Extras specific customization below...
-%bcond_without       	fedora
-##
+%global _version	2009-06-R1
 
 ## {Local macros...
-%global username	kismet
-%global crontabdir	%_sysconfdir/cron.daily
-%global homedir		%_var/lib/%name
-%global logdir		%_var/log/%name
 %global cfgdir		%_sysconfdir/%name
 %global _rpmversion	0.0.%(echo %_version | tr - .)
 ## ...local macros}
@@ -18,40 +10,32 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 6
+Release:	%release_func 0
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
 Source0:	http://www.kismetwireless.net/code/%name-%_version.tar.gz
 Source1:	http://www.kismetwireless.net/code/%name-%_version.tar.gz.asc
-Source10:	tmpwatch.kismet
-Source11:	sysconfig.kismet
-Patch7:		kismet-2006-04-R1-ssize.patch
-Patch8:		kismet-2007-01-R1-setgroups.patch
-Patch13:	kismet-2008-05-R1-typedef.patch
-Patch14:	kismet-2008-05-R1-typo.patch
-Patch15:	kismet-2008-05-R1-const.patch
-Patch16:	kismet-2008-05-R1-fmt.patch
-Patch17:	kismet-2008-05-R1-gcc44.patch
+
+Source12:	kismet_capture.pam
+Source13:	kismet_capture.console
+
+Patch16:	kismet-2009-06-R1-fmt.patch
+Patch17:	kismet-2009-06-R1-perms.patch
+Patch18:	kismet-2009-06-R1-envp.patch
+
 BuildRoot:	%_tmppath/%name-%version-%release-root
-BuildRequires:		expat-devel ncurses-devel diffutils
-BuildRequires:		gmp-devel wget libpcap-devel
-BuildRequires:		ImageMagick-devel
-# should be required by ImageMagick-devel but are missing in FC4
-BuildRequires:		libtiff-devel libjpeg-devel freetype-devel
-BuildRequires:		fedora-usermgmt-devel
-BuildRequires:		dbus-devel
-Provides:		user(%username)
-Provides:		group(%username)
-Requires(missingok):	tmpwatch
-Requires(missingok):	crontabs
-Requires(pre):		%crontabdir
-Requires(postun):	%crontabdir
-%{?FE_USERADD_REQ}
+BuildRequires:	ncurses-devel diffutils
+BuildRequires:	libpcap-devel pcre-devel
+Requires:	usermode
 
+# HACK: work around https://fedorahosted.org/usermode/ticket/1
+Source50:	kismet_capture_wrap.c
+BuildRequires:	dietlibc
 
-%package extras
-Summary:	Non-core programs for 'kismet'
+
+%package plugins
+Summary:	Plugins for kismet
 Group:		Applications/Internet
 Requires:	%name = %version-%release
 
@@ -67,40 +51,27 @@ standard named networks, detecting (and 
 networks, and infering the presence of nonbeaconing networks via data
 traffic.
 
-%description extras
+%description plugins
 Kismet is an 802.11 layer2 wireless network detector, sniffer, and
 intrusion detection system. Kismet will work with any wireless card
 which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
 802.11a, and 802.11g traffic.
 
-This subpackage contains programs which provide additional functionality
-but introduce dependencies which are not needed for kismet to work.
+This subpackage contains plugins shipped by the kismet package.
 
 
 %prep
 %setup -q -n %name-%_version
-%patch7  -p1 -b .ssize
-%patch8  -p1 -b .setgroups
-%patch13 -p1 -b .typedef
-%patch14 -p1 -b .typo
-%patch15 -p1 -b .const
-%patch16 -p1 -b .fmt
-%patch17 -p0 -b .gcc44
-
-sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet
-touch --reference=%SOURCE10 tmpwatch.kismet || :	# keep timestamp
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
-sed -i -e "s!your_user_here!%username!g;
-           s!^gps=true!gps=false!;
-           s!^logtemplate=%%!logtemplate=%logdir/%%!;
-	   s!^configdir=.*!configdir=%h/!" \
-		conf/kismet.conf.in conf/kismet_drone.conf
-
-# do not strip installed binaries as it conflicts with the -debuginfo
-# mechanism
-sed -i -e "s!\(install .*\) -s !\1 !g" Makefile.in
+sed -i \
+    -e '/^ouifile=/etc/manuf/d' \
+    -e '/^ouifile=/usr/share/wireshark/wireshark/manuf/d' \
+    conf/kismet.conf.in conf/kismet_drone.conf
 
 
 %build
@@ -113,26 +84,41 @@ export LDFLAGS='-Wl,--as-needed'
 make clean
 make %{?_smp_mflags} HOME="$HOME"
 
+for i in plugin-{ptw,spectools}; do
+    make -C $i KIS_SRC_DIR=`pwd` \
+    	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
+	 CFLAGS="-I\$(KIS_SRC_DIR) -fPIC $RPM_OPT_FLAGS" \
+	 LDFLAGS="-shared -rdynamic -Wl,--as-needed"
+done
+
+
+# HACK: work around https://fedorahosted.org/usermode/ticket/1
+diet %__cc $RPM_OPT_FLAGS %SOURCE50 -o kismet_capture.wrap
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT _tmp
+
 make install	\
 	DESTDIR="$RPM_BUILD_ROOT" \
 	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
-install -d $RPM_BUILD_ROOT{%homedir,%logdir,%crontabdir,%_sysconfdir/sysconfig}
-install -p -m755 tmpwatch.kismet $RPM_BUILD_ROOT%crontabdir
-install -p -m644 %SOURCE11       $RPM_BUILD_ROOT%_sysconfdir/sysconfig/kismet
 
+for i in plugin-{ptw,spectools}; do
+    make -C $i install KIS_DEST_DIR=`pwd`/_tmp
+done
+
+install -d $RPM_BUILD_ROOT{%homedir,%crontabdir,%_libdir/kismet{,_client},%_libexecdir,%_sysconfdir/{sysconfig,pam.d,security/console.apps}}
 
-%pre
-%__fe_groupadd 12 -r %username &>/dev/null || :
-%__fe_useradd  12 -r -s /sbin/nologin -M -d %homedir		\
-	          -c 'Kismet user' -g %username %username &>/dev/null || :
+install -p -m 0644 %SOURCE12     $RPM_BUILD_ROOT%_sysconfdir/pam.d/kismet_capture
+install -p -m 0644 %SOURCE13     $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/kismet_capture
+install -p -m 0755 kismet_capture $RPM_BUILD_ROOT%_libexecdir/
 
+install -Dp -m 0755 _tmp/lib/kismet/*        $RPM_BUILD_ROOT%_libdir/kismet/
+install -Dp -m 0755 _tmp/lib/kismet_client/* $RPM_BUILD_ROOT%_libdir/kismet_client/
 
-%postun
-%__fe_userdel  %username &>/dev/null || :
-%__fe_groupdel %username &>/dev/null || :
+
+#ln -s ./consolehelper            $RPM_BUILD_ROOT%_bindir/kismet_capture
+install -p -m 0755 kismet_capture.wrap $RPM_BUILD_ROOT%_bindir/kismet_capture
 
 
 %clean
@@ -141,26 +127,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG* GPL README TODO docs
-%dir %attr(0770,root,%username) %homedir
-%dir %attr(0730,root,%username) %logdir
-%dir %attr(0750,root,%username) %cfgdir
+%doc CHANGELOG* GPL README docs
+%dir %attr(0755,root,root) %cfgdir
 %config(noreplace) %cfgdir/*
 %_bindir/kismet*
 %_datadir/kismet
 %_mandir/*/kismet*
 
-%config            %crontabdir/tmpwatch.kismet
-%config(noreplace) %_sysconfdir/sysconfig/kismet
+%dir %_libdir/kismet
+%dir %_libdir/kismet_client
+
+%_sysconfdir/pam.d/*
+%_sysconfdir/security/console.apps/*
+%_libexecdir/*
 
 
-%files extras
+%files plugins
 %defattr(-,root,root,-)
-%_bindir/gps*
-%_mandir/*/gps*
+%dir %_libdir/kismet/*.so
+%dir %_libdir/kismet_client/*.so
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.06.R1-0
+- updated to 2009-06-R1
+- reworked large parts of the package due to major upstream changes:
+  * there is no separate user anymore but a kismet_capture consolehelper wrapper
+  * a lot of the old filesystem layout has been changed/removed
+  * removed -extras subpackage; added -plugins one
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2008.05.R1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/lastver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lastver	21 Jun 2008 17:05:08 -0000	1.3
+++ lastver	9 Aug 2009 15:01:09 -0000	1.4
@@ -1 +1 @@
-2008-05-R1
+2009-06-R1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Jun 2008 17:05:08 -0000	1.5
+++ sources	9 Aug 2009 15:01:09 -0000	1.6
@@ -1,2 +1,2 @@
-6ee365d36354b4dee4945e67f8149294  kismet-2008-05-R1.tar.gz
-6976640def18c452c3b27282577a9ae9  kismet-2008-05-R1.tar.gz.asc
+8d77138020ace39f175a906dc0d3b267  kismet-2009-06-R1.tar.gz
+6eb095566baea5727a08aa269655119c  kismet-2009-06-R1.tar.gz.asc


