summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlad Wenter2017-10-06 23:15:25 +0200
committerAlad Wenter2017-10-06 23:16:45 +0200
commitb62f9d7b78fc89ee77586ab59928fd17fce43b4d (patch)
tree41659e644110f69d5f2fe3d8281e9e4d36facb70
parent8400632db33a92e44ec5e80bb458e928a817d4d1 (diff)
downloadaur-b62f9d7b78fc89ee77586ab59928fd17fce43b4d.tar.gz
aurutils: backports for aurbuild -s
-rw-r--r--.SRCINFO8
-rw-r--r--0001-aurbuild-backport-fix-for-236.patch40
-rw-r--r--0002-aurbuild-disable-verbose-signing.patch25
-rw-r--r--PKGBUILD20
4 files changed, 86 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1f75e963c4..a4ab8a3f04c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Sep 10 17:56:44 UTC 2017
+# Fri Oct 6 21:15:23 UTC 2017
pkgbase = aurutils
pkgdesc = helper tools for the arch user repository
pkgver = 1.5.3
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/AladW/aurutils
arch = any
license = custom:ISC
@@ -20,8 +20,12 @@ pkgbase = aurutils
optdepends = repose: repo-add alternative
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
sha256sums = a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5
sha256sums = SKIP
+ sha256sums = 5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86
+ sha256sums = f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb
pkgname = aurutils
diff --git a/0001-aurbuild-backport-fix-for-236.patch b/0001-aurbuild-backport-fix-for-236.patch
new file mode 100644
index 00000000000..5ab99e7b4d4
--- /dev/null
+++ b/0001-aurbuild-backport-fix-for-236.patch
@@ -0,0 +1,40 @@
+From 07d302de1d48e2daea193d9a3a2931331c8abce0 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
+
+---
+ bin/aurbuild | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/bin/aurbuild b/bin/aurbuild
+index 05df8b0..4672372 100755
+--- a/bin/aurbuild
++++ b/bin/aurbuild
+@@ -110,6 +110,7 @@ root=$(canonicalize_path "${root-$server}")
+ if [[ -w $root/ && -r $root/ ]]; then
+ # File: custom.db -> custom.db.tar
+ db_path=$(readlink -f "$root/$database".db)
++ files_path=$(readlink -f "$root/$database".files)
+ else
+ error "$argv0: $root: permission denied"
+ exit 13
+@@ -168,8 +169,13 @@ while read -r -u "$fd" pkg _; do
+
+ # https://github.com/vodik/repose/issues/46
+ if ((sign_pkg)); then
+- gpg "${gpg_args[@]}" --output "$var_tmp/${db_path##*/}".sig "$db_path"
+- mv -bv "$var_tmp/${db_path##*/}".sig -t "$root"
++ for i in "$db_path" "$files_path"; do
++ # https://github.com/AladW/aurutils/issues/236
++ i_sig=$var_tmp/${i##*/}.sig
++
++ gpg "${gpg_args[@]}" --output "$i_sig" "$i"
++ mv -bv "$i_sig" -t "$root"
++ done
+ fi
+
+ if ((chroot)); then
+--
+2.14.2
+
diff --git a/0002-aurbuild-disable-verbose-signing.patch b/0002-aurbuild-disable-verbose-signing.patch
new file mode 100644
index 00000000000..6461434bfa2
--- /dev/null
+++ b/0002-aurbuild-disable-verbose-signing.patch
@@ -0,0 +1,25 @@
+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/PKGBUILD b/PKGBUILD
index 2d7e114f3dd..2f928818029 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Alad Wenter <alad@mailbox.org>
pkgname=aurutils
pkgver=1.5.3
-pkgrel=3
+pkgrel=4
pkgdesc='helper tools for the arch user repository'
arch=('any')
url='https://github.com/AladW/aurutils'
@@ -15,13 +15,23 @@ optdepends=('devtools: systemd-nspawn support'
'expac: aursift script'
'repose: repo-add alternative')
source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
- "$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc")
+ "$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")
sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5'
- 'SKIP')
+ 'SKIP'
+ '5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86'
+ 'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb')
# 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
+}
+
package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" PREFIX="/usr" install
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" PREFIX="/usr" install
}