[arch-commits] Commit in synergy/trunk (PKGBUILD unfuck-cryptopp-thanks-gentoo.patch)

[Sven-Hendrik Haase]

    Date: Friday, November 22, 2013 @ 17:04:29
  Author: svenstaro
Revision: 101310

upgpkg: synergy 1.4.15-2

Try to fix the cryptopp problems

Added:
  synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch
Modified:
  synergy/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   17 +++--
 unfuck-cryptopp-thanks-gentoo.patch |   97 ++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-22 13:42:25 UTC (rev 101309)
+++ PKGBUILD	2013-11-22 16:04:29 UTC (rev 101310)
@@ -6,7 +6,7 @@
 
 pkgname=synergy
 pkgver=1.4.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64')
@@ -16,16 +16,19 @@
 license=('GPL2')
 source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
         "synergys.socket"
-        "synergys.service")
-sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a'
-            'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
-            'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f')
+        "synergys.service"
+        "unfuck-cryptopp-thanks-gentoo.patch")
+sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73'
+          '947406e72351145c65ba9884ed175bf781482d46'
+          '00f2259c31c9551c0830d9e889fd0a0790cf9045'
+          '129151952e6d25504ca823aee8ebe93ce3d376ce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
-  # Unzip the crypto library
-  unzip -d tools/cryptopp562 tools/cryptopp562.zip
+  # 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 -D CMAKE_INSTALL_PREFIX=/usr . 
   make

Added: unfuck-cryptopp-thanks-gentoo.patch
===================================================================
--- unfuck-cryptopp-thanks-gentoo.patch	                        (rev 0)
+++ unfuck-cryptopp-thanks-gentoo.patch	2013-11-22 16:04:29 UTC (rev 101310)
@@ -0,0 +1,97 @@
+--- 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)
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -13,47 +13,6 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu/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)
+ 	list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm)
+@@ -83,5 +42,3 @@
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ 	endif()
+ endif()
+-
+-add_library(cryptopp STATIC ${cryptopp_src})
+--- a/src/lib/io/CCryptoMode.h
++++ b/src/lib/io/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/io/CCryptoStream.h
++++ b/src/lib/io/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;
+