diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | 0001-aurbuild-backport-fix-for-236.patch | 6 | ||||
| -rw-r--r-- | 0002-aurbuild-disable-verbose-signing.patch | 25 | ||||
| -rw-r--r-- | 0002-aursync-make-L-optional-281.patch (renamed from 0003-aursync-make-L-optional-281.patch) | 20 | ||||
| -rw-r--r-- | 0003-aurbuild-update-default-options.patch | 28 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
6 files changed, 47 insertions, 58 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Jan 27 12:27:40 UTC 2018 +# Sat Jan 27 13:02:51 UTC 2018 pkgbase = aurutils pkgdesc = helper tools for the arch user repository pkgver = 1.5.3 - pkgrel = 7 + pkgrel = 8 url = https://github.com/AladW/aurutils arch = any license = custom:ISC @@ -21,13 +21,13 @@ pkgbase = aurutils source = aurutils-1.5.3.tar.gz::https://github.com/AladW/aurutils/archive/1.5.3.tar.gz 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-make-L-optional-281.patch + source = 0002-aursync-make-L-optional-281.patch + source = 0003-aurbuild-update-default-options.patch sha256sums = a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5 sha256sums = SKIP - sha256sums = 5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86 - sha256sums = f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb - sha256sums = ada79e7e8c637704081a00a8a7253744eb8776ffe16042a1e197b9e67f335317 + sha256sums = e4076af43608a00e47379232b4d42412b5956d96c73f66ecb2cfd62d8a2eba86 + sha256sums = 6a28f1e1c98a69a236409ed659f0a699c89bb16748d364be2ba0841041cd015c + sha256sums = 84976fe128a6ea5b7bb185d63fe447a340404a9d63700020158202e6e8006b49 pkgname = aurutils diff --git a/0001-aurbuild-backport-fix-for-236.patch b/0001-aurbuild-backport-fix-for-236.patch index 5ab99e7b4d4a..73f43c84c5f0 100644 --- a/0001-aurbuild-backport-fix-for-236.patch +++ b/0001-aurbuild-backport-fix-for-236.patch @@ -1,7 +1,7 @@ -From 07d302de1d48e2daea193d9a3a2931331c8abce0 Mon Sep 17 00:00:00 2001 +From 79b42b1252ff70ba46cb7fff077ab5afa0115568 Mon Sep 17 00:00:00 2001 From: Alad Wenter <alad@mailbox.org> Date: Fri, 6 Oct 2017 23:03:14 +0200 -Subject: [PATCH 1/2] aurbuild: backport fix for #236 +Subject: [PATCH 1/3] aurbuild: backport fix for #236 --- bin/aurbuild | 10 ++++++++-- @@ -36,5 +36,5 @@ index 05df8b0..4672372 100755 if ((chroot)); then -- -2.14.2 +2.16.1 diff --git a/0002-aurbuild-disable-verbose-signing.patch b/0002-aurbuild-disable-verbose-signing.patch deleted file mode 100644 index 6461434bfa29..000000000000 --- a/0002-aurbuild-disable-verbose-signing.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1e16b62746576f594a5da9859a8a58e5f5be74f1 Mon Sep 17 00:00:00 2001 -From: Alad Wenter <alad@mailbox.org> -Date: Fri, 6 Oct 2017 23:10:04 +0200 -Subject: [PATCH 2/2] aurbuild: disable verbose signing - ---- - bin/aurbuild | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/aurbuild b/bin/aurbuild -index 4672372..951a9ba 100755 ---- a/bin/aurbuild -+++ b/bin/aurbuild -@@ -4,7 +4,7 @@ readonly basedir=$PWD - readonly PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' - set -e - --declare -a gpg_args=(--detach-sign --no-armor --verbose --batch) -+declare -a gpg_args=(--detach-sign --no-armor --batch) - declare -a makechrootpkg_args=(-cnu) makepkg_args=(-Lcrs) - declare -i chroot=0 sign_pkg=0 - --- -2.14.2 - diff --git a/0003-aursync-make-L-optional-281.patch b/0002-aursync-make-L-optional-281.patch index 4402e0c627c4..9fbdeb9e88e2 100644 --- a/0003-aursync-make-L-optional-281.patch +++ b/0002-aursync-make-L-optional-281.patch @@ -1,27 +1,13 @@ -From 3ed30e94e974988acd36c77dd73820366a311ff0 Mon Sep 17 00:00:00 2001 +From 43ee1e5f814886b3f04bf899205ef2c2c03aba02 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) +Subject: [PATCH 2/3] aursync: make -L optional (#281) --- - bin/aurbuild | 2 +- bin/aursync | 7 ++++--- man1/aursync.1 | 7 ++++++- - 3 files changed, 11 insertions(+), 5 deletions(-) + 2 files changed, 10 insertions(+), 4 deletions(-) -diff --git a/bin/aurbuild b/bin/aurbuild -index 05df8b0..babd81d 100755 ---- a/bin/aurbuild -+++ b/bin/aurbuild -@@ -5,7 +5,7 @@ readonly PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' - set -e - - declare -a gpg_args=(--detach-sign --no-armor --verbose --batch) --declare -a makechrootpkg_args=(-cnu) makepkg_args=(-Lcrs) -+declare -a makechrootpkg_args=(-cnu) makepkg_args=(-crs) - declare -i chroot=0 sign_pkg=0 - - conf_chroot() { diff --git a/bin/aursync b/bin/aursync index fdf485d..1a96c0d 100755 --- a/bin/aursync diff --git a/0003-aurbuild-update-default-options.patch b/0003-aurbuild-update-default-options.patch new file mode 100644 index 000000000000..bb83c5d761c1 --- /dev/null +++ b/0003-aurbuild-update-default-options.patch @@ -0,0 +1,28 @@ +From fb682a53f0bad47baaf734d5af2baa2964fdb85b Mon Sep 17 00:00:00 2001 +From: Alad Wenter <alad@mailbox.org> +Date: Sat, 27 Jan 2018 13:57:37 +0100 +Subject: [PATCH 3/3] aurbuild: update default options + +Remove gpg --verbose, makepkg -L +--- + bin/aurbuild | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/aurbuild b/bin/aurbuild +index 4672372..f5ca92c 100755 +--- a/bin/aurbuild ++++ b/bin/aurbuild +@@ -4,8 +4,8 @@ readonly basedir=$PWD + readonly PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' + set -e + +-declare -a gpg_args=(--detach-sign --no-armor --verbose --batch) +-declare -a makechrootpkg_args=(-cnu) makepkg_args=(-Lcrs) ++declare -a gpg_args=(--detach-sign --no-armor --batch) ++declare -a makechrootpkg_args=(-cnu) makepkg_args=(-crs) + declare -i chroot=0 sign_pkg=0 + + conf_chroot() { +-- +2.16.1 + @@ -1,7 +1,7 @@ # Maintainer: Alad Wenter <alad@mailbox.org> pkgname=aurutils pkgver=1.5.3 -pkgrel=7 +pkgrel=8 pkgdesc='helper tools for the arch user repository' arch=('any') url='https://github.com/AladW/aurutils' @@ -15,16 +15,16 @@ optdepends=('devtools: systemd-nspawn support' 'expac: aursift script' 'repose: repo-add alternative') _backports=('0001-aurbuild-backport-fix-for-236.patch' - '0002-aurbuild-disable-verbose-signing.patch' - '0003-aursync-make-L-optional-281.patch') + '0002-aursync-make-L-optional-281.patch' + '0003-aurbuild-update-default-options.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[@]}") sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5' 'SKIP' - '5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86' - 'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb' - 'ada79e7e8c637704081a00a8a7253744eb8776ffe16042a1e197b9e67f335317') + 'e4076af43608a00e47379232b4d42412b5956d96c73f66ecb2cfd62d8a2eba86' + '6a28f1e1c98a69a236409ed659f0a699c89bb16748d364be2ba0841041cd015c' + '84976fe128a6ea5b7bb185d63fe447a340404a9d63700020158202e6e8006b49') # Alad Wenter <alad@mailbox.org> validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A') |