diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-03 01:31:27 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-03 18:23:39 +0200 |
| commit | e348436589795c72d5e7007eb64ef0efdbe75726 (patch) | |
| tree | 1ff2d94ff594f84e319a1393cfa99bd6ffef1233 /gnu | |
| parent | 606b200fe7448b85de5f4ed9d4aa7677b227a980 (diff) | |
| download | guix-patches-e348436589795c72d5e7007eb64ef0efdbe75726.tar guix-patches-e348436589795c72d5e7007eb64ef0efdbe75726.tar.gz | |
gnu: amule: Update to 2.3.3.
* gnu/packages/networking.scm (amule): Update to 2.3.3.
[source]: Remove patch.
* gnu/packages/patches/amule-crypto-6.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/networking.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/amule-crypto-6.patch | 45 |
3 files changed, 2 insertions, 50 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a5820b5827..8c235f50c8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -809,7 +809,6 @@ dist_patch_DATA = \ %D%/packages/patches/akonadi-not-relocatable.patch \ %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ - %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/anki-mpv-args.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 945123e600..5be5cfd606 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2947,7 +2947,7 @@ file for more details.") (define-public amule (package (name "amule") - (version "2.3.2") + (version "2.3.3") (source (origin (method git-fetch) (uri (git-reference @@ -2956,9 +2956,7 @@ file for more details.") (file-name (git-file-name name version)) (sha256 (base32 - "010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn")) - ;; Patch for adopting crypto++ >= 6.0. - (patches (search-patches "amule-crypto-6.patch")))) + "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/amule-crypto-6.patch b/gnu/packages/patches/amule-crypto-6.patch deleted file mode 100644 index 21a86ab0fa..0000000000 --- a/gnu/packages/patches/amule-crypto-6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1d1368c7909ffd8423730afaa811ce7b6a3a8aa Mon Sep 17 00:00:00 2001 -From: Tommy Jerry Mairo <tommy.mairo@gmail.com> -Date: Sun, 4 Feb 2018 12:42:00 -0800 -Subject: [PATCH 1/2] Bugfix: API mismatch with crypto++ 6.0.0 - ---- - src/ClientCreditsList.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp -index 3bea9fe2d..a7ae1e34c 100644 ---- a/src/ClientCreditsList.cpp -+++ b/src/ClientCreditsList.cpp -@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting() - // calculate and store public key - CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey)); - CryptoPP::ArraySink asink(m_abyMyPublicKey, 80); -- pubkey.DEREncode(asink); -+ pubkey.AccessMaterial().Save(asink); - m_nMyPublicKeyLen = asink.TotalPutLength(); - asink.MessageEnd(); - } catch (const CryptoPP::Exception& e) { - -From 88ba0ac952b78382445f2fff73c6792c0474dc62 Mon Sep 17 00:00:00 2001 -From: Tommy Jerry Mairo <tommy.mairo@gmail.com> -Date: Wed, 21 Mar 2018 11:56:28 -0700 -Subject: [PATCH 2/2] Update: Change AccessMaterial to GetMaterial - ---- - src/ClientCreditsList.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp -index a7ae1e34c..69e881fd8 100644 ---- a/src/ClientCreditsList.cpp -+++ b/src/ClientCreditsList.cpp -@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting() - // calculate and store public key - CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey)); - CryptoPP::ArraySink asink(m_abyMyPublicKey, 80); -- pubkey.AccessMaterial().Save(asink); -+ pubkey.GetMaterial().Save(asink); - m_nMyPublicKeyLen = asink.TotalPutLength(); - asink.MessageEnd(); - } catch (const CryptoPP::Exception& e) { |