salfter/portage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bitgemd for upcoming boost 1.66...probably need to fix other coin daemons too

Browse Source
This commit is contained in:
Scott Alfter
2018-03-02 07:47:59 -08:00
committed by layman
parent c6829a1fd7
commit 0de209e352
4 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-p2p/bitgemd/Manifest
View File

@@ -1,7 +1,5 @@
AUX bitgem.conf 80 SHA256 541ae10cc2246b620de3e7efa97eee59efacf83d28ea5f1297a121d0708226d2 SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f WHIRLPOOL 728e38b62da2c7c3a1149ac511b92d156f7b3c51dacfadd7ce74d9e6f915a6547c4cc8d34159243f50eee333c63b35949b311ea5a7f48a6c3bf17a5d4d47c123
AUX bitgem.confd 201 SHA256 119799038ac15b71e7e8935e29908c137d854a5b35e9e9fea8f5c06feb9f481c SHA512 1741cb1dae175b9fea89677ca49b5d54fc7493e8d19489ec1f3e561800bf007bb64225b807d8c59ff4dc0c9d05b9b4b9ab3c0c654e3c1b8866d044f1aad73d28 WHIRLPOOL 4575759d67780f71821bc6e62e2bd4d1d2706b0f11a105c7ec88ee8b44ff4c4fe3560e0fe663c739bf662b59fadafec9a3ba2d526949af2cda6be827f1edf0c3
AUX bitgem.initd 2451 SHA256 371ce535fe0928853211d21550f81f1e953a38963700dbfb2d83b4ce9d3064b4 SHA512 3d6064fc262fa4d21d21880c773640bff164d9627552f0c026316cb75fb01afe21512ed79dde51dbc45f373bbdf09ab8b131c56f282ab96c14aad49c680e3393 WHIRLPOOL 82a7c1b49f67f4e0e986ed1389dc2c749d272375255101e4ef1a8eb3cad75194be25bca50941a0c8f727d99c94adacce3042f1672c785946abf022fb1a341793
AUX bitgemd-array-disambiguation.patch 412 SHA256 5f4a92bddd08e081aa75d67a6befed9e147a276e57f802fbd8d886fa534a5dff SHA512 fe1c5db34d5b027c5679b241a020d8dd3b77a6a34af3bd5f1066a91e6b7f95a1b85d7637376bc85dd0efd220b9f1349e48b89e79cbf508a1d825eafa719e287c WHIRLPOOL a1623a87d212825e004d3393e0eb5ea997b43baadf8d8e19705da0e8857219d90f9d89d9b6f22acc5718f677b7d026540a2f3a866d9a88de4c9d9d588c96c0ed
AUX bitgemd-miniupnpc-fix.patch 373 SHA256 38ebd1e9339e6a48fdcd07c1232aa3e073fd2e4034622607c6de93171bf7e6c8 SHA512 28a2b112867037e1dc303a75921823153b85ef21bd9b530b1e0f57bf7efb31862cea835f9996f1b794deb917c69b9529c94f696ee948177d2c6551dbd9978638 WHIRLPOOL d32bcf5b65e63867bb1917d77bf6d262c517d75e138842bd5fb9c4c4c8b9121387e2c1e643de78f734d5a9479dfe86ae3b6f2113b420c9134910f878a0f08ccd
AUX bitgemd.logrotate 107 SHA256 7268ca30a07d7e3313c3013340ee8a81cc83cf99ae261705bb62129e9741080b SHA512 c59463355a15dba4d500a97e81e1d4fd1e85fa3b7a2a77b2609ca04551d425c0db0c5dba4f87b356cba8699f8e69f3c23adb21715e30e75a835fc9b38e47793d WHIRLPOOL e7ce0df51d4653774486d9332e0f06b99be7a8699907ed6d9a16ea2a7ef5ea97374e10bac170a8cbbcc74f4351fcc2b1fbc5963ac36adb78439719d5eea85adb
EBUILD bitgemd-9999.ebuild 2856 SHA256 5400a554f247ff5c7de3a79a8ce41f003f6709dbf0246f20ea57150bc91f8b65 SHA512 fc18f18b3368b6a6df5ca57b1bfbc02023a783dd649c0d52b6d245d177ecc78797c038ef6c466cdcb1ebceb25eb84ad3331b7bc402a9e54b7a8557e664f67d2a WHIRLPOOL b3fa9be3f9495abb96f2aead31a8b15e5e3bdd52578989d7a0c82061918f995da84a074ad1ffdec7d391b909a667833c214443daf340c048ea88ccacb0a72677
EBUILD bitgemd-9999.ebuild 2985 SHA256 cd90b9c31b1aa0c7ef2ca2dba4122dc78e02b4124c90876af30839f2e4577cd5 SHA512 35a9ccbf1970497e3da7a64175653b07050b233fbcbe67e530467bd094c5ff01e93b61ace27e65e5526230ad4132448a46f968cf5feee8740de2132514c6b436 WHIRLPOOL de76a3ab4d283f9cdd7bfaad4d29bb1035da1ff74312cef016fdc33691c8830dd74af8e37b8ae61953457299f5e6ab1dc166795e5d71bf64ff15a2be8a639090

17
net-p2p/bitgemd/bitgemd-9999.ebuild
View File

@@ -15,7 +15,7 @@ MyP="${MyPN}-${MyPV}"
DESCRIPTION="Bitgem"
HOMEPAGE="https://github.com/bitgem/bitgem"
EGIT_PROJECT="bitgem"
EGIT_REPO_URI="https://github.com/bitgem/bitgem"
EGIT_REPO_URI="https://gitlab.com/salfter/bitgem.git"
LICENSE="MIT ISC GPL-2"
SLOT="0"
@@ -48,19 +48,24 @@ pkg_setup() {
}
src_prepare() {
if has_version '>=dev-libs/boost-1.52'; then
sed -i 's/\(-l db_cxx\)/-l boost_chrono$(BOOST_LIB_SUFFIX) \1/' src/makefile.unix
fi
if has_version '>=dev-libs/boost-1.52'; then
sed -i 's/\(-l db_cxx\)/-l boost_chrono$(BOOST_LIB_SUFFIX) \1/' src/makefile.unix
fi
# disable FORTIFY_SOURCE
sed -i "s/HARDENING+=-D_FORTIFY_SOURCE=2/#HARDENING+=-D_FORTIFY_SOURCE=2/" src/makefile.unix
# current miniupnp requires a patch
epatch $FILESDIR/bitgemd-miniupnpc-fix.patch
epatch $S/miniupnpc-fix.patch
# 9 Jan 18: patch needed for new Boost API?
# see https://github.com/FairCoinTeam/fair-coin/issues/14 for similar bug
epatch $FILESDIR/bitgemd-array-disambiguation.patch
epatch $S/array-disambiguation.patch
# 2 Mar 18: fixes needed for Boost 1.66
if has_version '>=dev-libs/boost-1.66'; then
epatch $S/boost-1.66-fixes.patch
fi
}
src_compile() {

11
net-p2p/bitgemd/files/bitgemd-array-disambiguation.patch
View File

@@ -1,11 +0,0 @@
--- src/net.cpp~ 2018-01-09 07:59:35.000000000 -0800
+++ src/net.cpp 2018-01-09 08:07:01.000000000 -0800
@@ -57,7 +57,7 @@
static CNode* pnodeLocalHost = NULL;
CAddress addrSeenByPeer(CService("0.0.0.0", 0), nLocalServices);
uint64 nLocalHostNonce = 0;
-array<int, THREAD_MAX> vnThreadsRunning;
+boost::array<int, THREAD_MAX> vnThreadsRunning;
static std::vector<SOCKET> vhListenSocket;
CAddrMan addrman;

11
net-p2p/bitgemd/files/bitgemd-miniupnpc-fix.patch
View File

@@ -1,11 +0,0 @@
--- src/net.cpp~ 2017-05-11 12:04:16.000000000 -0700
+++ src/net.cpp 2017-05-11 12:04:23.111929217 -0700
@@ -1034,7 +1034,7 @@
#else
/* miniupnpc 1.6 */
int error = 0;
- devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
#endif
struct UPNPUrls urls;