aurutils: github issue #261

3 files changed, 39 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4ab8a3f04cd..656b7f7a337e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Oct  6 21:15:23 UTC 2017
+# Sat Oct 14 15:04:40 UTC 2017
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
 	pkgver = 1.5.3
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/AladW/aurutils
 	arch = any
 	license = custom:ISC
@@ -22,10 +22,12 @@ pkgbase = aurutils
 	source = aurutils-1.5.3.tar.gz.asc::https://github.com/AladW/aurutils/releases/download/1.5.3/1.5.3.tar.gz.asc
 	source = 0001-aurbuild-backport-fix-for-236.patch
 	source = 0002-aurbuild-disable-verbose-signing.patch
+	source = 0003-aursync-1-r-is-not-a-default-option.patch
 	sha256sums = a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5
 	sha256sums = SKIP
 	sha256sums = 5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86
 	sha256sums = f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb
+	sha256sums = 43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1
 
 pkgname = aurutils
 
diff --git a/0003-aursync-1-r-is-not-a-default-option.patch b/0003-aursync-1-r-is-not-a-default-option.patch
new file mode 100644
index 000000000000..2d263f886f2e
--- /dev/null
+++ b/0003-aursync-1-r-is-not-a-default-option.patch
@@ -0,0 +1,25 @@
+From 20dc81ad04a647ef66b08c274590666554df40c9 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Sat, 14 Oct 2017 16:59:57 +0200
+Subject: [PATCH] aursync(1): -r is not a default option
+
+---
+ man1/aursync.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man1/aursync.1 b/man1/aursync.1
+index 5569c36..82b8d82 100644
+--- a/man1/aursync.1
++++ b/man1/aursync.1
+@@ -78,7 +78,7 @@ value of the configured repository.
+ .RE
+ 
+ .SS makepkg
+-The default set of options is \fImakepkg -Lcrs\fR.
++The default set of options is \fImakepkg -Lcs\fR.
+ 
+ .B \-f, --force
+ .RS
+-- 
+2.14.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 77482ab9101b..02879b67196d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <alad@mailbox.org>
 pkgname=aurutils
 pkgver=1.5.3
-pkgrel=4
+pkgrel=5
 pkgdesc='helper tools for the arch user repository'
 arch=('any')
 url='https://github.com/AladW/aurutils'
@@ -14,21 +14,25 @@ optdepends=('devtools: systemd-nspawn support'
             'parallel: threaded downloads'
             'expac: aursift script'
             'repose: repo-add alternative')
+_backports=('0001-aurbuild-backport-fix-for-236.patch'
+            '0002-aurbuild-disable-verbose-signing.patch'
+            '0003-aursync-1-r-is-not-a-default-option.patch')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
         "$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc"
-        "0001-aurbuild-backport-fix-for-236.patch"
-        "0002-aurbuild-disable-verbose-signing.patch")
+        "${_backports[@]}")
 sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5'
             'SKIP'
             '5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86'
-            'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb')
+            'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb'
+            '43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1')
 # Alad Wenter <alad@mailbox.org>
 validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -p1 < "$srcdir"/0001-aurbuild-backport-fix-for-236.patch
-    patch -p1 < "$srcdir"/0002-aurbuild-disable-verbose-signing.patch
+    for p in "${_backports[@]}"; do
+        patch -p1 < "$srcdir/$p"
+    done
 }
 
 package() {