From: Oreo639 <Oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pacman: update to 6.0.0
Date: Sat, 12 Jun 2021 21:30:15 +0200 [thread overview]
Message-ID: <20210612193015.p2imy4-X3r-u8G5zL_6f6tOqzd3sg8JKUb2Dz_CxjuE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31444@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by Oreo639 against master on the void-packages repository
https://github.com/Oreo639/void-packages pacup
https://github.com/void-linux/void-packages/pull/31444
pacman: update to 6.0.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31444.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pacup-31444.patch --]
[-- Type: text/x-diff, Size: 3147 bytes --]
From 53dfe73572a617f91aa339fffb3d32d87eb6cccf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 12 Jun 2021 12:19:56 -0700
Subject: [PATCH] pacman: update to 6.0.0
---
srcpkgs/pacman/patches/gpg2gpg2.patch | 21 ++++++++++-----------
srcpkgs/pacman/template | 8 ++++----
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/pacman/patches/gpg2gpg2.patch b/srcpkgs/pacman/patches/gpg2gpg2.patch
index ba668e1f2eda..db2ed45b4499 100644
--- a/srcpkgs/pacman/patches/gpg2gpg2.patch
+++ b/srcpkgs/pacman/patches/gpg2gpg2.patch
@@ -3,36 +3,35 @@ Arch's "gnupg" package is this distro's "gnupg2"
This patches all references to the gpg command to use
gpg2 instead.
-diff -Naur pacman-5.2.1.orig/scripts/pacman-key.sh.in pacman-5.2.1/scripts/pacman-key.sh.in
---- scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700
-+++ scripts/pacman-key.sh.in 2020-05-24 02:30:26.838797182 -0700
+diff -Naur pacman-6.0.0.orig/scripts/pacman-key.sh.in pacman-6.0.0/scripts/pacman-key.sh.in
+--- scripts/pacman-key.sh.in 2021-05-19 20:38:45.954786000 -0700
++++ scripts/pacman-key.sh.in 2021-06-12 12:25:27.924889358 -0700
@@ -51,6 +51,7 @@
- UPDATEDB=0
USE_COLOR='y'
VERIFY=0
+ VERBOSE=0
+GPG_COMMAND='gpg2'
-
+
usage() {
printf "pacman-key (pacman) %s\n" ${myver}
-@@ -591,8 +592,8 @@
+@@ -665,8 +666,8 @@
unset ALL_OFF BOLD BLUE GREEN RED YELLOW
fi
-
+
-if ! type -p gpg >/dev/null; then
- error "$(gettext "Cannot find the %s binary required for all %s operations.")" "gpg" "pacman-key"
+if ! type -p ${GPG_COMMAND} >/dev/null; then
+ error "$(gettext "Cannot find the %s binary required for all %s operations.")" "${GPG_COMMAND}" "pacman-key"
exit 1
fi
-
-@@ -611,7 +612,7 @@
+
+@@ -685,7 +686,7 @@
# file, falling back on a hard default
PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(pacman-conf --config="$CONFIG" gpgdir)}
-
+
-GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
+GPG_PACMAN=(${GPG_COMMAND} --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
if [[ -n ${KEYSERVER} ]]; then
GPG_PACMAN+=(--keyserver "${KEYSERVER}")
fi
-
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index d23aba0468bf..210f47d45ad1 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=2
+version=6.0.0
+revision=1
make_dirs="/var/lib/pacman 0755 root root
/usr/var/cache/pacman/pkg 0755 root root
/usr/share/libalpm/hooks 0755 root root"
@@ -15,8 +15,8 @@ short_desc="Simple library-based package manager"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.archlinux.org/pacman/"
-distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
-checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.xz"
+checksum=004448085a7747bdc7a0a4dd5d1fb7556c6b890111a06e029ab088f9905d4808
if [ "$XBPS_TARGET_LIBC" = musl ]; then
do_check() {
next prev parent reply other threads:[~2021-06-12 19:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 19:23 [PR PATCH] " Oreo639
2021-06-12 19:30 ` Oreo639 [this message]
2021-06-14 3:03 ` ericonr
2021-06-14 3:18 ` Oreo639
2021-06-14 3:30 ` ericonr
2021-07-10 4:13 ` ericonr
2021-07-10 4:37 ` Oreo639
2021-07-22 20:22 ` [PR PATCH] [Updated] " Oreo639
2021-07-22 20:25 ` Oreo639
2021-07-22 20:28 ` Oreo639
2021-07-22 20:33 ` Oreo639
2021-09-04 20:03 ` ericonr
2021-09-04 21:09 ` [PR PATCH] [Updated] " Oreo639
2021-11-27 9:49 ` [PR PATCH] [Updated] pacman: update to 6.0.1 Oreo639
2021-11-27 9:50 ` Oreo639
2021-11-29 6:01 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210612193015.p2imy4-X3r-u8G5zL_6f6tOqzd3sg8JKUb2Dz_CxjuE@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).