Date: Tuesday, January 17, 2017 @ 22:16:13
Author: bisson
Revision: 286900
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
unison/repos/extra-i686/PKGBUILD
(from rev 286899, unison/trunk/PKGBUILD)
unison/repos/extra-i686/desktop
(from rev 286899, unison/trunk/desktop)
unison/repos/extra-i686/large.patch
(from rev 286899, unison/trunk/large.patch)
unison/repos/extra-x86_64/PKGBUILD
(from rev 286899, unison/trunk/PKGBUILD)
unison/repos/extra-x86_64/desktop
(from rev 286899, unison/trunk/desktop)
unison/repos/extra-x86_64/large.patch
(from rev 286899, unison/trunk/large.patch)
Deleted:
unison/repos/extra-i686/PKGBUILD
unison/repos/extra-i686/desktop
unison/repos/extra-x86_64/PKGBUILD
unison/repos/extra-x86_64/desktop
--------------------------+
/PKGBUILD | 108 +++++++++++++++++++++++++++++++++++++++++++++
/desktop | 22 +++++++++
extra-i686/PKGBUILD | 47 -------------------
extra-i686/desktop | 11 ----
extra-i686/large.patch | 49 ++++++++++++++++++++
extra-x86_64/PKGBUILD | 47 -------------------
extra-x86_64/desktop | 11 ----
extra-x86_64/large.patch | 49 ++++++++++++++++++++
8 files changed, 228 insertions(+), 116 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-17 22:15:32 UTC (rev 286899)
+++ extra-i686/PKGBUILD 2017-01-17 22:16:13 UTC (rev 286900)
@@ -1,47 +0,0 @@
-# $Id$
-#Maintainer: Gaetan Bisson <bis...@archlinux.org>
-#Contributor: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=unison
-pkgver=2.48.4
-pkgrel=1
-pkgdesc='File-synchronization tool'
-url='http://www.cis.upenn.edu/~bcpierce/unison/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-optdepends=('gtk2: for gtk2 support')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-source=("http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz";
- 'desktop')
-sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
- '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
-
-options=('!makeflags')
-
-build() {
- cd "${srcdir}/src"
- CFLAGS=""
-
- for ui in text gtk2; do
- make clean
- make mkProjectInfo
- make UISTYLE=$ui DEBUGGING=false THREADS=true
- mv unison unison-$ui
- done
-}
-
-package() {
- cd "${srcdir}/src"
-
- install -d "${pkgdir}"/usr/bin
- install -m755 unison-* "${pkgdir}"/usr/bin
-
- install -d "${pkgdir}"/usr/share/{pixmaps,applications}
- convert win32rc/U.ico[1] "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
- install -m644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
- cd "${pkgdir}"/usr/bin
- ln -s unison-text unison
- ln -s unison-gtk2 unison-x11
- ln -s unison unison-${pkgver%.*}
-}
Copied: unison/repos/extra-i686/PKGBUILD (from rev 286899,
unison/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-17 22:16:13 UTC (rev 286900)
@@ -0,0 +1,54 @@
+# $Id$
+#Maintainer: Gaetan Bisson <bis...@archlinux.org>
+#Contributor: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=unison
+pkgver=2.48.4
+pkgrel=2
+pkgdesc='File-synchronization tool'
+url='https://www.cis.upenn.edu/~bcpierce/unison/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+optdepends=('gtk2: for gtk2 support')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+source=("https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'large.patch'
+ 'desktop')
+sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
+ '95433c2aa961cba19535fdf556e30bafa414a420'
+ '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
+
+options=('!makeflags')
+
+prepare() {
+ cd "${srcdir}/src"
+ patch -p0 -i ../large.patch
+}
+
+build() {
+ cd "${srcdir}/src"
+ CFLAGS=""
+
+ for ui in text gtk2; do
+ make clean
+ make mkProjectInfo
+ make UISTYLE=$ui DEBUGGING=false THREADS=true
+ mv unison unison-$ui
+ done
+}
+
+package() {
+ cd "${srcdir}/src"
+
+ install -d "${pkgdir}"/usr/bin
+ install -m755 unison-* "${pkgdir}"/usr/bin
+
+ install -d "${pkgdir}"/usr/share/{pixmaps,applications}
+ convert win32rc/U.ico[1] "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -m644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+ cd "${pkgdir}"/usr/bin
+ ln -s unison-text unison
+ ln -s unison-gtk2 unison-x11
+ ln -s unison unison-${pkgver%.*}
+}
Deleted: extra-i686/desktop
===================================================================
--- extra-i686/desktop 2017-01-17 22:15:32 UTC (rev 286899)
+++ extra-i686/desktop 2017-01-17 22:16:13 UTC (rev 286900)
@@ -1,11 +0,0 @@
-[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/extra-i686/desktop (from rev 286899, unison/trunk/desktop)
===================================================================
--- extra-i686/desktop (rev 0)
+++ extra-i686/desktop 2017-01-17 22:16:13 UTC (rev 286900)
@@ -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/extra-i686/large.patch (from rev 286899,
unison/trunk/large.patch)
===================================================================
--- extra-i686/large.patch (rev 0)
+++ extra-i686/large.patch 2017-01-17 22:16:13 UTC (rev 286900)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-17 22:15:32 UTC (rev 286899)
+++ extra-x86_64/PKGBUILD 2017-01-17 22:16:13 UTC (rev 286900)
@@ -1,47 +0,0 @@
-# $Id$
-#Maintainer: Gaetan Bisson <bis...@archlinux.org>
-#Contributor: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=unison
-pkgver=2.48.4
-pkgrel=1
-pkgdesc='File-synchronization tool'
-url='http://www.cis.upenn.edu/~bcpierce/unison/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-optdepends=('gtk2: for gtk2 support')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-source=("http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz";
- 'desktop')
-sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
- '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
-
-options=('!makeflags')
-
-build() {
- cd "${srcdir}/src"
- CFLAGS=""
-
- for ui in text gtk2; do
- make clean
- make mkProjectInfo
- make UISTYLE=$ui DEBUGGING=false THREADS=true
- mv unison unison-$ui
- done
-}
-
-package() {
- cd "${srcdir}/src"
-
- install -d "${pkgdir}"/usr/bin
- install -m755 unison-* "${pkgdir}"/usr/bin
-
- install -d "${pkgdir}"/usr/share/{pixmaps,applications}
- convert win32rc/U.ico[1] "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
- install -m644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
- cd "${pkgdir}"/usr/bin
- ln -s unison-text unison
- ln -s unison-gtk2 unison-x11
- ln -s unison unison-${pkgver%.*}
-}
Copied: unison/repos/extra-x86_64/PKGBUILD (from rev 286899,
unison/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-17 22:16:13 UTC (rev 286900)
@@ -0,0 +1,54 @@
+# $Id$
+#Maintainer: Gaetan Bisson <bis...@archlinux.org>
+#Contributor: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=unison
+pkgver=2.48.4
+pkgrel=2
+pkgdesc='File-synchronization tool'
+url='https://www.cis.upenn.edu/~bcpierce/unison/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+optdepends=('gtk2: for gtk2 support')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+source=("https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'large.patch'
+ 'desktop')
+sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
+ '95433c2aa961cba19535fdf556e30bafa414a420'
+ '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
+
+options=('!makeflags')
+
+prepare() {
+ cd "${srcdir}/src"
+ patch -p0 -i ../large.patch
+}
+
+build() {
+ cd "${srcdir}/src"
+ CFLAGS=""
+
+ for ui in text gtk2; do
+ make clean
+ make mkProjectInfo
+ make UISTYLE=$ui DEBUGGING=false THREADS=true
+ mv unison unison-$ui
+ done
+}
+
+package() {
+ cd "${srcdir}/src"
+
+ install -d "${pkgdir}"/usr/bin
+ install -m755 unison-* "${pkgdir}"/usr/bin
+
+ install -d "${pkgdir}"/usr/share/{pixmaps,applications}
+ convert win32rc/U.ico[1] "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -m644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+ cd "${pkgdir}"/usr/bin
+ ln -s unison-text unison
+ ln -s unison-gtk2 unison-x11
+ ln -s unison unison-${pkgver%.*}
+}
Deleted: extra-x86_64/desktop
===================================================================
--- extra-x86_64/desktop 2017-01-17 22:15:32 UTC (rev 286899)
+++ extra-x86_64/desktop 2017-01-17 22:16:13 UTC (rev 286900)
@@ -1,11 +0,0 @@
-[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/extra-x86_64/desktop (from rev 286899,
unison/trunk/desktop)
===================================================================
--- extra-x86_64/desktop (rev 0)
+++ extra-x86_64/desktop 2017-01-17 22:16:13 UTC (rev 286900)
@@ -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/extra-x86_64/large.patch (from rev 286899,
unison/trunk/large.patch)
===================================================================
--- extra-x86_64/large.patch (rev 0)
+++ extra-x86_64/large.patch 2017-01-17 22:16:13 UTC (rev 286900)
@@ -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;
