pacman 7.0.0-1
This commit is contained in:
parent
0f320d22ef
commit
ca8d748700
@ -1,42 +0,0 @@
|
||||
From 111eed0251238a9d3f90e76d62f2ac01aeccce48 Mon Sep 17 00:00:00 2001
|
||||
From: Allan McRae <allan@archlinux.org>
|
||||
Date: Wed, 13 Mar 2024 11:33:15 +1000
|
||||
Subject: [PATCH] Fix unused result warnings
|
||||
|
||||
Not actually a fix, as the pacman output will still be weird and
|
||||
we will not gracefully exit, but it does print an error message...
|
||||
|
||||
Signed-off-by: Allan McRae <allan@archlinux.org>
|
||||
---
|
||||
src/pacman/util.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/pacman/util.c b/src/pacman/util.c
|
||||
index 8a94e8caf..ebc210404 100644
|
||||
--- a/src/pacman/util.c
|
||||
+++ b/src/pacman/util.c
|
||||
@@ -428,10 +428,10 @@ static char *concat_list(alpm_list_t *lst, formatfn fn)
|
||||
}
|
||||
|
||||
if(tmp) {
|
||||
- asprintf(&output, "%s %s", tmp, str);
|
||||
+ pm_asprintf(&output, "%s %s", tmp, str);
|
||||
free(tmp);
|
||||
} else {
|
||||
- asprintf(&output, "%s", str);
|
||||
+ pm_asprintf(&output, "%s", str);
|
||||
}
|
||||
tmp = output;
|
||||
|
||||
@@ -441,7 +441,7 @@ static char *concat_list(alpm_list_t *lst, formatfn fn)
|
||||
}
|
||||
|
||||
if(!output) {
|
||||
- asprintf(&output, "%s", "");
|
||||
+ pm_asprintf(&output, "%s", "");
|
||||
}
|
||||
|
||||
return output;
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From bae9594ac1806ce30f2af1de27c49bb101a00d44 Mon Sep 17 00:00:00 2001
|
||||
From: Morten Linderud <morten@linderud.pw>
|
||||
Date: Thu, 14 Mar 2024 23:04:59 +0100
|
||||
Subject: [PATCH] debugedit: only check for debugedit if we build a package
|
||||
|
||||
We only really need debugedit while building the package, while this
|
||||
check would run if you tried something like `makepkg --verifysource`.
|
||||
Use the same checks as we have for fakeroot to wrap debugedit so we
|
||||
don't beg for dependencies we don't need.
|
||||
|
||||
Fixes: 3ed08f97ecd5941c3f72e3e94f17826dd959f823
|
||||
|
||||
Signed-off-by: Morten Linderud <morten@linderud.pw>
|
||||
---
|
||||
scripts/libmakepkg/executable/debugedit.sh.in | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/scripts/libmakepkg/executable/debugedit.sh.in b/scripts/libmakepkg/executable/debugedit.sh.in
|
||||
index a28c3d4e2..c62595c46 100644
|
||||
--- a/scripts/libmakepkg/executable/debugedit.sh.in
|
||||
+++ b/scripts/libmakepkg/executable/debugedit.sh.in
|
||||
@@ -29,10 +29,12 @@ source "$MAKEPKG_LIBRARY/util/option.sh"
|
||||
executable_functions+=('executable_debugedit')
|
||||
|
||||
executable_debugedit() {
|
||||
- if check_option "debug" "y"; then
|
||||
- if ! type -p debugedit >/dev/null; then
|
||||
- error "$(gettext "Cannot find the %s binary required for including source files in debug packages.")" "debugedit"
|
||||
- return 1
|
||||
+ if (( SOURCEONLY || BUILDPKG )); then
|
||||
+ if check_option "debug" "y"; then
|
||||
+ if ! type -p debugedit >/dev/null; then
|
||||
+ error "$(gettext "Cannot find the %s binary required for including source files in debug packages.")" "debugedit"
|
||||
+ return 1
|
||||
+ fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 6bb95c8856437513ee0ab19226bc090d6fd0fb06 Mon Sep 17 00:00:00 2001
|
||||
From: Allan McRae <allan@archlinux.org>
|
||||
Date: Tue, 5 Mar 2024 07:25:11 +1000
|
||||
Subject: [PATCH] Fix error messages for unknown key in databases
|
||||
|
||||
Signed-off-by: Allan McRae <allan@archlinux.org>
|
||||
---
|
||||
lib/libalpm/be_local.c | 2 +-
|
||||
lib/libalpm/be_sync.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
|
||||
index 80b0e9d12..b4a7c35a1 100644
|
||||
--- a/lib/libalpm/be_local.c
|
||||
+++ b/lib/libalpm/be_local.c
|
||||
@@ -838,7 +838,7 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
|
||||
}
|
||||
FREELIST(lines);
|
||||
} else {
|
||||
- _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in sync database\n"), info->name, line);
|
||||
+ _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in local database\n"), info->name, line);
|
||||
alpm_list_t *lines = NULL;
|
||||
READ_AND_STORE_ALL(lines);
|
||||
FREELIST(lines);
|
||||
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
|
||||
index 24693976e..e47cdefe7 100644
|
||||
--- a/lib/libalpm/be_sync.c
|
||||
+++ b/lib/libalpm/be_sync.c
|
||||
@@ -692,7 +692,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
|
||||
}
|
||||
FREELIST(lines);
|
||||
} else {
|
||||
- _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in local database\n"), pkg->name, line);
|
||||
+ _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in sync database\n"), pkg->name, line);
|
||||
alpm_list_t *lines = NULL;
|
||||
READ_AND_STORE_ALL(lines);
|
||||
FREELIST(lines);
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03 Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Shapovalov <intelfx@intelfx.name>
|
||||
Date: Wed, 13 Mar 2024 04:27:31 +0100
|
||||
Subject: [PATCH] make_aligned_titles: pass the correct buffer length
|
||||
|
||||
The third parameter to wcstombs() is the length of the output buffer
|
||||
(first parameter) in bytes. Take the correct sizeof() here.
|
||||
|
||||
This is not a problem in practice, but prevents _FORTIFY_SOURCE=3 from
|
||||
detecting a possible output buffer overflow (as the source buffer is
|
||||
bigger than the destination).
|
||||
|
||||
Fixes #104.
|
||||
|
||||
Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
|
||||
---
|
||||
src/pacman/package.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pacman/package.c b/src/pacman/package.c
|
||||
index b832663c0..95d0c4c4c 100644
|
||||
--- a/src/pacman/package.c
|
||||
+++ b/src/pacman/package.c
|
||||
@@ -140,7 +140,7 @@ static void make_aligned_titles(void)
|
||||
size_t padlen = maxcol - wcol[i];
|
||||
wmemset(wbuf[i] + wlen[i], L' ', padlen);
|
||||
wmemcpy(wbuf[i] + wlen[i] + padlen, title_suffix, ARRAYSIZE(title_suffix));
|
||||
- wcstombs(titles[i], wbuf[i], sizeof(wbuf[i]));
|
||||
+ wcstombs(titles[i], wbuf[i], sizeof(titles[i]));
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 95f148c2222db608a0d72d5c5577d0c71e7fa199 Mon Sep 17 00:00:00 2001
|
||||
From: Allan McRae <allan@archlinux.org>
|
||||
Date: Mon, 4 Mar 2024 13:39:37 +1000
|
||||
Subject: [PATCH] Update website to reflect gitlab usage
|
||||
|
||||
Signed-off-by: Allan McRae <allan@archlinux.org>
|
||||
---
|
||||
doc/index.asciidoc | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/doc/index.asciidoc b/doc/index.asciidoc
|
||||
index 10981a7a9..0bc123aff 100644
|
||||
--- a/doc/index.asciidoc
|
||||
+++ b/doc/index.asciidoc
|
||||
@@ -34,6 +34,8 @@ makepkg/repo-add/pacman toolchain via GnuPG and GPGME.
|
||||
Version 5.0 added support for pre/post-transaction hooks and sync database file
|
||||
list operations.
|
||||
|
||||
+Version 6.0 added support for parallel downloads.
|
||||
+
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
@@ -192,7 +194,9 @@ Releases
|
||||
|
||||
|======
|
||||
|
||||
-Source code for all releases is available at
|
||||
+Source code for releases since moving to gitlab is available at
|
||||
+link:https://gitlab.archlinux.org/pacman/pacman/-/releases[].
|
||||
+Source code for historical releases is available at
|
||||
link:https://sources.archlinux.org/other/pacman/[]. To install, download the newest
|
||||
available source tarball, unpack it in a directory, and run the three magic
|
||||
commands:
|
||||
@@ -240,14 +244,10 @@ link:translation-help.html[translation-help].
|
||||
|
||||
Bugs
|
||||
----
|
||||
-If you find bugs (which is quite likely), please email them to the pacman-dev
|
||||
-mailing last at mailto:pacman-dev@lists.archlinux.org[] with specific information
|
||||
-such as your command-line, the nature of the bug, and even the package database
|
||||
-if it helps.
|
||||
-
|
||||
-You can also post a bug to the Arch Linux bug tracker
|
||||
-link:https://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
|
||||
-bugs under the Pacman project.
|
||||
+If you find bugs (which is quite likely), please report them to the issue
|
||||
+tracker at link:https://gitlab.archlinux.org/pacman/pacman/-/issues[] with
|
||||
+specific information such as your command-line, the nature of the bug, and even
|
||||
+the package database if it helps.
|
||||
|
||||
Copyright
|
||||
---------
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 0571ee82bff0edbd5ffac2228d4e6ac510b9008e Mon Sep 17 00:00:00 2001
|
||||
From: Christian Heusel <christian@heusel.eu>
|
||||
Date: Wed, 13 Mar 2024 17:38:56 +0100
|
||||
Subject: [PATCH] repo-add: fix parseopts missing arg to -k/--key
|
||||
|
||||
The current code treats -k/--key as a binary option which later makes it
|
||||
fail parsing the argument as then the end of arguments '--' is treated
|
||||
as the GPGKEY. We fix this by adding the appropriate specifier to the
|
||||
long and shortopt.
|
||||
|
||||
Closes https://gitlab.archlinux.org/pacman/pacman/-/issues/105
|
||||
|
||||
Fixes: 4f43ce3e ("repo-add: use parseopts from libmakepkg")
|
||||
Signed-off-by: Christian Heusel <christian@heusel.eu>
|
||||
---
|
||||
scripts/repo-add.sh.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
|
||||
index bdd549d20..39137f975 100644
|
||||
--- a/scripts/repo-add.sh.in
|
||||
+++ b/scripts/repo-add.sh.in
|
||||
@@ -605,8 +605,8 @@ trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
|
||||
trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
|
||||
|
||||
|
||||
-OPT_SHORT="knpqRsv"
|
||||
-OPT_LONG=('include-sigs' 'key' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
|
||||
+OPT_SHORT="k:npqRsv"
|
||||
+OPT_LONG=('include-sigs' 'key:' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
|
||||
'sign' 'verify')
|
||||
if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
|
||||
exit 1 # E_INVALID_OPTION
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Reference in New Issue
Block a user