7 files changed, 67 insertions, 18 deletions

diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 5add32354ad7..bfb8781cf669 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fd
-PORTVERSION=	3.00k
+PORTVERSION=	3.00l
 CATEGORIES=	shells net
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
 		ftp://ftp.unixusers.net/src/fdclone/
diff --git a/shells/fd/distinfo b/shells/fd/distinfo
index 89a4f7b209aa..5e60899e8c2a 100644
--- a/shells/fd/distinfo
+++ b/shells/fd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FD-3.00k.tar.gz) = c818781e7b257e4f9c656d6d0d3d57c673ec08bd5f2b4bfad4d0ab18ac31e117
-SIZE (FD-3.00k.tar.gz) = 927192
+SHA256 (FD-3.00l.tar.gz) = c244a68cccaa2052a26bf095260b9b5f482bf3fa2936192220589e37d7a3ccf8
+SIZE (FD-3.00l.tar.gz) = 941893
diff --git a/shells/fd/files/patch-archive.c b/shells/fd/files/patch-archive.c
deleted file mode 100644
index ac6a86c8d5ec..000000000000
--- a/shells/fd/files/patch-archive.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch taken from [FDclone-users:00977].
-
-diff -ur ../old/FD-3.00k/archive.c ./archive.c
---- ../old/FD-3.00k/archive.c	Sat Apr 21 00:00:00 2012
-+++ ./archive.c	Sun Apr 22 19:33:51 2012
-@@ -969,8 +969,7 @@
- 		poparchdupl();
- 		return(-1);
- 	}
--	maxfile = 0;
--	filepos = -1;
-+	maxfile = filepos = 0;
- 
- 	return(1);
- }
diff --git a/shells/fd/files/patch-custom.c b/shells/fd/files/patch-custom.c
new file mode 100644
index 000000000000..b44250a975b5
--- /dev/null
+++ b/shells/fd/files/patch-custom.c
@@ -0,0 +1,18 @@
+[FDclone-users:00986]
+--- custom.c.orig	2012-06-30 00:00:00.000000000 +0900
++++ custom.c	2012-07-16 19:12:29.374464026 +0900
+@@ -4004,11 +4004,10 @@
+ 	char *new;
+ 	int i, j, n;
+ 
+-	if (origflaglist) new = NULL;
++	if (origflaglist || origmaxfdtype <= 0) new = NULL;
+ 	else {
+-		for (n = 0; n < origmaxfdtype; n++) /*EMPTY*/;
+-		origflaglist = new = Xmalloc(n * sizeof(char));
+-		memset(origflaglist, 0, n * sizeof(char));
++		origflaglist = new = Xmalloc(origmaxfdtype * sizeof(char));
++		memset(origflaglist, 0, origmaxfdtype * sizeof(char));
+ 	}
+ 
+ 	for (i = n = 0; i < maxfdtype; i++) {
diff --git a/shells/fd/files/patch-mkmfsed.c b/shells/fd/files/patch-mkmfsed.c
new file mode 100644
index 000000000000..1bc3f1a2538e
--- /dev/null
+++ b/shells/fd/files/patch-mkmfsed.c
@@ -0,0 +1,21 @@
+[FDclone-users:00986]
+--- mkmfsed.c.orig	2012-06-30 00:00:00.000000000 +0900
++++ mkmfsed.c	2012-07-16 19:12:29.375463265 +0900
+@@ -193,7 +193,7 @@
+ # if	__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+ 	strappend(buf3, "-Wno-attributes");
+ # endif
+-# if	__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
++# if	__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+ 	strappend(buf3, "-Wno-empty-body");
+ # endif
+ #endif	/* __GNUC__ && __GNUC_MINOR__ */
+@@ -207,7 +207,7 @@
+ #  if	H___GNUC__ > 4 || (H___GNUC__ == 4 && H___GNUC_MINOR__ >= 1)
+ 		strappend(buf1, "-Wno-attributes");
+ #  endif
+-#  if	H___GNUC__ > 4 || (H___GNUC__ == 4 && H___GNUC_MINOR__ >= 2)
++#  if	H___GNUC__ > 4 || (H___GNUC__ == 4 && H___GNUC_MINOR__ >= 3)
+ 		strappend(buf1, "-Wno-empty-body");
+ #  endif
+ # endif	/* H___GNUC__ && H___GNUC_MINOR__ */
diff --git a/shells/fd/files/patch-posixsh.c b/shells/fd/files/patch-posixsh.c
new file mode 100644
index 000000000000..ba6473085279
--- /dev/null
+++ b/shells/fd/files/patch-posixsh.c
@@ -0,0 +1,13 @@
+[FDclone-users:00997]
+--- posixsh.c.orig	2012-06-30 00:00:00.000000000 +0900
++++ posixsh.c	2012-07-16 19:12:29.376464809 +0900
+@@ -112,8 +112,7 @@
+ 	int ret;
+ 	sigmask_t mask, omask;
+ 
+-	if (ttypgrp < (p_id_t)0 || pgrp < (p_id_t)0 || pgrp == ttypgrp)
+-		return(0);
++	if (ttypgrp < (p_id_t)0 || pgrp < (p_id_t)0) return(0);
+ 	else if (!job) {
+ 		ttypgrp = pgrp;
+ 		return(0);
diff --git a/shells/fd/files/patch-system.c b/shells/fd/files/patch-system.c
new file mode 100644
index 000000000000..5dce208c5c39
--- /dev/null
+++ b/shells/fd/files/patch-system.c
@@ -0,0 +1,12 @@
+[FDclone-users:00997]
+--- system.c.orig	2012-06-30 00:00:00.000000000 +0900
++++ system.c	2012-07-16 19:12:29.380468959 +0900
+@@ -2769,7 +2769,7 @@
+ 	if (trapok >= 0) trapok = 0;
+ 
+ # ifndef	NOJOB
+-	if (mypid == orgpgrp) {
++	if (mypid == orgpgrp && (childpgrp < (p_id_t)0 || pid == childpgrp)) {
+ 		VOID_C gettermio(orgpgrp, jobok);
+ #  ifdef	FD
+ 		checkscreen(-1, -1);