Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
unison
Commits:
893c8bda by Caleb Maclennan at 2024-04-02T01:43:36+03:00
upgpkg: 2.53.4-3: Rebuild without patch
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − unison-large.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,20 +1,18 @@
pkgbase = unison
pkgdesc = File-synchronization tool
pkgver = 2.53.4
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/bcpierce00/unison/
arch = x86_64
- license = GPL2
+ license = GPL-3.0-Only
makedepends = emacs
makedepends = lablgtk3
makedepends = ocaml
optdepends = gtk3: graphical interface
options = !makeflags
source =
https://github.com/bcpierce00/unison//archive/v2.53.4/unison-2.53.4.tar.gz
- source = unison-large.patch
source = unison.desktop
sha512sums =
91077955aabbd919e6d6df04a704878238d745ac3693e0e41b8a37a922db4ebfceb204378ab1283303ef5ad9d80445bc8caeafad36f67b8df8c30d8b4e0c6947
- sha512sums =
e2f7a5e6e832ee9c694f36e399178652456d2047b22cba86603982cd6f6caf54e520fc87a8bde1940b2da46102cf3aa89f3e062c965efc77cd840b47e01b4d2f
sha512sums =
3e6e7b793deb60dab64c6e585e3b2ceee01ced0f8b73d1373ac1cd8aaaadb5c7415f2295b8a044a57fc15356dfe76bab002e1e633495e5f8e436871c83c48990
pkgname = unison
=====================================
PKGBUILD
=====================================
@@ -5,29 +5,22 @@
pkgname=unison
pkgver=2.53.4
-pkgrel=2
+pkgrel=3
pkgdesc='File-synchronization tool'
url="https://github.com/bcpierce00/$pkgname/";
arch=(x86_64)
-license=(GPL2)
+license=(GPL-3.0-Only)
optdepends=('gtk3: graphical interface')
makedepends=(emacs
lablgtk3
ocaml)
_archive="$pkgname-$pkgver"
source=("$url/archive/v$pkgver/$_archive.tar.gz"
- "$pkgname-large.patch"
"$pkgname.desktop")
sha512sums=('91077955aabbd919e6d6df04a704878238d745ac3693e0e41b8a37a922db4ebfceb204378ab1283303ef5ad9d80445bc8caeafad36f67b8df8c30d8b4e0c6947'
-
'e2f7a5e6e832ee9c694f36e399178652456d2047b22cba86603982cd6f6caf54e520fc87a8bde1940b2da46102cf3aa89f3e062c965efc77cd840b47e01b4d2f'
'3e6e7b793deb60dab64c6e585e3b2ceee01ced0f8b73d1373ac1cd8aaaadb5c7415f2295b8a044a57fc15356dfe76bab002e1e633495e5f8e436871c83c48990')
options=('!makeflags')
-prepare() {
- cd "$_archive"
- patch -p0 -i "../$pkgname-large.patch"
-}
-
build() {
cd "$_archive"
export CFLAGS=
=====================================
unison-large.patch deleted
=====================================
@@ -1,49 +0,0 @@
-diff -Nrua /usr/ports/net/unison/patches/patch-bytearray_stubs_c
./patches/patch-bytearray_stubs_c
---- /usr/ports/net/unison/patches/patch-bytearray_stubs_c Thu Jan 1
01:00:00 1970
-+++ ./patches/patch-bytearray_stubs_c Tue Jan 17 08:44:39 2017
-@@ -0,0 +1,45 @@
-+Fix rare SIGSEGV when transferring large replicas.
-+Fix a theoretical integer overflow.
-+
-+Patches from here:
-+https://caml.inria.fr/mantis/view.php?id=7431#c17026
-+and here:
-+https://caml.inria.fr/mantis/view.php?id=7431#c16962
-+
-+Related issue reports:
-+https://github.com/bcpierce00/unison/issues/48
-+https://caml.inria.fr/mantis/view.php?id=7431
-+https://bugzilla.redhat.com/show_bug.cgi?id=1401759
-+
-+Thanks to Alex Markley and OCaml developers
-+--- bytearray_stubs.c.orig Tue Jan 17 08:41:00 2017
-++++ bytearray_stubs.c Tue Jan 17 08:41:21 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;
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/unison/-/commit/893c8bda4b38bbf9d216bc067ea597f95d3826d8
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/unison/-/commit/893c8bda4b38bbf9d216bc067ea597f95d3826d8
You're receiving this email because of your account on gitlab.archlinux.org.
