Replace interactive shell with simple C program, since interactive shell is not always interactive (bug#148913)

(Portage version: 2.1.1-r1)

6 files changed, 50 insertions, 13 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index f6cf126ffb40..1eeb85c7cb74 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/aircrack-ng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.10 2006/10/23 16:22:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.11 2006/10/30 21:31:15 alonbl Exp $
+
+  30 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/process-group-leader.c, aircrack-ng-0.5-r1.ebuild,
+  aircrack-ng-0.6.ebuild, aircrack-ng-0.6.1.ebuild,
+  aircrack-ng-0.6.2.ebuild:
+  Replace interactive shell with simple C program, since interactive shell is
+  not always interactive (bug#148913)
 
   23 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> aircrack-ng-0.5-r1.ebuild,
   aircrack-ng-0.6.ebuild, aircrack-ng-0.6.1.ebuild,
diff --git a/net-wireless/aircrack-ng/aircrack-ng-0.5-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-0.5-r1.ebuild
index 59d4e04db452..993b8b41830f 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-0.5-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.5-r1.ebuild,v 1.3 2006/10/23 16:22:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.5-r1.ebuild,v 1.4 2006/10/30 21:31:15 alonbl Exp $
 
 inherit toolchain-funcs eutils
 
@@ -20,8 +20,9 @@ src_test() {
 	#./aircrack-ng wep.ivs || die 'cracking WEP key failed'
 
 	# Upstream uses signal in order to quit,
-	# So protect busybox with interactive shell.
-	/bin/sh -ci "./aircrack-ng test/wpa.cap -w test/password.lst" || die 'cracking WPA key failed'
+	# So protect busybox with process group leader.
+	${CHOST}-gcc -o process-group-leader "${FILESDIR}/process-group-leader.c"
+	./process-group-leader ./aircrack-ng test/wpa.cap -w test/password.lst || die 'cracking WPA key failed'
 }
 
 src_compile() {
diff --git a/net-wireless/aircrack-ng/aircrack-ng-0.6.1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-0.6.1.ebuild
index 928ffa6bfa6c..6c848836b29e 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-0.6.1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.6.1.ebuild,v 1.2 2006/10/23 16:22:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.6.1.ebuild,v 1.3 2006/10/30 21:31:15 alonbl Exp $
 
 inherit toolchain-funcs eutils
 
@@ -20,8 +20,9 @@ src_test() {
 	#./aircrack-ng wep.ivs || die 'cracking WEP key failed'
 
 	# Upstream uses signal in order to quit,
-	# So protect busybox with interactive shell.
-	/bin/sh -ci "./aircrack-ng test/wpa.cap -w test/password.lst" || die 'cracking WPA key failed'
+	# So protect busybox with process group leader.
+	${CHOST}-gcc -o process-group-leader "${FILESDIR}/process-group-leader.c"
+	./process-group-leader ./aircrack-ng test/wpa.cap -w test/password.lst || die 'cracking WPA key failed'
 }
 
 src_compile() {
diff --git a/net-wireless/aircrack-ng/aircrack-ng-0.6.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-0.6.2.ebuild
index 124ba5d9e4d2..4379b3315312 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-0.6.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.6.2.ebuild,v 1.2 2006/10/23 16:22:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.6.2.ebuild,v 1.3 2006/10/30 21:31:15 alonbl Exp $
 
 inherit toolchain-funcs eutils
 
@@ -20,8 +20,9 @@ src_test() {
 	#./aircrack-ng wep.ivs || die 'cracking WEP key failed'
 
 	# Upstream uses signal in order to quit,
-	# So protect busybox with interactive shell.
-	/bin/sh -ci "./aircrack-ng test/wpa.cap -w test/password.lst" || die 'cracking WPA key failed'
+	# So protect busybox with process group leader.
+	${CHOST}-gcc -o process-group-leader "${FILESDIR}/process-group-leader.c"
+	./process-group-leader ./aircrack-ng test/wpa.cap -w test/password.lst || die 'cracking WPA key failed'
 }
 
 src_compile() {
diff --git a/net-wireless/aircrack-ng/aircrack-ng-0.6.ebuild b/net-wireless/aircrack-ng/aircrack-ng-0.6.ebuild
index 112ba813db15..ed69610638fe 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-0.6.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.6.ebuild,v 1.2 2006/10/23 16:22:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.6.ebuild,v 1.3 2006/10/30 21:31:15 alonbl Exp $
 
 inherit toolchain-funcs eutils
 
@@ -20,8 +20,9 @@ src_test() {
 	#./aircrack-ng wep.ivs || die 'cracking WEP key failed'
 
 	# Upstream uses signal in order to quit,
-	# So protect busybox with interactive shell.
-	/bin/sh -ci "./aircrack-ng test/wpa.cap -w test/password.lst" || die 'cracking WPA key failed'
+	# So protect busybox with process group leader.
+	${CHOST}-gcc -o process-group-leader "${FILESDIR}/process-group-leader.c"
+	./process-group-leader ./aircrack-ng test/wpa.cap -w test/password.lst || die 'cracking WPA key failed'
 }
 
 src_compile() {
diff --git a/net-wireless/aircrack-ng/files/process-group-leader.c b/net-wireless/aircrack-ng/files/process-group-leader.c
new file mode 100644
index 000000000000..4c5f1ad4d8f6
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/process-group-leader.c
@@ -0,0 +1,26 @@
+#include <unistd.h>
+#include <sys/signal.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+
+int main (int argc, char *argv[]) {
+	pid_t pid;
+
+	signal (SIGQUIT, SIG_IGN);
+	signal (SIGTERM, SIG_IGN);
+	setpgrp ();
+
+	pid=fork ();
+	if (pid == 0) {
+		int status;
+		wait (&status);
+		exit (WEXITSTATUS(status));
+	}
+	else {
+		execv (argv[1], &argv[1]);
+		exit (1);
+	}
+
+	return 0;
+}
+