summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlad Wenter2018-01-27 03:27:32 +0100
committerAlad Wenter2018-01-27 03:29:03 +0100
commit3a5a4f833054215b183eca3b0310bea4443b8249 (patch)
treedacdf2667e2816d8da722ba521381d47be632cad
parent78c21f8d2100b72d43a94991b0da649c6ee34180 (diff)
downloadaur-3a5a4f833054215b183eca3b0310bea4443b8249.tar.gz
aurutils: update to 1.5.3-6
https://github.com/AladW/aurutils/issues/281
-rw-r--r--.SRCINFO8
-rw-r--r--0003-aursync-1-r-is-not-a-default-option.patch25
-rw-r--r--0003-aursync-make-L-optional-281.patch70
-rw-r--r--PKGBUILD6
4 files changed, 77 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 656b7f7a337..c98b020fd89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Oct 14 15:04:40 UTC 2017
+# Sat Jan 27 02:28:49 UTC 2018
pkgbase = aurutils
pkgdesc = helper tools for the arch user repository
pkgver = 1.5.3
- pkgrel = 5
+ pkgrel = 6
url = https://github.com/AladW/aurutils
arch = any
license = custom:ISC
@@ -22,12 +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
+ source = 0003-aursync-make-L-optional-281.patch
sha256sums = a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5
sha256sums = SKIP
sha256sums = 5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86
sha256sums = f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb
- sha256sums = 43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1
+ sha256sums = 4019c459d9c5e9592af3f290920f3f5e039bedfa29ddd3f130639db18b2c9f45
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
deleted file mode 100644
index 2d263f886f2..00000000000
--- a/0003-aursync-1-r-is-not-a-default-option.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/0003-aursync-make-L-optional-281.patch b/0003-aursync-make-L-optional-281.patch
new file mode 100644
index 00000000000..e83385b8066
--- /dev/null
+++ b/0003-aursync-make-L-optional-281.patch
@@ -0,0 +1,70 @@
+From 5a6ca442b7499d15d95005f77db591d01facd6ad Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@mailbox.org>
+Date: Sat, 27 Jan 2018 03:21:37 +0100
+Subject: [PATCH] aursync: make -L optional (#281)
+
+---
+ bin/aursync | 7 ++++---
+ man1/aursync.1 | 7 ++++++-
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/bin/aursync b/bin/aursync
+index fdf485d..1a96c0d 100755
+--- a/bin/aursync
++++ b/bin/aursync
+@@ -58,9 +58,9 @@ if getopt -T || (($? != 4)); then
+ exit 22
+ fi
+
+-longopts=allan,bind:,chroot,container:,force,help,ignore:,no-confirm,no-ver,no-view,print,rmdeps,sign,tar,temp,repo:,root:,update
++longopts=allan,bind:,chroot,container:,force,help,ignore:,no-confirm,no-ver,no-view,print,rmdeps,sign,tar,temp,repo:,root:,update,log
+
+-if TEMP=$(getopt -o B:cC:fhnprstTu -l "$longopts" -n "$argv0" -- "$@"); then
++if TEMP=$(getopt -o B:cC:fhLnprstTu -l "$longopts" -n "$argv0" -- "$@"); then
+ eval set -- "$TEMP"
+ else
+ usage
+@@ -78,6 +78,7 @@ while true; do
+ -f|--force) local_args+=(-f); shift ;;
+ -n|--no-confirm) local_args+=(--noconfirm); shift ;;
+ -r|--rmdeps) local_args+=(-r); shift ;;
++ -L|--log) local_args+=(-L); shift ;;
+ -p|--print) printonly=1; shift ;;
+ -t|--tar) snapshot=1; shift ;;
+ -u|--update) update=1; shift ;;
+@@ -103,7 +104,7 @@ fi
+ if ((chroot)); then
+ makepkg_args=(-cnu "${chroot_args[@]}")
+ else
+- makepkg_args=(-Lcs "${local_args[@]}")
++ makepkg_args=(-cs "${local_args[@]}")
+ fi
+
+ if ! (($# + update)); then
+diff --git a/man1/aursync.1 b/man1/aursync.1
+index 5569c36..834afd7 100644
+--- a/man1/aursync.1
++++ b/man1/aursync.1
+@@ -78,13 +78,18 @@ value of the configured repository.
+ .RE
+
+ .SS makepkg
+-The default set of options is \fImakepkg -Lcrs\fR.
++The default set of options is \fImakepkg -cs\fR.
+
+ .B \-f, --force
+ .RS
+ Overwrite built packages. (\fImakepkg -f\fR)
+ .RE
+
++.B \-L, --log
++.RS
++Enable logging to a text file in the build directory. (\fImakepkg -L\fR)
++.RE
++
+ .B \-n, --no-confirm
+ .RS
+ Do not wait for user input. (\fImakepkg --noconfirm\fR)
+--
+2.16.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 02879b67196..15d3e5d7e60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Alad Wenter <alad@mailbox.org>
pkgname=aurutils
pkgver=1.5.3
-pkgrel=5
+pkgrel=6
pkgdesc='helper tools for the arch user repository'
arch=('any')
url='https://github.com/AladW/aurutils'
@@ -16,7 +16,7 @@ optdepends=('devtools: systemd-nspawn support'
'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')
+ '0003-aursync-make-L-optional-281.patch')
source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
"$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc"
"${_backports[@]}")
@@ -24,7 +24,7 @@ sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5'
'SKIP'
'5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86'
'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb'
- '43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1')
+ '4019c459d9c5e9592af3f290920f3f5e039bedfa29ddd3f130639db18b2c9f45')
# Alad Wenter <alad@mailbox.org>
validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')