Update from aur
This commit is contained in:
40
src/aurutils/0001-aurbuild-backport-fix-for-236.patch
Normal file
40
src/aurutils/0001-aurbuild-backport-fix-for-236.patch
Normal file
@@ -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
|
||||
|
25
src/aurutils/0002-aurbuild-disable-verbose-signing.patch
Normal file
25
src/aurutils/0002-aurbuild-disable-verbose-signing.patch
Normal file
@@ -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
|
||||
|
25
src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch
Normal file
25
src/aurutils/0003-aursync-1-r-is-not-a-default-option.patch
Normal file
@@ -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
|
||||
|
@@ -1,13 +1,12 @@
|
||||
# Maintainer: Alad Wenter <alad@mailbox.org>
|
||||
pkgname=aurutils
|
||||
pkgver=1.5.3
|
||||
_commit=01cbab783489eefc1859287bd0cb898de40c8100 # 1.5.3
|
||||
pkgrel=2
|
||||
pkgrel=5
|
||||
pkgdesc='helper tools for the arch user repository'
|
||||
arch=('any')
|
||||
url=https://github.com/AladW/aurutils
|
||||
license=('ISC')
|
||||
url='https://github.com/AladW/aurutils'
|
||||
license=('custom:ISC')
|
||||
depends=('pacman>=5' 'git' 'jq' 'pacutils>=0.4')
|
||||
checkdepends=('shellcheck')
|
||||
makedepends=('git')
|
||||
optdepends=('devtools: systemd-nspawn support'
|
||||
'vifm: build file interaction'
|
||||
@@ -15,10 +14,28 @@ optdepends=('devtools: systemd-nspawn support'
|
||||
'parallel: threaded downloads'
|
||||
'expac: aursift script'
|
||||
'repose: repo-add alternative')
|
||||
source=("$pkgname-$pkgver::git+$url#commit=$_commit")
|
||||
sha256sums=('SKIP')
|
||||
_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"
|
||||
"${_backports[@]}")
|
||||
sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5'
|
||||
'SKIP'
|
||||
'5001ece7fc2a4ec7e1860a0162e042f19adab13bad5c1070436306f2fe2f2b86'
|
||||
'f0a2d95b4fb51e4a392e0515ef6e10e0478a609caf7257aa8a896fadf027bfbb'
|
||||
'43180210b22268ab5b54563541804dec74c08587e77870e527b736cb4f62d4a1')
|
||||
# Alad Wenter <alad@mailbox.org>
|
||||
validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
for p in "${_backports[@]}"; do
|
||||
patch -p1 < "$srcdir/$p"
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname-$pkgver"
|
||||
make DESTDIR="$pkgdir" PREFIX="/usr" install
|
||||
cd "$pkgname-$pkgver"
|
||||
make DESTDIR="$pkgdir" PREFIX="/usr" install
|
||||
}
|
||||
|
Reference in New Issue
Block a user