From owner-svn-ports-all@freebsd.org Mon Jan 15 15:02:03 2018 Return-Path: Delivered-To: svn-ports-all@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 08FE1EB28EE; Mon, 15 Jan 2018 15:02:02 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 645147A29E; Mon, 15 Jan 2018 15:02:02 +0000 (UTC) (envelope-from madpilot@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8733112AF7; Mon, 15 Jan 2018 15:02:01 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0FF21JB003513; Mon, 15 Jan 2018 15:02:01 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FF21rW003511; Mon, 15 Jan 2018 15:02:01 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201801151502.w0FF21rW003511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Jan 2018 15:02:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459060 - in branches/2018Q1/net/unison: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2018Q1/net/unison: . files X-SVN-Commit-Revision: 459060 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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, 15 Jan 2018 15:02:03 -0000 Author: madpilot Date: Mon Jan 15 15:02:01 2018 New Revision: 459060 URL: https://svnweb.freebsd.org/changeset/ports/459060 Log: MFH: r458159 Import upstream patch to fix crash in certain situations. Obtained from: https://github.com/bcpierce00/unison/commit/ed12af1f890623b4aff8b08316ca473a00ebf45e#diff-b4c630fa7a766bd2e17a1838276ea339 Approved by: ports-secteam (swills) Added: branches/2018Q1/net/unison/files/patch-copy.ml - copied unchanged from r458159, head/net/unison/files/patch-copy.ml Modified: branches/2018Q1/net/unison/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/unison/Makefile ============================================================================== --- branches/2018Q1/net/unison/Makefile Mon Jan 15 14:57:33 2018 (r459059) +++ branches/2018Q1/net/unison/Makefile Mon Jan 15 15:02:01 2018 (r459060) @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.48.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} Copied: branches/2018Q1/net/unison/files/patch-copy.ml (from r458159, head/net/unison/files/patch-copy.ml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net/unison/files/patch-copy.ml Mon Jan 15 15:02:01 2018 (r459060, copy of r458159, head/net/unison/files/patch-copy.ml) @@ -0,0 +1,20 @@ +diff --git a/src/copy.ml b/src/copy.ml +index b9e10f6..19c2370 100644 +--- copy.ml ++++ copy.ml +@@ -1004,7 +1004,14 @@ let recursively fspathFrom pathFrom fspathTo pathTo = + let ch = Os.childrenOf fspathFrom pFrom in + Safelist.iter + (fun n -> copy (Path.child pFrom n) (Path.child pTo n)) ch +- | `ABSENT -> assert false in ++ | `ABSENT -> ++ (* BCP 4/16: Was "assert false", but this causes unison to ++ crash when (1) the copyonconflict preference is used, (2) ++ there is a conflict between a deletion and a change, and ++ (3) the change is propagated on top of the deletion. Seems ++ better to silently ignore the copy request. *) ++ () ++ in + debug (fun () -> Util.msg " Copying recursively %s / %s\n" + (Fspath.toDebugString fspathFrom) (Path.toString pathFrom)); + copy pathFrom pathTo;