* Re: [PR PATCH] [Updated] pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
@ 2021-06-12 19:30 ` Oreo639
2021-06-14 3:03 ` ericonr
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-06-12 19:30 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
2021-06-12 19:30 ` [PR PATCH] [Updated] " Oreo639
@ 2021-06-14 3:03 ` ericonr
2021-06-14 3:18 ` Oreo639
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-06-14 3:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31444#issuecomment-860333110
Comment:
Given that arch had to import new patches (https://github.com/archlinux/svntogit-packages/commit/45a24c15e9db6cb6ed9b2c43e72eb66deb3ee7ee#diff-3e341d2d9c67be01819b25b25d5e53ea3cdf3a38d28846cda85a195eb9b7203a) I think we should wait for a proper release.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
2021-06-12 19:30 ` [PR PATCH] [Updated] " Oreo639
2021-06-14 3:03 ` ericonr
@ 2021-06-14 3:18 ` Oreo639
2021-06-14 3:30 ` ericonr
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-06-14 3:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by Oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/31444#issuecomment-860336995
Comment:
Yeah, thank you for pointing that out. (I missed that)
Should I leave this open or close it?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (2 preceding siblings ...)
2021-06-14 3:18 ` Oreo639
@ 2021-06-14 3:30 ` ericonr
2021-07-10 4:13 ` ericonr
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-06-14 3:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31444#issuecomment-860339724
Comment:
I think it's okay to leave it open, we just can't merge yet.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (3 preceding siblings ...)
2021-06-14 3:30 ` ericonr
@ 2021-07-10 4:13 ` ericonr
2021-07-10 4:37 ` Oreo639
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-07-10 4:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31444#issuecomment-877560692
Comment:
#28217 we can remove the gpg patch then.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (4 preceding siblings ...)
2021-07-10 4:13 ` ericonr
@ 2021-07-10 4:37 ` Oreo639
2021-07-22 20:22 ` [PR PATCH] [Updated] " Oreo639
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-07-10 4:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by Oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/31444#issuecomment-877564112
Comment:
Alright. Thanks for the heads up.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (5 preceding siblings ...)
2021-07-10 4:37 ` Oreo639
@ 2021-07-22 20:22 ` Oreo639
2021-07-22 20:25 ` Oreo639
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-07-22 20:22 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (6 preceding siblings ...)
2021-07-22 20:22 ` [PR PATCH] [Updated] " Oreo639
@ 2021-07-22 20:25 ` Oreo639
2021-07-22 20:28 ` Oreo639
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-07-22 20:25 UTC (permalink / raw)
To: ml
[-- 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: 4469 bytes --]
From e4922c41000cbf884cfc85b6191527f504d5d411 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 22 Jul 2021 13:18:30 -0700
Subject: [PATCH] pacman: update to 6.0.0
---
.../pacman-6.0.0-fix-404-download.patch | 40 +++++++++++++++++
...man-6.0.0-fix-key-import-double-free.patch | 45 +++++++++++++++++++
srcpkgs/pacman/template | 4 +-
3 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
create mode 100644 srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
diff --git a/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch b/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
new file mode 100644
index 000000000000..041de91981ee
--- /dev/null
+++ b/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
@@ -0,0 +1,40 @@
+From 3401f9e142ac4c701cd98c52618cb13164f2146b Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Wed, 2 Jun 2021 21:48:53 +1000
+Subject: [PATCH] libalpm: prevent download error pages ending up in package
+ files
+
+Some servers respond with error pages (e.g. 404.html) when a package is
+not present. These were getting written to packages before moving onto
+the next server. Reset the download progress on 400+ error conditions
+to avoid this.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ lib/libalpm/dload.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
+index 2d8b4d6d..3eea998b 100644
+--- a/lib/libalpm/dload.c
++++ b/lib/libalpm/dload.c
+@@ -510,6 +510,16 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg,
+ payload->remote_name, hostname, payload->error_buffer);
+ server_soft_error(handle, payload->fileurl);
+ }
++
++ fflush(payload->localf);
++ if(fstat(fileno(payload->localf), &st) == 0 && st.st_size != payload->initial_size) {
++ /* an html error page was written to the file, reset it */
++ if(ftruncate(fileno(payload->localf), payload->initial_size)) {
++ RET_ERR(handle, ALPM_ERR_SYSTEM, -1);
++ }
++ fseek(payload->localf, payload->initial_size, SEEK_SET);
++ }
++
+ if(curl_retry_next_server(curlm, curl, payload) == 0) {
+ (*active_downloads_num)++;
+ return 2;
+--
+GitLab
+
diff --git a/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch b/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
new file mode 100644
index 000000000000..13d289fcada5
--- /dev/null
+++ b/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
@@ -0,0 +1,45 @@
+From 542910d684191eb7f25ddc5d3d8fe3060028a267 Mon Sep 17 00:00:00 2001
+From: morganamilo <morganamilo@archlinux.org>
+Date: Thu, 3 Jun 2021 19:45:22 +0100
+Subject: [PATCH] libalpm: fix double free when importing key
+
+Comit 5151de30 tried to fix leaking memory when importing a key. However
+key_search_keyserver() writes to the key passed in, making the original
+uid and fingerprint unreachable, causing the new uid and fingerprint to
+double free.
+
+Fixes FS#71107
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ lib/libalpm/signing.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
+index b1b50bc8..a7be3a1a 100644
+--- a/lib/libalpm/signing.c
++++ b/lib/libalpm/signing.c
+@@ -513,6 +513,10 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
+ .key = &fetch_key
+ };
+ QUESTION(handle, &question);
++
++ free(fetch_key.uid);
++ free(fetch_key.fingerprint);
++
+ if(question.import) {
+ /* Try to import the key from a WKD first */
+ if(email_from_uid(uid, &email) == 0) {
+@@ -538,9 +542,6 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
+ }
+ }
+ gpgme_key_unref(fetch_key.data);
+- free(fetch_key.uid);
+- free(fetch_key.fingerprint);
+-
+ return ret;
+ }
+
+--
+GitLab
+
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..4c06b9b20b07 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=3
+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"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (7 preceding siblings ...)
2021-07-22 20:25 ` Oreo639
@ 2021-07-22 20:28 ` Oreo639
2021-07-22 20:33 ` Oreo639
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-07-22 20:28 UTC (permalink / raw)
To: ml
[-- 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: 4914 bytes --]
From f382bba5f9b847e062acf8d08a43763c4131d544 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 22 Jul 2021 13:18:30 -0700
Subject: [PATCH] pacman: update to 6.0.0
---
.../pacman-6.0.0-fix-404-download.patch | 40 +++++++++++++++++
...man-6.0.0-fix-key-import-double-free.patch | 45 +++++++++++++++++++
srcpkgs/pacman/template | 6 +--
3 files changed, 88 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
create mode 100644 srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
diff --git a/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch b/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
new file mode 100644
index 000000000000..041de91981ee
--- /dev/null
+++ b/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
@@ -0,0 +1,40 @@
+From 3401f9e142ac4c701cd98c52618cb13164f2146b Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Wed, 2 Jun 2021 21:48:53 +1000
+Subject: [PATCH] libalpm: prevent download error pages ending up in package
+ files
+
+Some servers respond with error pages (e.g. 404.html) when a package is
+not present. These were getting written to packages before moving onto
+the next server. Reset the download progress on 400+ error conditions
+to avoid this.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ lib/libalpm/dload.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
+index 2d8b4d6d..3eea998b 100644
+--- a/lib/libalpm/dload.c
++++ b/lib/libalpm/dload.c
+@@ -510,6 +510,16 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg,
+ payload->remote_name, hostname, payload->error_buffer);
+ server_soft_error(handle, payload->fileurl);
+ }
++
++ fflush(payload->localf);
++ if(fstat(fileno(payload->localf), &st) == 0 && st.st_size != payload->initial_size) {
++ /* an html error page was written to the file, reset it */
++ if(ftruncate(fileno(payload->localf), payload->initial_size)) {
++ RET_ERR(handle, ALPM_ERR_SYSTEM, -1);
++ }
++ fseek(payload->localf, payload->initial_size, SEEK_SET);
++ }
++
+ if(curl_retry_next_server(curlm, curl, payload) == 0) {
+ (*active_downloads_num)++;
+ return 2;
+--
+GitLab
+
diff --git a/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch b/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
new file mode 100644
index 000000000000..13d289fcada5
--- /dev/null
+++ b/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
@@ -0,0 +1,45 @@
+From 542910d684191eb7f25ddc5d3d8fe3060028a267 Mon Sep 17 00:00:00 2001
+From: morganamilo <morganamilo@archlinux.org>
+Date: Thu, 3 Jun 2021 19:45:22 +0100
+Subject: [PATCH] libalpm: fix double free when importing key
+
+Comit 5151de30 tried to fix leaking memory when importing a key. However
+key_search_keyserver() writes to the key passed in, making the original
+uid and fingerprint unreachable, causing the new uid and fingerprint to
+double free.
+
+Fixes FS#71107
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ lib/libalpm/signing.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
+index b1b50bc8..a7be3a1a 100644
+--- a/lib/libalpm/signing.c
++++ b/lib/libalpm/signing.c
+@@ -513,6 +513,10 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
+ .key = &fetch_key
+ };
+ QUESTION(handle, &question);
++
++ free(fetch_key.uid);
++ free(fetch_key.fingerprint);
++
+ if(question.import) {
+ /* Try to import the key from a WKD first */
+ if(email_from_uid(uid, &email) == 0) {
+@@ -538,9 +542,6 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
+ }
+ }
+ gpgme_key_unref(fetch_key.data);
+- free(fetch_key.uid);
+- free(fetch_key.fingerprint);
+-
+ return ret;
+ }
+
+--
+GitLab
+
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..a2388935f6e5 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=3
+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,7 +15,7 @@ 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"
+distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.xz"
checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
make_check=ci-skip
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (8 preceding siblings ...)
2021-07-22 20:28 ` Oreo639
@ 2021-07-22 20:33 ` Oreo639
2021-09-04 20:03 ` ericonr
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-07-22 20:33 UTC (permalink / raw)
To: ml
[-- 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: 5031 bytes --]
From 37a0521220f1f9f1277643e1cd20cf872fcbe699 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 22 Jul 2021 13:18:30 -0700
Subject: [PATCH] pacman: update to 6.0.0
---
.../pacman-6.0.0-fix-404-download.patch | 40 +++++++++++++++++
...man-6.0.0-fix-key-import-double-free.patch | 45 +++++++++++++++++++
srcpkgs/pacman/template | 8 ++--
3 files changed, 89 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
create mode 100644 srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
diff --git a/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch b/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
new file mode 100644
index 000000000000..041de91981ee
--- /dev/null
+++ b/srcpkgs/pacman/patches/pacman-6.0.0-fix-404-download.patch
@@ -0,0 +1,40 @@
+From 3401f9e142ac4c701cd98c52618cb13164f2146b Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Wed, 2 Jun 2021 21:48:53 +1000
+Subject: [PATCH] libalpm: prevent download error pages ending up in package
+ files
+
+Some servers respond with error pages (e.g. 404.html) when a package is
+not present. These were getting written to packages before moving onto
+the next server. Reset the download progress on 400+ error conditions
+to avoid this.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ lib/libalpm/dload.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
+index 2d8b4d6d..3eea998b 100644
+--- a/lib/libalpm/dload.c
++++ b/lib/libalpm/dload.c
+@@ -510,6 +510,16 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg,
+ payload->remote_name, hostname, payload->error_buffer);
+ server_soft_error(handle, payload->fileurl);
+ }
++
++ fflush(payload->localf);
++ if(fstat(fileno(payload->localf), &st) == 0 && st.st_size != payload->initial_size) {
++ /* an html error page was written to the file, reset it */
++ if(ftruncate(fileno(payload->localf), payload->initial_size)) {
++ RET_ERR(handle, ALPM_ERR_SYSTEM, -1);
++ }
++ fseek(payload->localf, payload->initial_size, SEEK_SET);
++ }
++
+ if(curl_retry_next_server(curlm, curl, payload) == 0) {
+ (*active_downloads_num)++;
+ return 2;
+--
+GitLab
+
diff --git a/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch b/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
new file mode 100644
index 000000000000..13d289fcada5
--- /dev/null
+++ b/srcpkgs/pacman/patches/pacman-6.0.0-fix-key-import-double-free.patch
@@ -0,0 +1,45 @@
+From 542910d684191eb7f25ddc5d3d8fe3060028a267 Mon Sep 17 00:00:00 2001
+From: morganamilo <morganamilo@archlinux.org>
+Date: Thu, 3 Jun 2021 19:45:22 +0100
+Subject: [PATCH] libalpm: fix double free when importing key
+
+Comit 5151de30 tried to fix leaking memory when importing a key. However
+key_search_keyserver() writes to the key passed in, making the original
+uid and fingerprint unreachable, causing the new uid and fingerprint to
+double free.
+
+Fixes FS#71107
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+---
+ lib/libalpm/signing.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
+index b1b50bc8..a7be3a1a 100644
+--- a/lib/libalpm/signing.c
++++ b/lib/libalpm/signing.c
+@@ -513,6 +513,10 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
+ .key = &fetch_key
+ };
+ QUESTION(handle, &question);
++
++ free(fetch_key.uid);
++ free(fetch_key.fingerprint);
++
+ if(question.import) {
+ /* Try to import the key from a WKD first */
+ if(email_from_uid(uid, &email) == 0) {
+@@ -538,9 +542,6 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
+ }
+ }
+ gpgme_key_unref(fetch_key.data);
+- free(fetch_key.uid);
+- free(fetch_key.fingerprint);
+-
+ return ret;
+ }
+
+--
+GitLab
+
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..4558d1abeaf9 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=3
+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
make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (9 preceding siblings ...)
2021-07-22 20:33 ` Oreo639
@ 2021-09-04 20:03 ` ericonr
2021-09-04 21:09 ` [PR PATCH] [Updated] " Oreo639
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-09-04 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31444#issuecomment-913032957
Comment:
6.0.1 has been released :)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.0
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (10 preceding siblings ...)
2021-09-04 20:03 ` ericonr
@ 2021-09-04 21:09 ` Oreo639
2021-11-27 9:49 ` [PR PATCH] [Updated] pacman: update to 6.0.1 Oreo639
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-09-04 21:09 UTC (permalink / raw)
To: ml
[-- 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: 1268 bytes --]
From 44b9ba5e4f47d8b3e3f9db122b46e3ce16a5a906 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 4 Sep 2021 14:05:21 -0700
Subject: [PATCH] pacman: update to 6.0.1
---
srcpkgs/pacman/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..f6ba68b9de73 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=3
+version=6.0.1
+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=0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731
make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.1
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (11 preceding siblings ...)
2021-09-04 21:09 ` [PR PATCH] [Updated] " Oreo639
@ 2021-11-27 9:49 ` Oreo639
2021-11-27 9:50 ` Oreo639
2021-11-29 6:01 ` [PR PATCH] [Merged]: " ericonr
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-11-27 9:49 UTC (permalink / raw)
To: ml
[-- 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.1
<!-- 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: 1269 bytes --]
From 4df3d2f30a1060a1c361ebf154fbaee995436163 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 27 Nov 2021 01:46:21 -0800
Subject: [PATCH] pacman: update to 6.0.1
---
srcpkgs/pacman/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..f6ba68b9de73 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=3
+version=6.0.1
+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=0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731
make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] pacman: update to 6.0.1
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (12 preceding siblings ...)
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
14 siblings, 0 replies; 16+ messages in thread
From: Oreo639 @ 2021-11-27 9:50 UTC (permalink / raw)
To: ml
[-- 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.1
<!-- 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: 1569 bytes --]
From 72811022481eb62121b183a3e625b5e5809477d1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 27 Nov 2021 01:46:21 -0800
Subject: [PATCH] pacman: update to 6.0.1
---
srcpkgs/pacman/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..d14176f089d7 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,13 +1,13 @@
# Template file for 'pacman'
pkgname=pacman
-version=5.2.2
-revision=3
+version=6.0.1
+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"
conf_files="/etc/pacman.conf"
build_style=meson
-hostmakedepends="autoconf automake curl libtool gettext-devel pkg-config asciidoc"
+hostmakedepends="curl gettext-devel pkg-config asciidoc"
makedepends="libarchive-devel gpgme-devel libcurl-devel"
depends="gnupg>=2"
checkdepends="fakeroot"
@@ -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=0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731
make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = musl ]; then
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: pacman: update to 6.0.1
2021-06-12 19:23 [PR PATCH] pacman: update to 6.0.0 Oreo639
` (13 preceding siblings ...)
2021-11-27 9:50 ` Oreo639
@ 2021-11-29 6:01 ` ericonr
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-11-29 6:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
There's a merged pull request on the void-packages repository
pacman: update to 6.0.1
https://github.com/void-linux/void-packages/pull/31444
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 16+ messages in thread