9 changed files with 442 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+unison-2.27.57.tar.gz
+/unison-2.27.157.tar.gz
--- a/dead.package
+++ b/dead.package
@ -1 +0,0 @@
-Orphaned for 6+ weeks
--- a/1
+++ b/1
@ -0,0 +1 @@
+4cc2a0332cb8c947adc04b9d4f2a83b0  unison-2.27.157.tar.gz
--- a/unison.png
+++ b/unison.png
--- a/unison227-Fix-bad-interaction-with-OpenSSH-5.6.patch
+++ b/unison227-Fix-bad-interaction-with-OpenSSH-5.6.patch
@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sun, 3 Apr 2011 11:44:19 +0200
+Subject: Fix bad interaction with OpenSSH 5.6
+
+Origin: https://bugs.archlinux.org/task/20877
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031
+---
+ terminal.ml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/terminal.ml b/terminal.ml
+index 657f3d2..aafa425 100644
+--- a/terminal.ml
+++ b/terminal.ml
+@@ -191,7 +191,6 @@ let create_session cmd args new_stdin new_stdout new_stderr =
+             exit 127
+           end
+       | childPid ->
+-          Unix.close slaveFd;
+           (Some masterFd, childPid)
+       end
+ 
+-- 
--- a/unison227-gtk.patch
+++ b/unison227-gtk.patch
@ -0,0 +1,12 @@
+diff -ur unison-2.13.16.old/uigtk2.ml unison-2.13.16/uigtk2.ml
+--- unison-2.13.16.old/uigtk2.ml	2005-06-02 16:59:21.000000000 +0100
+++ unison-2.13.16/uigtk2.ml	2018-05-31 09:48:38.682263959 +0100
+@@ -82,7 +82,7 @@
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+   p
+ 
+ (*********************************************************************
--- a/unison227-ocaml312.patch
+++ b/unison227-ocaml312.patch
@ -0,0 +1,11 @@
+--- unison-2.27.57/update.mli.old	2012-01-16 14:08:18.784651309 +0000
+++ unison-2.27.57/update.mli	2012-01-16 14:08:35.414983940 +0000
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2007 (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
+module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t
--- a/unison227-ocaml408.patch
+++ b/unison227-ocaml408.patch
@ -0,0 +1,86 @@
+diff -ur unison-2.27.157.old/files.ml unison-2.27.157/files.ml
+--- unison-2.27.157.old/files.ml	2008-06-04 13:56:56.000000000 +0100
+++ unison-2.27.157/files.ml	2019-07-28 10:42:29.680182956 +0100
+@@ -703,7 +703,7 @@
+   with End_of_file ->
+     Unix.closedir dirh
+   end;
+-  Sort.list (<) !files
+  List.sort compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
+diff -ur unison-2.27.157.old/Makefile.OCaml unison-2.27.157/Makefile.OCaml
+--- unison-2.27.157.old/Makefile.OCaml	2009-01-15 03:34:22.000000000 +0000
+++ unison-2.27.157/Makefile.OCaml	2019-07-28 10:42:29.681182960 +0100
+@@ -115,11 +115,7 @@
+   else
+     EXEC_EXT=
+     # openpty is in the libutil library
+-    ifneq ($(OSARCH),solaris)
+-      ifneq ($(OSARCH),osx)
+-        CLIBS+=-cclib -lutil
+-      endif
+-    endif
+    CLIBS+=-cclib -lutil
+     buildexecutable::
+ 	@echo Building for Unix
+   endif
+@@ -364,7 +360,7 @@
+ 
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ 	@echo Linking $@
+-	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
+	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+ 
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
+diff -ur unison-2.27.157.old/pty.c unison-2.27.157/pty.c
+--- unison-2.27.157.old/pty.c	2009-01-15 03:34:22.000000000 +0000
+++ unison-2.27.157/pty.c	2019-07-28 10:42:29.682182965 +0100
+@@ -28,6 +28,7 @@
+ 
+ #ifdef HAS_OPENPTY
+ 
+#include <pty.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ 
+diff -ur unison-2.27.157.old/recon.ml unison-2.27.157/recon.ml
+--- unison-2.27.157.old/recon.ml	2007-01-01 23:45:39.000000000 +0000
+++ unison-2.27.157/recon.ml	2019-07-28 10:42:29.683182970 +0100
+@@ -440,8 +440,8 @@
+ 
+ (* Sorts the paths so that they will be displayed in order                   *)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+  List.sort
+    (fun (p1, _) (p2, _) -> Path.compare p1 p2)
+     pathUpdatesList
+ 
+ let rec enterPath p t =
+diff -ur unison-2.27.157.old/uicommon.ml unison-2.27.157/uicommon.ml
+--- unison-2.27.157.old/uicommon.ml	2009-05-29 16:30:16.000000000 +0100
+++ unison-2.27.157/uicommon.ml	2019-07-28 10:42:29.683182970 +0100
+@@ -349,7 +349,7 @@
+     | c ->
+         buf.[!pos] <- c; pos := !pos + 1
+   done;
+-  "{" ^ String.sub buf 0 !pos ^ "}"
+  "{" ^ Bytes.to_string (Bytes.sub buf 0 !pos) ^ "}"
+ 
+ let ignorePath path = "Path " ^ quote (Path.toString path)
+ 
+diff -ur unison-2.27.157.old/uigtk2.ml unison-2.27.157/uigtk2.ml
+--- unison-2.27.157.old/uigtk2.ml	2019-07-28 10:41:59.633039946 +0100
+++ unison-2.27.157/uigtk2.ml	2019-07-28 10:42:29.685182979 +0100
+@@ -83,7 +83,7 @@
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+    (Gpointer.region_of_bytes (Bytes.of_string Pixmaps.icon_data)) (GdkPixbuf.get_pixels p);
+   p
+ 
+ (*********************************************************************
--- a/unison227.spec
+++ b/unison227.spec
@ -0,0 +1,307 @@
+# These is the exact upstream version we are packaging
+%global ver_maj 2
+%global ver_min 27
+%global ver_patch 157
+
+# All Unison versions sharing ver_compat are compatible
+# Examples are 2.13.15 and 2.13.16 -> ver_compat == 2.13
+# In older versions, even patch levels were not compatible
+# Examples are ver_compat==2.9.0 and ver_compat==2.9.1
+%global ver_compat      %{ver_maj}.%{ver_min}
+%global ver_compat_name %{ver_maj}%{ver_min}
+%global ver_noncompat   .%{ver_patch}
+
+# ver_priority is the first component of ver_compat, catenated with the second
+# component of ver_compat zero-filled to 3 digits, catenated with a final
+# zero-filled 3-digit field. The final field contains the 3rd component of
+# ver_compat (if there is one), otherwise 0.
+%global ver_priority %(printf %%d%%03d%%03d `echo %{ver_compat}|sed 's/\\./ /g'`)
+
+# Is this package the unisonNNN package with the highest ${ver_compat}
+# available in this Fedora branch/release? If so, we provide unison.
+%global provide_unison 1
+
+Name:      unison%{ver_compat_name}
+Version:   %{ver_compat}%{ver_noncompat}
+Release:   16%{?dist}
+
+Summary:   Multi-master File synchronization tool
+
+License:   GPL+
+URL:       http://www.cis.upenn.edu/~bcpierce/unison
+Source0:   http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{version}/unison-%{version}.tar.gz
+Source1:   unison.png
+
+# Fix for OCaml 3.12.
+Patch0:    %{name}-ocaml312.patch
+# RBZ #813156
+Patch1:    %{name}-Fix-bad-interaction-with-OpenSSH-5.6.patch
+# Small hack for new lablgtk.
+Patch2:    unison227-gtk.patch
+# Various small fixes for OCaml 4.08.
+Patch3:    unison227-ocaml408.patch
+
+BuildRequires: ocaml
+BuildRequires: ocaml-lablgtk-devel
+BuildRequires: tetex-latex
+BuildRequires: desktop-file-utils
+# for lablgtk
+BuildRequires: gtk2-devel
+
+Requires:            xorg-x11-fonts-misc
+Requires(posttrans): %{_sbindir}/alternatives
+Requires(postun):    %{_sbindir}/alternatives
+
+# Enforce the switch from unison to unisonN.NN
+Obsoletes: unison < 2.27.57-3
+# Let users just install "unison" if they want
+%if 0%{?provide_unison}
+Provides: unison = %{version}-%{release}
+%endif
+
+%description
+Unison is a multi-master file-synchronization tool. It allows two
+replicas of a collection of files and directories to be stored on
+different hosts (or different locations on the same host), modified
+separately, and then brought up to date by propagating the changes
+in each replica to the other.
+
+Note that this package contains Unison version %{ver_compat}, and
+will never be upgraded to a different major version. Other packages
+exist if you require a different major version.
+
+%prep
+%setup -q -n unison-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+# Parallel builds break.
+unset MAKEFLAGS
+make NATIVE=true UISTYLE=gtk2 OCAMLOPT="ocamlopt -unsafe-string -g"
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+cp -f unison %{buildroot}%{_bindir}/unison-%{ver_compat}
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+cp -f %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/unison-%{ver_compat}.png
+
+cat > unison-%{ver_compat}.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Exec=unison-%{ver_compat}
+Name=Unison File Synchronizer (version %{ver_compat})
+GenericName=File Synchronizer
+Comment=Multi-master File synchronization tool
+Terminal=false
+Icon=unison-%{ver_compat}
+Encoding=UTF-8
+StartupNotify=true
+Categories=Utility;
+EOF
+
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+    unison-%{ver_compat}.desktop
+
+
+%posttrans
+alternatives \
+  --install \
+  %{_bindir}/unison \
+  unison \
+  %{_bindir}/unison-%{ver_compat} \
+  %{ver_priority}
+
+# Clean up after previous package version's incorrect alternatives usage.
+alternatives --remove unison-icon \
+  %{_datadir}/pixmaps/unison-%{ver_compat}.png || :
+alternatives --remove unison-desktop \
+  %{_datadir}/applications/fedora-unison-%{ver_compat}.desktop || :
+
+%postun
+if [ $1 -eq 0 ]; then
+  alternatives --remove unison \
+    %{_bindir}/unison-%{ver_compat}
+fi
+exit 0
+
+%files
+%doc COPYING NEWS README
+%attr(0755, root, root) %{_bindir}/unison-%{ver_compat}
+%{_datadir}/applications/unison-%{ver_compat}.desktop
+%{_datadir}/pixmaps/unison-%{ver_compat}.png
+
+%changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu May 31 2018 Richard W.M. Jones <rjones@redhat.com> - 2.27.157-11
+- Use unsafe-string with OCaml 4.06.
+- Add small hack to keep it working with new lablgtk.
+- Enable debugging.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 2.27.157-6
+- remove ExcludeArch
+
+* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 2.27.157-5
+- Rebuild for OCaml 4.04.0.
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.157-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jan 05 2016 Richard Jones <rjones@redhat.com> - 2.27.157-3
+- Use global instead of define.
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.157-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jun 15 2015 Richard W.M. Jones <rjones@redhat.com> - 2.27.157-1
+- New upstream branched version 2.27.157.
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Dec 14 2012 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-19
+- Rebuild for OCaml 4.00.1.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jun 06 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 2.27.57-17
+- Include fix for RBZ 813156
+- Spec file cleanup
+
+* Mon Jan 16 2012 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-16
+- Include fix for OCaml 3.12.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jan 8 2009 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-11
+- Add Requires: xorg-x11-fonts-misc
+
+* Wed Nov 26 2008 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-10
+- Rebuild for OCaml 3.11.0+rc1.
+
+* Sat May 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-9
+- Rebuild with OCaml 3.10.2-2 (fixes bz 441685, 445545).
+
+* Sun Mar 30 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-8
+- Don't use alternatives for desktop and icon files, to avoid duplicate
+  menu entries.
+
+* Wed Mar 19 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-7
+- Fix license to match correct interpretation of source & GPL
+- Remove Excludes for ppc64, since ocaml is available there now, in devel
+
+* Sat Mar 15 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-6
+- Rename package unison2.27 -> unison227 to match Fedora naming rules
+- Automatically calculate ver_priority using the shell; easier maintenance
+
+* Sat Mar 1 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-5
+- Use Provides/Obsoletes to provide upgrade path, per:
+  http://fedoraproject.org/wiki/Packaging/NamingGuidelines
+
+* Thu Feb 28 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-4
+- Explicitly conflict with existing unison package
+
+* Fri Feb 22 2008 Stephen Warren <s-t-rhbugzilla@wwwdotorg.org> - 2.27.57-3
+- Derived unison2.27 package from unison2.13 package
+
+* Mon Feb  4 2008 Gerard Milmeister <gemi@bluewin.ch> - 2.27.57-2
+- exclude arch ppc64
+
+* Mon Feb  4 2008 Gerard Milmeister <gemi@bluewin.ch> - 2.27.57-1
+- new release 2.27.57
+
+* Tue Aug 29 2006 Gerard Milmeister <gemi@bluewin.ch> - 2.13.16-3
+- Rebuild for FE6
+
+* Tue Feb 28 2006 Gerard Milmeister <gemi@bluewin.ch> - 2.13.16-2
+- Rebuild for Fedora Extras 5
+
+* Thu Sep  1 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.13.16-1
+- New Version 2.13.16
+
+* Sun Jul 31 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.12.0-0
+- New Version 2.12.0
+
+* Fri May 27 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.10.2-7
+- Bump and rebuild with new ocaml and new lablgtk
+
+* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 2.10.2-6
+- rebuild on all arches
+
+* Mon May 16 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.10.2-5
+- Patch: http://groups.yahoo.com/group/unison-users/message/3200
+
+* Fri Apr  8 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Thu Feb 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.10.2-2
+- BR gtk2-devel
+- Added NEWS and README docs
+
+* Sat Feb 12 2005 Gerard Milmeister <gemi@bluewin.ch> - 0:2.10.2-1
+- New Version 2.10.2
+
+* Wed Apr 28 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.74-0.fdr.1
+- New Version 2.9.74
+- Added icon
+
+* Tue Jan 13 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.72-0.fdr.1
+- New Version 2.9.72
+
+* Tue Dec  9 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.70-0.fdr.2
+- Changed Summary
+- Added .desktop file
+
+* Fri Oct 31 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:2.9.70-0.fdr.1
+- First Fedora release
+
				`@ -0,0 +1 @@`
				`4cc2a0332cb8c947adc04b9d4f2a83b0 unison-2.27.157.tar.gz`