diff options
Diffstat (limited to 'net-p2p/mldonkey')
| -rw-r--r-- | net-p2p/mldonkey/Manifest | 3 | ||||
| -rw-r--r-- | net-p2p/mldonkey/files/cpp17-byte-namespace.patch | 63 | ||||
| -rw-r--r-- | net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild | 2 |
3 files changed, 67 insertions, 1 deletions
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest index dab730f4a27f..d458549a89ff 100644 --- a/net-p2p/mldonkey/Manifest +++ b/net-p2p/mldonkey/Manifest @@ -1,5 +1,6 @@ +AUX cpp17-byte-namespace.patch 2224 BLAKE2B 8d69353ae9a5d3297f304d2b130ed06f5f2f8aef5ae1116a69e36019c70e3c991354b0d8ad27951910b67b8a87641b563c7065c4e50f11452c0f9be79971cbae SHA512 8f7e1893846568e41e651f63ed9a003090adbe3ec7a6ccb18a1e2638ccbc9b249e99b27babfca030129d8b4c1f72b752a5c6eb18cc21a066cd08ff414c92a8d8 AUX mldonkey.confd 949 BLAKE2B 05e1ceaa111249a979931c14eb599201e525f50af2370318c4bd0b6025694b55167e400c784774719dc084e326de378365e6a53badaf48cc1681003ef5b55ceb SHA512 d45f8ca35aacbd4f05a936c591866b7cb4b19e6c69139f728160c8dc09b3d4c1f689d28fa7287692f8382c291b50ff91b3ea594fe781f861efa991f2927e882c AUX mldonkey.initd 3509 BLAKE2B d3098a027f044f3bfc7559fa1869f7080844de1cec93fe26424322aafd482c7f010fef96854115e42e4b2a37f31b1d0f6caf94abf0c97c52d794db4767f5c0c1 SHA512 0c423feb9abbe7b08d77a3221a3638a0a93526bbf68c5e60e944413f4fd13ac44813609179b981c31d19e1e8fe11333f16dc8388a144208694cb84c008dbbed3 DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934 -EBUILD mldonkey-3.1.7-r2.ebuild 4605 BLAKE2B 3842e7aa6cd7aace9be040d80ac2f905b5e3cac9db08ec2bf71cb6d854c3ba25e82dc638a4f4b4d8984e04a2a9b9a95e3a4571f48dbd43f728ae9674afb40d62 SHA512 c565722c0523bd174fb42703ebd44d43d2422e07334c4bd5493254e3d15b5faba71e4d9daf8585e38e61f52cd7110d428ee199beefdc64a8348057d14ffd82c5 +EBUILD mldonkey-3.1.7-r2.ebuild 4659 BLAKE2B 60a14309d772b80cd916b1b187795e69592c7604eae0034b7bb64040d5848d2f17945ef0606000f208e79ffe737dfacf796187899c1c16ab1402a66796d05e34 SHA512 5346ed2cf24081cafbd05ac373a02ae9f8f9e21b720992d0d476d3cb366fbf488a4acba0c7e112dd2a15e6b61f2ae53058352432b43803ec366abccf21840e59 MISC metadata.xml 809 BLAKE2B 1e1d3eb87ffee2ab5b4fe9860de53679b7b29095d14811687d53cc9f4dc150bfe728375ab8acb48348d8f1a85d8f93e0d008f14cfd8e15129377fb26fe719dab SHA512 1d58b72d25faafecbe527956dd19820a78566e27dd10c996fc36a81807a48245efbb6d5a037304770b823e0c9930dc333db22749a8ebc3d056a4118f8d970286 diff --git a/net-p2p/mldonkey/files/cpp17-byte-namespace.patch b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch new file mode 100644 index 000000000000..0b1ca44e8eed --- /dev/null +++ b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch @@ -0,0 +1,63 @@ +diff -ur a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc +--- a/src/utils/lib/CryptoPP.cc 2021-07-06 22:20:46.675183781 +0200 ++++ b/src/utils/lib/CryptoPP.cc 2021-07-06 22:20:51.025182789 +0200 +@@ -9482,7 +9482,7 @@ + #define PRIVKEYSIZE 384 + + static Signer* s_signer = NULL; +-static byte m_publicKey[MAXPUBKEYSIZE+1]; ++static CryptoPP::byte m_publicKey[MAXPUBKEYSIZE+1]; + static unsigned long m_publicKeyLen = 0; + + void cc_lprintf_nl(const char * msg, bool verb); +@@ -9555,7 +9555,7 @@ + + + // return signatureSize (buf) +-int createSignature(byte *buf, int maxLen, byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) { ++int createSignature(CryptoPP::byte *buf, int maxLen, CryptoPP::byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) { + + int result = 0; + +@@ -9570,7 +9570,7 @@ + CryptoPP::SecByteBlock sBB(s_signer->SignatureLength()); + CryptoPP::AutoSeededRandomPool rng; + +- byte bArray[MAXPUBKEYSIZE+9]; ++ CryptoPP::byte bArray[MAXPUBKEYSIZE+9]; + + memcpy(bArray,key,keyLen); + PokeUInt32(bArray+keyLen,cInt); +@@ -9597,7 +9597,7 @@ + + } + +-int verifySignature(byte *key, int keyLen, byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) { ++int verifySignature(CryptoPP::byte *key, int keyLen, CryptoPP::byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) { + using namespace CryptoPP; + + bool result = false; +@@ -9607,7 +9607,7 @@ + StringSource ss_Pubkey(key, keyLen,true,0); + Verifier pubKey(ss_Pubkey); + +- byte bArray[MAXPUBKEYSIZE+9]; ++ CryptoPP::byte bArray[MAXPUBKEYSIZE+9]; + + memcpy(bArray,m_publicKey,m_publicKeyLen); + PokeUInt32(bArray+m_publicKeyLen,cInt); +diff -ur a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h +--- a/src/utils/lib/CryptoPP.h 2021-07-06 22:20:46.675183781 +0200 ++++ b/src/utils/lib/CryptoPP.h 2021-07-06 22:20:56.271848200 +0200 +@@ -181,10 +181,9 @@ + # define __USE_W32_SOCKETS + #endif + +-typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs +- + NAMESPACE_BEGIN(CryptoPP) + ++typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs + typedef unsigned short word16; + typedef unsigned int word32; + diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild index 8557ea1a285e..c1bb19df5b69 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild @@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND} RESTRICT="!ocamlopt? ( strip )" +PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" ) + S="${WORKDIR}/${P}-2" pkg_setup() { |