[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: gnu: Add amule.
From: |
Ludovic Courtès |
Subject: |
12/12: gnu: Add amule. |
Date: |
Mon, 30 Apr 2018 17:41:33 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 1170198d65181ef23bc6a5d130a2b47630cfbb62
Author: fis <address@hidden>
Date: Sat Apr 7 03:44:36 2018 +0800
gnu: Add amule.
* gnu/packages/networking.scm (amule): New public variable.
* gnu/packages/patches/amule_crypto-6.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/local.mk | 1 +
gnu/packages/networking.scm | 63 +++++++++++++++++++++++++++++++
gnu/packages/patches/amule-crypto-6.patch | 45 ++++++++++++++++++++++
3 files changed, 109 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5be445f..a9a7e69 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -557,6 +557,7 @@ dist_patch_DATA =
\
%D%/packages/patches/aegis-test-fixup-1.patch \
%D%/packages/patches/aegis-test-fixup-2.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
+ %D%/packages/patches/amule-crypto-6.patch \
%D%/packages/patches/ansible-wrap-program-hack.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 b9fb016..f7e5d23 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2017 Gábor Boskovits <address@hidden>
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
;;; Copyright © 2018 Adam Van Ymeren <address@hidden>
+;;; Copyright © 2018 Fis Trivial <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -56,6 +57,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages dejagnu)
@@ -66,6 +68,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
#:use-module (gnu packages libidn)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
@@ -84,6 +87,7 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages wm)
+ #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml)
#:use-module (ice-9 match))
@@ -1702,3 +1706,62 @@ file for more details.")
;; src/libstrongswan/plugins/blowfish/blowfish_crypter.c
;; src/libstrongswan/plugins/des/des_crypter.c
license:bsd-4))))
+
+(define-public amule
+ (package
+ (name "amule")
+ (version "2.3.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/amule-project/amule/archive/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1wvcj0n9xz03xz5c2xwp6dwfp7sqjhhwbki3m0lwikskpn9lkzk2"))
+ ;; Patch for adopting crypto++ >= 6.0.
+ (patches (search-patches "amule-crypto-6.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'patch-source-shebangs 'autogen
+ (lambda _
+ (invoke "sh" "autogen.sh")
+ #t)))
+ #:configure-flags
+ '("--disable-rpath"
+ "--enable-wxcas"
+ "--enable-cas"
+ "--enable-alc"
+ "--enable-alcc"
+ "--enable-xas"
+ "--enable-amulecmd"
+ "--enable-geoip"
+ "--enable-ccache"
+ "--enable-nls"
+ "--enable-optimize"
+ "--enable-amule-gui"
+ "--enable-amule-daemon"
+ "--enable-webserver"
+ "--with-denoise-level=0")))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext-minimal" ,gettext-minimal)
+ ("perl" ,perl)))
+ (inputs
+ `(("zlib" ,zlib)
+ ("crypto++" ,crypto++)
+ ("libpng" ,libpng)
+ ("wxwidgets-gtk2", wxwidgets-gtk2)))
+ (home-page "http://amule.org/")
+ (synopsis "Peer-to-peer client for the eD2K and Kademlia networks")
+ (description
+ "aMule is an eMule-like client for the eD2k and Kademlia peer-to-peer
+file sharing networks. It includes a graphical user interface (GUI), a daemon
+allowing you to run a client with no graphical interface, and a Web GUI for
+remote access. The @command{amulecmd} command allows you to control aMule
+remotely.")
+ (license license:gpl2+)))
diff --git a/gnu/packages/patches/amule-crypto-6.patch
b/gnu/packages/patches/amule-crypto-6.patch
new file mode 100644
index 0000000..21a86ab
--- /dev/null
+++ b/gnu/packages/patches/amule-crypto-6.patch
@@ -0,0 +1,45 @@
+From d1d1368c7909ffd8423730afaa811ce7b6a3a8aa Mon Sep 17 00:00:00 2001
+From: Tommy Jerry Mairo <address@hidden>
+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 <address@hidden>
+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) {
- branch master updated (e64a3b4 -> 1170198), Ludovic Courtès, 2018/04/30
- 02/12: gnu: tcc-wrapper: Use Guile 2.2., Ludovic Courtès, 2018/04/30
- 03/12: gnu: gzochi: Build without '-Werror'., Ludovic Courtès, 2018/04/30
- 04/12: gnu: gzochi: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30
- 06/12: gnu: guile-ics: Update to 0.2.0., Ludovic Courtès, 2018/04/30
- 05/12: gnu: geiser: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30
- 09/12: gnu: guile-irregex: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30
- 07/12: gnu: guile-ics: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30
- 08/12: gnu: guile-minikanren: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30
- 12/12: gnu: Add amule.,
Ludovic Courtès <=
- 01/12: weather: Fix type error when reporting CI stats., Ludovic Courtès, 2018/04/30
- 11/12: gnu: guile-dbi: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30
- 10/12: gnu: guile-redis: Switch to Guile 2.2., Ludovic Courtès, 2018/04/30