- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] 3 commits: libmakepkg: Fix git clone command
by Allan McRae (＠allan) 30 Aug '22

30 Aug '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 184f5931 by soloturn at 2022-08-02T13:07:09+10:00 libmakepkg: Fix git clone command Commit e017a5975cfe3e53670848bd45c982524d6745af introduced the GITFLAGS environmental variable. While ensuring the default of "--mirror" was kept, there was a capitalisation mistake made. Handle the default for GITFLAGS directly in the git clone command. - - - - - 064e556c by Ben Westover at 2022-08-02T23:04:22+10:00 doc: Fix grammar in pacman.8.asciidoc Signed-off-by: Ben Westover <kwestover.kw(a)gmail.com> - - - - - 656abdb2 by Ben Westover at 2022-08-04T22:29:27+10:00 doc: Create documentation for pacman-db-upgrade and testpkg There are two "binaries" that are currently missing documentation, pacman-db-upgrade and testpkg. This patch adds that documentation. Signed-off-by: Ben Westover <kwestover.kw(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5 changed files: - doc/meson.build - + doc/pacman-db-upgrade.8.asciidoc - doc/pacman.8.asciidoc - + doc/testpkg.8.asciidoc - scripts/libmakepkg/source/git.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/e017a5975cfe3e53670848… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/e017a5975cfe3e53670848… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH 1/2] Diff color version strings
by David Gustavsson 18 Aug '22

18 Aug '22

In package table, with VerbosePkgLists and Color, color the part of package version strings that changes. Signed-off-by: David Gustavsson <david.e.gustavsson(a)gmail.com> --- src/pacman/conf.c | 4 ++++ src/pacman/conf.h | 2 ++ src/pacman/util.c | 35 +++++++++++++++++++++++++++++++---- src/pacman/util.h | 1 + 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..d5c598b9 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -80,6 +80,8 @@ void enable_colors(int colors) colstr->err = BOLDRED; colstr->faint = GREY46; colstr->nocolor = NOCOLOR; + colstr->diffrem = RED; + colstr->diffadd = GREEN; } else { colstr->colon = ":: "; colstr->title = ""; @@ -91,6 +93,8 @@ void enable_colors(int colors) colstr->err = ""; colstr->faint = ""; colstr->nocolor = ""; + colstr->diffrem = ""; + colstr->diffadd = ""; } } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f7916ca9..782b5758 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,6 +33,8 @@ typedef struct __colstr_t { const char *err; const char *faint; const char *nocolor; + const char *diffrem; + const char *diffadd; } colstr_t; typedef struct __config_repo_t { diff --git a/src/pacman/util.c b/src/pacman/util.c index 53833d6f..10d7c573 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -840,8 +840,10 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) { char *str; off_t size = 0; + size_t i = 0; double human_size; const char *label; + const char *version; alpm_list_t *ret = NULL; /* a row consists of the package name, */ @@ -858,12 +860,28 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* old and new versions */ - pm_asprintf(&str, "%s", - target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); + version = alpm_pkg_get_version(target->remove); + char old_version[strlen(version) + strlen(config->colstr.diffrem) + strlen(config->colstr.nocolor) + 1]; + memcpy(old_version, (char *)version, strlen(version) + 1); + version = alpm_pkg_get_version(target->install); + char new_version[strlen(version) + strlen(config->colstr.diffadd) + strlen(config->colstr.nocolor) + 1]; + memcpy(new_version, (char *)version, strlen(version) + 1); + + i = 0; + while (old_version[i] != '\0' && new_version[i] != '\0' && old_version[i] == new_version[i]) { + i++; + } + insertstring(old_version, config->colstr.diffrem, i); + insertstring(new_version, config->colstr.diffadd, i); + snprintf(old_version + i + strlen(old_version + i), + strlen(config->colstr.nocolor) + 1, "%s", config->colstr.nocolor); + snprintf(new_version + i + strlen(new_version + i), + strlen(config->colstr.nocolor) + 1, "%s", config->colstr.nocolor); + + pm_asprintf(&str, "%s", old_version); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); - pm_asprintf(&str, "%s", - target->install != NULL ? alpm_pkg_get_version(target->install) : ""); + pm_asprintf(&str, "%s", new_version); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* and size */ @@ -1859,3 +1877,12 @@ void console_erase_line(void) { printf("\x1B[K"); } + +/* inserts string insert into string at index i, modifying string */ +void insertstring(char *string, const char *insert, size_t i) +{ + char temp[strlen(string) - i + 1]; + memcpy(temp, string + i, strlen(string + i) + 1); + memcpy(string + i, insert, strlen(insert) + 1); + memcpy(string + i + strlen(insert), temp, strlen(temp) + 1); +} diff --git a/src/pacman/util.h b/src/pacman/util.h index 52e79915..003961eb 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -88,6 +88,7 @@ void console_cursor_move_down(unsigned int lines); void console_cursor_move_end(void); /* Erases line from the current cursor position till the end of the line */ void console_erase_line(void); +void insertstring(char *string, const char *insert, size_t i); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.35.1

2 3

[PATCH] doc: Create documentation for pacman-db-upgrade and testpkg
by Ben Westover 03 Aug '22

03 Aug '22

There are two "binaries" that are currently missing documentation, pacman-db-upgrade and testpkg. This patch adds that documentation. Signed-off-by: Ben Westover <kwestover.kw(a)gmail.com> --- doc/meson.build | 2 ++ doc/pacman-db-upgrade.8.asciidoc | 39 ++++++++++++++++++++++++++++++++ doc/testpkg.8.asciidoc | 21 +++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 doc/pacman-db-upgrade.8.asciidoc create mode 100644 doc/testpkg.8.asciidoc diff --git a/doc/meson.build b/doc/meson.build index 06df92c9..a18e7f3f 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -5,7 +5,9 @@ manpages = [ { 'name': 'makepkg-template.1' }, { 'name': 'repo-add.8' }, { 'name': 'vercmp.8' }, + { 'name': 'testpkg.8' }, { 'name': 'pacman-key.8' }, + { 'name': 'pacman-db-upgrade.8' }, { 'name': 'PKGBUILD.5', 'extra_depends' : [ 'PKGBUILD-example.txt' ] }, { 'name': 'makepkg.conf.5' }, { 'name': 'pacman.conf.5' }, diff --git a/doc/pacman-db-upgrade.8.asciidoc b/doc/pacman-db-upgrade.8.asciidoc new file mode 100644 index 00000000..d984179b --- /dev/null +++ b/doc/pacman-db-upgrade.8.asciidoc @@ -0,0 +1,39 @@ +pacman-db-upgrade(8) +==================== + +Name +---- +pacman-db-upgrade - upgrade the local pacman database to a newer format + +Synopsis +-------- +'pacman-db-upgrade' [options] + +Description +----------- +'pacman-db-upgrade' is a script that upgrades the local database used +by linkman:pacman[8] to a newer format. + +Common Options +-------------- +*-h, \--help*:: +Show the built-in help message and exit. +*-V, \--version*:: +Show version information and exit. +*\--nocolor*:: +Remove color from output. + +pacman-db-upgrade Options +------------------------- +*-d, \--dbpath* <path>:: +Set an alternate database location. +*\--config* <path>:: +Set an alternate configuration file. +*-r, \--root* <path>:: +Sset an alternate installation root. + +See Also +-------- +linkman:pacman[8] + +include::footer.asciidoc[] diff --git a/doc/testpkg.8.asciidoc b/doc/testpkg.8.asciidoc new file mode 100644 index 00000000..6401a9be --- /dev/null +++ b/doc/testpkg.8.asciidoc @@ -0,0 +1,21 @@ +testpkg(8) +========== + +Name +---- +testpkg - test a pacman package for validity + +Synopsis +-------- +'testpkg' <package file> + +Description +----------- +'testpkg' is a script used to make sure packages produced by +linkman:makepkg[8] are valid. + +See Also +-------- +linkman:makepkg[8] + +include::footer.asciidoc[] -- 2.37.1

2 4

Runtime dependencies not required for building
by Hugo Osvaldo Barrera 02 Aug '22

02 Aug '22

Some packages I maintain have a lot of runtime dependencies that are not required at build time (this is common for packages which only ship scripts and have no tests). When building on a clean chroot, I have to wait for hundreds of megabytes in packages to be copied and installed. This is rather inefficient, since these are not required. However, the `makedepends` ARE required in this case, but there is no overlap. I'd like some way to indicate that a PKGBUILD does not require its runtime dependencies for building the package. Perhaps something like `options=(!depends)` I'd like to hear feedback on this, thoughts? -- Hugo Osvaldo Barrera

2 2

[Git][pacman/pacman][master] 5 commits: meson: replace deprecated get_pkgconfig_variable()
by Allan McRae (＠allan) 29 Jul '22

29 Jul '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: daa2db6a by Joe Baldino at 2022-07-29T09:41:47+10:00 meson: replace deprecated get_pkgconfig_variable() Apparently that function was deprecated in 0.56, so use the generic getter introduced in 0.51 instead. This squashes a warning. Signed-off-by: Joe Baldino <pedanticdm(a)gmx.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5abe1455 by Alexander F. Rødseth at 2022-07-29T09:42:38+10:00 pacman: remove redundant argument The fill_progress function is called from two locations, and both locations pass in the same percentage value twice. This patch modifies the function signature to to receive the percentage value just once. Signed-off-by: Alexander F. Rødseth <xyproto(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 51b2e1c9 by Alexander F. Rødseth at 2022-07-29T09:44:04+10:00 pacman: let the progress bar "C"/"c" move up and down at a more regular rate For some terminal widths, the "C"/"c" character does not alternate at regular intervals, but may look like it is stuck at either lowercase or uppercase. The previous behavior toggled based on the character position, while this new behavior toggles the chomp alternation based on the progress percentage value. This leads to slightly improved chomping. Signed-off-by: Alexander F. Rødseth <xyproto(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 79bd5121 by Daan De Meyer at 2022-07-29T10:17:52+10:00 Add --keyringdir meson option to configure the keyring directory On Debian, keyrings are stored in /usr/share/keyrings. To support this, let's add a new --keyringdir option that allows configuring the directory under datarootdir where the keyrings should be imported from. We default to 'pacman/keyrings' for backwards compatibility. - - - - - e017a597 by soloturn at 2022-07-29T11:00:01+10:00 makepkg: Add GITFLAGS environmental variable to customise checkout The default flag used to clone a git repository when using makepkg is "--mirror". However, when working with huge repositories, the use of different flags during cloning can allow an faster checkout. For example, using "--filter=blob:none" allows for small checkouts, at the expense of requiring downloads during the build stage if anything but the HEAD commit is used for the build. In addition, this example would serve as a replacement for the often requested (but broken) addition of --depth=1. Add support for the environment variable GITFLAG to pass flags for the git clone command. Note that this overrides the default rather than adding to it in order to prevent incompatibilities. - - - - - 10 changed files: - build-aux/edit-script.sh.in - doc/makepkg.8.asciidoc - doc/meson.build - doc/pacman-key.8.asciidoc - meson.build - meson_options.txt - scripts/completion/zsh_completion.in - scripts/libmakepkg/source/git.sh.in - scripts/pacman-key.sh.in - src/pacman/callback.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/ff7c6c8e570bcf5e078763… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/ff7c6c8e570bcf5e078763… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH 1/2] pacman: remove redundant argument
by Alexander F. Rødseth 28 Jul '22

28 Jul '22

The fill_progress function is called from two locations, and both locations pass in the same percentage value twice. This patch modifies the function signature to to receive the percentage value just once. Signed-off-by: Alexander F. Rødseth <xyproto(a)archlinux.org> --- src/pacman/callback.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a06f3bcc..df4032a4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -150,12 +150,11 @@ static int64_t get_update_timediff(int first_call) } /* refactored from cb_trans_progress */ -static void fill_progress(const int bar_percent, const int disp_percent, - const int proglen) +static void fill_progress(const int percent, const int proglen) { /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ const int hashlen = proglen > 8 ? proglen - 8 : 0; - const int hash = bar_percent * hashlen / 100; + const int hash = percent * hashlen / 100; int i; if(hashlen > 0) { @@ -188,7 +187,7 @@ static void fill_progress(const int bar_percent, const int disp_percent, /* print display percent after progress bar */ /* 5 = 1 space + 3 digits + 1 % */ if(proglen >= 5) { - printf(" %3d%%", disp_percent); + printf(" %3d%%", percent); } putchar('\r'); @@ -677,7 +676,7 @@ void cb_progress(void *ctx, alpm_progress_t event, const char *pkgname, free(wcstr); /* call refactored fill progress function */ - fill_progress(percent, percent, cols - infolen); + fill_progress(percent, cols - infolen); if(percent == 100) { putchar('\n'); @@ -855,7 +854,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) free(fname); free(wcfname); - fill_progress(file_percent, file_percent, cols - infolen); + fill_progress(file_percent, cols - infolen); return; } -- 2.37.1

2 3

[PATCH] meson: replace deprecated get_pkgconfig_variable()
by Joe Baldino 28 Jul '22

28 Jul '22

Apparently that function was deprecated in 0.56, so use the generic getter introduced in 0.51 instead. This squashes a warning. Signed-off-by: Joe Baldino <pedanticdm(a)gmx.us> --- Notes: WARNING: Deprecated features used: * 0.56.0: {'dependency.get_pkgconfig_variable'} See: https://mesonbuild.com/Reference-manual_returned_dep.html#depget_variable meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1519a2bbb4ef..6ea97672e33d 100644 --- a/meson.build +++ b/meson.build @@ -43,7 +43,7 @@ endif bashcompletion = dependency('bash-completion', required : false) if bashcompletion.found() - BASHCOMPDIR = bashcompletion.get_pkgconfig_variable('completionsdir') + BASHCOMPDIR = bashcompletion.get_variable(pkgconfig: 'completionsdir') else BASHCOMPDIR = join_paths(DATAROOTDIR, 'bash-completion/completions') endif -- 2.37.1

2 1

Fwd: [PATCH] This simple patch allows comments in the middle of a line.
by Fabiano Furtado 25 Jul '22

25 Jul '22

>From 4a87185f577d61f51c94e9b158d602460c795330 Mon Sep 17 00:00:00 2001 From: Fabiano Furtado <fabianofurtado <at> gmail <dot> com> Date: Sun, 24 Jul 2022 16:44:31 -0300 Subject: [PATCH] As described in https://archlinux.org/pacman/pacman.conf.5.html#_description, "Comments are only supported by beginning a line with the hash (#) symbol. Comments cannot begin in the middle of a line.". This patch allows comments in the middle of a line. Example: LogFile = /tmp/pacman.log#/var/log/pacman.log Signed-off-by: Fabiano Furtado <fabianofurtado <at> gmail <dot> com> --- src/common/ini.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 410a2843..4d09d844 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -60,14 +60,22 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) } while(safe_fgets(line, PATH_MAX, fp)) { - char *key, *value; + char *key, *value, *comment; size_t line_len; linenum++; + if(line[0] == '#') { + continue; + } + + if((comment = strchr(line,'#')) != NULL) { + *comment = '\0'; + } + line_len = strtrim(line); - if(line_len == 0 || line[0] == '#') { + if(line_len == 0) { continue; } -- 2.37.1

2 2

[PATCH] proto: Change the default checksum from md5 to sha256
by Ben Westover 22 Jul '22

22 Jul '22

MD5 isn't a very good checksum, and the PKGBUILD page on the Arch Wiki states that it should not be used, instead recommending sha256 or b2. This patch changes the default from md5 to sha256 because that seems to be the most commonly used checksum today. Signed-off-by: Ben Westover <kwestover.kw(a)gmail.com> --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD-vcs.proto | 2 +- proto/PKGBUILD.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 9898ef81..eea97e56 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -28,7 +28,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() +sha256sums=() validpgpkeys=() prepare() { diff --git a/proto/PKGBUILD-vcs.proto b/proto/PKGBUILD-vcs.proto index ae9956a9..49c6759f 100644 --- a/proto/PKGBUILD-vcs.proto +++ b/proto/PKGBUILD-vcs.proto @@ -25,7 +25,7 @@ options=() install= source=('FOLDER::VCS+URL#FRAGMENT') noextract=() -md5sums=('SKIP') +sha256sums=('SKIP') # Please refer to the 'USING VCS SOURCES' section of the PKGBUILD man page for # a description of each element in the source array. diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index a2c600d5..9aff797c 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() +sha256sums=() validpgpkeys=() prepare() { -- 2.36.1

1 0

[PATCH v2] util: Flush cursor state to stdout before removing signal handler
by Chris Down 22 Jul '22

22 Jul '22

It's possible that the cursor does not reappear after pressing ^C during shutdown. In my case, I noticed this when pressing ^C after getting results from `pacman -F` -- this can reasonably reliably be triggered by issuing a file query and pressing ^C shortly after results are shown. There are two reasons for this issue: 1. The graceful SIGINT handler is removed at the start of cleanup(), but the window from entering cleanup() to reaching exit() is non trivial. The main offender is FREELIST(pm_targets), which on my T14s takes >0.1s to execute. This means that if you are unlucky enough to press ^C while there, the cursor isn't coming back, because we haven't issued any command to show the cursor again yet, and the userspace signal handler is already blown away. 2. Moving console_cursor_show() to earlier in cleanup() only half solves the issue. While it's fine not to flush after _hiding_ the cursor, since it will at least make itself apparent before any other text reaches the screen, _showing_ the cursor must be followed by flushing stdout, because once the graceful SIGINT handler is gone, if you press ^C, no flush will be triggered (and thus there will be no cursor). This fixes the issue by always starting out by showing the cursor again at cleanup() time. This means that no matter where we get caught at ^C, we will not end up leaving the terminal without its beloved ensign. Signed-off-by: Chris Down <chris(a)chrisdown.name> --- src/pacman/pacman.c | 2 +- src/pacman/util.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ea536a47..e5c6e420 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -289,6 +289,7 @@ static void setuseragent(void) */ static void cleanup(int ret) { + console_cursor_show(); remove_soft_interrupt_handler(); if(config) { /* free alpm library resources */ @@ -302,7 +303,6 @@ static void cleanup(int ret) /* free memory */ FREELIST(pm_targets); - console_cursor_show(); exit(ret); } diff --git a/src/pacman/util.c b/src/pacman/util.c index 53833d6f..e92b2012 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1426,6 +1426,16 @@ void console_cursor_hide(void) { void console_cursor_show(void) { if(isatty(fileno(stdout))) { printf(CURSOR_SHOW_ANSICODE); + + /* We typically explicitly show the cursor either when we are + * getting input from stdin, or when we are in the process of + * exiting. In the former case, it's not guaranteed that the + * terminal will see the command before reading from stdin. In + * the latter case, we need to make sure that if we get a + * further TERM/INT after we return signal disposition to + * SIG_DFL, it doesn't leave the cursor invisible. + */ + fflush(stdout); } } -- 2.35.1

2 4