summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Jerry Mairo2018-02-04 13:17:59 -0800
committerTommy Jerry Mairo2018-02-04 13:17:59 -0800
commit186fd5611e141383d0eb22522aa8fba252d63b25 (patch)
tree054d26787c06b77308780712c9511ef5bc1068f7
parent85351aaf59d544200fe1000157c414136fc1f80f (diff)
downloadaur-186fd5611e141383d0eb22522aa8fba252d63b25.tar.gz
Update: crypto++ 6.0.0 patch
-rw-r--r--PKGBUILD11
-rw-r--r--crypto++.patch13
2 files changed, 20 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 28bd11b4a8a..21b29b10ee6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@
# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
pkgname=amule-dlp-git
pkgver=2.3.2.r10451.df46c833b
-pkgrel=1
+pkgrel=2
pkgdesc="An eMule-like client for ed2k p2p network with DLP patch"
arch=('i686' 'x86_64')
url="https://github.com/persmule/amule-dlp"
license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++<=5.6.5' 'libsm' 'boost-libs')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++>=6.0.0' 'libsm' 'boost-libs')
conflicts=('amule' 'amule-dlp' 'amule-dlp-hg')
makedepends=('git' 'boost')
optdepends=('antileech')
@@ -20,10 +20,12 @@ install=amule.install
provides=('amule' 'amule-dlp')
source=("git+https://github.com/persmule/amule-dlp.git#commit=df46c833b41d4821129d83cf11e03ace104fc2ed"
'amuled.systemd'
- 'amuleweb.systemd')
+ 'amuleweb.systemd'
+ 'crypto++.patch')
sha256sums=('SKIP'
'6dbdd1ad1c3c3d8637b8f4cbd5416f39c8e4277a2f8498577b08bf6cda8dbca9'
- 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2')
+ 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
+ '5627ec0fc6fcb80ad9b730a8a6a3c3279305bdd04d8f522c15f163d889f93922')
pkgver() {
cd "${srcdir}/amule-dlp"
@@ -32,6 +34,7 @@ pkgver() {
prepare(){
cd "${srcdir}/amule-dlp"
+ patch -p1 -i ../crypto++.patch
cp src/aMule.xpm amule.xpm
}
diff --git a/crypto++.patch b/crypto++.patch
new file mode 100644
index 00000000000..2834630d526
--- /dev/null
+++ b/crypto++.patch
@@ -0,0 +1,13 @@
+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) {