[arch-commits] Commit in parity/trunk (2 files)

[Nicola Squartini]

    Date: Friday, January 20, 2017 @ 10:36:35
  Author: tensor5
Revision: 208107

upgpkg: parity 1.5.0-1

Added:
  parity/trunk/35666f718b5097a959c8b9d8ec4bd72915bb223e.patch
Modified:
  parity/trunk/PKGBUILD

------------------------------------------------+
 35666f718b5097a959c8b9d8ec4bd72915bb223e.patch |   33 +++++++++++++++++++++++
 PKGBUILD                                       |   18 +++++++++---
 2 files changed, 46 insertions(+), 5 deletions(-)

Added: 35666f718b5097a959c8b9d8ec4bd72915bb223e.patch
===================================================================
--- 35666f718b5097a959c8b9d8ec4bd72915bb223e.patch	                        (rev 0)
+++ 35666f718b5097a959c8b9d8ec4bd72915bb223e.patch	2017-01-20 10:36:35 UTC (rev 208107)
@@ -0,0 +1,33 @@
+From 35666f718b5097a959c8b9d8ec4bd72915bb223e Mon Sep 17 00:00:00 2001
+From: Arkadiy Paronyan <arkady.paronyan at gmail.com>
+Date: Fri, 20 Jan 2017 10:18:26 +0100
+Subject: [PATCH] Don't panic on uknown git commit hash (#4231)
+
+---
+ ipc-common-types/src/types/version_info.rs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/ipc-common-types/src/types/version_info.rs b/ipc-common-types/src/types/version_info.rs
+index bd869bf..a0b7e62 100644
+--- a/ipc-common-types/src/types/version_info.rs
++++ b/ipc-common-types/src/types/version_info.rs
+@@ -17,8 +17,9 @@
+ //! Types used in the public API
+ 
+ use std::fmt;
++use std::str::FromStr;
+ use semver::{Version};
+-use util::{H160};
++use util::{H160, FixedHash};
+ use util::misc::raw_package_info;
+ use release_track::ReleaseTrack;
+ 
+@@ -47,7 +48,7 @@ impl VersionInfo {
+ 		VersionInfo {
+ 			track: raw.0.into(),
+ 			version: { let mut v = Version::parse(raw.1).expect("Environment variables are known to be valid; qed"); v.build = vec![]; v.pre = vec![]; v },
+-			hash: raw.2.into(),
++			hash: H160::from_str(raw.2).unwrap_or_else(|_| H160::zero()),
+ 		}
+ 	}
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-20 10:29:16 UTC (rev 208106)
+++ PKGBUILD	2017-01-20 10:36:35 UTC (rev 208107)
@@ -2,20 +2,28 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=parity
-pkgver=1.4.10
+pkgver=1.5.0
 pkgrel=1
 pkgdesc='Fast, light, robust Ethereum implementation'
 arch=('i686' 'x86_64')
 url='https://ethcore.io/parity.html'
 license=('GPL3')
-depends=('gcc-libs')
+depends=('openssl')
 makedepends=('cargo')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ethcore/parity/archive/v${pkgver}.tar.gz")
-sha256sums=('4c93213896dd14825bca2e5b1f42ba942c254ae01546aeb6b2c1a4f39b67901b')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ethcore/parity/archive/v${pkgver}.tar.gz"
+        '35666f718b5097a959c8b9d8ec4bd72915bb223e.patch')
+sha256sums=('2999918f6b3f46b87acb3c5d0f362e4964f1079653ab9fea81990c9a601a5d04'
+            '66094d441f7f2cd356ac4a5f8ffecbb4d3eb2d5a752aa4fcdcb817489084cb81')
 
+prepare() {
+    cd ${pkgname}-${pkgver}
+
+    patch -Np1 -i ../35666f718b5097a959c8b9d8ec4bd72915bb223e.patch
+}
+
 build() {
     cd ${pkgname}-${pkgver}
-    
+
     cargo build --release
 }