[kismet/f13/master] updated to 2010-07-R1; rediffed patches
ensc
ensc at fedoraproject.org
Mon Aug 16 19:43:36 UTC 2010
commit a17dc03cd007a6feef6f5bb427cc44c7ae27e1bc
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon Aug 16 21:36:23 2010 +0200
updated to 2010-07-R1; rediffed patches
.gitignore | 2 +
kismet-2009-06-R1-envp.patch | 18 ++++++++--------
kismet-2009-06-R1-perms.patch | 21 ++++++++++--------
kismet-2009-11-R1-pluginlibs.patch | 13 -----------
kismet-2010-01-R1-fmt.patch | 40 ------------------------------------
kismet-2010-01-R1-listen.patch | 18 ----------------
kismet.spec | 13 ++++-------
lastver | 2 +-
sources | 4 +-
9 files changed, 31 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f31e1e8..13ac0c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
kismet-2010-01-R1.tar.gz
kismet-2010-01-R1.tar.gz.asc
+kismet-2010-07-R1.tar.gz
+kismet-2010-07-R1.tar.gz.asc
diff --git a/kismet-2009-06-R1-envp.patch b/kismet-2009-06-R1-envp.patch
index 0f8f9c8..d20b645 100644
--- a/kismet-2009-06-R1-envp.patch
+++ b/kismet-2009-06-R1-envp.patch
@@ -1,16 +1,16 @@
Preserve environment when calling the kismet_capture client. We need
stuff like $DISPLAY or $XAUTHORITY to display the consolehelper dialog.
-Index: kismet-2010-01-R1/ipc_remote.cc
+Index: kismet-2010-07-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]);
-
+--- kismet-2010-07-R1.orig/ipc_remote.cc
++++ kismet-2010-07-R1/ipc_remote.cc
+@@ -342,7 +342,7 @@ int IPCRemote::SpawnIPC() {
+ // We're running as the child here, we have to pass this failure
+ // up in the return value and this doesn't cause an immediate exit
+ // with error for the caller...
- if (execve(cmdarg[0], cmdarg, NULL) < 0) {
+ if (execve(cmdarg[0], cmdarg, globalreg->envp) < 0) {
int status = errno;
- fprintf(stderr, "Failed to exec as IPC child: %s\n",
- strerror(status));
+
+ string fail = "Failed to launch IPC child: " +
diff --git a/kismet-2009-06-R1-perms.patch b/kismet-2009-06-R1-perms.patch
index 452b53d..388c7d3 100644
--- a/kismet-2009-06-R1-perms.patch
+++ b/kismet-2009-06-R1-perms.patch
@@ -1,8 +1,8 @@
-Index: kismet-2010-01-R1/Makefile.in
+Index: kismet-2010-07-R1/Makefile.in
===================================================================
---- kismet-2010-01-R1.orig/Makefile.in
-+++ kismet-2010-01-R1/Makefile.in
-@@ -94,16 +94,16 @@ Makefile: Makefile.in configure
+--- kismet-2010-07-R1.orig/Makefile.in
++++ kismet-2010-07-R1/Makefile.in
+@@ -101,7 +101,7 @@ Makefile: Makefile.in configure
@-echo "'Makefile.in' or 'configure' are more current than this Makefile. You should re-run 'configure'."
binsuidinstall:
@@ -11,14 +11,17 @@ Index: kismet-2010-01-R1/Makefile.in
commoninstall:
mkdir -p $(ETC)
- mkdir -p $(BIN)
+@@ -109,11 +109,11 @@ commoninstall:
-- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
-- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
+ if test -e $(NC); then \
+ echo "Installing client"; \
+- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet; \
+- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC); \
++ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet; \
++ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC); \
+ fi;
- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS);
- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
-+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet
-+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS);
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
diff --git a/kismet.spec b/kismet.spec
index 3d0515b..e48b4bd 100644
--- a/kismet.spec
+++ b/kismet.spec
@@ -1,4 +1,4 @@
-%global _version 2010-01-R1
+%global _version 2010-07-R1
## {Local macros...
%global cfgdir %_sysconfdir/%name
@@ -12,7 +12,7 @@
Summary: WLAN detector, sniffer and IDS
Name: kismet
Version: %_rpmversion
-Release: %release_func 1301
+Release: %release_func 1300
License: GPLv2+
Group: Applications/Internet
URL: http://www.kismetwireless.net/
@@ -22,11 +22,8 @@ Source1: http://www.kismetwireless.net/code/%name-%_version.tar.gz.asc
Source12: kismet_capture.pam
Source13: kismet_capture.console
-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
-Patch20: kismet-2010-01-R1-listen.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: ncurses-devel diffutils
@@ -69,11 +66,8 @@ This subpackage contains plugins shipped by the kismet package.
%prep
%setup -q -n %name-%_version
-%apply -n16 -p1
%apply -n17 -p1
%apply -n18 -p1
-%apply -n19 -p1
-%apply -n20 -p1
/bin/cp -a /usr/lib/rpm/config.sub .
@@ -163,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 16 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2010.07.R1-1300
+- updated to 2010-07-R1; rediffed patches
+
* Sun Feb 21 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2010.01.R1-1301
- added patch to honor listen configuration (#553275)
diff --git a/lastver b/lastver
index 3b34b3f..47eb0d6 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-2010-01-R1
+2010-07-R1
diff --git a/sources b/sources
index 8b19c7b..791c533 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a6d6edcf65d5bb2cb5de6472bcc16f19 kismet-2010-01-R1.tar.gz
-bf730d15b28402fab5a4ac7efcaf6bc2 kismet-2010-01-R1.tar.gz.asc
+85e59186eb529889118b5635f35cf57d kismet-2010-07-R1.tar.gz
+9bb69a7ca445eb8c68278f94128f51d8 kismet-2010-07-R1.tar.gz.asc
More information about the scm-commits
mailing list