rpms/kismet/devel kismet-2010-01-R1-fmt.patch, NONE, 1.1 sources, 1.7, 1.8 lastver, 1.5, 1.6 kismet.spec, 1.30, 1.31 kismet-2009-11-R1-pluginlibs.patch, 1.1, 1.2 kismet-2009-06-R1-perms.patch, 1.1, 1.2 kismet-2009-06-R1-envp.patch, 1.1, 1.2 .cvsignore, 1.6, 1.7 kismet-2009-06-R1-fmt.patch, 1.1, NONE

[ensc]

Author: ensc

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

Modified Files:
	sources lastver kismet.spec kismet-2009-11-R1-pluginlibs.patch 
	kismet-2009-06-R1-perms.patch kismet-2009-06-R1-envp.patch 
	.cvsignore 
Added Files:
	kismet-2010-01-R1-fmt.patch 
Removed Files:
	kismet-2009-06-R1-fmt.patch 
Log Message:
- updated to 2010-01-R1
- rediffed patches


kismet-2010-01-R1-fmt.patch:
 kis_panel_network.cc |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE kismet-2010-01-R1-fmt.patch ---
Index: kismet-2010-01-R1/kis_panel_network.cc
===================================================================
--- kismet-2010-01-R1.orig/kis_panel_network.cc
+++ kismet-2010-01-R1/kis_panel_network.cc
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <inttypes.h>
+
 // Panel has to be here to pass configure, so just test these
 #if (defined(HAVE_LIBNCURSES) || defined (HAVE_LIBCURSES))
 
@@ -1162,7 +1164,7 @@ void Kis_Netlist::Proto_BSSID(CLIPROTO_C
 	// Manuf field
 	net->manuf = MungeToPrintable((*proto_parsed)[fnum++].word);
 
-	if (sscanf((*proto_parsed)[fnum++].word.c_str(), "%llu", 
+	if (sscanf((*proto_parsed)[fnum++].word.c_str(), "%" SCNu64,
 			   &(net->data_cryptset)) != 1) {
 		delete net;
 		return;
@@ -1717,7 +1719,7 @@ void Kis_Netlist::Proto_CLIENT(CLIPROTO_
 	if (cli->dhcp_vendor == " ")
 		cli->dhcp_vendor = "";
 
-	if (sscanf((*proto_parsed)[fnum++].word.c_str(), "%llu", 
+	if (sscanf((*proto_parsed)[fnum++].word.c_str(), "%" SCNu64,
 			   &(cli->data_cryptset)) != 1) {
 		delete cli;
 		return;
@@ -2500,7 +2502,7 @@ int Kis_Netlist::PrintNetworkLine(Kis_Di
 			rofft += 4;
 		} else if (b == bcol_clients) {
 			// TODO - handle clients
-			snprintf(rline + rofft, max - rofft, "%4d", net->client_map.size());
+			snprintf(rline + rofft, max - rofft, "%4zd", net->client_map.size());
 			rofft += 4;
 		} else if (b == bcol_datasize) {
 			char dt = ' ';


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Dec 2009 12:23:03 -0000	1.7
+++ sources	16 Jan 2010 18:43:38 -0000	1.8
@@ -1,2 +1,2 @@
-6987fb1dd8574a6b85ca3af3c068568e  kismet-2009-11-R1.tar.gz
-c619b1a50ccb042472b22b0a341ad29b  kismet-2009-11-R1.tar.gz.asc
+a6d6edcf65d5bb2cb5de6472bcc16f19  kismet-2010-01-R1.tar.gz
+bf730d15b28402fab5a4ac7efcaf6bc2  kismet-2010-01-R1.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lastver	6 Dec 2009 12:23:03 -0000	1.5
+++ lastver	16 Jan 2010 18:43:38 -0000	1.6
@@ -1 +1 @@
-2009-11-R1
+2010-01-R1


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- kismet.spec	6 Dec 2009 12:23:03 -0000	1.30
+++ kismet.spec	16 Jan 2010 18:43:39 -0000	1.31
@@ -1,4 +1,4 @@
-%global _version	2009-11-R1
+%global _version	2010-01-R1
 
 ## {Local macros...
 %global cfgdir		%_sysconfdir/%name
@@ -6,6 +6,8 @@
 ## ...local macros}
 
 %{!?release_func:%global release_func() %1%{?dist}}
+%{!?apply:%global  apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p%%{-p*}} %%{-b:-b%%{-b*}} \
+%nil}
 
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
@@ -20,7 +22,7 @@ Source1:	http://www.kismetwireless.net/c
 Source12:	kismet_capture.pam
 Source13:	kismet_capture.console
 
-Patch16:	kismet-2009-06-R1-fmt.patch
+Patch16:	kismet-2010-01-R1-fmt.patch
 Patch17:	kismet-2009-06-R1-perms.patch
 Patch18:	kismet-2009-06-R1-envp.patch
 Patch19:	kismet-2009-11-R1-pluginlibs.patch
@@ -66,10 +68,10 @@ This subpackage contains plugins shipped
 
 %prep
 %setup -q -n %name-%_version
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
+%apply -n16 -p1
+%apply -n17 -p1
+%apply -n18 -p1
+%apply -n19 -p1
 
 /bin/cp -a /usr/lib/rpm/config.sub .
 
@@ -88,7 +90,9 @@ sed -i \
 #export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
 export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
 export LDFLAGS='-Wl,--as-needed'
-%configure --sysconfdir=%cfgdir
+%configure \
+	   --sysconfdir=%cfgdir \
+	   CXXFLAGS="$RPM_OPT_FLAGS -D__STDC_FORMAT_MACROS"
 
 # HOME will be set to @srcdir@ which is disturbing distcc
 make clean
@@ -157,6 +161,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 16 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2010.01.R1-1300
+- updated to 2010-01-R1
+- rediffed patches
+
 * Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.11.R1-1300
 - updated to 2009-11-R1
 

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

Index: kismet-2009-11-R1-pluginlibs.patch
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet-2009-11-R1-pluginlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kismet-2009-11-R1-pluginlibs.patch	6 Dec 2009 12:23:03 -0000	1.1
+++ kismet-2009-11-R1-pluginlibs.patch	16 Jan 2010 18:43:39 -0000	1.2
@@ -1,7 +1,7 @@
-Index: kismet-2009-11-R1/plugin-ptw/Makefile
+Index: kismet-2010-01-R1/plugin-ptw/Makefile
 ===================================================================
---- kismet-2009-11-R1.orig/plugin-ptw/Makefile
-+++ kismet-2009-11-R1/plugin-ptw/Makefile
+--- kismet-2010-01-R1.orig/plugin-ptw/Makefile
++++ kismet-2010-01-R1/plugin-ptw/Makefile
 @@ -9,7 +9,7 @@ top_builddir = $(BLDHOME)
  
  PLUGINLDFLAGS ?= $(LDFLAGS)

kismet-2009-06-R1-perms.patch:
 Makefile.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: kismet-2009-06-R1-perms.patch
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet-2009-06-R1-perms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kismet-2009-06-R1-perms.patch	9 Aug 2009 15:00:06 -0000	1.1
+++ kismet-2009-06-R1-perms.patch	16 Jan 2010 18:43:39 -0000	1.2
@@ -1,8 +1,8 @@
-Index: kismet-2009-06-R1/Makefile.in
+Index: kismet-2010-01-R1/Makefile.in
 ===================================================================
---- kismet-2009-06-R1.orig/Makefile.in
-+++ kismet-2009-06-R1/Makefile.in
-@@ -127,16 +127,16 @@ Makefile: Makefile.in configure
+--- kismet-2010-01-R1.orig/Makefile.in
++++ kismet-2010-01-R1/Makefile.in
+@@ -94,16 +94,16 @@ Makefile: Makefile.in configure
  	@-echo "'Makefile.in' or 'configure' are more current than this Makefile.  You should re-run 'configure'."
  
  binsuidinstall:

kismet-2009-06-R1-envp.patch:
 ipc_remote.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: kismet-2009-06-R1-envp.patch
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet-2009-06-R1-envp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kismet-2009-06-R1-envp.patch	9 Aug 2009 15:00:07 -0000	1.1
+++ kismet-2009-06-R1-envp.patch	16 Jan 2010 18:43:39 -0000	1.2
@@ -1,10 +1,10 @@
 Preserve environment when calling the kismet_capture client. We need
 stuff like $DISPLAY or $XAUTHORITY to display the consolehelper dialog.
 
-Index: kismet-2009-06-R1/ipc_remote.cc
+Index: kismet-2010-01-R1/ipc_remote.cc
 ===================================================================
---- kismet-2009-06-R1.orig/ipc_remote.cc
-+++ kismet-2009-06-R1/ipc_remote.cc
+--- kismet-2010-01-R1.orig/ipc_remote.cc
++++ kismet-2010-01-R1/ipc_remote.cc
 @@ -323,7 +323,7 @@ int IPCRemote::SpawnIPC() {
  
  				snprintf(cmdarg[1], 4, "%d", sockpair[0]);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Dec 2009 12:23:03 -0000	1.6
+++ .cvsignore	16 Jan 2010 18:43:39 -0000	1.7
@@ -1,2 +1,2 @@
-kismet-2009-11-R1.tar.gz
-kismet-2009-11-R1.tar.gz.asc
+kismet-2010-01-R1.tar.gz
+kismet-2010-01-R1.tar.gz.asc


--- kismet-2009-06-R1-fmt.patch DELETED ---