cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amule: apply patch from upstream to cope with cryptopp update

Browse Source
This commit is contained in:
sthen 2020-11-18 00:15:57 +00:00
parent b2df5abec9
commit 1fe4e04982
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/amule/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.77 2020/02/08 16:30:09 fcambus Exp $
# $OpenBSD: Makefile,v 1.78 2020/11/18 00:15:57 sthen Exp $
COMMENT-main = another eDonkey P2P file sharing client
COMMENT-web = webserver interface to amuled
@ -6,10 +6,11 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
V = 2.3.2
DISTNAME = aMule-$V
REVISION = 18
REVISION = 19
CATEGORIES = net
HOMEPAGE = http://www.amule.org/
PORTROACH = site:https://github.com/amule-project/amule/releases
MULTI_PACKAGES =-main -web -daemon

17
net/amule/patches/patch-acinclude_m4
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-acinclude_m4,v 1.5 2016/09/19 14:06:53 dcoppa Exp $
--- acinclude.m4.orig Sun Sep 18 15:32:06 2016
+++ acinclude.m4 Sun Sep 18 15:33:07 2016
$OpenBSD: patch-acinclude_m4,v 1.6 2020/11/18 00:15:57 sthen Exp $
Index: acinclude.m4
--- acinclude.m4.orig
+++ acinclude.m4
@@ -287,7 +287,7 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
;;
openbsd*)
@ -10,3 +12,12 @@ $OpenBSD: patch-acinclude_m4,v 1.5 2016/09/19 14:06:53 dcoppa Exp $
MULECPPFLAGS="-D__OPENBSD__"
;;
*cygwin* | *mingw32*)
@@ -358,7 +358,7 @@ AC_DEFUN([MULE_COMPILATION_FLAGS],
AS_IF([test ${GCC:-no} = yes], [MULE_ADDCCXXFLAG([-W -Wall -Wshadow -Wundef -ggdb -fno-inline -fmessage-length=0])])
AS_IF([test ${SYS:-unknown} = win32], [MULE_ADDFLAG([RC], [-D__DEBUG__])])
], [
- AS_IF([test ${GCC:-no} = yes], [MULE_ADDCCXXFLAG([-W -Wall -Wshadow -Wundef])])
+ AS_IF([test ${GCC:-no} = yes], [MULE_ADDCCXXFLAG([-W -Wall -Wshadow])])
])
MULE_IF_ENABLED([profile],

18
net/amule/patches/patch-src_ClientCreditsList_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_ClientCreditsList_cpp,v 1.1 2020/11/18 00:15:57 sthen Exp $
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
Index: src/ClientCreditsList.cpp
--- src/ClientCreditsList.cpp.orig
+++ 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) {