alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/applications/misc/synergy/cryptopp.patch

46 lines
1.8 KiB
Diff
Raw Normal View History

synergy: upgrade to 1.4.17
2014-02-24 14:19:23 +00:00
diff -urN synergy-1.4.17-Source/CMakeLists.txt synergy-1.4.17-Source-fix/CMakeLists.txt
--- synergy-1.4.17-Source/CMakeLists.txt 2014-03-14 21:34:19.000000000 +0100
+++ synergy-1.4.17-Source-fix/CMakeLists.txt 2014-04-11 13:37:18.839338710 +0200
@@ -145,6 +145,9 @@
synergy: Update to new upstream version 1.4.12. This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 05:20:45 +01:00
check_type_size(long SIZEOF_LONG)
check_type_size(short SIZEOF_SHORT)
synergy: upgrade to 1.4.17
2014-02-24 14:19:23 +00:00
+ # let's just assume cryptopp exists (provided by the Nix expression)
+ list(APPEND libs cryptopp)
synergy: Update to new upstream version 1.4.12. This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 05:20:45 +01:00
+
# pthread is used on both Linux and Mac
check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
if (HAVE_PTHREAD)
synergy: upgrade to 1.4.17
2014-02-24 14:19:23 +00:00
@@ -317,7 +320,6 @@
synergy: Update to new upstream version 1.4.12. This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 05:20:45 +01:00
endif()
add_subdirectory(src)
synergy: upgrade to 1.4.17
2014-02-24 14:19:23 +00:00
-add_subdirectory(ext)
synergy: Update to new upstream version 1.4.12. This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 05:20:45 +01:00
if (WIN32)
synergy: upgrade to 1.4.17
2014-02-24 14:19:23 +00:00
# TODO: consider using /analyze to uncover potential bugs in the source code.
diff -urN synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h synergy-1.4.17-Source-fix/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
+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h 2014-04-11 13:36:01.111985556 +0200
@@ -25,6 +25,6 @@
# pragma GCC system_header
#endif
synergy: Update to new upstream version 1.4.12. This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 05:20:45 +01:00
-#include <cryptopp562/gcm.h>
-#include <cryptopp562/modes.h>
-#include <cryptopp562/aes.h>
+#include <cryptopp/gcm.h>
+#include <cryptopp/modes.h>
+#include <cryptopp/aes.h>
synergy: upgrade to 1.4.17
2014-02-24 14:19:23 +00:00
diff -urN synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h synergy-1.4.17-Source-fix/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
+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h 2014-04-11 13:36:07.173013005 +0200
@@ -25,5 +25,5 @@
# pragma GCC system_header
#endif
synergy: Update to new upstream version 1.4.12. This brings in support for encryption and thus requires the crypto++ library as an additional dependency. Unfortunately the upstream integration isn't quite the way we'd like it to be, so we need to add a small patch to ignore the bundled version and use the package from nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 05:20:45 +01:00
-#include <cryptopp562/osrng.h>
-#include <cryptopp562/sha.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/sha.h>
Copy permalink