summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaansu2016-09-07 23:12:05 -0700
committerRaansu2016-09-07 23:12:05 -0700
commit306972710f967b4783d303a28fdd7feda3b17d35 (patch)
treef39a42b787d36a0eccd6897c3b797311fa989c6d
parent0dd7ba18338ad1d75fec5363e1b39fa10e3387e6 (diff)
downloadaur-306972710f967b4783d303a28fdd7feda3b17d35.tar.gz
Add temporary patch fix until the fix is merged into the source code.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--diff.patch44
3 files changed, 52 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27a90ced281..bd4d6d1fcd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Mar 5 23:13:15 UTC 2016
pkgbase = clam-git
pkgdesc = The most widely held crypto-currency ever! This package provides both the GUI QT4 and daemon clients.
- pkgver = 1.4.5.265.ge15b722
+ pkgver = 1.4.5.273.g304677d
pkgrel = 1
url = http://www.clamclient.com
arch = any
@@ -27,9 +25,9 @@ pkgbase = clam-git
conflicts = clam-qt
conflicts = clamd
source = git://github.com/nochowderforyou/clams.git
- source = https://github.com/bitcoin/bitcoin/commit/9f3e48e5219a09b5ddfd6883d1f0498910eff4b6.patch
+ source = diff.patch
sha256sums = SKIP
- sha256sums = 0910004577764c2251a33c4868c7358a42da68f94d6462e44bbcb1945cefd748
+ sha256sums = 35bf3c157717e8d6376c3a15b18297b6dadf842f5aff79c9243e26b77bbb1bb6
pkgname = clam-git
diff --git a/PKGBUILD b/PKGBUILD
index 7d96c03ff61..5ceee8fd5bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname='clam-git'
_gitname=clams
-pkgver=1.4.5.265.ge15b722
+pkgver=1.4.5.273.g304677d
pkgrel=1
arch=('any')
url="http://www.clamclient.com"
@@ -16,9 +16,10 @@ pkgdesc="The most widely held crypto-currency ever! This package provides both t
provides=('clam-qt' 'clamd')
conflicts=('clam-qt' 'clamd')
source=("git://github.com/nochowderforyou/clams.git"
- "https://github.com/bitcoin/bitcoin/commit/9f3e48e5219a09b5ddfd6883d1f0498910eff4b6.patch")
+ "diff.patch")
sha256sums=('SKIP'
- '0910004577764c2251a33c4868c7358a42da68f94d6462e44bbcb1945cefd748')
+
+'35bf3c157717e8d6376c3a15b18297b6dadf842f5aff79c9243e26b77bbb1bb6')
pkgver() {
cd "$srcdir/$_gitname"
@@ -27,7 +28,7 @@ pkgver() {
prepare() {
cd "$srcdir/$_gitname"
- patch -Np1 -i "$srcdir"/9f3e48e5219a09b5ddfd6883d1f0498910eff4b6.patch
+ patch -Np1 -i "$srcdir"/diff.patch
}
build() {
diff --git a/diff.patch b/diff.patch
new file mode 100644
index 00000000000..fed316d61e7
--- /dev/null
+++ b/diff.patch
@@ -0,0 +1,44 @@
+--- a/src/chainparams.cpp 2016-09-07 22:43:02.398093506 -0700
++++ b/src/chainparams.cpp 2016-09-07 22:14:12.888168216 -0700
+@@ -90,16 +90,16 @@
+ //
+ // http://doc.satoshilabs.com/slips/slip-0044.html gives the CLAM coin type version as 23 (0x80000017)
+
+- base58Prefixes[PUBKEY_ADDRESS] = list_of(137);
+- base58Prefixes[SCRIPT_ADDRESS] = list_of(13);
++ base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,137);
++ base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,13);
+ //CLAM Secret key, from old base58.h (release 1.4.2.1) == 5 + 128
+- base58Prefixes[SECRET_KEY] = list_of(133);
++ base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,133);
+ //BTC, LTC and DOGE secret keys
+- base58Prefixes[SECRET_KEY_BTC] = list_of(128);
+- base58Prefixes[SECRET_KEY_LTC] = list_of(176);
+- base58Prefixes[SECRET_KEY_DOGE] = list_of(158);
+- base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E);
+- base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4);
++ base58Prefixes[SECRET_KEY_BTC] = std::vector<unsigned char>(1,128);
++ base58Prefixes[SECRET_KEY_LTC] = std::vector<unsigned char>(1,176);
++ base58Prefixes[SECRET_KEY_DOGE] = std::vector<unsigned char>(1,158);
++ base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >();
++ base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();
+
+ convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));
+ }
+@@ -148,11 +148,11 @@
+ vFixedSeeds.clear();
+ vSeeds.clear();
+
+- base58Prefixes[PUBKEY_ADDRESS] = list_of(111);
+- base58Prefixes[SCRIPT_ADDRESS] = list_of(196);
+- base58Prefixes[SECRET_KEY] = list_of(239);
+- base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);
+- base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94);
++ base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
++ base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,96);
++ base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239);
++ base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >();
++ base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container<std::vector<unsigned char> >();
+
+ convertSeed6(vFixedSeeds, pnSeed6_test, ARRAYLEN(pnSeed6_test));
+