Make Generic-NQS actually work properly

PR:		ports/31208
Submitted by:	AMAKAWA Shuhei <sa264@cam.ac.uk>

5 files changed, 38 insertions, 2 deletions

diff --git a/net/generic-nqs/Makefile b/net/generic-nqs/Makefile
index f2a9a8b21db5..d6391c15981f 100644
--- a/net/generic-nqs/Makefile
+++ b/net/generic-nqs/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=			Generic-NQS
 PORTVERSION=		3.50.9
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=			net
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
diff --git a/net/generic-nqs/files/nqs.sh b/net/generic-nqs/files/nqs.sh
index fbdb6ffa0adb..eefff9f50f74 100644
--- a/net/generic-nqs/files/nqs.sh
+++ b/net/generic-nqs/files/nqs.sh
@@ -8,7 +8,7 @@ start)
 	fi
 	;;
 stop)
-	killall nqsdaemon && echo -n ' nqs'
+	killall -KILL nqsdaemon netdaemon loaddaemon && echo -n ' nqs'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/net/generic-nqs/files/patch-ab b/net/generic-nqs/files/patch-ab
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/generic-nqs/files/patch-ab
+++ /dev/null
diff --git a/net/generic-nqs/files/patch-ah b/net/generic-nqs/files/patch-ah
new file mode 100644
index 000000000000..8c650745f69e
--- /dev/null
+++ b/net/generic-nqs/files/patch-ah
@@ -0,0 +1,19 @@
+--- Source-Tree/nqsdaemon/all-systems/nqs_mai.c.orig	Sun Mar 19 13:19:21 2000
++++ Source-Tree/nqsdaemon/all-systems/nqs_mai.c	Sat Oct  6 10:21:00 2001
+@@ -247,8 +247,14 @@
+ 		argv [0] = "mail";
+ 		argv [1] = maildest;
+ 		argv [2] = (char *) 0;
+-		execve ("/bin/mail", argv,	/* Execve() mail program */
+-			envp);
++		{
++			struct stat stb;
++			if (stat("/bin/mail", &stb) != -1)
++				execve ("/bin/mail",/* Execve() mail program */
++					argv, envp);
++			else if (stat("/usr/bin/mail", &stb) != -1)
++				execve ("/usr/bin/mail", argv, envp);
++		}
+ 		_exit (1);
+ 	}
+ 	else if (pid == -1) return (-1);	/* Fork failed */
diff --git a/net/generic-nqs/files/patch-ai b/net/generic-nqs/files/patch-ai
new file mode 100644
index 000000000000..ebe5475a7382
--- /dev/null
+++ b/net/generic-nqs/files/patch-ai
@@ -0,0 +1,17 @@
+--- Source-Tree/pipeclient/all-systems/pipeclient.c.orig	Sun Mar 19 13:19:42 2000
++++ Source-Tree/pipeclient/all-systems/pipeclient.c	Thu Nov 15 14:17:26 2001
+@@ -1059,7 +1059,14 @@
+ 	signal(SIGPIPE, catch_sigpipe);
+ 
+ 	do {
++#if HAS_BSD_PIPE
++		if (interconn () < 0) {
++			sal_dprintf(SAL_DEBUG_INFO, SAL_DEBUG_MSG_WARNING, "pipeclient: Unable to get a pipe to the local daemon.\n");
++			ourserexit (RCM_UNAFAILURE, (char *) 0);
++		}
++#else
+ 		interset(-1);
++#endif
+ 		interclear ();
+ 		interw32i (rawreq->orig_seqno);
+ 		interw32u (rawreq->orig_mid);