summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/unison240/files/patch-Makefile.OCaml15
-rw-r--r--net/unison240/files/patch-hash__compat.c168
-rw-r--r--net/unison240/files/patch-uutil.ml11
-rw-r--r--net/unison248/Makefile1
-rw-r--r--net/unison248/files/patch-Makefile.OCaml15
-rw-r--r--net/unison248/files/patch-hash__compat.c168
-rw-r--r--net/unison248/files/patch-uutil.ml11
7 files changed, 383 insertions, 6 deletions
diff --git a/net/unison240/files/patch-Makefile.OCaml b/net/unison240/files/patch-Makefile.OCaml
index dfd96642b5e9..624f4afe967d 100644
--- a/net/unison240/files/patch-Makefile.OCaml
+++ b/net/unison240/files/patch-Makefile.OCaml
@@ -1,6 +1,6 @@
--- Makefile.OCaml.orig 2014-12-30 02:21:28 UTC
+++ Makefile.OCaml
-@@ -72,7 +72,7 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.*
+@@ -72,7 +72,7 @@ LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
# This should be set to an appropriate value automatically, depending
# on whether the lablgtk library is available
LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
@@ -9,7 +9,7 @@
##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
## at the moment and we don't want to confuse people by building it by default
ifeq ($(OSARCH),osx)
-@@ -91,7 +91,7 @@ buildexecutable::
+@@ -91,7 +91,7 @@ INCLFLAGS=-I lwt -I ubase -I system
### Default parameters
INCLFLAGS=-I lwt -I ubase -I system
@@ -18,7 +18,16 @@
CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM)
ifeq ($(OSARCH),win32)
-@@ -292,7 +292,7 @@ endif
+@@ -233,7 +233,7 @@ OCAMLLIBS+=unix.cma str.cma bigarray.cma
+ # File extensions will be substituted for the native code version
+ OCAMLLIBS+=unix.cma str.cma bigarray.cma
+
+-COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT)
++COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) hash_compat$(OBJ_EXT)
+
+ ########################################################################
+ ### User Interface setup
+@@ -292,7 +292,7 @@ ifeq ($(UISTYLE), gtk2)
# Gtk2 GUI
ifeq ($(UISTYLE), gtk2)
diff --git a/net/unison240/files/patch-hash__compat.c b/net/unison240/files/patch-hash__compat.c
new file mode 100644
index 000000000000..ba746e41d22b
--- /dev/null
+++ b/net/unison240/files/patch-hash__compat.c
@@ -0,0 +1,168 @@
+--- hash_compat.c.orig 2024-02-06 20:29:47 UTC
++++ hash_compat.c
+@@ -0,0 +1,165 @@
++/* The pre-OCaml 4.00 hash implementation */
++/* FIXME: This is included for backwards compatibility only and must be
++ * REMOVED when a new hash function included in a stable release has been
++ * available for a few years. The removal of this function will break
++ * Unison version compatibility. There must be plenty of time given
++ * for users to upgrade (most users don't compile themselves and are at
++ * mercy of whatever package repositories they use). */
++
++/* Code copied from OCaml sources */
++/**************************************************************************/
++/* */
++/* OCaml */
++/* */
++/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
++/* */
++/* Copyright 1996 Institut National de Recherche en Informatique et */
++/* en Automatique. */
++/* */
++/* All rights reserved. This file is distributed under the terms of */
++/* the GNU Lesser General Public License version 2.1, with the */
++/* special exception on linking described in the file LICENSE. */
++/* */
++/**************************************************************************/
++
++#include <caml/mlvalues.h>
++#include <caml/custom.h>
++#include <caml/address_class.h>
++
++struct hash_state {
++ uintnat accu;
++ intnat univ_limit, univ_count;
++};
++
++static void hash_aux(struct hash_state*, value obj);
++
++CAMLprim value unsn_hash_univ_param(value count, value limit, value obj)
++{
++ struct hash_state h;
++ h.univ_limit = Long_val(limit);
++ h.univ_count = Long_val(count);
++ h.accu = 0;
++ hash_aux(&h, obj);
++ return Val_long(h.accu & 0x3FFFFFFF);
++ /* The & has two purposes: ensure that the return value is positive
++ and give the same result on 32 bit and 64 bit architectures. */
++}
++
++#define Alpha 65599
++#define Beta 19
++#define Combine(new) (h->accu = h->accu * Alpha + (new))
++#define Combine_small(new) (h->accu = h->accu * Beta + (new))
++
++static void hash_aux(struct hash_state* h, value obj)
++{
++ unsigned char * p;
++ mlsize_t i, j;
++ tag_t tag;
++
++ h->univ_limit--;
++ if (h->univ_count < 0 || h->univ_limit < 0) return;
++
++ again:
++ if (Is_long(obj)) {
++ h->univ_count--;
++ Combine(Long_val(obj));
++ return;
++ }
++ if (! Is_in_value_area(obj)) {
++ /* obj is a pointer outside the heap, to an object with
++ a priori unknown structure. Use its physical address as hash key. */
++ Combine((intnat) obj);
++ return;
++ }
++ /* Pointers into the heap are well-structured blocks. So are atoms.
++ We can inspect the block contents. */
++ /* The code needs reindenting later. Leaving as is to facilitate review. */
++ tag = Tag_val(obj);
++ switch (tag) {
++ case String_tag:
++ h->univ_count--;
++ i = caml_string_length(obj);
++ for (p = &Byte_u(obj, 0); i > 0; i--, p++)
++ Combine_small(*p);
++ break;
++ case Double_tag:
++ /* For doubles, we inspect their binary representation, LSB first.
++ The results are consistent among all platforms with IEEE floats. */
++ h->univ_count--;
++#ifdef ARCH_BIG_ENDIAN
++ for (p = &Byte_u(obj, sizeof(double) - 1), i = sizeof(double);
++ i > 0;
++ p--, i--)
++#else
++ for (p = &Byte_u(obj, 0), i = sizeof(double);
++ i > 0;
++ p++, i--)
++#endif
++ Combine_small(*p);
++ break;
++ case Double_array_tag:
++ h->univ_count--;
++ for (j = 0; j < Bosize_val(obj); j += sizeof(double)) {
++#ifdef ARCH_BIG_ENDIAN
++ for (p = &Byte_u(obj, j + sizeof(double) - 1), i = sizeof(double);
++ i > 0;
++ p--, i--)
++#else
++ for (p = &Byte_u(obj, j), i = sizeof(double);
++ i > 0;
++ p++, i--)
++#endif
++ Combine_small(*p);
++ }
++ break;
++ case Abstract_tag:
++ /* We don't know anything about the contents of the block.
++ Better do nothing. */
++ break;
++ case Infix_tag:
++ hash_aux(h, obj - Infix_offset_val(obj));
++ break;
++ case Forward_tag:
++ obj = Forward_val (obj);
++ goto again;
++ case Object_tag:
++ h->univ_count--;
++ Combine(Oid_val(obj));
++ break;
++ case Custom_tag:
++ /* If no hashing function provided, do nothing */
++ if (Custom_ops_val(obj)->hash != NULL) {
++ h->univ_count--;
++ Combine(Custom_ops_val(obj)->hash(obj));
++ }
++ break;
++#ifdef NO_NAKED_POINTERS
++ case Closure_tag:
++ h->univ_count--;
++ Combine_small(tag);
++ /* Recursively hash the environment fields */
++ i = Wosize_val(obj);
++ j = Start_env_closinfo(Closinfo_val(obj));
++ while (i > j) {
++ i--;
++ hash_aux(h, Field(obj, i));
++ }
++ /* Combine the code pointers, closure info fields, and infix headers */
++ while (i > 0) {
++ i--;
++ Combine(Field(obj, i));
++ h->univ_count--;
++ }
++ break;
++#endif
++ default:
++ h->univ_count--;
++ Combine_small(tag);
++ i = Wosize_val(obj);
++ while (i != 0) {
++ i--;
++ hash_aux(h, Field(obj, i));
++ }
++ break;
++ }
++}
diff --git a/net/unison240/files/patch-uutil.ml b/net/unison240/files/patch-uutil.ml
new file mode 100644
index 000000000000..cf364ade3fcf
--- /dev/null
+++ b/net/unison240/files/patch-uutil.ml
@@ -0,0 +1,11 @@
+--- uutil.ml.orig 2024-02-06 20:32:31 UTC
++++ uutil.ml
+@@ -34,7 +34,7 @@ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF
+
+ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF
+
+-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
++external hash_param : int -> int -> 'a -> int = "unsn_hash_univ_param" "noalloc"
+
+ let hash x = hash_param 10 100 x
+
diff --git a/net/unison248/Makefile b/net/unison248/Makefile
index 44cdcabe527e..a17c5f845bfc 100644
--- a/net/unison248/Makefile
+++ b/net/unison248/Makefile
@@ -34,6 +34,7 @@ WRKSRC_SUBDIR= src
NO_OCAML_RUNDEPENDS=yes
CONFLICTS= unison-devel
MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
+MAKE_JOBS_UNSAFE= yes
ALL_TARGET= unison all
USE_GITHUB= yes
diff --git a/net/unison248/files/patch-Makefile.OCaml b/net/unison248/files/patch-Makefile.OCaml
index 3e91ae298763..73ff7ac83133 100644
--- a/net/unison248/files/patch-Makefile.OCaml
+++ b/net/unison248/files/patch-Makefile.OCaml
@@ -1,6 +1,6 @@
---- Makefile.OCaml.orig 2017-03-23 16:39:49 UTC
+--- Makefile.OCaml.orig 2017-12-18 12:23:54 UTC
+++ Makefile.OCaml
-@@ -32,7 +32,11 @@ ifeq ($(shell uname),OpenBSD)
+@@ -32,7 +32,11 @@ ifeq ($(shell uname),NetBSD)
else
ifeq ($(shell uname),NetBSD)
OSARCH=NetBSD
@@ -12,7 +12,16 @@
ifeq ($(shell uname),Linux)
OSARCH=Linux
endif
-@@ -311,6 +315,10 @@ ifeq ($(OSARCH),Linux)
+@@ -240,7 +244,7 @@ OCAMLLIBS+=unix.cma str.cma bigarray.cma
+ # File extensions will be substituted for the native code version
+ OCAMLLIBS+=unix.cma str.cma bigarray.cma
+
+-COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT)
++COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) hash_compat$(OBJ_EXT)
+
+ ########################################################################
+ ### User Interface setup
+@@ -311,6 +315,10 @@ endif
-include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile
endif
diff --git a/net/unison248/files/patch-hash__compat.c b/net/unison248/files/patch-hash__compat.c
new file mode 100644
index 000000000000..ba746e41d22b
--- /dev/null
+++ b/net/unison248/files/patch-hash__compat.c
@@ -0,0 +1,168 @@
+--- hash_compat.c.orig 2024-02-06 20:29:47 UTC
++++ hash_compat.c
+@@ -0,0 +1,165 @@
++/* The pre-OCaml 4.00 hash implementation */
++/* FIXME: This is included for backwards compatibility only and must be
++ * REMOVED when a new hash function included in a stable release has been
++ * available for a few years. The removal of this function will break
++ * Unison version compatibility. There must be plenty of time given
++ * for users to upgrade (most users don't compile themselves and are at
++ * mercy of whatever package repositories they use). */
++
++/* Code copied from OCaml sources */
++/**************************************************************************/
++/* */
++/* OCaml */
++/* */
++/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
++/* */
++/* Copyright 1996 Institut National de Recherche en Informatique et */
++/* en Automatique. */
++/* */
++/* All rights reserved. This file is distributed under the terms of */
++/* the GNU Lesser General Public License version 2.1, with the */
++/* special exception on linking described in the file LICENSE. */
++/* */
++/**************************************************************************/
++
++#include <caml/mlvalues.h>
++#include <caml/custom.h>
++#include <caml/address_class.h>
++
++struct hash_state {
++ uintnat accu;
++ intnat univ_limit, univ_count;
++};
++
++static void hash_aux(struct hash_state*, value obj);
++
++CAMLprim value unsn_hash_univ_param(value count, value limit, value obj)
++{
++ struct hash_state h;
++ h.univ_limit = Long_val(limit);
++ h.univ_count = Long_val(count);
++ h.accu = 0;
++ hash_aux(&h, obj);
++ return Val_long(h.accu & 0x3FFFFFFF);
++ /* The & has two purposes: ensure that the return value is positive
++ and give the same result on 32 bit and 64 bit architectures. */
++}
++
++#define Alpha 65599
++#define Beta 19
++#define Combine(new) (h->accu = h->accu * Alpha + (new))
++#define Combine_small(new) (h->accu = h->accu * Beta + (new))
++
++static void hash_aux(struct hash_state* h, value obj)
++{
++ unsigned char * p;
++ mlsize_t i, j;
++ tag_t tag;
++
++ h->univ_limit--;
++ if (h->univ_count < 0 || h->univ_limit < 0) return;
++
++ again:
++ if (Is_long(obj)) {
++ h->univ_count--;
++ Combine(Long_val(obj));
++ return;
++ }
++ if (! Is_in_value_area(obj)) {
++ /* obj is a pointer outside the heap, to an object with
++ a priori unknown structure. Use its physical address as hash key. */
++ Combine((intnat) obj);
++ return;
++ }
++ /* Pointers into the heap are well-structured blocks. So are atoms.
++ We can inspect the block contents. */
++ /* The code needs reindenting later. Leaving as is to facilitate review. */
++ tag = Tag_val(obj);
++ switch (tag) {
++ case String_tag:
++ h->univ_count--;
++ i = caml_string_length(obj);
++ for (p = &Byte_u(obj, 0); i > 0; i--, p++)
++ Combine_small(*p);
++ break;
++ case Double_tag:
++ /* For doubles, we inspect their binary representation, LSB first.
++ The results are consistent among all platforms with IEEE floats. */
++ h->univ_count--;
++#ifdef ARCH_BIG_ENDIAN
++ for (p = &Byte_u(obj, sizeof(double) - 1), i = sizeof(double);
++ i > 0;
++ p--, i--)
++#else
++ for (p = &Byte_u(obj, 0), i = sizeof(double);
++ i > 0;
++ p++, i--)
++#endif
++ Combine_small(*p);
++ break;
++ case Double_array_tag:
++ h->univ_count--;
++ for (j = 0; j < Bosize_val(obj); j += sizeof(double)) {
++#ifdef ARCH_BIG_ENDIAN
++ for (p = &Byte_u(obj, j + sizeof(double) - 1), i = sizeof(double);
++ i > 0;
++ p--, i--)
++#else
++ for (p = &Byte_u(obj, j), i = sizeof(double);
++ i > 0;
++ p++, i--)
++#endif
++ Combine_small(*p);
++ }
++ break;
++ case Abstract_tag:
++ /* We don't know anything about the contents of the block.
++ Better do nothing. */
++ break;
++ case Infix_tag:
++ hash_aux(h, obj - Infix_offset_val(obj));
++ break;
++ case Forward_tag:
++ obj = Forward_val (obj);
++ goto again;
++ case Object_tag:
++ h->univ_count--;
++ Combine(Oid_val(obj));
++ break;
++ case Custom_tag:
++ /* If no hashing function provided, do nothing */
++ if (Custom_ops_val(obj)->hash != NULL) {
++ h->univ_count--;
++ Combine(Custom_ops_val(obj)->hash(obj));
++ }
++ break;
++#ifdef NO_NAKED_POINTERS
++ case Closure_tag:
++ h->univ_count--;
++ Combine_small(tag);
++ /* Recursively hash the environment fields */
++ i = Wosize_val(obj);
++ j = Start_env_closinfo(Closinfo_val(obj));
++ while (i > j) {
++ i--;
++ hash_aux(h, Field(obj, i));
++ }
++ /* Combine the code pointers, closure info fields, and infix headers */
++ while (i > 0) {
++ i--;
++ Combine(Field(obj, i));
++ h->univ_count--;
++ }
++ break;
++#endif
++ default:
++ h->univ_count--;
++ Combine_small(tag);
++ i = Wosize_val(obj);
++ while (i != 0) {
++ i--;
++ hash_aux(h, Field(obj, i));
++ }
++ break;
++ }
++}
diff --git a/net/unison248/files/patch-uutil.ml b/net/unison248/files/patch-uutil.ml
new file mode 100644
index 000000000000..cf364ade3fcf
--- /dev/null
+++ b/net/unison248/files/patch-uutil.ml
@@ -0,0 +1,11 @@
+--- uutil.ml.orig 2024-02-06 20:32:31 UTC
++++ uutil.ml
+@@ -34,7 +34,7 @@ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF
+
+ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF
+
+-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
++external hash_param : int -> int -> 'a -> int = "unsn_hash_univ_param" "noalloc"
+
+ let hash x = hash_param 10 100 x
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 08:18:48 +0000