Hello community, here is the log from the commit of package synergy for openSUSE:Factory checked in at 2013-09-30 17:49:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/synergy (Old) and /work/SRC/openSUSE:Factory/.synergy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "synergy" Changes: -------- New Changes file: --- /dev/null 2013-09-21 22:50:09.852032506 +0200 +++ /work/SRC/openSUSE:Factory/.synergy.new/synergy.changes 2013-09-30 17:49:56.000000000 +0200 @@ -0,0 +1,188 @@ +------------------------------------------------------------------- +Fri Sep 13 14:12:58 UTC 2013 - tchvatal@suse.com + +- Format the deps, and sort them out. + +------------------------------------------------------------------- +Fri Sep 13 13:28:25 UTC 2013 - tchvatal@suse.com + +- Fix the build again. + +------------------------------------------------------------------- +Fri Sep 13 13:10:26 UTC 2013 - tchvatal@suse.com + +- Merge back qsynergy to have just one spec file. + +------------------------------------------------------------------- +Fri Sep 13 09:22:44 UTC 2013 - tchvatal@suse.com + +- Move desktop file to the qsynergy part. + +------------------------------------------------------------------- +Fri Sep 13 09:15:46 UTC 2013 - tchvatal@suse.com + +- Do not use init script, there is no damn reason to not launch it + via gui or just set the command to autostart with login, which + is more obvious than init script. Anyway it should be replaced + by service file if someone wants to resurrect it. + * Removes rcsynergy sysconfig.synergy +- Remove README.SUSE as it is pointless if we want to use it as + upstream desired. + +------------------------------------------------------------------- +Fri Sep 13 09:08:15 UTC 2013 - tchvatal@suse.com + +- Format spec file and use system cryptopp library. + * add patch synergy-1.4.12-cryptopp.patch + +------------------------------------------------------------------- +Mon Jun 17 09:12:52 UTC 2013 - boris@steki.net + +- updated to latest upstream version 1.4.12 +- Bugfixes and new features + * Bug #3565 - Encryption fails when typing fast (Invalid message from client) + * Bug #3606 - GUI is elevated after setup + * Bug #3572 - Mac caps lock causes disconnect +- Feature #12 - Encryption +- Feature #421 - Portable version + * Bug #2855 - Mouse cursor remains hidden on Mac client (intermittently/randomly) + * Bug #3281 - server start on OS X defaults to 'interactive' + * Bug #3310 - Port in settings screen + + +------------------------------------------------------------------- +Tue Oct 9 13:53:29 UTC 2012 - sleep_walker@suse.cz + +- update to 1.4.10 +- remove xinput2.patch which reached upstream + +------------------------------------------------------------------- +Mon Jul 9 14:05:35 UTC 2012 - werner@suse.de + +- Update to beta 1.4.8 + +------------------------------------------------------------------- +Wed Sep 14 18:50:53 UTC 2011 - adam@mizerski.pl + +- build with %optflags + +------------------------------------------------------------------- +Mon Aug 1 12:34:34 UTC 2011 - msvec@novell.com + +- update to 1.3.7 (bug fix release) +- re-added man pages + +------------------------------------------------------------------- +Sat Apr 16 22:24:36 UTC 2011 - adam@mizerski.pl + +- update to 1.3.6 +- deleted all patches, because fixed upstream or no longer suitable +- obsoletes synergy-plus, because projects has merged. + +------------------------------------------------------------------- +Wed Mar 10 18:03:44 CET 2010 - jeffm@suse.de + +- Added firewall definitions for use with SuSEfirewall2 + +------------------------------------------------------------------- +Mon Nov 16 15:45:41 UTC 2009 - hmuelle@novell.com + +- Fixed issue with "perror was not declared in this scope" by + "stdio.h" to two files: + lib/arch/CArchNetworkBSD.cpp + lib/arch/CArchDaemonUnix.cpp + +------------------------------------------------------------------- +Wed May 13 13:55:28 CEST 2009 - sbrabec@suse.cz + +- Fixed intermittent delays (bnc#495388). +- synergy-1.3.1-64bit_bug.patch was not applied by mistake. Fixed. + +------------------------------------------------------------------- +Sat Aug 16 00:00:00 CEST 2008 - guru@unixtech.be +- use latest SVN trunk +- added patch to fix Java swing crashing bug (lp#207057, bnc#413716) + +------------------------------------------------------------------- +Mon Jul 14 03:31:29 CEST 2008 - pascal.bleser@opensuse.org + +- merged patches from home:sbrabec/synergy +- openSUSE 11.0 builds +- cleaned up spec file +- added debuginfo support + +------------------------------------------------------------------- +Wed Jan 25 21:41:58 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 11 14:58:59 CET 2006 - sbrabec@suse.cz + +- Updated to version 1.2.7. + +------------------------------------------------------------------- +Wed Dec 21 11:36:05 CET 2005 - mmj@suse.de + +- Notify about errors + +------------------------------------------------------------------- +Mon Nov 14 19:12:02 CET 2005 - sbrabec@suse.cz + +- Updated to version 1.2.6. + +------------------------------------------------------------------- +Mon Aug 8 13:30:00 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.2.4. + +------------------------------------------------------------------- +Mon Aug 1 16:47:38 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.2.3. + +------------------------------------------------------------------- +Tue Apr 26 17:34:12 CEST 2005 - sbrabec@suse.cz + +- Do not build with -Werror. + +------------------------------------------------------------------- +Mon Feb 14 19:28:41 CET 2005 - sbrabec@suse.cz + +- Updated to version 1.2.2. + +------------------------------------------------------------------- +Thu Jan 06 17:17:51 CET 2005 - sbrabec@suse.cz + +- Updated to version 1.2.1. + +------------------------------------------------------------------- +Fri Aug 27 16:10:05 CEST 2004 - sbrabec@suse.cz + +- Updated to version 1.0.15. + +------------------------------------------------------------------- +Mon May 24 16:46:50 CEST 2004 - ro@suse.de + +- added return values to non-void functions + +------------------------------------------------------------------- +Thu Feb 05 15:06:25 CET 2004 - sbrabec@suse.cz + +- Updated to version 1.0.14. + +------------------------------------------------------------------- +Sat Jan 10 21:33:54 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Mon Aug 11 15:18:57 CEST 2003 - sbrabec@suse.cz + +- Updated to version 1.0.12. + +------------------------------------------------------------------- +Thu May 15 14:16:21 CEST 2003 - sbrabec@suse.cz + +- Added new SuSE package. + New: ---- qsynergy.desktop synergy-1.4.12-Source.tar.gz synergy-1.4.12-cryptopp.patch synergy-firewall-services synergy.changes synergy.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ synergy.spec ++++++ # # spec file for package synergy # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: synergy Version: 1.4.12 Release: 0 Summary: Mouse, keyboard and clipboard sharing utility License: GPL-2.0+ Group: System/X11/Utilities Url: http://synergy-foss.org/ Source: http://synergy.googlecode.com/files/synergy-%{version}-Source.tar.gz Source1: synergy-firewall-services Source2: qsynergy.desktop Patch0: synergy-1.4.12-cryptopp.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libcryptopp-devel BuildRequires: libqt4-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xtst) BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq Provides: synergy-plus = %{version} Obsoletes: synergy-plus < %{version} %description Synergy lets you easily share a single mouse and keyboard between multiple computers with different operating systems, each with its own display, without special hardware. It's intended for users with multiple computers on their desk since each system uses its own display. Redirecting the mouse and keyboard is as simple as moving the mouse off the edge of your screen. Synergy also merges the clipboards of all the systems into one, allowing cut-and-paste between systems. Furthermore, it synchronizes screen savers so they all start and stop together and, if screen locking is enabled, only one screen requires a password to unlock them all. %package -n qsynergy Summary: Qt GUI for easily configuring Synergy2 Group: Productivity/Networking/Other Requires: synergy = %{version} %description -n qsynergy QSynergy is a comprehensive and easy to use graphical front end for Synergy. Synergy lets a user control more than one computer with a single mouse and keyboard. %prep %setup -q -n "synergy-%{version}-Source" %patch0 -p1 cp %{SOURCE2} . %build cmake -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS_RELEASE="%{optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -DNDEBUG" make VERBOSE=1 %{?_smp_mflags} # GUI build cd src/gui qmake PREFIX=%{_prefix} CONFIG+=RELEASE QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}" make %{?_smp_mflags} %install chmod -x ChangeLog install -D bin/synergyc "%{buildroot}%{_bindir}/synergyc" install -D bin/synergys "%{buildroot}%{_bindir}/synergys" install -D -m0644 doc/synergy.conf.example "%{buildroot}%{_sysconfdir}/synergy.conf" install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy" install -D -m0644 doc/synergys.man %{buildroot}/%{_mandir}/man1/synergys.1 install -D -m0644 doc/synergyc.man %{buildroot}/%{_mandir}/man1/synergyc.1 gzip -9 %{buildroot}/%{_mandir}/man1/synergys.1 # GUI package install -Dm 0755 bin/%{name} %{buildroot}%{_bindir}/q%{name} %suse_update_desktop_file -i q%{name} -r DesktopUtility # we need some icon %post %{fillup_only} %files %defattr(-, root, root) %doc README ChangeLog COPYING doc/synergy.conf* %config(noreplace) %{_sysconfdir}/synergy.conf %{_bindir}/synergyc %{_bindir}/synergys %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy %doc %{_mandir}/man1/synergys.1.gz %doc %{_mandir}/man1/synergyc.1.gz %files -n qsynergy %defattr(-,root,root) %doc COPYING %{_bindir}/q%{name} %{_datadir}/applications/q%{name}.desktop %changelog ++++++ qsynergy.desktop ++++++ [Desktop Entry] Exec=qsynergy Name=qsynergy GenericName=qsynergy StartupNotify=false Terminal=false TerminalOptions= Type=Application X-KDE-autostart-after=kdesktop ++++++ synergy-1.4.12-cryptopp.patch ++++++ --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -13,24 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -set(cpp_dir cryptopp562) - -file(GLOB cpp_src ${cpp_dir}/*.cpp) - -if (WIN32) - file(GLOB cpp_hdr ${cpp_dir}/*.h) - list(APPEND cpp_src ${cpp_hdr}) -endif() - -file(GLOB cpp_ignore - ${cpp_dir}/simple.cpp - ${cpp_dir}/strciphr.cpp - ${cpp_dir}/polynomi.cpp - ${cpp_dir}/eprecomp.cpp - ${cpp_dir}/eccrypto.cpp - ${cpp_dir}/algebra.cpp) -list(REMOVE_ITEM cpp_src ${cpp_ignore}) - # if 64-bit windows, compile asm file. if (CMAKE_CL_64) list(APPEND cpp_src ${cpp_dir}/x64dll.asm ${cpp_dir}/x64masm.asm) @@ -60,5 +42,3 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") endif() endif() - -add_library(cryptopp STATIC ${cpp_src}) --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,10 @@ endif() + set(CMAKE_REQUIRED_LIBRARIES crypto++) + set(CMAKE_REQUIRED_LIBRARIES) + set(CMAKE_INCLUDE_DIRECTORIES) + check_type_size(char SIZEOF_CHAR) check_type_size(int SIZEOF_INT) check_type_size(long SIZEOF_LONG) --- a/src/lib/synergy/CCryptoMode.h +++ b/src/lib/synergy/CCryptoMode.h @@ -17,9 +17,9 @@ #pragma once -#include <cryptopp562/gcm.h> -#include <cryptopp562/modes.h> -#include <cryptopp562/aes.h> +#include <cryptopp/gcm.h> +#include <cryptopp/modes.h> +#include <cryptopp/aes.h> #include "ECryptoMode.h" #include "CString.h" --- a/src/lib/synergy/CCryptoStream.h +++ b/src/lib/synergy/CCryptoStream.h @@ -20,8 +20,8 @@ #include "BasicTypes.h" #include "CStreamFilter.h" #include "CCryptoMode.h" -#include <cryptopp562/osrng.h> -#include <cryptopp562/sha.h> +#include <cryptopp/osrng.h> +#include <cryptopp/sha.h> class CCryptoOptions; ++++++ synergy-firewall-services ++++++ ## Name: Synergy ## Description: Synergy allows screens from different hosts to be linked together as one virtual screen TCP="24800" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org