[arch-commits] Commit in unison/repos (4 files)

[Gaëtan Bisson]

    Date: Saturday, February 3, 2018 @ 19:32:50
  Author: bisson
Revision: 315823

archrelease: copy trunk to testing-x86_64

Added:
  unison/repos/testing-x86_64/
  unison/repos/testing-x86_64/PKGBUILD
    (from rev 315822, unison/trunk/PKGBUILD)
  unison/repos/testing-x86_64/desktop
    (from rev 315822, unison/trunk/desktop)
  unison/repos/testing-x86_64/large.patch
    (from rev 315822, unison/trunk/large.patch)

-------------+
 PKGBUILD    |   45 +++++++++++++++++++++++++++++++++++++++++++++
 desktop     |   11 +++++++++++
 large.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+)

Copied: unison/repos/testing-x86_64/PKGBUILD (from rev 315822, unison/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2018-02-03 19:32:50 UTC (rev 315823)
@@ -0,0 +1,45 @@
+# $Id$
+#Maintainer: Gaetan Bisson <bisson at archlinux.org>
+#Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=unison
+_pkgver=2.48.15v4
+pkgver=${_pkgver%v*}
+pkgrel=1
+pkgdesc='File-synchronization tool'
+#url='https://github.com/bcpierce00/unison/'
+url='https://www.cis.upenn.edu/~bcpierce/unison/'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('ocaml' 'emacs')
+source=("https://github.com/bcpierce00/unison/archive/v${_pkgver}.tar.gz"
+        'large.patch'
+        'desktop')
+sha256sums=('f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec'
+            '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
+            'e9ef4e8b845453e21abafa8c9d153080375024d2465e3bf65f0e5a2ca1f5ea4a')
+
+options=('!makeflags')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${_pkgver}"
+	patch -p0 -i ../large.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${_pkgver}"
+	export CFLAGS=
+	make UISTYLE=text DEBUGGING=false THREADS=true
+	mv src/unison src/unison-text
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${_pkgver}"
+	install -d "${pkgdir}"/usr/bin
+	install -m755 src/unison-* "${pkgdir}"/usr/bin
+	ln -s unison-text "${pkgdir}"/usr/bin/unison
+
+	install -d "${pkgdir}"/usr/share/{pixmaps,applications}
+	install -m644 icons/U.32x32x16m.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+	install -m644 ../desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+}

Copied: unison/repos/testing-x86_64/desktop (from rev 315822, unison/trunk/desktop)
===================================================================
--- testing-x86_64/desktop	                        (rev 0)
+++ testing-x86_64/desktop	2018-02-03 19:32:50 UTC (rev 315823)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Comment=File synchronisation tool for X11
+TryExec=unison-x11
+Exec=unison-x11
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true

Copied: unison/repos/testing-x86_64/large.patch (from rev 315822, unison/trunk/large.patch)
===================================================================
--- testing-x86_64/large.patch	                        (rev 0)
+++ testing-x86_64/large.patch	2018-02-03 19:32:50 UTC (rev 315823)
@@ -0,0 +1,49 @@
+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;