update to 2.0.0

This commit is contained in:
Alad Wenter 2019-01-10 17:21:24 +01:00
parent f2a4865bd7
commit ce83f1eb96
10 changed files with 46 additions and 357 deletions

View file

@ -1,41 +1,27 @@
# Generated by mksrcinfo v8
# Wed Mar 28 18:45:02 UTC 2018
pkgbase = aurutils
pkgdesc = helper tools for the arch user repository
pkgver = 1.5.3
pkgrel = 10
pkgver = 2.0.0
pkgrel = 1
url = https://github.com/AladW/aurutils
install = aurutils.install
arch = any
license = custom:ISC
makedepends = git
depends = pacman>=5
depends = git
depends = jq
depends = pacutils>=0.4
optdepends = devtools: systemd-nspawn support
depends = expac
depends = diffstat
depends = pacutils
depends = parallel
depends = wget
optdepends = bash-completion: bash completion
optdepends = devtools: aur-chroot
optdepends = vifm: build file interaction
optdepends = aria2: threaded downloads
optdepends = parallel: threaded downloads
optdepends = expac: aursift script
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-aursync-make-L-optional-281.patch
source = 0003-aurbuild-update-default-options.patch
source = 0004-aurfetch-specify-git-work-tree-git-dir-274.patch
source = 0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch
source = 0006-aurfetch-aursearch-use-aria2-no-conf.patch
source = 0007-aurchain-do-not-sort-results-when-appending.patch
sha256sums = a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5
optdepends = xdelta3: generate delta files
source = aurutils-2.0.0.tar.gz::https://github.com/AladW/aurutils/archive/2.0.0.tar.gz
source = aurutils-2.0.0.tar.gz.asc::https://github.com/AladW/aurutils/releases/download/2.0.0/2.0.0.tar.gz.asc
validpgpkeys = DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A
sha256sums = 64e0785d08b83e75f9ca37a035c853a8d56fec68b01508f56fcc2f81a714755a
sha256sums = SKIP
sha256sums = 8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883
sha256sums = 75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8
sha256sums = bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a
sha256sums = 40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b
sha256sums = 2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359
sha256sums = 8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f
sha256sums = 1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2
pkgname = aurutils

View file

@ -1,39 +0,0 @@
From 9c28c606c12b244a1034fbc7693ffe7894d86d7b 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/7] 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.11.0

View file

@ -1,69 +0,0 @@
From 74d0496ad357ca8c65562a028cb5b95888ea71cf Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@mailbox.org>
Date: Sat, 27 Jan 2018 03:21:37 +0100
Subject: [PATCH 2/7] 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.11.0

View file

@ -1,27 +0,0 @@
From 4a7ef4e264162909f3ceb1debccb5cb23aebcba3 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/7] 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.11.0

View file

@ -1,53 +0,0 @@
From ecc173230584327d74ea2d8899fec30d6ce6340c Mon Sep 17 00:00:00 2001
From: Alad Wenter <AladW@users.noreply.github.com>
Date: Mon, 22 Jan 2018 16:16:16 +0100
Subject: [PATCH 4/7] aurfetch: specify git work-tree/git-dir (#274)
Avoid "Stopping at filesystem boundary" issues with different file
systems.
---
bin/aurfetch | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/bin/aurfetch b/bin/aurfetch
index 95c49c3..0a79287 100755
--- a/bin/aurfetch
+++ b/bin/aurfetch
@@ -8,24 +8,25 @@ declare -i aurball=0
declare logdir=/dev/null
clone() {
- declare -r logdir=$1 startdir=$PWD
+ declare -r logdir=$1
while IFS= read -r; do
+ # Avoid issues with exotic file system layouts (#274)
+ git_wrap() { git --work-tree="$REPLY" --git-dir="$REPLY"/.git "$@"; }
+
if [[ -d $REPLY/.git ]]; then
- cd_safe "$REPLY"
+ # returns 0 even if nothing was fetched
+ git_wrap fetch -v
- git fetch -v # returns 0 even if nothing was fetched
-
- if [[ $(git rev-parse HEAD) != $(git rev-parse '@{upstream}') ]]; then
+ if [[ $(git_wrap rev-parse HEAD) != $(git_wrap rev-parse '@{upstream}') ]]; then
if [[ -d $logdir ]]; then
- git --no-pager log --patch --stat '..@{upstream}' >> "$logdir/$REPLY".patch
+ git_wrap --no-pager log --patch --stat '..@{upstream}' \
+ >> "$logdir/$REPLY".patch
fi
- git reset --hard HEAD
- git merge
+ git_wrap reset --hard HEAD
+ git_wrap merge
fi
-
- cd_safe "$startdir"
else
git clone "$aurweb/$REPLY".git
fi
--
2.11.0

View file

@ -1,33 +0,0 @@
From 1de27b86ea0cb2076a03167e838374dd6442809b Mon Sep 17 00:00:00 2001
From: rafasc <rafa.almas@gmail.com>
Date: Mon, 26 Mar 2018 19:37:43 +0100
Subject: [PATCH 5/6] specify absolute paths for GIT_DIR & GIT_WORK_TREE
Specifying a relative directory will trigger a regression under some
circumstances.
$ GIT_DIR=spotify/.git GIT_WORK_TREE=spotify git reset HEAD
fatal: couldn't read spotify/.git/packed-refs: Not a directory
$ GIT_DIR=$PWD/spotify/.git GIT_WORK_TREE=$PWD/spotify git reset HEAD
workaround for AladW/aurutils#332
---
bin/aurfetch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/aurfetch b/bin/aurfetch
index 0a79287..4e026fa 100755
--- a/bin/aurfetch
+++ b/bin/aurfetch
@@ -12,7 +12,7 @@ clone() {
while IFS= read -r; do
# Avoid issues with exotic file system layouts (#274)
- git_wrap() { git --work-tree="$REPLY" --git-dir="$REPLY"/.git "$@"; }
+ git_wrap() { git --work-tree="$PWD/$REPLY" --git-dir="$PWD/$REPLY"/.git "$@"; }
if [[ -d $REPLY/.git ]]; then
# returns 0 even if nothing was fetched
--
2.11.0

View file

@ -1,39 +0,0 @@
From da84181ae5b284557ec4d6afca7c8bcc7e87185a Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@mailbox.org>
Date: Tue, 27 Mar 2018 00:49:26 +0200
Subject: [PATCH 6/7] aurfetch, aursearch: use aria2 --no-conf
Avoid conflicts when a configuration file is used.
---
bin/aurfetch | 2 +-
bin/aursearch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/aurfetch b/bin/aurfetch
index 4e026fa..2cd5385 100755
--- a/bin/aurfetch
+++ b/bin/aurfetch
@@ -39,7 +39,7 @@ snapshot() {
cd_safe "$gzdir"
if type -P aria2c >/dev/null 2>&1; then
- aria2c --stderr=true -i -
+ aria2c --stderr=true -i --no-conf=true -
elif type -P parallel >/dev/null 2>&1; then
parallel --will-cite -X -j +5 --nice 10 --halt soon,fail=1 \
curl -fLsS --remote-name-all --cert-status {}
diff --git a/bin/aursearch b/bin/aursearch
index 5ff0a5c..dbb339e 100755
--- a/bin/aursearch
+++ b/bin/aursearch
@@ -20,7 +20,7 @@ split_info() {
dl_stdin() {
if type -P aria2c >/dev/null 2>&1; then
- aria2c --download-result=hide --console-log-level=error --stderr=true -d "$tmp"/aria2 -i - && cat "$tmp"/aria2/*
+ aria2c --download-result=hide --console-log-level=error --stderr=true -d "$tmp"/aria2 --no-conf=true -i - && cat "$tmp"/aria2/*
elif type -P parallel >/dev/null 2>&1; then
parallel --will-cite -X -j +8 --nice 10 --halt soon,fail=1 -r curl -fgLsS --compressed --cert-status {}
else
--
2.11.0

View file

@ -1,31 +0,0 @@
From 5f779d382da346038996b877d320fa26c7d501c7 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@mailbox.org>
Date: Tue, 27 Mar 2018 01:26:44 +0200
Subject: [PATCH 7/7] aurchain: do not sort results when appending
https://bbs.archlinux.org/viewtopic.php?pid=1761231#p1761231
---
bin/aurchain | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/bin/aurchain b/bin/aurchain
index 27a0808..e4b82ca 100755
--- a/bin/aurchain
+++ b/bin/aurchain
@@ -42,13 +42,11 @@ chain() {
for ((a = 1; a <= 30; ++a)); do
declare -i sub=$((a-1))
- pair json/$sub > tsv/$sub
+ pair json/$sub | tee -a tsv/n > tsv/$sub
fld 1 tsv/$sub >> pkgname
fld 1 tsv/$sub >> seen
- sort -u tsv/$sub >> tsv/n
-
# Avoid querying duplicates (#4)
readarray -t target < <(fld 2 tsv/$sub | grep -Fxvf seen)
--
2.11.0

View file

@ -1,49 +1,29 @@
# Maintainer: Alad Wenter <alad@mailbox.org>
# Maintainer: Alad Wenter <alad@archlinux.org>
pkgname=aurutils
pkgver=1.5.3
pkgrel=10
pkgver=2.0.0
pkgrel=1
pkgdesc='helper tools for the arch user repository'
arch=('any')
url='https://github.com/AladW/aurutils'
arch=('any')
license=('custom:ISC')
depends=('pacman>=5' 'git' 'jq' 'pacutils>=0.4')
makedepends=('git')
optdepends=('devtools: systemd-nspawn support'
'vifm: build file interaction'
'aria2: threaded downloads'
'parallel: threaded downloads'
'expac: aursift script'
'repose: repo-add alternative')
_backports=('0001-aurbuild-backport-fix-for-236.patch'
'0002-aursync-make-L-optional-281.patch'
'0003-aurbuild-update-default-options.patch'
'0004-aurfetch-specify-git-work-tree-git-dir-274.patch'
'0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch'
'0006-aurfetch-aursearch-use-aria2-no-conf.patch'
'0007-aurchain-do-not-sort-results-when-appending.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'
'8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883'
'75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8'
'bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a'
'40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b'
'2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359'
'8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f'
'1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2')
# Alad Wenter <alad@mailbox.org>
validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')
"$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc")
install=$pkgname.install
depends=('git' 'jq' 'expac' 'diffstat' 'pacutils' 'parallel' 'wget')
optdepends=('bash-completion: bash completion'
'devtools: aur-chroot'
'vifm: build file interaction'
'xdelta3: generate delta files')
sha256sums=('64e0785d08b83e75f9ca37a035c853a8d56fec68b01508f56fcc2f81a714755a'
'SKIP')
validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A') # Alad Wenter <alad@archlinux.org>
prepare() {
build() {
cd "$pkgname-$pkgver"
for p in "${_backports[@]}"; do
patch -p1 < "$srcdir/$p"
done
make DESTDIR="$pkgdir"
}
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" PREFIX="/usr" install
make DESTDIR="$pkgdir" install
}

14
aurutils.install Normal file
View file

@ -0,0 +1,14 @@
post_upgrade() {
if (( $(vercmp '2.0.0-1' "$2") )); then
cat >&2 <<-EOF
As of 2.0.0, aurutils no longer supports repose. If you have repose installed,
please rebuild your local repository using repo-add. See:
https://bbs.archlinux.org/viewtopic.php?pid=1707649#p1707649
for detailed instructions. For the 2.0.0 changelog, see:
https://github.com/AladW/aurutils/releases/tag/2.0.0
EOF
fi
}