[arch-commits] Commit in synergy/repos (16 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Wed Nov 12 21:17:34 UTC 2014


    Date: Wednesday, November 12, 2014 @ 22:17:34
  Author: svenstaro
Revision: 122470

archrelease: copy trunk to community-i686, community-x86_64

Added:
  synergy/repos/community-i686/PKGBUILD
    (from rev 122469, synergy/trunk/PKGBUILD)
  synergy/repos/community-i686/synergys_at.service
    (from rev 122469, synergy/trunk/synergys_at.service)
  synergy/repos/community-i686/synergys_at.socket
    (from rev 122469, synergy/trunk/synergys_at.socket)
  synergy/repos/community-i686/unfuck-cryptopp-thanks-gentoo.patch
    (from rev 122469, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch)
  synergy/repos/community-x86_64/PKGBUILD
    (from rev 122469, synergy/trunk/PKGBUILD)
  synergy/repos/community-x86_64/synergys_at.service
    (from rev 122469, synergy/trunk/synergys_at.service)
  synergy/repos/community-x86_64/synergys_at.socket
    (from rev 122469, synergy/trunk/synergys_at.socket)
  synergy/repos/community-x86_64/unfuck-cryptopp-thanks-gentoo.patch
    (from rev 122469, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch)
Deleted:
  synergy/repos/community-i686/PKGBUILD
  synergy/repos/community-i686/synergys_at.service
  synergy/repos/community-i686/synergys_at.socket
  synergy/repos/community-i686/unfuck-cryptopp-thanks-gentoo.patch
  synergy/repos/community-x86_64/PKGBUILD
  synergy/repos/community-x86_64/synergys_at.service
  synergy/repos/community-x86_64/synergys_at.socket
  synergy/repos/community-x86_64/unfuck-cryptopp-thanks-gentoo.patch

------------------------------------------------------+
 /PKGBUILD                                            |  140 ++++++++++
 /synergys_at.service                                 |   22 +
 /synergys_at.socket                                  |   18 +
 /unfuck-cryptopp-thanks-gentoo.patch                 |  218 +++++++++++++++++
 community-i686/PKGBUILD                              |   71 -----
 community-i686/synergys_at.service                   |   11 
 community-i686/synergys_at.socket                    |    9 
 community-i686/unfuck-cryptopp-thanks-gentoo.patch   |  109 --------
 community-x86_64/PKGBUILD                            |   71 -----
 community-x86_64/synergys_at.service                 |   11 
 community-x86_64/synergys_at.socket                  |    9 
 community-x86_64/unfuck-cryptopp-thanks-gentoo.patch |  109 --------
 12 files changed, 398 insertions(+), 400 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-i686/PKGBUILD	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,71 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Michael Düll <mail at akurei.me>
-
-# I would just like to take a minute here and state that synergy is
-# some of the worst packaged software ever. They BUNDLE a fucking
-# zip for cryptopp and do not provide an option to use a system-
-# installed version of that library. They change around paths every
-# update and just generally don't seem to care much.
-pkgname=synergy
-pkgver=1.6.0
-_pkgver=2449
-pkgrel=1
-pkgdesc="Share a single mouse and keyboard between multiple computers"
-url="http://synergy-foss.org"
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++' 'libxkbcommon-x11' 'avahi')
-makedepends=('libxt' 'cmake' 'qt5-base' 'unzip' 'subversion')
-optdepends=('qt5-base: gui support')
-license=('GPL2')
-source=("synergy-${pkgver}::https://github.com/synergy/synergy/archive/1.6.0.tar.gz"
-        "synergys_at.socket"
-        "synergys_at.service"
-        "unfuck-cryptopp-thanks-gentoo.patch")
-sha1sums=('SKIP'
-          '7ec33221725fc496b807e0f435c5e87b590beb5d'
-          '65ab58cc3546d6374a05a6a260f15045632e43ce'
-          '8e321e664ae4b7a763175524dd938a88d85c7909')
-
-build() {
-  cd "${srcdir}/synergy-${pkgver}"
-
-  # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo!
-  # You and Fedora are our only friends in this crazy world.
-  patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" .
-  make -j1
-
-  cd src/gui
-  qmake
-  make
-}
-
-package() {
-  cd "${srcdir}/synergy-${pkgver}"
-
-  # install binary
-  install -Dm755 bin/synergy "$pkgdir/usr/bin/synergy"
-  install -Dm755 bin/synergyc "$pkgdir/usr/bin/synergyc"
-  install -Dm755 bin/synergys "$pkgdir/usr/bin/synergys"
-
-  # install config
-  install -Dm644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
-  install -Dm644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced"
-  install -Dm644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" 
-
-  # install manfiles
-  install -Dm644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
-  install -Dm644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
-
-  # install systemd service and socket
-  install -Dm644 "$srcdir/synergys_at.service" "$pkgdir/usr/lib/systemd/system/synergys at .service"
-  install -Dm644 "$srcdir/synergys_at.socket" "$pkgdir/usr/lib/systemd/system/synergys at .socket"
-
-  # install desktop/icon stuff
-  install -Dm644 "res/synergy.ico" "$pkgdir/usr/share/icons/synergy.ico"
-  install -Dm644 "res/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
-}

Copied: synergy/repos/community-i686/PKGBUILD (from rev 122469, synergy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,70 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Michael Düll <mail at akurei.me>
+
+# I would just like to take a minute here and state that synergy is
+# some of the worst packaged software ever. They BUNDLE a fucking
+# zip for cryptopp and do not provide an option to use a system-
+# installed version of that library. They change around paths every
+# update and just generally don't seem to care much.
+pkgname=synergy
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Share a single mouse and keyboard between multiple computers"
+url="http://synergy-foss.org"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++' 'libxkbcommon-x11' 'avahi')
+makedepends=('libxt' 'cmake' 'qt5-base' 'unzip' 'subversion')
+optdepends=('qt5-base: gui support')
+license=('GPL2')
+source=("synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/${pkgver}.tar.gz"
+        "synergys_at.socket"
+        "synergys_at.service"
+        "unfuck-cryptopp-thanks-gentoo.patch")
+sha1sums=('b509c4302ad68d656dfe29711baaca79b835c14a'
+          '7ec33221725fc496b807e0f435c5e87b590beb5d'
+          '65ab58cc3546d6374a05a6a260f15045632e43ce'
+          '8e321e664ae4b7a763175524dd938a88d85c7909')
+
+build() {
+  cd "${srcdir}/synergy-${pkgver}"
+
+  # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo!
+  # You and Fedora are our only friends in this crazy world.
+  patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" .
+  make -j1
+
+  cd src/gui
+  qmake
+  make
+}
+
+package() {
+  cd "${srcdir}/synergy-${pkgver}"
+
+  # install binary
+  install -Dm755 bin/synergy "$pkgdir/usr/bin/synergy"
+  install -Dm755 bin/synergyc "$pkgdir/usr/bin/synergyc"
+  install -Dm755 bin/synergys "$pkgdir/usr/bin/synergys"
+
+  # install config
+  install -Dm644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
+  install -Dm644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced"
+  install -Dm644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" 
+
+  # install manfiles
+  install -Dm644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
+  install -Dm644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
+
+  # install systemd service and socket
+  install -Dm644 "$srcdir/synergys_at.service" "$pkgdir/usr/lib/systemd/system/synergys at .service"
+  install -Dm644 "$srcdir/synergys_at.socket" "$pkgdir/usr/lib/systemd/system/synergys at .socket"
+
+  # install desktop/icon stuff
+  install -Dm644 "res/synergy.ico" "$pkgdir/usr/share/icons/synergy.ico"
+  install -Dm644 "res/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
+}

Deleted: community-i686/synergys_at.service
===================================================================
--- community-i686/synergys_at.service	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-i686/synergys_at.service	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Synergy Server Daemon
-After=network.target
-
-[Service]
-User=%i
-ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: synergy/repos/community-i686/synergys_at.service (from rev 122469, synergy/trunk/synergys_at.service)
===================================================================
--- community-i686/synergys_at.service	                        (rev 0)
+++ community-i686/synergys_at.service	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+User=%i
+ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/synergys_at.socket
===================================================================
--- community-i686/synergys_at.socket	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-i686/synergys_at.socket	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=synergys at .service
-
-[Socket]
-ListenStream=24800
-Accept=false
-
-[Install]
-WantedBy=sockets.target

Copied: synergy/repos/community-i686/synergys_at.socket (from rev 122469, synergy/trunk/synergys_at.socket)
===================================================================
--- community-i686/synergys_at.socket	                        (rev 0)
+++ community-i686/synergys_at.socket	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys at .service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target

Deleted: community-i686/unfuck-cryptopp-thanks-gentoo.patch
===================================================================
--- community-i686/unfuck-cryptopp-thanks-gentoo.patch	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-i686/unfuck-cryptopp-thanks-gentoo.patch	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,109 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,6 +133,10 @@
-	check_type_size(long SIZEOF_LONG)
-	check_type_size(short SIZEOF_SHORT)
- 
-+	set(CMAKE_REQUIRED_LIBRARIES crypto++)
-+	set(CMAKE_REQUIRED_LIBRARIES)
-+	set(CMAKE_INCLUDE_DIRECTORIES)
-+
-	# pthread is used on both Linux and Mac
-	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
-	if (HAVE_PTHREAD)
-diff -ru synergy-1.4.17-Source/ext/CMakeLists.txt lol/ext/CMakeLists.txt
---- synergy-1.4.17-Source/ext/CMakeLists.txt	2014-03-20 20:24:24.000000000 +0100
-+++ lol/ext/CMakeLists.txt	2014-03-27 01:53:09.017682192 +0100
-@@ -13,46 +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(cryptopp_dir cryptopp562)
--
--# only compile the crypto++ files we need.
--set(cryptopp_src
--	${cryptopp_dir}/3way.cpp
--	${cryptopp_dir}/algparam.cpp
--	${cryptopp_dir}/asn.cpp
--	${cryptopp_dir}/authenc.cpp
--	${cryptopp_dir}/basecode.cpp
--	${cryptopp_dir}/cpu.cpp
--	${cryptopp_dir}/cryptlib.cpp
--	${cryptopp_dir}/des.cpp
--	${cryptopp_dir}/dessp.cpp
--	${cryptopp_dir}/dll.cpp
--	${cryptopp_dir}/ec2n.cpp
--	${cryptopp_dir}/ecp.cpp
--	${cryptopp_dir}/filters.cpp
--	${cryptopp_dir}/fips140.cpp
--	${cryptopp_dir}/gcm.cpp
--	${cryptopp_dir}/gf2n.cpp
--	${cryptopp_dir}/gfpcrypt.cpp
--	${cryptopp_dir}/hex.cpp
--	${cryptopp_dir}/hmac.cpp
--	${cryptopp_dir}/hrtimer.cpp
--	${cryptopp_dir}/integer.cpp
--	${cryptopp_dir}/iterhash.cpp
--	${cryptopp_dir}/misc.cpp
--	${cryptopp_dir}/modes.cpp
--	${cryptopp_dir}/mqueue.cpp
--	${cryptopp_dir}/nbtheory.cpp
--	${cryptopp_dir}/oaep.cpp
--	${cryptopp_dir}/osrng.cpp
--	${cryptopp_dir}/pubkey.cpp
--	${cryptopp_dir}/queue.cpp
--	${cryptopp_dir}/randpool.cpp
--	${cryptopp_dir}/rdtables.cpp
--	${cryptopp_dir}/rijndael.cpp
--	${cryptopp_dir}/rng.cpp
--	${cryptopp_dir}/sha.cpp
--)
- 
- # if 64-bit windows, compile asm file.
- if (CMAKE_CL_64)
-@@ -87,10 +47,3 @@
- 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
- 	endif()
- endif()
--
--add_library(cryptopp STATIC ${cryptopp_src})
--
--if (UNIX)
--	# ignore warnings in crypto++
--	set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
--endif()
-diff -ru synergy-1.4.17-Source/src/CMakeLists.txt lol/src/CMakeLists.txt
---- synergy-1.4.17-Source/src/CMakeLists.txt	2014-02-26 18:46:02.000000000 +0100
-+++ lol/src/CMakeLists.txt	2014-03-27 01:54:56.390157358 +0100
-@@ -18,7 +18,3 @@
- add_subdirectory(cmd)
- add_subdirectory(plugin)
- add_subdirectory(micro)
--
--if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
--	add_subdirectory(test)
--endif()
-diff -ru synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h lol/src/lib/io/CryptoMode_cryptopp.h
---- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
-+++ lol/src/lib/io/CryptoMode_cryptopp.h	2014-03-27 01:45:34.810484242 +0100
-@@ -25,6 +25,6 @@
- #	pragma GCC system_header
- #endif 
- 
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.h>
-diff -ru synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h lol/src/lib/io/CryptoStream_cryptopp.h
---- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
-+++ lol/src/lib/io/CryptoStream_cryptopp.h	2014-03-27 01:45:45.727405235 +0100
-@@ -25,5 +25,5 @@
- #	pragma GCC system_header
- #endif
- 
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>

Copied: synergy/repos/community-i686/unfuck-cryptopp-thanks-gentoo.patch (from rev 122469, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch)
===================================================================
--- community-i686/unfuck-cryptopp-thanks-gentoo.patch	                        (rev 0)
+++ community-i686/unfuck-cryptopp-thanks-gentoo.patch	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,109 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,6 +133,10 @@
+	check_type_size(long SIZEOF_LONG)
+	check_type_size(short SIZEOF_SHORT)
+ 
++	set(CMAKE_REQUIRED_LIBRARIES crypto++)
++	set(CMAKE_REQUIRED_LIBRARIES)
++	set(CMAKE_INCLUDE_DIRECTORIES)
++
+	# pthread is used on both Linux and Mac
+	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+	if (HAVE_PTHREAD)
+diff -ru synergy-1.4.17-Source/ext/CMakeLists.txt lol/ext/CMakeLists.txt
+--- synergy-1.4.17-Source/ext/CMakeLists.txt	2014-03-20 20:24:24.000000000 +0100
++++ lol/ext/CMakeLists.txt	2014-03-27 01:53:09.017682192 +0100
+@@ -13,46 +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(cryptopp_dir cryptopp562)
+-
+-# only compile the crypto++ files we need.
+-set(cryptopp_src
+-	${cryptopp_dir}/3way.cpp
+-	${cryptopp_dir}/algparam.cpp
+-	${cryptopp_dir}/asn.cpp
+-	${cryptopp_dir}/authenc.cpp
+-	${cryptopp_dir}/basecode.cpp
+-	${cryptopp_dir}/cpu.cpp
+-	${cryptopp_dir}/cryptlib.cpp
+-	${cryptopp_dir}/des.cpp
+-	${cryptopp_dir}/dessp.cpp
+-	${cryptopp_dir}/dll.cpp
+-	${cryptopp_dir}/ec2n.cpp
+-	${cryptopp_dir}/ecp.cpp
+-	${cryptopp_dir}/filters.cpp
+-	${cryptopp_dir}/fips140.cpp
+-	${cryptopp_dir}/gcm.cpp
+-	${cryptopp_dir}/gf2n.cpp
+-	${cryptopp_dir}/gfpcrypt.cpp
+-	${cryptopp_dir}/hex.cpp
+-	${cryptopp_dir}/hmac.cpp
+-	${cryptopp_dir}/hrtimer.cpp
+-	${cryptopp_dir}/integer.cpp
+-	${cryptopp_dir}/iterhash.cpp
+-	${cryptopp_dir}/misc.cpp
+-	${cryptopp_dir}/modes.cpp
+-	${cryptopp_dir}/mqueue.cpp
+-	${cryptopp_dir}/nbtheory.cpp
+-	${cryptopp_dir}/oaep.cpp
+-	${cryptopp_dir}/osrng.cpp
+-	${cryptopp_dir}/pubkey.cpp
+-	${cryptopp_dir}/queue.cpp
+-	${cryptopp_dir}/randpool.cpp
+-	${cryptopp_dir}/rdtables.cpp
+-	${cryptopp_dir}/rijndael.cpp
+-	${cryptopp_dir}/rng.cpp
+-	${cryptopp_dir}/sha.cpp
+-)
+ 
+ # if 64-bit windows, compile asm file.
+ if (CMAKE_CL_64)
+@@ -87,10 +47,3 @@
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
+ 	endif()
+ endif()
+-
+-add_library(cryptopp STATIC ${cryptopp_src})
+-
+-if (UNIX)
+-	# ignore warnings in crypto++
+-	set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+diff -ru synergy-1.4.17-Source/src/CMakeLists.txt lol/src/CMakeLists.txt
+--- synergy-1.4.17-Source/src/CMakeLists.txt	2014-02-26 18:46:02.000000000 +0100
++++ lol/src/CMakeLists.txt	2014-03-27 01:54:56.390157358 +0100
+@@ -18,7 +18,3 @@
+ add_subdirectory(cmd)
+ add_subdirectory(plugin)
+ add_subdirectory(micro)
+-
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
+-	add_subdirectory(test)
+-endif()
+diff -ru synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h lol/src/lib/io/CryptoMode_cryptopp.h
+--- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
++++ lol/src/lib/io/CryptoMode_cryptopp.h	2014-03-27 01:45:34.810484242 +0100
+@@ -25,6 +25,6 @@
+ #	pragma GCC system_header
+ #endif 
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+diff -ru synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h lol/src/lib/io/CryptoStream_cryptopp.h
+--- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
++++ lol/src/lib/io/CryptoStream_cryptopp.h	2014-03-27 01:45:45.727405235 +0100
+@@ -25,5 +25,5 @@
+ #	pragma GCC system_header
+ #endif
+ 
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-x86_64/PKGBUILD	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,71 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Michael Düll <mail at akurei.me>
-
-# I would just like to take a minute here and state that synergy is
-# some of the worst packaged software ever. They BUNDLE a fucking
-# zip for cryptopp and do not provide an option to use a system-
-# installed version of that library. They change around paths every
-# update and just generally don't seem to care much.
-pkgname=synergy
-pkgver=1.6.0
-_pkgver=2449
-pkgrel=1
-pkgdesc="Share a single mouse and keyboard between multiple computers"
-url="http://synergy-foss.org"
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++' 'libxkbcommon-x11' 'avahi')
-makedepends=('libxt' 'cmake' 'qt5-base' 'unzip' 'subversion')
-optdepends=('qt5-base: gui support')
-license=('GPL2')
-source=("synergy-${pkgver}::https://github.com/synergy/synergy/archive/1.6.0.tar.gz"
-        "synergys_at.socket"
-        "synergys_at.service"
-        "unfuck-cryptopp-thanks-gentoo.patch")
-sha1sums=('SKIP'
-          '7ec33221725fc496b807e0f435c5e87b590beb5d'
-          '65ab58cc3546d6374a05a6a260f15045632e43ce'
-          '8e321e664ae4b7a763175524dd938a88d85c7909')
-
-build() {
-  cd "${srcdir}/synergy-${pkgver}"
-
-  # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo!
-  # You and Fedora are our only friends in this crazy world.
-  patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" .
-  make -j1
-
-  cd src/gui
-  qmake
-  make
-}
-
-package() {
-  cd "${srcdir}/synergy-${pkgver}"
-
-  # install binary
-  install -Dm755 bin/synergy "$pkgdir/usr/bin/synergy"
-  install -Dm755 bin/synergyc "$pkgdir/usr/bin/synergyc"
-  install -Dm755 bin/synergys "$pkgdir/usr/bin/synergys"
-
-  # install config
-  install -Dm644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
-  install -Dm644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced"
-  install -Dm644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" 
-
-  # install manfiles
-  install -Dm644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
-  install -Dm644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
-
-  # install systemd service and socket
-  install -Dm644 "$srcdir/synergys_at.service" "$pkgdir/usr/lib/systemd/system/synergys at .service"
-  install -Dm644 "$srcdir/synergys_at.socket" "$pkgdir/usr/lib/systemd/system/synergys at .socket"
-
-  # install desktop/icon stuff
-  install -Dm644 "res/synergy.ico" "$pkgdir/usr/share/icons/synergy.ico"
-  install -Dm644 "res/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
-}

Copied: synergy/repos/community-x86_64/PKGBUILD (from rev 122469, synergy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,70 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Michael Düll <mail at akurei.me>
+
+# I would just like to take a minute here and state that synergy is
+# some of the worst packaged software ever. They BUNDLE a fucking
+# zip for cryptopp and do not provide an option to use a system-
+# installed version of that library. They change around paths every
+# update and just generally don't seem to care much.
+pkgname=synergy
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Share a single mouse and keyboard between multiple computers"
+url="http://synergy-foss.org"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++' 'libxkbcommon-x11' 'avahi')
+makedepends=('libxt' 'cmake' 'qt5-base' 'unzip' 'subversion')
+optdepends=('qt5-base: gui support')
+license=('GPL2')
+source=("synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/${pkgver}.tar.gz"
+        "synergys_at.socket"
+        "synergys_at.service"
+        "unfuck-cryptopp-thanks-gentoo.patch")
+sha1sums=('b509c4302ad68d656dfe29711baaca79b835c14a'
+          '7ec33221725fc496b807e0f435c5e87b590beb5d'
+          '65ab58cc3546d6374a05a6a260f15045632e43ce'
+          '8e321e664ae4b7a763175524dd938a88d85c7909')
+
+build() {
+  cd "${srcdir}/synergy-${pkgver}"
+
+  # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo!
+  # You and Fedora are our only friends in this crazy world.
+  patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" .
+  make -j1
+
+  cd src/gui
+  qmake
+  make
+}
+
+package() {
+  cd "${srcdir}/synergy-${pkgver}"
+
+  # install binary
+  install -Dm755 bin/synergy "$pkgdir/usr/bin/synergy"
+  install -Dm755 bin/synergyc "$pkgdir/usr/bin/synergyc"
+  install -Dm755 bin/synergys "$pkgdir/usr/bin/synergys"
+
+  # install config
+  install -Dm644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
+  install -Dm644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced"
+  install -Dm644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" 
+
+  # install manfiles
+  install -Dm644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
+  install -Dm644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
+
+  # install systemd service and socket
+  install -Dm644 "$srcdir/synergys_at.service" "$pkgdir/usr/lib/systemd/system/synergys at .service"
+  install -Dm644 "$srcdir/synergys_at.socket" "$pkgdir/usr/lib/systemd/system/synergys at .socket"
+
+  # install desktop/icon stuff
+  install -Dm644 "res/synergy.ico" "$pkgdir/usr/share/icons/synergy.ico"
+  install -Dm644 "res/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
+}

Deleted: community-x86_64/synergys_at.service
===================================================================
--- community-x86_64/synergys_at.service	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-x86_64/synergys_at.service	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Synergy Server Daemon
-After=network.target
-
-[Service]
-User=%i
-ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

Copied: synergy/repos/community-x86_64/synergys_at.service (from rev 122469, synergy/trunk/synergys_at.service)
===================================================================
--- community-x86_64/synergys_at.service	                        (rev 0)
+++ community-x86_64/synergys_at.service	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+User=%i
+ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/synergys_at.socket
===================================================================
--- community-x86_64/synergys_at.socket	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-x86_64/synergys_at.socket	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=synergys at .service
-
-[Socket]
-ListenStream=24800
-Accept=false
-
-[Install]
-WantedBy=sockets.target

Copied: synergy/repos/community-x86_64/synergys_at.socket (from rev 122469, synergy/trunk/synergys_at.socket)
===================================================================
--- community-x86_64/synergys_at.socket	                        (rev 0)
+++ community-x86_64/synergys_at.socket	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys at .service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target

Deleted: community-x86_64/unfuck-cryptopp-thanks-gentoo.patch
===================================================================
--- community-x86_64/unfuck-cryptopp-thanks-gentoo.patch	2014-11-12 21:17:17 UTC (rev 122469)
+++ community-x86_64/unfuck-cryptopp-thanks-gentoo.patch	2014-11-12 21:17:34 UTC (rev 122470)
@@ -1,109 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,6 +133,10 @@
-	check_type_size(long SIZEOF_LONG)
-	check_type_size(short SIZEOF_SHORT)
- 
-+	set(CMAKE_REQUIRED_LIBRARIES crypto++)
-+	set(CMAKE_REQUIRED_LIBRARIES)
-+	set(CMAKE_INCLUDE_DIRECTORIES)
-+
-	# pthread is used on both Linux and Mac
-	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
-	if (HAVE_PTHREAD)
-diff -ru synergy-1.4.17-Source/ext/CMakeLists.txt lol/ext/CMakeLists.txt
---- synergy-1.4.17-Source/ext/CMakeLists.txt	2014-03-20 20:24:24.000000000 +0100
-+++ lol/ext/CMakeLists.txt	2014-03-27 01:53:09.017682192 +0100
-@@ -13,46 +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(cryptopp_dir cryptopp562)
--
--# only compile the crypto++ files we need.
--set(cryptopp_src
--	${cryptopp_dir}/3way.cpp
--	${cryptopp_dir}/algparam.cpp
--	${cryptopp_dir}/asn.cpp
--	${cryptopp_dir}/authenc.cpp
--	${cryptopp_dir}/basecode.cpp
--	${cryptopp_dir}/cpu.cpp
--	${cryptopp_dir}/cryptlib.cpp
--	${cryptopp_dir}/des.cpp
--	${cryptopp_dir}/dessp.cpp
--	${cryptopp_dir}/dll.cpp
--	${cryptopp_dir}/ec2n.cpp
--	${cryptopp_dir}/ecp.cpp
--	${cryptopp_dir}/filters.cpp
--	${cryptopp_dir}/fips140.cpp
--	${cryptopp_dir}/gcm.cpp
--	${cryptopp_dir}/gf2n.cpp
--	${cryptopp_dir}/gfpcrypt.cpp
--	${cryptopp_dir}/hex.cpp
--	${cryptopp_dir}/hmac.cpp
--	${cryptopp_dir}/hrtimer.cpp
--	${cryptopp_dir}/integer.cpp
--	${cryptopp_dir}/iterhash.cpp
--	${cryptopp_dir}/misc.cpp
--	${cryptopp_dir}/modes.cpp
--	${cryptopp_dir}/mqueue.cpp
--	${cryptopp_dir}/nbtheory.cpp
--	${cryptopp_dir}/oaep.cpp
--	${cryptopp_dir}/osrng.cpp
--	${cryptopp_dir}/pubkey.cpp
--	${cryptopp_dir}/queue.cpp
--	${cryptopp_dir}/randpool.cpp
--	${cryptopp_dir}/rdtables.cpp
--	${cryptopp_dir}/rijndael.cpp
--	${cryptopp_dir}/rng.cpp
--	${cryptopp_dir}/sha.cpp
--)
- 
- # if 64-bit windows, compile asm file.
- if (CMAKE_CL_64)
-@@ -87,10 +47,3 @@
- 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
- 	endif()
- endif()
--
--add_library(cryptopp STATIC ${cryptopp_src})
--
--if (UNIX)
--	# ignore warnings in crypto++
--	set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
--endif()
-diff -ru synergy-1.4.17-Source/src/CMakeLists.txt lol/src/CMakeLists.txt
---- synergy-1.4.17-Source/src/CMakeLists.txt	2014-02-26 18:46:02.000000000 +0100
-+++ lol/src/CMakeLists.txt	2014-03-27 01:54:56.390157358 +0100
-@@ -18,7 +18,3 @@
- add_subdirectory(cmd)
- add_subdirectory(plugin)
- add_subdirectory(micro)
--
--if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
--	add_subdirectory(test)
--endif()
-diff -ru synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h lol/src/lib/io/CryptoMode_cryptopp.h
---- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
-+++ lol/src/lib/io/CryptoMode_cryptopp.h	2014-03-27 01:45:34.810484242 +0100
-@@ -25,6 +25,6 @@
- #	pragma GCC system_header
- #endif 
- 
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.h>
-diff -ru synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h lol/src/lib/io/CryptoStream_cryptopp.h
---- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
-+++ lol/src/lib/io/CryptoStream_cryptopp.h	2014-03-27 01:45:45.727405235 +0100
-@@ -25,5 +25,5 @@
- #	pragma GCC system_header
- #endif
- 
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>

Copied: synergy/repos/community-x86_64/unfuck-cryptopp-thanks-gentoo.patch (from rev 122469, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch)
===================================================================
--- community-x86_64/unfuck-cryptopp-thanks-gentoo.patch	                        (rev 0)
+++ community-x86_64/unfuck-cryptopp-thanks-gentoo.patch	2014-11-12 21:17:34 UTC (rev 122470)
@@ -0,0 +1,109 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,6 +133,10 @@
+	check_type_size(long SIZEOF_LONG)
+	check_type_size(short SIZEOF_SHORT)
+ 
++	set(CMAKE_REQUIRED_LIBRARIES crypto++)
++	set(CMAKE_REQUIRED_LIBRARIES)
++	set(CMAKE_INCLUDE_DIRECTORIES)
++
+	# pthread is used on both Linux and Mac
+	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+	if (HAVE_PTHREAD)
+diff -ru synergy-1.4.17-Source/ext/CMakeLists.txt lol/ext/CMakeLists.txt
+--- synergy-1.4.17-Source/ext/CMakeLists.txt	2014-03-20 20:24:24.000000000 +0100
++++ lol/ext/CMakeLists.txt	2014-03-27 01:53:09.017682192 +0100
+@@ -13,46 +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(cryptopp_dir cryptopp562)
+-
+-# only compile the crypto++ files we need.
+-set(cryptopp_src
+-	${cryptopp_dir}/3way.cpp
+-	${cryptopp_dir}/algparam.cpp
+-	${cryptopp_dir}/asn.cpp
+-	${cryptopp_dir}/authenc.cpp
+-	${cryptopp_dir}/basecode.cpp
+-	${cryptopp_dir}/cpu.cpp
+-	${cryptopp_dir}/cryptlib.cpp
+-	${cryptopp_dir}/des.cpp
+-	${cryptopp_dir}/dessp.cpp
+-	${cryptopp_dir}/dll.cpp
+-	${cryptopp_dir}/ec2n.cpp
+-	${cryptopp_dir}/ecp.cpp
+-	${cryptopp_dir}/filters.cpp
+-	${cryptopp_dir}/fips140.cpp
+-	${cryptopp_dir}/gcm.cpp
+-	${cryptopp_dir}/gf2n.cpp
+-	${cryptopp_dir}/gfpcrypt.cpp
+-	${cryptopp_dir}/hex.cpp
+-	${cryptopp_dir}/hmac.cpp
+-	${cryptopp_dir}/hrtimer.cpp
+-	${cryptopp_dir}/integer.cpp
+-	${cryptopp_dir}/iterhash.cpp
+-	${cryptopp_dir}/misc.cpp
+-	${cryptopp_dir}/modes.cpp
+-	${cryptopp_dir}/mqueue.cpp
+-	${cryptopp_dir}/nbtheory.cpp
+-	${cryptopp_dir}/oaep.cpp
+-	${cryptopp_dir}/osrng.cpp
+-	${cryptopp_dir}/pubkey.cpp
+-	${cryptopp_dir}/queue.cpp
+-	${cryptopp_dir}/randpool.cpp
+-	${cryptopp_dir}/rdtables.cpp
+-	${cryptopp_dir}/rijndael.cpp
+-	${cryptopp_dir}/rng.cpp
+-	${cryptopp_dir}/sha.cpp
+-)
+ 
+ # if 64-bit windows, compile asm file.
+ if (CMAKE_CL_64)
+@@ -87,10 +47,3 @@
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
+ 	endif()
+ endif()
+-
+-add_library(cryptopp STATIC ${cryptopp_src})
+-
+-if (UNIX)
+-	# ignore warnings in crypto++
+-	set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+diff -ru synergy-1.4.17-Source/src/CMakeLists.txt lol/src/CMakeLists.txt
+--- synergy-1.4.17-Source/src/CMakeLists.txt	2014-02-26 18:46:02.000000000 +0100
++++ lol/src/CMakeLists.txt	2014-03-27 01:54:56.390157358 +0100
+@@ -18,7 +18,3 @@
+ add_subdirectory(cmd)
+ add_subdirectory(plugin)
+ add_subdirectory(micro)
+-
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
+-	add_subdirectory(test)
+-endif()
+diff -ru synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h lol/src/lib/io/CryptoMode_cryptopp.h
+--- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
++++ lol/src/lib/io/CryptoMode_cryptopp.h	2014-03-27 01:45:34.810484242 +0100
+@@ -25,6 +25,6 @@
+ #	pragma GCC system_header
+ #endif 
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+diff -ru synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h lol/src/lib/io/CryptoStream_cryptopp.h
+--- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
++++ lol/src/lib/io/CryptoStream_cryptopp.h	2014-03-27 01:45:45.727405235 +0100
+@@ -25,5 +25,5 @@
+ #	pragma GCC system_header
+ #endif
+ 
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>


More information about the arch-commits mailing list