autu: Update to 2.1-1

2 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc3deacf1229..48e9e88e5c74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu May  9 03:25:45 UTC 2019
+# Sat Jul 13 02:51:10 UTC 2019
 pkgbase = rush
 	pkgdesc = GNU Restricted User Shell
-	pkgver = 1.9
+	pkgver = 2.1
 	pkgrel = 1
 	url = http://puszcza.gnu.org.ua/software/rush/
 	arch = i686
@@ -10,13 +10,13 @@ pkgbase = rush
 	license = GPL3
 	makedepends = patch
 	backup = etc/rush.rc
-	source = http://ftp.gnu.org/gnu/rush/rush-1.9.tar.xz
+	source = http://ftp.gnu.org/gnu/rush/rush-2.1.tar.xz
 	source = rush-1.7-glib-2.16-gets.patch
-	md5sums = 271abbfdbf18fadd8dacd0b342ff413f
+	md5sums = 6724eb3ab5134d3bad5b4b91a0c5b97f
 	md5sums = dcd87b8bf9738796621030930384f97d
-	sha1sums = f1fd69ffb1025601f7bb5aaf7c4857e7e4827043
+	sha1sums = fd81c4701af5149008f09f94e2b30f4680a8f885
 	sha1sums = adb33d34f04846734ec3457517b46fb7a73efa6f
-	sha256sums = e42b6b8fbf0ef0c216aff9fecac8752e7cac322b7f149e4932f6b68435a5d598
+	sha256sums = c2ff487d44ce3d14854d0269eb0aa4c0f98bcca35390fad5ea52da75d9e4abdf
 	sha256sums = 159dd2fc0fd4feec5d43cf7763a429b9c2da5c50597b157de9e5b376d9ff85a8
 
 pkgname = rush
diff --git a/PKGBUILD b/PKGBUILD
index 3dcc4d2d57ae..fccaeb41ca21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 set -u
 pkgname='rush'
-pkgver='1.9'
+pkgver='2.1'
 pkgrel='1'
 pkgdesc='GNU Restricted User Shell'
 arch=('i686' 'x86_64')
@@ -17,11 +17,11 @@ _verwatch=("${url}download.html" "${pkgname}-\([0-9\.]\+\)\.tar.xz" 't')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'rush-1.7-glib-2.16-gets.patch')
 # md5 and sha1 are published by gnu
-md5sums=('271abbfdbf18fadd8dacd0b342ff413f'
+md5sums=('6724eb3ab5134d3bad5b4b91a0c5b97f'
          'dcd87b8bf9738796621030930384f97d')
-sha1sums=('f1fd69ffb1025601f7bb5aaf7c4857e7e4827043'
+sha1sums=('fd81c4701af5149008f09f94e2b30f4680a8f885'
           'adb33d34f04846734ec3457517b46fb7a73efa6f')
-sha256sums=('e42b6b8fbf0ef0c216aff9fecac8752e7cac322b7f149e4932f6b68435a5d598'
+sha256sums=('c2ff487d44ce3d14854d0269eb0aa4c0f98bcca35390fad5ea52da75d9e4abdf'
             '159dd2fc0fd4feec5d43cf7763a429b9c2da5c50597b157de9e5b376d9ff85a8')
 
 prepare() {
@@ -30,14 +30,16 @@ prepare() {
   if [ "$(vercmp ${pkgver} '1.8')" -lt 0 ]; then
     patch -p1 < "${srcdir}/rush-1.7-glib-2.16-gets.patch"
   fi
-  sed -i -e 's:^\s*[^#]:#&:g' 'etc/rush.rc'
-  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --sbindir='/usr/bin'
+  sed -e 's:^\s*[^#]:#&:g' -i 'etc/rush.rc'
   set +u
 }
 
 build() {
   set -u
   cd "${pkgname}-${pkgver}"
+  if [ ! -s 'Makefile' ]; then
+    ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --sbindir='/usr/bin'
+  fi
   local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
   nice make -s -j "${_nproc}"
   set +u
@@ -46,14 +48,14 @@ build() {
 check() {
   set -u
   cd "${pkgname}-${pkgver}"
-  make check
+  make -j1 check
   set +u
 }
 
 package() {
   set -u
   cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make -j1 DESTDIR="${pkgdir}" install
   set +u
 }
 set +u