unison received an update to 2.51.2. An overview on what has changed can
be found at https://github.com/bcpierce00/unison/releases. Noticeable is
that this version breaks compatibility with older versions.
Tested OK on amd64, and make test runs successfully.
Response MAINTAINER: 'fine, ok giovanni@'.
Additional comments/OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/unison/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 21 Dec 2017 15:31:48 -0000 1.14
+++ Makefile 3 Apr 2018 18:03:10 -0000
@@ -3,13 +3,9 @@
COMMENT= multi-platform file synchronization tool
CATEGORIES= net
-REV= v3
-VER= 2.48.15
GH_ACCOUNT= bcpierce00
GH_PROJECT= unison
-GH_TAGNAME= v${VER}${REV}
-DISTNAME= ${GH_TAGNAME}
-PKGNAME= ${GH_PROJECT}-${VER}
+GH_TAGNAME= v2.51.2
HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
@@ -17,7 +13,7 @@ MAINTAINER= Giovanni Bechis <giovanni@op
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c curses m pthread util
+WANTLIB= c m util
MODULES= lang/ocaml
@@ -35,11 +31,10 @@ MAKE_FLAGS= UISTYLE=text
BUILD_DEPENDS+= x11/lablgtk2
LIB_DEPENDS= x11/gtk+2
MAKE_FLAGS= UISTYLE=gtk2
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender fontconfig freetype
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
-WANTLIB += gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo z
+WANTLIB+= X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB+= Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
+WANTLIB+= gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
+WANTLIB+= intl pango-1.0 pangocairo-1.0 pangoft2-1.0 z
.endif
TEST_DEPENDS += emacs->=24:editors/emacs
@@ -57,7 +52,7 @@ ALL_TARGET= unison
DOCS= BUGS.txt NEWS README
-WRKDIST= ${WRKDIR}/${PKGNAME}${REV}/src
+WRKDIST= ${WRKDIR}/${PKGNAME}/src
# Avoid the nightmare of their Makefile install target.
# Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/unison/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 21 Dec 2017 15:31:48 -0000 1.7
+++ distinfo 3 Apr 2018 18:03:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (v2.48.15v3.tar.gz) = 2DfbASwkH4/0Bdu5a/0EnirXc4n8LVv78gjyOpvfSuI=
-SIZE (v2.48.15v3.tar.gz) = 1911724
+SHA256 (unison-2.51.2.tar.gz) = ou/L6rZRvm32nMmyUwEaB5Vey5H7QHohlxlFEZeEnV4=
+SIZE (unison-2.51.2.tar.gz) = 1398790
Index: patches/patch-bytearray_stubs_c
===================================================================
RCS file: patches/patch-bytearray_stubs_c
diff -N patches/patch-bytearray_stubs_c
--- patches/patch-bytearray_stubs_c 13 Mar 2017 22:25:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-bytearray_stubs_c,v 1.1 2017/03/13 22:25:14 giovanni Exp $
-
-Fix rare SIGSEGV when transferring large replicas.
-Fix a theoretical integer overflow.
-
-References:
-https://github.com/bcpierce00/unison/commit/c1ddff13aa96b124680cce61673129aeb563dbf7
-https://github.com/bcpierce00/unison/commit/f59663d67f4593a5bc1e554058fe6864751e805e
-
-Thanks to Alex Markley and OCaml developers
---- bytearray_stubs.c.orig Mon May 23 18:40:05 2016
-+++ bytearray_stubs.c Sun Mar 12 20:41:53 2017
-@@ -5,6 +5,7 @@
-
- #include "caml/intext.h"
- #include "caml/bigarray.h"
-+#include "caml/memory.h"
-
- CAMLprim value ml_marshal_to_bigarray(value v, value flags)
- {
-@@ -21,15 +22,18 @@ CAMLprim value ml_marshal_to_bigarray(value v, value f
-
- CAMLprim value ml_unmarshal_from_bigarray(value b, value ofs)
- {
-+ CAMLparam1(b); /* Holds [b] live until unmarshalling completes. */
-+ value result;
- struct caml_bigarray *b_arr = Bigarray_val(b);
-- return input_value_from_block (Array_data (b_arr, ofs),
-+ result = input_value_from_block (Array_data (b_arr, ofs),
- b_arr->dim[0] - Long_val(ofs));
-+ CAMLreturn(result);
- }
-
- CAMLprim value ml_blit_string_to_bigarray
- (value s, value i, value a, value j, value l)
- {
-- char *src = String_val(s) + Int_val(i);
-+ char *src = String_val(s) + Long_val(i);
- char *dest = Array_data(Bigarray_val(a), j);
- memcpy(dest, src, Long_val(l));
- return Val_unit;
Index: patches/patch-test_ml
===================================================================
RCS file: patches/patch-test_ml
diff -N patches/patch-test_ml
--- patches/patch-test_ml 21 Dec 2017 15:31:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_ml,v 1.1 2017/12/21 15:31:48 giovanni Exp $
-
-Index: test.ml
---- test.ml.orig
-+++ test.ml
-@@ -370,8 +370,6 @@ let test() =
- check "4" R2 (Dir ["x", File "foo"]);
- );
-
-- (raise (Util.Fatal "Skipping some tests -- remove me!\n") : unit);
--
- if bothRootsLocal then
- runtest "backups 1 (local)" ["backup = Name *"] (fun() ->
- put R1 (Dir []); put R2 (Dir []); sync();
Index: patches/patch-uicommon_ml
===================================================================
RCS file: patches/patch-uicommon_ml
diff -N patches/patch-uicommon_ml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-uicommon_ml 3 Apr 2018 18:03:10 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: uicommon.ml
+--- uicommon.ml.orig
++++ uicommon.ml
+@@ -494,7 +494,7 @@ let promptForRoots getFirstRoot getSecondRoot =
+ (* ---- *)
+
+ let makeTempDir pattern =
+- let ic = Unix.open_process_in (Printf.sprintf "(mktemp --tmpdir -d
%s.XXXXXX || mktemp -d -t %s) 2>/dev/null" pattern pattern) in
++ let ic = Unix.open_process_in (Printf.sprintf "(mktemp --tmpdir -d
%s.XXXXXX || mktemp -d -t %s.XXXXXX) 2>/dev/null" pattern pattern) in
+ let path = input_line ic in
+ ignore (Unix.close_process_in ic);
+ path
