Update to v1.2.0 with patch for SEGV

2 files changed, 29 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4cdb898dc79..7e9b104a6e06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mitamae
 	pkgdesc = Configuration management tool embedding mruby
-	pkgver = 1.1.2
-	pkgrel = 2
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://github.com/k0kubun/mitamae
 	arch = i686
 	arch = x86_64
@@ -10,10 +10,14 @@ pkgbase = mitamae
 	makedepends = git
 	depends = glibc
 	depends = openssl
-	source = https://github.com/k0kubun/mitamae/archive/v1.1.2.tar.gz
+	source = https://github.com/k0kubun/mitamae/archive/v1.2.0.tar.gz
+	source = mruby-10bb7ad693e7c7443de924a39c1fedb4461108ba.tar.gz::https://github.com/k0kubun/mruby/archive/10bb7ad693e7c7443de924a39c1fedb4461108ba.tar.gz
 	source = build_config.rb
-	sha512sums = 57d2c4fe093ee729e8d35799dcafc1b5ea92e34dd7a3ab17e3f2ce0fef612368d3b5d09f2a9d18891fc52ff24ae18ff755b4ff8319bcd0ba534b436cd78df893
+	source = https://patch-diff.githubusercontent.com/raw/k0kubun/mitamae/pull/29.patch
+	sha512sums = 7ecf5e6cc777bc157cd82ab7e453ecce6a0fbf4f54dffde2027d31751b95b9169c774b5f913553bbe40bc48448f109e3a69bfddd4a27311dff91bc4632b8f76c
+	sha512sums = 6c07592f3c797570649a1f88bd9328a52bb789d227437747a912a742635f8d238b52777da8e9447cccbc9187c97fed17a9cbd84718bc44405fde5e7e0443ce4d
 	sha512sums = 8910ff0a465e821021de68713161c0a43ad6344a868430c6b8c1384ab1d50980968bedc3feb26cdb48556e318015784e9c11325495184da5358aa61143b0e4aa
+	sha512sums = a4f983cd6232727e6de233ab0c10eded1a377c2d763878c3db658cabcdbe4f8c5c4dc683ec7b486a01ba510c31bc8df86b450f373317884ba10b04a4d4a221b7
 
 pkgname = mitamae
 
diff --git a/PKGBUILD b/PKGBUILD
index 035c6d5e23f2..a651a761f980 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,34 @@
 # Maintainer: Kohei Suzuki <eagletmt@gmail.com>
 pkgname=mitamae
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Configuration management tool embedding mruby"
 arch=('i686' 'x86_64')
 url="https://github.com/k0kubun/mitamae"
 license=('MIT')
 depends=('glibc' 'openssl')
 makedepends=('ruby' 'git')
+_mruby_sha1=10bb7ad693e7c7443de924a39c1fedb4461108ba
 source=("https://github.com/k0kubun/${pkgname}/archive/v${pkgver}.tar.gz"
-        'build_config.rb')
+        "mruby-${_mruby_sha1}.tar.gz::https://github.com/k0kubun/mruby/archive/${_mruby_sha1}.tar.gz"
+        'build_config.rb'
+        'https://patch-diff.githubusercontent.com/raw/k0kubun/mitamae/pull/29.patch'
+        )
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/29.patch"
+  rmdir mruby
+  tar xf "$srcdir/mruby-${_mruby_sha1}.tar.gz"
+  mv "mruby-${_mruby_sha1}" mruby
+}
 
 build() {
   cd "$pkgname-$pkgver"
 
   cp "$srcdir/build_config.rb" .
-  rake compile
+  mruby/minirake compile
 }
 
 package() {
@@ -27,5 +40,7 @@ package() {
   install -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
-sha512sums=('57d2c4fe093ee729e8d35799dcafc1b5ea92e34dd7a3ab17e3f2ce0fef612368d3b5d09f2a9d18891fc52ff24ae18ff755b4ff8319bcd0ba534b436cd78df893'
-            '8910ff0a465e821021de68713161c0a43ad6344a868430c6b8c1384ab1d50980968bedc3feb26cdb48556e318015784e9c11325495184da5358aa61143b0e4aa')
+sha512sums=('7ecf5e6cc777bc157cd82ab7e453ecce6a0fbf4f54dffde2027d31751b95b9169c774b5f913553bbe40bc48448f109e3a69bfddd4a27311dff91bc4632b8f76c'
+            '6c07592f3c797570649a1f88bd9328a52bb789d227437747a912a742635f8d238b52777da8e9447cccbc9187c97fed17a9cbd84718bc44405fde5e7e0443ce4d'
+            '8910ff0a465e821021de68713161c0a43ad6344a868430c6b8c1384ab1d50980968bedc3feb26cdb48556e318015784e9c11325495184da5358aa61143b0e4aa'
+            'a4f983cd6232727e6de233ab0c10eded1a377c2d763878c3db658cabcdbe4f8c5c4dc683ec7b486a01ba510c31bc8df86b450f373317884ba10b04a4d4a221b7')