| 1 |
jer 13/10/26 15:36:49 |
| 2 |
|
| 3 |
Added: synergy-1.4.15-cryptopp.patch |
| 4 |
Log: |
| 5 |
Version bump (bug #489444 by Patrick). |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/synergy/files/synergy-1.4.15-cryptopp.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/synergy/files/synergy-1.4.15-cryptopp.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/synergy/files/synergy-1.4.15-cryptopp.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: synergy-1.4.15-cryptopp.patch |
| 16 |
=================================================================== |
| 17 |
--- a/CMakeLists.txt |
| 18 |
+++ b/CMakeLists.txt |
| 19 |
@@ -133,6 +133,10 @@ |
| 20 |
check_type_size(long SIZEOF_LONG) |
| 21 |
check_type_size(short SIZEOF_SHORT) |
| 22 |
|
| 23 |
+ set(CMAKE_REQUIRED_LIBRARIES crypto++) |
| 24 |
+ set(CMAKE_REQUIRED_LIBRARIES) |
| 25 |
+ set(CMAKE_INCLUDE_DIRECTORIES) |
| 26 |
+ |
| 27 |
# pthread is used on both Linux and Mac |
| 28 |
check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) |
| 29 |
if (HAVE_PTHREAD) |
| 30 |
--- a/tools/CMakeLists.txt |
| 31 |
+++ b/tools/CMakeLists.txt |
| 32 |
@@ -13,47 +13,6 @@ |
| 33 |
# You should have received a copy of the GNU General Public License |
| 34 |
# along with this program. If not, see <http://www.gnu/licenses/>. |
| 35 |
|
| 36 |
-set(cryptopp_dir cryptopp562) |
| 37 |
- |
| 38 |
-# only compile the crypto++ files we need. |
| 39 |
-set(cryptopp_src |
| 40 |
- ${cryptopp_dir}/3way.cpp |
| 41 |
- ${cryptopp_dir}/algparam.cpp |
| 42 |
- ${cryptopp_dir}/asn.cpp |
| 43 |
- ${cryptopp_dir}/authenc.cpp |
| 44 |
- ${cryptopp_dir}/basecode.cpp |
| 45 |
- ${cryptopp_dir}/cpu.cpp |
| 46 |
- ${cryptopp_dir}/cryptlib.cpp |
| 47 |
- ${cryptopp_dir}/des.cpp |
| 48 |
- ${cryptopp_dir}/dessp.cpp |
| 49 |
- ${cryptopp_dir}/dll.cpp |
| 50 |
- ${cryptopp_dir}/ec2n.cpp |
| 51 |
- ${cryptopp_dir}/ecp.cpp |
| 52 |
- ${cryptopp_dir}/filters.cpp |
| 53 |
- ${cryptopp_dir}/fips140.cpp |
| 54 |
- ${cryptopp_dir}/gcm.cpp |
| 55 |
- ${cryptopp_dir}/gf2n.cpp |
| 56 |
- ${cryptopp_dir}/gfpcrypt.cpp |
| 57 |
- ${cryptopp_dir}/hex.cpp |
| 58 |
- ${cryptopp_dir}/hmac.cpp |
| 59 |
- ${cryptopp_dir}/hrtimer.cpp |
| 60 |
- ${cryptopp_dir}/integer.cpp |
| 61 |
- ${cryptopp_dir}/iterhash.cpp |
| 62 |
- ${cryptopp_dir}/misc.cpp |
| 63 |
- ${cryptopp_dir}/modes.cpp |
| 64 |
- ${cryptopp_dir}/mqueue.cpp |
| 65 |
- ${cryptopp_dir}/nbtheory.cpp |
| 66 |
- ${cryptopp_dir}/oaep.cpp |
| 67 |
- ${cryptopp_dir}/osrng.cpp |
| 68 |
- ${cryptopp_dir}/pubkey.cpp |
| 69 |
- ${cryptopp_dir}/queue.cpp |
| 70 |
- ${cryptopp_dir}/randpool.cpp |
| 71 |
- ${cryptopp_dir}/rdtables.cpp |
| 72 |
- ${cryptopp_dir}/rijndael.cpp |
| 73 |
- ${cryptopp_dir}/rng.cpp |
| 74 |
- ${cryptopp_dir}/sha.cpp |
| 75 |
-) |
| 76 |
- |
| 77 |
# if 64-bit windows, compile asm file. |
| 78 |
if (CMAKE_CL_64) |
| 79 |
list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm) |
| 80 |
@@ -83,5 +42,3 @@ |
| 81 |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") |
| 82 |
endif() |
| 83 |
endif() |
| 84 |
- |
| 85 |
-add_library(cryptopp STATIC ${cryptopp_src}) |
| 86 |
--- a/src/lib/io/CCryptoMode.h |
| 87 |
+++ b/src/lib/io/CCryptoMode.h |
| 88 |
@@ -17,9 +17,9 @@ |
| 89 |
|
| 90 |
#pragma once |
| 91 |
|
| 92 |
-#include <cryptopp562/gcm.h> |
| 93 |
-#include <cryptopp562/modes.h> |
| 94 |
-#include <cryptopp562/aes.h> |
| 95 |
+#include <crypto++/gcm.h> |
| 96 |
+#include <crypto++/modes.h> |
| 97 |
+#include <crypto++/aes.h> |
| 98 |
#include "ECryptoMode.h" |
| 99 |
#include "CString.h" |
| 100 |
|
| 101 |
--- a/src/lib/io/CCryptoStream.h |
| 102 |
+++ b/src/lib/io/CCryptoStream.h |
| 103 |
@@ -20,8 +20,8 @@ |
| 104 |
#include "BasicTypes.h" |
| 105 |
#include "CStreamFilter.h" |
| 106 |
#include "CCryptoMode.h" |
| 107 |
-#include <cryptopp562/osrng.h> |
| 108 |
-#include <cryptopp562/sha.h> |
| 109 |
+#include <crypto++/osrng.h> |
| 110 |
+#include <crypto++/sha.h> |
| 111 |
|
| 112 |
class CCryptoOptions; |
Archives