From owner-svn-ports-head@freebsd.org Tue Jul 25 11:46:40 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 307F4C793D6; Tue, 25 Jul 2017 11:46:40 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E85E373254; Tue, 25 Jul 2017 11:46:39 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6PBkdm6054355; Tue, 25 Jul 2017 11:46:39 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6PBkcCt054351; Tue, 25 Jul 2017 11:46:38 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201707251146.v6PBkcCt054351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 25 Jul 2017 11:46:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446570 - in head/sysutils/xe: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/sysutils/xe: . files X-SVN-Commit-Revision: 446570 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2017 11:46:40 -0000 Author: tobik Date: Tue Jul 25 11:46:38 2017 New Revision: 446570 URL: https://svnweb.freebsd.org/changeset/ports/446570 Log: sysutils/xe: Update to 0.9 Changes: https://github.com/chneukirchen/xe/blob/v0.9/NEWS.md Modified: head/sysutils/xe/Makefile head/sysutils/xe/distinfo head/sysutils/xe/files/patch-tests head/sysutils/xe/files/patch-xe.c Modified: head/sysutils/xe/Makefile ============================================================================== --- head/sysutils/xe/Makefile Tue Jul 25 10:22:17 2017 (r446569) +++ head/sysutils/xe/Makefile Tue Jul 25 11:46:38 2017 (r446570) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xe -PORTVERSION= 0.7.0 +PORTVERSION= 0.9 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/sysutils/xe/distinfo ============================================================================== --- head/sysutils/xe/distinfo Tue Jul 25 10:22:17 2017 (r446569) +++ head/sysutils/xe/distinfo Tue Jul 25 11:46:38 2017 (r446570) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492163693 -SHA256 (chneukirchen-xe-v0.7.0_GH0.tar.gz) = 32af920a2d27ed0bb8bcb69339fcc805110888e872c92a372d3888df52b300f8 -SIZE (chneukirchen-xe-v0.7.0_GH0.tar.gz) = 7047 +TIMESTAMP = 1500981663 +SHA256 (chneukirchen-xe-v0.9_GH0.tar.gz) = 0e72bafd0d5c30953ef7a5dca710296aec621a60fb62c0aaf7ee2af5e68c2ac2 +SIZE (chneukirchen-xe-v0.9_GH0.tar.gz) = 8444 Modified: head/sysutils/xe/files/patch-tests ============================================================================== --- head/sysutils/xe/files/patch-tests Tue Jul 25 10:22:17 2017 (r446569) +++ head/sysutils/xe/files/patch-tests Tue Jul 25 11:46:38 2017 (r446570) @@ -1,48 +1,39 @@ Fix tests -- -A% with no arguments fails now with the additional checks in 0.7.0 - Trying to exec /dev/null/calc.exe on FreeBSD will fail with ENOENT (xe exit 127) but on Linux fails with ENODIR (xe exit 126) - The argscap check returns 8186 + 8186 + 1339 = 17711 on FreeBSD, which should be fine. ---- tests.orig 2017-04-13 15:28:38 UTC +--- tests.orig 2017-07-17 14:20:26 UTC +++ tests -@@ -1,5 +1,5 @@ - #!/bin/sh --printf '1..42\n' -+printf '1..41\n' +@@ -194,7 +194,7 @@ check_output 'using -LL' '{ echo 1; sleep 1; echo 2; s + EOF - set -e - -@@ -127,9 +127,6 @@ check_output 'using -A%' '$XE -A% echo - - -- 3 + check_output 'using -vvL' '{ echo 1; sleep 1; echo 2; sleep 1; echo 3; } | xe -j2 -vvL -s "printf \$1; sleep 1; echo \$1" | wc -l' </dev/null || echo $?' </dev/null || echo $?' </dev/null || echo $?' </dev/null || echo $?' < #include @@ -8,16 +8,16 @@ #include #include #include -@@ -99,7 +100,7 @@ mywait() +@@ -114,7 +115,7 @@ my_child: } else if (WEXITSTATUS(status) > 125) { exit(WEXITSTATUS(status)); } - } else if (WIFSIGNALED(status)) { + } else if (WIFSIGNALED(status) && !(fflag && WTERMSIG(status) == SIGPIPE)) { - fprintf(stderr, "xe: pid %d terminated by signal %d\n", - pid, WTERMSIG(status)); + fprintf(stderr, "xe: job %ld [pid %ld] terminated by signal %d\n", + children[i].iter, (long)pid, WTERMSIG(status)); exit(125); -@@ -358,6 +359,7 @@ main(int argc, char *argv[], char *envp[ +@@ -472,6 +473,7 @@ main(int argc, char *argv[], char *envp[]) pusharg("/bin/sh"); pusharg("-c"); pusharg(sflag);