summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorrunical2018-03-28 21:18:36 +0200
committerrunical2018-03-28 21:18:36 +0200
commitf2a4865bd7823df0a2faea3fa3fb6619874f7eb7 (patch)
tree4ef8c82408262af3a85d7398c143d1b94f01d584
parent671f0ef9a326819982bcca82cc1972a2f43a1cb2 (diff)
downloadaur-f2a4865bd7823df0a2faea3fa3fb6619874f7eb7.tar.gz
Add backports for various issues
-rw-r--r--.SRCINFO18
-rw-r--r--0001-aurbuild-backport-fix-for-236.patch7
-rw-r--r--0002-aursync-make-L-optional-281.patch7
-rw-r--r--0003-aurbuild-update-default-options.patch7
-rw-r--r--0004-aurfetch-specify-git-work-tree-git-dir-274.patch7
-rw-r--r--0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch33
-rw-r--r--0006-aurfetch-aursearch-use-aria2-no-conf.patch39
-rw-r--r--0007-aurchain-do-not-sort-results-when-appending.patch31
-rw-r--r--PKGBUILD18
9 files changed, 139 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c189f8f72aa..74255221857 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Feb 15 13:53:03 UTC 2018
+# Wed Mar 28 18:45:02 UTC 2018
pkgbase = aurutils
pkgdesc = helper tools for the arch user repository
pkgver = 1.5.3
- pkgrel = 9
+ pkgrel = 10
url = https://github.com/AladW/aurutils
arch = any
license = custom:ISC
@@ -24,12 +24,18 @@ pkgbase = aurutils
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
sha256sums = SKIP
- sha256sums = ea5e34adeb4c8ead68bd8aa934b5b39ad30f4ca05262b6b99a305e2eaf2ee577
- sha256sums = 849adcbb1c9510b7bc87a85b8e1589fa972e2aeca0efff583eb22f65b2f28fd3
- sha256sums = 156cb3becc09e2042780dec2f06d91a28f32c1d898e94915d1753e38f056a59a
- sha256sums = 3372a7342606924685c80c8583d31cf202ece24d1a3aa86c709c650ac3ddc930
+ sha256sums = 8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883
+ sha256sums = 75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8
+ sha256sums = bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a
+ sha256sums = 40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b
+ sha256sums = 2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359
+ sha256sums = 8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f
+ sha256sums = 1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2
pkgname = aurutils
diff --git a/0001-aurbuild-backport-fix-for-236.patch b/0001-aurbuild-backport-fix-for-236.patch
index 3dd8e7e7737..355a9050b8e 100644
--- a/0001-aurbuild-backport-fix-for-236.patch
+++ b/0001-aurbuild-backport-fix-for-236.patch
@@ -1,7 +1,7 @@
-From 1ac09c520814769d670f4b351c889e4a421b55a0 Mon Sep 17 00:00:00 2001
+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/4] aurbuild: backport fix for #236
+Subject: [PATCH 1/7] aurbuild: backport fix for #236
---
bin/aurbuild | 10 ++++++++--
@@ -36,5 +36,4 @@ index 05df8b0..4672372 100755
if ((chroot)); then
--
-2.16.1
-
+2.11.0
diff --git a/0002-aursync-make-L-optional-281.patch b/0002-aursync-make-L-optional-281.patch
index 088ab972531..f8733fcbee7 100644
--- a/0002-aursync-make-L-optional-281.patch
+++ b/0002-aursync-make-L-optional-281.patch
@@ -1,7 +1,7 @@
-From bed6e3128a7e95b837cb98a4fdafa289038378b0 Mon Sep 17 00:00:00 2001
+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/4] aursync: make -L optional (#281)
+Subject: [PATCH 2/7] aursync: make -L optional (#281)
---
bin/aursync | 7 ++++---
@@ -66,5 +66,4 @@ index 5569c36..834afd7 100644
.RS
Do not wait for user input. (\fImakepkg --noconfirm\fR)
--
-2.16.1
-
+2.11.0
diff --git a/0003-aurbuild-update-default-options.patch b/0003-aurbuild-update-default-options.patch
index c91d5c1bcba..e726ba164e6 100644
--- a/0003-aurbuild-update-default-options.patch
+++ b/0003-aurbuild-update-default-options.patch
@@ -1,7 +1,7 @@
-From 4bf451876d51787b8be2694a4ccd16da1a233186 Mon Sep 17 00:00:00 2001
+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/4] aurbuild: update default options
+Subject: [PATCH 3/7] aurbuild: update default options
Remove gpg --verbose, makepkg -L
---
@@ -24,5 +24,4 @@ index 4672372..f5ca92c 100755
conf_chroot() {
--
-2.16.1
-
+2.11.0
diff --git a/0004-aurfetch-specify-git-work-tree-git-dir-274.patch b/0004-aurfetch-specify-git-work-tree-git-dir-274.patch
index 5d26322836b..3cb51799f8d 100644
--- a/0004-aurfetch-specify-git-work-tree-git-dir-274.patch
+++ b/0004-aurfetch-specify-git-work-tree-git-dir-274.patch
@@ -1,7 +1,7 @@
-From c57c6b90bf62510d774215abd9f4f816c4d8b789 Mon Sep 17 00:00:00 2001
+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/4] aurfetch: specify git work-tree/git-dir (#274)
+Subject: [PATCH 4/7] aurfetch: specify git work-tree/git-dir (#274)
Avoid "Stopping at filesystem boundary" issues with different file
systems.
@@ -50,5 +50,4 @@ index 95c49c3..0a79287 100755
git clone "$aurweb/$REPLY".git
fi
--
-2.16.1
-
+2.11.0
diff --git a/0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch b/0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch
new file mode 100644
index 00000000000..b9dd7d0190e
--- /dev/null
+++ b/0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch
@@ -0,0 +1,33 @@
+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
diff --git a/0006-aurfetch-aursearch-use-aria2-no-conf.patch b/0006-aurfetch-aursearch-use-aria2-no-conf.patch
new file mode 100644
index 00000000000..15cf9eaf12e
--- /dev/null
+++ b/0006-aurfetch-aursearch-use-aria2-no-conf.patch
@@ -0,0 +1,39 @@
+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
diff --git a/0007-aurchain-do-not-sort-results-when-appending.patch b/0007-aurchain-do-not-sort-results-when-appending.patch
new file mode 100644
index 00000000000..985cdf158b8
--- /dev/null
+++ b/0007-aurchain-do-not-sort-results-when-appending.patch
@@ -0,0 +1,31 @@
+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
diff --git a/PKGBUILD b/PKGBUILD
index 341ae988a30..af78c2bddea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Alad Wenter <alad@mailbox.org>
pkgname=aurutils
pkgver=1.5.3
-pkgrel=9
+pkgrel=10
pkgdesc='helper tools for the arch user repository'
arch=('any')
url='https://github.com/AladW/aurutils'
@@ -17,16 +17,22 @@ optdepends=('devtools: systemd-nspawn support'
_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')
+ '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'
- 'ea5e34adeb4c8ead68bd8aa934b5b39ad30f4ca05262b6b99a305e2eaf2ee577'
- '849adcbb1c9510b7bc87a85b8e1589fa972e2aeca0efff583eb22f65b2f28fd3'
- '156cb3becc09e2042780dec2f06d91a28f32c1d898e94915d1753e38f056a59a'
- '3372a7342606924685c80c8583d31cf202ece24d1a3aa86c709c650ac3ddc930')
+ '8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883'
+ '75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8'
+ 'bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a'
+ '40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b'
+ '2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359'
+ '8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f'
+ '1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2')
# Alad Wenter <alad@mailbox.org>
validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A')