Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package synergy

Bug #854567 (important)

Synergy 1.4.16-2 includes a fix for bug #854567 which is a crash on ARM in the 
synergy client during startup.

In addition changes were made to update the fields and description in
debian/control for new maintainer, version control system, and upstream URLs.
unblock synergy/1.4.16-2

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru synergy-1.4.16/debian/changelog synergy-1.4.16/debian/changelog
--- synergy-1.4.16/debian/changelog     2017-01-08 10:28:04.000000000 +0000
+++ synergy-1.4.16/debian/changelog     2017-02-08 22:08:21.000000000 +0000
@@ -1,3 +1,14 @@
+synergy (1.4.16-2) unstable; urgency=medium
+
+  * Added ensure_non00_cursor.patch to fix a crash when synergyc starts.
+    Closes: #854567
+  * Updated debian/control fields: Maintainer, Homepage, Vcs-* with new
+    maintainer and upstream information
+  * Changed description to indicate new upstream locations for binary and
+    source releases (old URL returned page not found)
+
+ -- Joshua Honeycutt <joshua.honeyc...@gmail.com>  Wed, 08 Feb 2017 16:08:21 
-0600
+
 synergy (1.4.16-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru synergy-1.4.16/debian/control synergy-1.4.16/debian/control
--- synergy-1.4.16/debian/control       2016-10-24 04:36:22.000000000 +0000
+++ synergy-1.4.16/debian/control       2017-02-08 22:08:21.000000000 +0000
@@ -1,10 +1,10 @@
 Source: synergy
 Section: x11
 Priority: optional
-Maintainer: Jeff Licquia <licq...@debian.org>
-Homepage: http://synergy-foss.org/
-Vcs-Git: http://git.licquia.org/raw/synergy-debian.git
-Vcs-Browser: http://git.licquia.org/?p=synergy-debian.git;a=summary
+Maintainer: Joshua Honeycutt <joshua.honeyc...@gmail.com>
+Homepage: https://symless.com/synergy/
+Vcs-Git: https://github.com/epakai/synergy-debian.git
+Vcs-Browser: https://github.com/epakai/synergy-debian
 Build-Depends: debhelper (>= 7), libxt-dev, libxtst-dev, libxinerama-dev, 
cmake, docbook-utils, libcrypto++-dev, pkg-config, libqt4-dev, 
libcurl4-gnutls-dev | libcurl-dev, google-mock, libgtest-dev
 Standards-Version: 3.9.5
 
@@ -25,5 +25,8 @@
  together and, if screen locking is enabled, only one screen requires
  a password to unlock them all.
  .
- Packages for Windows/MacOS/RPM and Sources can be found at
- http://sourceforge.net/project/showfiles.php?group_id=59275
+ Packages for Windows/MacOS/RPM are available for paid members at 
+ https://symless.com/synergy/
+ .
+ Sources can be found at
+ https://github.com/symless/synergy/releases
diff -Nru synergy-1.4.16/debian/patches/ensure_non00_cursor.patch 
synergy-1.4.16/debian/patches/ensure_non00_cursor.patch
--- synergy-1.4.16/debian/patches/ensure_non00_cursor.patch     1970-01-01 
00:00:00.000000000 +0000
+++ synergy-1.4.16/debian/patches/ensure_non00_cursor.patch     2017-02-08 
22:08:21.000000000 +0000
@@ -0,0 +1,33 @@
+Description: Upstream fix for synergyc crash when createBlankCursor tries to 
create a 0x0 cursor.
+Origin: 
https://github.com/symless/synergy/commit/723a8a919570b3e3faa5ac430e675f14945e1951
+Bug-Debian: https://bugs.debian.org/854567
+Bug: https://github.com/symless/synergy/issues/5322
+Bug: https://github.com/symless/synergy/issues/5068
+Bug: https://github.com/symless/synergy/issues/5087
+Bug: https://github.com/symless/synergy/issues/5504
+Author: Joshua Honeycutt <joshua.honeyc...@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-02-09
+
+--- a/src/lib/platform/CXWindowsScreen.cpp
++++ b/src/lib/platform/CXWindowsScreen.cpp
+@@ -33,6 +33,7 @@
+ #include "TMethodEventJob.h"
+ #include <cstring>
+ #include <cstdlib>
++#include <algorithm>
+ #if X_DISPLAY_MISSING
+ #     error X11 is required to build synergy
+ #else
+@@ -1660,8 +1661,10 @@
+       // this seems just a bit more complicated than really necessary
+ 
+       // get the closet cursor size to 1x1
+-      unsigned int w, h;
++      unsigned int w = 0, h = 0;
+       XQueryBestCursor(m_display, m_root, 1, 1, &w, &h);
++      w = std::max(1u, w);
++      h = std::max(1u, h);
+ 
+       // make bitmap data for cursor of closet size.  since the cursor
+       // is blank we can use the same bitmap for shape and mask:  all
diff -Nru synergy-1.4.16/debian/patches/series 
synergy-1.4.16/debian/patches/series
--- synergy-1.4.16/debian/patches/series        2017-01-08 10:21:30.000000000 
+0000
+++ synergy-1.4.16/debian/patches/series        2017-02-08 22:08:21.000000000 
+0000
@@ -1,3 +1,4 @@
+ensure_non00_cursor.patch
 debian_google-test.patch
 system-cryptopp.patch
 cprotocolutil-writef.patch

Reply via email to