diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2018-08-24 17:22:01 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2018-08-24 17:22:01 +0000 |
| commit | edf512ca2e5e5a59e84993103663d499dc54600d (patch) | |
| tree | 755180fd4810fbf33aa78186166afc94eafc7a8e /net-p2p | |
| parent | d0dff0b145c82c7f6acffe2125012004f4d4d6cb (diff) | |
| download | ports-edf512ca2e5e5a59e84993103663d499dc54600d.tar.gz ports-edf512ca2e5e5a59e84993103663d499dc54600d.zip | |
Notes
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/amule-devel/Makefile | 6 | ||||
| -rw-r--r-- | net-p2p/amule/Makefile | 7 | ||||
| -rw-r--r-- | net-p2p/amule/files/patch-src_ClientCreditsList.cpp | 16 |
3 files changed, 20 insertions, 9 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index fa01722a840e..ee1756b0fc22 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= amule PORTVERSION= 10998 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel @@ -31,6 +32,7 @@ CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ @@ -109,10 +111,6 @@ XAS_USE= PERL5+=run .include <bsd.port.options.mk> -.if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) -CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM -.endif - .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 6da98b226f4b..cefc64507c05 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} @@ -29,6 +29,7 @@ CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ @@ -106,10 +107,6 @@ XAS_USE= PERL5+=run .include <bsd.port.options.mk> -.if ${ARCH} == "i386" -CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM -.endif - .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif diff --git a/net-p2p/amule/files/patch-src_ClientCreditsList.cpp b/net-p2p/amule/files/patch-src_ClientCreditsList.cpp new file mode 100644 index 000000000000..03377e4105d5 --- /dev/null +++ b/net-p2p/amule/files/patch-src_ClientCreditsList.cpp @@ -0,0 +1,16 @@ +From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001 +From: Tommy Jerry Mairo <tommy.mairo@gmail.com> +Date: Wed, 21 Mar 2018 19:56:28 +0100 +Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0 + +--- src/ClientCreditsList.cpp.orig 2016-09-16 07:55:06 UTC ++++ 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.GetMaterial().Save(asink); + m_nMyPublicKeyLen = asink.TotalPutLength(); + asink.MessageEnd(); + } catch (const CryptoPP::Exception& e) { |