svn commit: r459060 - in branches/2018Q1/net/unison: . files
Guido Falsi
madpilot at FreeBSD.org
Mon Jan 15 15:02:03 UTC 2018
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;
More information about the svn-ports-branches
mailing list