rpms/kismet/devel kismet-2009-11-R1-pluginlibs.patch, NONE, 1.1 sources, 1.6, 1.7 lastver, 1.4, 1.5 kismet.spec, 1.29, 1.30 .cvsignore, 1.5, 1.6

[ensc]

Author: ensc

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

Modified Files:
	sources lastver kismet.spec .cvsignore 
Added Files:
	kismet-2009-11-R1-pluginlibs.patch 
Log Message:
updated to 2009-11-R1


kismet-2009-11-R1-pluginlibs.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-11-R1-pluginlibs.patch ---
Index: kismet-2009-11-R1/plugin-ptw/Makefile
===================================================================
--- kismet-2009-11-R1.orig/plugin-ptw/Makefile
+++ kismet-2009-11-R1/plugin-ptw/Makefile
@@ -9,7 +9,7 @@ top_builddir = $(BLDHOME)
 
 PLUGINLDFLAGS ?= $(LDFLAGS)
 PLUGINLDFLAGS += -shared -rdynamic
-LIBS	+= -lstdc++ -lssl -lpthread
+LIBS	+= -lstdc++ -lssl -lcrypto -lpthread
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Aug 2009 15:01:09 -0000	1.6
+++ sources	6 Dec 2009 12:23:03 -0000	1.7
@@ -1,2 +1,2 @@
-8d77138020ace39f175a906dc0d3b267  kismet-2009-06-R1.tar.gz
-6eb095566baea5727a08aa269655119c  kismet-2009-06-R1.tar.gz.asc
+6987fb1dd8574a6b85ca3af3c068568e  kismet-2009-11-R1.tar.gz
+c619b1a50ccb042472b22b0a341ad29b  kismet-2009-11-R1.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/lastver,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lastver	9 Aug 2009 15:01:09 -0000	1.4
+++ lastver	6 Dec 2009 12:23:03 -0000	1.5
@@ -1 +1 @@
-2009-06-R1
+2009-11-R1


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- kismet.spec	9 Aug 2009 20:49:14 -0000	1.29
+++ kismet.spec	6 Dec 2009 12:23:03 -0000	1.30
@@ -1,4 +1,4 @@
-%global _version	2009-06-R1
+%global _version	2009-11-R1
 
 ## {Local macros...
 %global cfgdir		%_sysconfdir/%name
@@ -10,7 +10,7 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 2
+Release:	%release_func 1300
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
@@ -23,6 +23,7 @@ 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
+Patch19:	kismet-2009-11-R1-pluginlibs.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 BuildRequires:	ncurses-devel diffutils
@@ -68,9 +69,13 @@ This subpackage contains plugins shipped
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 /bin/cp -a /usr/lib/rpm/config.sub .
 
+sed -i 's!\$(prefix)/lib/!%_libdir/!g' plugin-*/Makefile
+
+
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
 sed -i \
@@ -89,11 +94,11 @@ export LDFLAGS='-Wl,--as-needed'
 make clean
 make %{?_smp_mflags} HOME="$HOME"
 
-for i in plugin-{ptw,spectools}; do
+for i in plugin-{ptw,spectools,autowep}; do
     make -C $i KIS_SRC_DIR=`pwd` \
-    	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
+	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
 	 CFLAGS="-I\$(KIS_SRC_DIR) -fPIC $RPM_OPT_FLAGS" \
-	 LDFLAGS="-shared -rdynamic -Wl,--as-needed"
+	 PLUGINLDFLAGS="-shared -rdynamic -Wl,--as-needed"
 done
 
 
@@ -104,12 +109,11 @@ diet %__cc $RPM_OPT_FLAGS %SOURCE50 -o k
 %install
 rm -rf $RPM_BUILD_ROOT _tmp
 
-make install	\
+for i in . plugin-{ptw,spectools,autowep}; do
+    make -C $i install	\
+        KIS_SRC_DIR=`pwd` \
 	DESTDIR="$RPM_BUILD_ROOT" \
 	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
-
-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}}
@@ -118,8 +122,7 @@ install -p -m 0644 %SOURCE12     $RPM_BU
 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/
+chmod 0755 $RPM_BUILD_ROOT%_libdir/kismet*/*.so
 
 
 #ln -s ./consolehelper            $RPM_BUILD_ROOT%_bindir/kismet_capture
@@ -154,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.11.R1-1300
+- updated to 2009-11-R1
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - enhanced kismet_capture's pam configuration file
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Aug 2009 15:01:08 -0000	1.5
+++ .cvsignore	6 Dec 2009 12:23:03 -0000	1.6
@@ -1,2 +1,2 @@
-kismet-2009-06-R1.tar.gz
-kismet-2009-06-R1.tar.gz.asc
+kismet-2009-11-R1.tar.gz
+kismet-2009-11-R1.tar.gz.asc