From owner-svn-ports-all@FreeBSD.ORG Mon Jul 16 10:20:45 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBAF21065673; Mon, 16 Jul 2012 10:20:45 +0000 (UTC) (envelope-from knu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9BEA08FC19; Mon, 16 Jul 2012 10:20:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GAKjeT029321; Mon, 16 Jul 2012 10:20:45 GMT (envelope-from knu@svn.freebsd.org) Received: (from knu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GAKjwJ029314; Mon, 16 Jul 2012 10:20:45 GMT (envelope-from knu@svn.freebsd.org) Message-Id: <201207161020.q6GAKjwJ029314@svn.freebsd.org> From: Akinori MUSHA Date: Mon, 16 Jul 2012 10:20:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r300936 - in head/shells/fd: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 10:20:45 -0000 Author: knu Date: Mon Jul 16 10:20:45 2012 New Revision: 300936 URL: http://svn.freebsd.org/changeset/ports/300936 Log: Update to 3.00l + patches. Added: head/shells/fd/files/patch-custom.c (contents, props changed) head/shells/fd/files/patch-mkmfsed.c (contents, props changed) head/shells/fd/files/patch-posixsh.c (contents, props changed) head/shells/fd/files/patch-system.c (contents, props changed) Deleted: head/shells/fd/files/patch-archive.c Modified: head/shells/fd/Makefile head/shells/fd/distinfo Modified: head/shells/fd/Makefile ============================================================================== --- head/shells/fd/Makefile Mon Jul 16 10:08:32 2012 (r300935) +++ head/shells/fd/Makefile Mon Jul 16 10:20:45 2012 (r300936) @@ -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/ Modified: head/shells/fd/distinfo ============================================================================== --- head/shells/fd/distinfo Mon Jul 16 10:08:32 2012 (r300935) +++ head/shells/fd/distinfo Mon Jul 16 10:20:45 2012 (r300936) @@ -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 Added: head/shells/fd/files/patch-custom.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fd/files/patch-custom.c Mon Jul 16 10:20:45 2012 (r300936) @@ -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++) { Added: head/shells/fd/files/patch-mkmfsed.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fd/files/patch-mkmfsed.c Mon Jul 16 10:20:45 2012 (r300936) @@ -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__ */ Added: head/shells/fd/files/patch-posixsh.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fd/files/patch-posixsh.c Mon Jul 16 10:20:45 2012 (r300936) @@ -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); Added: head/shells/fd/files/patch-system.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fd/files/patch-system.c Mon Jul 16 10:20:45 2012 (r300936) @@ -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);