summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD26
-rw-r--r--diff.patch44
3 files changed, 16 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 29e78623c586..d30da79bca1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
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.277.g9085811
- pkgrel = 4
+ pkgver = 1.4.5.273.g304677d
+ pkgrel = 2
url = http://www.clamclient.com
arch = any
license = MIT
@@ -25,9 +25,9 @@ pkgbase = clam-git
conflicts = clam-qt
conflicts = clamd
source = git://github.com/nochowderforyou/clams.git
- source = diff.patch
+ source = http://github.com/nochowderforyou/clams/pull/295.patch
sha256sums = SKIP
- sha256sums = ee44c9ecbe2a9be8680c6d558185781341fcf020f0dea43ef1066475c44c7d27
+ sha256sums = 121528e6e76c30379b9041f62058e719d2f054f5e8df69c7540b924195f38331
pkgname = clam-git
diff --git a/PKGBUILD b/PKGBUILD
index f47c8c479f2a..fd21d3eb5e63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
pkgname='clam-git'
_gitname=clams
-pkgver=1.4.5.277.g9085811
-pkgrel=4
+pkgver=1.4.5.273.g304677d
+pkgrel=2
arch=('any')
url="http://www.clamclient.com"
depends=('qt4' 'miniupnpc' 'db4.8' 'boost-libs' 'qrencode')
@@ -16,10 +16,9 @@ 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"
- "diff.patch")
+ "http://github.com/nochowderforyou/clams/pull/295.patch")
sha256sums=('SKIP'
-
-'ee44c9ecbe2a9be8680c6d558185781341fcf020f0dea43ef1066475c44c7d27')
+ '121528e6e76c30379b9041f62058e719d2f054f5e8df69c7540b924195f38331')
pkgver() {
cd "$srcdir/$_gitname"
@@ -28,7 +27,7 @@ pkgver() {
prepare() {
cd "$srcdir/$_gitname"
- patch -Np1 -i "$srcdir"/diff.patch
+ git apply "$srcdir"/241.patch
}
build() {
@@ -43,17 +42,16 @@ package() {
# install clam-qt client
msg2 'Installing clam-qt...'
install -Dm755 "$srcdir/$_gitname/src/qt/clam-qt" "$pkgdir/usr/bin/clam-qt"
-# install -Dm644 "$srcdir/$_gitname/share/pixmaps/clams80.xpm" "$pkgdir/usr/share/pixmaps/clams80.xpm"
-# desktop-file-install -m 644 --dir="$pkgdir/usr/share/applications/" "$srcdir/$_gitname/contrib/debian/clam-qt.desktop"
-
+ install -Dm644 "$srcdir/$_gitname/share/pixmaps/clams80.xpm" "$pkgdir/usr/share/pixmaps/clams80.xpm"
+ desktop-file-install -m 644 --dir="$pkgdir/usr/share/applications/" "$srcdir/$_gitname/contrib/debian/clam-qt.desktop"
+
# install clam daemon
msg2 'Installing clam-daemon...'
install -Dm755 "$srcdir/$_gitname/src/clamd" "$pkgdir/usr/bin/clamd"
-# install -Dm644 "$srcdir/$_gitname/contrib/debian/examples/clam.conf" "$pkgdir/usr/share/doc/$pkgname/examples/clam.conf"
-# install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/clamd.1" "$pkgdir/usr/share/man/man1/clamd.1"
-# install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/clam.conf.5" "$pkgdir/usr/share/man/man5/clam.conf.5"
-
+ install -Dm644 "$srcdir/$_gitname/contrib/debian/examples/clam.conf" "$pkgdir/usr/share/doc/$pkgname/examples/clam.conf"
+ install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/clamd.1" "$pkgdir/usr/share/man/man1/clamd.1"
+ install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/clam.conf.5" "$pkgdir/usr/share/man/man5/clam.conf.5"
# install license
install -D -m644 "$srcdir/$_gitname/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-} \ No newline at end of file
+}
diff --git a/diff.patch b/diff.patch
deleted file mode 100644
index bcae7069e8f5..000000000000
--- a/diff.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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,196);
-+ 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));
-