- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libmakepkg: allow correctly sourcing when $LIBRARY is not set
by Eli Schwartz 04 Jul '21

04 Jul '21

We usually set this up to default to the build time configured install location, but a couple of files crept in without this. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/buildenv.sh.in | 2 ++ scripts/libmakepkg/executable.sh.in | 2 ++ scripts/libmakepkg/util/pkgbuild.sh.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index 0f4178a90..07b32ce93 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -22,6 +22,8 @@ [[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return LIBMAKEPKG_BUILDENV_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + declare -a buildenv_functions build_options for lib in "$LIBRARY/buildenv/"*.sh; do diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in index ea40289ba..dfa8a0bdf 100644 --- a/scripts/libmakepkg/executable.sh.in +++ b/scripts/libmakepkg/executable.sh.in @@ -21,6 +21,8 @@ [[ -n "$LIBMAKEPKG_EXECUTABLE_SH" ]] && return LIBMAKEPKG_EXECUTABLE_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + declare -a executable_functions for lib in "$LIBRARY/executable/"*.sh; do diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index ceda7824f..e3c5b5902 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -21,6 +21,8 @@ [[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return LIBMAKEPKG_UTIL_PKGBUILD_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + source "$LIBRARY/util/schema.sh" -- 2.32.0

1 0

[pacman-dev] [Git][pacman/pacman][master] doc: use localdate instead of pacman_date to improve reproducibility
by Allan McRae (＠allan) 01 Jul '21

01 Jul '21

Allan McRae pushed to branch master at Pacman / Pacman Commits: b4383b8d by Jonas Witschel at 2021-07-01T11:19:18+10:00 doc: use localdate instead of pacman_date to improve reproducibility pacman_date is set to the current date during build without respecting SOURCE_DATE_EPOCH. As a result, a build cannot be fully reproduced on a later date because the date embedded into the man pages does not match. In contrast, the built-in asciidoc attribute "localdate" respects SOURCE_DATE_EPOCH and has the desired ISO 8601 format, so simply use that instead of the custom "pacman_date" attribute. Fixes: FS#71154 Signed-off-by: Jonas Witschel <diabonas at archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - doc/asciidoc.conf - doc/meson.build Changes: ===================================== doc/asciidoc.conf ===================================== @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> ===================================== doc/meson.build ===================================== @@ -25,7 +25,6 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ '-f', asciidoc_conf, '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), - '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), '-a', 'srcext=@0@'.format(get_option('src-ext')), '-a', 'pkgext=@0@'.format(get_option('pkg-ext')), '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/b4383b8d007e28aa76324f4… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/b4383b8d007e28aa76324f4… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[pacman-dev] Multiple progress bars not compatible with dumb terminals
by miha＠kamnitnik.top 29 Jun '21

29 Jun '21

On less capable terminals, pacman should probably display only one active progress bar simultaneously. An example of such a terminal is Emacs's M-x shell ($TERM == "dumb"). It can't display the additional "total" properly because it doesn't implement cursor movement.

2 2

[pacman-dev] [PATCH] doc: make man pages reproducible
by Allan McRae 25 Jun '21

25 Jun '21

Use asciidoc's localdate which respects SOURCE_DATE_EPOCH. Thanks to Jonas Witschel <diabonas(a)archlinux.org> for investigating this issue. Fixes FS#71154. --- doc/asciidoc.conf | 2 +- doc/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index e2e72672..830cc908 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> diff --git a/doc/meson.build b/doc/meson.build index 4aaac554..5a8eb3a4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -25,7 +25,6 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ '-f', asciidoc_conf, '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), - '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), '-a', 'srcext=@0@'.format(get_option('src-ext')), '-a', 'pkgext=@0@'.format(get_option('pkg-ext')), '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), -- 2.32.0

1 0

[pacman-dev] [PATCH] doc: use localdate instead of pacman_date to improve reproducibility
by Jonas Witschel 25 Jun '21

25 Jun '21

pacman_date is set to the current date during build without respecting SOURCE_DATE_EPOCH. As a result, a build cannot be fully reproduced on a later date because the date embedded into the man pages does not match. In contrast, the built-in asciidoc attribute "localdate" respects SOURCE_DATE_EPOCH and has the desired ISO 8601 format, so simply use that instead of the custom "pacman_date" attribute. Fixes: FS#71154 Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> --- doc/asciidoc.conf | 2 +- doc/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index e2e72672..830cc908 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> diff --git a/doc/meson.build b/doc/meson.build index 4aaac554..5a8eb3a4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -25,7 +25,6 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ '-f', asciidoc_conf, '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), - '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), '-a', 'srcext=@0@'.format(get_option('src-ext')), '-a', 'pkgext=@0@'.format(get_option('pkg-ext')), '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), -- 2.32.0

1 0

[pacman-dev] [PATCH] libalpm: look for up to date file anywhere in cache
by morganamilo 24 Jun '21

24 Jun '21

Currently when a package is in a secondary cachedir and there is no sig file, the downloader redownloads the whole file into the primary cachedir. So lets check all cachedirs for an up to date file. Fixes FS#71109 --- lib/libalpm/be_sync.c | 2 +- lib/libalpm/dload.c | 61 +++++++++++++++++++++++++++++-------------- lib/libalpm/dload.h | 3 ++- lib/libalpm/sync.c | 2 +- 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d85f36ee..f5f70a10 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -205,7 +205,7 @@ int SYMEXPORT alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force) event.type = ALPM_EVENT_DB_RETRIEVE_START; EVENT(handle, &event); - ret = _alpm_download(handle, payloads, syncpath); + ret = _alpm_download(handle, payloads, syncpath, NULL); if(ret < 0) { event.type = ALPM_EVENT_DB_RETRIEVE_FAILED; EVENT(handle, &event); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2c14841f..d5b52cd2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -55,7 +55,7 @@ #define HOSTNAME_SIZE 256 static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, - struct dload_payload *payload, const char *localpath); + struct dload_payload *payload, const char *localpath, alpm_list_t *cachedirs); static int curl_gethost(const char *url, char *buffer, size_t buf_len); /* number of "soft" errors required to blacklist a server, set to 0 to disable @@ -308,7 +308,7 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u return realsize; } -static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload) +static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload, alpm_list_t *cachedirs) { alpm_handle_t *handle = payload->handle; const char *useragent = getenv("HTTP_USER_AGENT"); @@ -353,14 +353,33 @@ static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload) curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); } - if(!payload->force && payload->destfile_name && - stat(payload->destfile_name, &st) == 0) { - /* start from scratch, but only download if our local is out of date. */ - curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); - _alpm_log(handle, ALPM_LOG_DEBUG, - "%s: using time condition %ld\n", - payload->remote_name, (long)st.st_mtime); + if(!payload->force && payload->destfile_name) { + if(stat(payload->destfile_name, &st) == 0) { + /* start from scratch, but only download if our local is out of date. */ + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s: using time condition %ld\n", + payload->remote_name, (long)st.st_mtime); + } else { + /* try and find an up to date file anywhere in cache */ + const char *name = get_filename(payload->destfile_name); + for(alpm_list_t *i = cachedirs; i; i = i->next) { + char *cachedir = i->data; + char *filepath = get_fullpath(cachedir, name, ""); + if(stat(filepath, &st) == 0) { + /* start from scratch, but only download if our local is out of date. */ + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s: using time condition %ld\n", + payload->remote_name, (long)st.st_mtime); + free(filepath); + break; + } + free(filepath); + } + } } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; @@ -469,7 +488,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload * Returns -2 if an error happened for an optional file */ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, - const char *localpath, int *active_downloads_num) + const char *localpath, int *active_downloads_num, alpm_list_t *cachedirs) { alpm_handle_t *handle = NULL; struct dload_payload *payload = NULL; @@ -638,7 +657,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, /* set hard upper limit of 16KiB */ sig->max_size = 16 * 1024; - curl_add_payload(handle, curlm, sig, localpath); + curl_add_payload(handle, curlm, sig, localpath, cachedirs); (*active_downloads_num)++; } @@ -721,7 +740,7 @@ cleanup: * Returns -1 if am error happened while starting a new download */ static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, - struct dload_payload *payload, const char *localpath) + struct dload_payload *payload, const char *localpath, alpm_list_t *cachedirs) { size_t len; CURL *curl = NULL; @@ -778,7 +797,7 @@ static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, } } - curl_set_handle_opts(curl, payload); + curl_set_handle_opts(curl, payload, cachedirs); if(payload->max_size == payload->initial_size && payload->max_size != 0) { /* .part file is complete */ @@ -823,7 +842,8 @@ cleanup: */ static int curl_download_internal(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, - const char *localpath) + const char *localpath, + alpm_list_t *cachedirs) { int active_downloads_num = 0; int err = 0; @@ -837,7 +857,7 @@ static int curl_download_internal(alpm_handle_t *handle, for(; active_downloads_num < max_streams && payloads; active_downloads_num++) { struct dload_payload *payload = payloads->data; - if(curl_add_payload(handle, curlm, payload, localpath) == 0) { + if(curl_add_payload(handle, curlm, payload, localpath, cachedirs) == 0) { payloads = payloads->next; } else { /* The payload failed to start. Do not start any new downloads. @@ -868,7 +888,7 @@ static int curl_download_internal(alpm_handle_t *handle, } if(msg->msg == CURLMSG_DONE) { int ret = curl_check_finished_download(curlm, msg, - localpath, &active_downloads_num); + localpath, &active_downloads_num, cachedirs); if(ret == -1) { /* if current payload failed to download then stop adding new payloads but wait for the * current ones @@ -896,11 +916,12 @@ static int curl_download_internal(alpm_handle_t *handle, */ int _alpm_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, - const char *localpath) + const char *localpath, + alpm_list_t *cachedirs) { if(handle->fetchcb == NULL) { #ifdef HAVE_LIBCURL - return curl_download_internal(handle, payloads, localpath); + return curl_download_internal(handle, payloads, localpath, cachedirs); #else RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif @@ -995,7 +1016,7 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls, event.type = ALPM_EVENT_PKG_RETRIEVE_START; event.pkg_retrieve.num = alpm_list_count(payloads); EVENT(handle, &event); - if(_alpm_download(handle, payloads, cachedir) == -1) { + if(_alpm_download(handle, payloads, cachedir, handle->cachedirs) == -1) { _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 8f3d17b4..f5dabae1 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -61,6 +61,7 @@ void _alpm_dload_payload_reset(struct dload_payload *payload); int _alpm_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, - const char *localpath); + const char *localpath, + alpm_list_t *cachedirs); #endif /* ALPM_DLOAD_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 36ad6242..a1226a4c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -833,7 +833,7 @@ static int download_files(alpm_handle_t *handle) payloads = alpm_list_add(payloads, payload); } - ret = _alpm_download(handle, payloads, cachedir); + ret = _alpm_download(handle, payloads, cachedir, handle->cachedirs); if(ret == -1) { event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); -- 2.32.0

5 5

[pacman-dev] Move to gitlab.archlinux.org
by Allan McRae 24 Jun '21

24 Jun '21

Hi all, With Arch shutting down our current git hosting in the near future, the main repo for pacman development has moved to: https://gitlab.archlinux.org/pacman/pacman Note that the bug tracker will remain on Flyspray and patches will remain submitted through the mailing list until such time that registration for an Arch Gitlab account is open for the wider community. With the move to gitlab, we now have some CI happening (though only post push at the moment). We currently test a bunch of configurations under Arch, and fairly default things under Fedora and Debian. If any of our BSD friends want to provide an addition to the CI configuration (.gitlab-ci.yml), I am more than happy to include it. I will move some of the development notes (e.g. my wiki page for the rough design of alternatives etc) into the project wiki. I'd also like to use the project wiki as an index for Feature Requests, and keep the bug tracker for only bugs. The idea would be any feature request file gets discussed, and if we deem it a suitable addition it then gets added to the wiki. That way we can have an annotated list of potential future feature that anyone can see without having to sift through a bug tracker. Also, real bugs that need fixed will be easier to spot. I am thinking it best to start on this before we open up the issue tracking on gitlab as it will clear our Flyspray bug list up quite a lot. Cheers, Allan

3 5

[pacman-dev] [PATCH] pacman: don't nuke local repos with -Sc
by morganamilo 24 Jun '21

24 Jun '21

When using a local repo as a cachedir pacman -Scc or pacman -Sc without KeepCurrent will delete the repo database and packages resulting in a lost database and non functional pacman. So special case file:/// repos in cache to not get nuked and foce KeepCurrent on. --- src/pacman/sync.c | 64 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 9 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b6da1a36..129d3f5c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -151,34 +151,71 @@ static int sync_cleandb_all(void) return ret; } -static int sync_cleancache(int level) +static int is_local_repo(char *dir) +{ + alpm_list_t *j, *k; + char *sanatized_dir = strdup(dir); + int len = strlen(sanatized_dir); + int ret = 0; + + if(sanatized_dir[len - 1] == '/') { + sanatized_dir[len - 1] = '\0'; + } + + for(j = alpm_get_syncdbs(config->handle); j; j = alpm_list_next(j)) { + alpm_db_t *db = j->data; + + for(k = alpm_db_get_servers(db); k; k = alpm_list_next(k)) { + char *server = k->data; + + if(strncmp(server, "file://", 7) == 0) { + server += 7; + + if(strcmp(server, sanatized_dir) == 0) { + ret = 1; + goto cleanup; + } + } + } + + } + +cleanup: + free(sanatized_dir); + return ret; +} + +static int sync_cleancache(int config_level) { alpm_list_t *i; alpm_list_t *sync_dbs = alpm_get_syncdbs(config->handle); alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle); + int config_cleanmethod = config->cleanmethod; int ret = 0; - if(!config->cleanmethod) { + if(config_cleanmethod) { /* default to KeepInstalled if user did not specify */ - config->cleanmethod = PM_CLEAN_KEEPINST; + config_cleanmethod = PM_CLEAN_KEEPINST; } - if(level == 1) { + if(config_level == 1) { printf(_("Packages to keep:\n")); - if(config->cleanmethod & PM_CLEAN_KEEPINST) { + if(config_cleanmethod & PM_CLEAN_KEEPINST) { printf(_(" All locally installed packages\n")); } - if(config->cleanmethod & PM_CLEAN_KEEPCUR) { + if(config_cleanmethod & PM_CLEAN_KEEPCUR) { printf(_(" All current sync database packages\n")); } } printf("\n"); for(i = cachedirs; i; i = alpm_list_next(i)) { - const char *cachedir = i->data; + char *cachedir = i->data; DIR *dir; struct dirent *ent; + int cleanmethod = config_cleanmethod; + int level = config_level; printf(_("Cache directory: %s\n"), (const char *)i->data); @@ -196,6 +233,15 @@ static int sync_cleancache(int level) printf(_("removing all files from cache...\n")); } + if(is_local_repo(cachedir)) { + pm_printf(ALPM_LOG_DEBUG, + _("cachedir '%s' is a local repo, keeping packages\n"), cachedir); + + level = 1; + cleanmethod |= PM_CLEAN_KEEPCUR; + cleanmethod &= ~PM_CLEAN_KEEPINST; + } + dir = opendir(cachedir); if(dir == NULL) { pm_printf(ALPM_LOG_ERROR, @@ -258,7 +304,7 @@ static int sync_cleancache(int level) local_name = alpm_pkg_get_name(localpkg); local_version = alpm_pkg_get_version(localpkg); - if(config->cleanmethod & PM_CLEAN_KEEPINST) { + if(cleanmethod & PM_CLEAN_KEEPINST) { /* check if this package is in the local DB */ pkg = alpm_db_get_pkg(db_local, local_name); if(pkg != NULL && alpm_pkg_vercmp(local_version, @@ -269,7 +315,7 @@ static int sync_cleancache(int level) delete = 0; } } - if(config->cleanmethod & PM_CLEAN_KEEPCUR) { + if(cleanmethod & PM_CLEAN_KEEPCUR) { alpm_list_t *j; /* check if this package is in a sync DB */ for(j = sync_dbs; j && delete; j = alpm_list_next(j)) { -- 2.32.0

4 10

[pacman-dev] [PATCH] PKGBUILD.5: Add fossil to list of supported VCSs
by David Passens 24 Jun '21

24 Jun '21

Since commit 08f4ae70, makepkg supports downloading from fossil. However, the PKGBUILD man page was only partially updated to reflect this change. --- doc/PKGBUILD.5.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index af615040..d207d92d 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -476,9 +476,9 @@ control system (VCS) is enabled by specifying the source in the form: source=('directory::url#fragment?query') -Currently makepkg supports the Bazaar, Git, Subversion, and Mercurial version -control systems. For other version control systems, manual cloning of upstream -repositories must be done in the `prepare()` function. +Currently makepkg supports the Bazaar, Git, Subversion, Fossil and Mercurial +version control systems. For other version control systems, manual cloning of +upstream repositories must be done in the `prepare()` function. The source URL is divided into four components: -- 2.32.0

2 1

[pacman-dev] [PATCH 1/1] conf: replace grey46 with bright black
by Christian Hesse 15 Jun '21

15 Jun '21

From: Christian Hesse <mail(a)eworm.de> This is not handled correctly in some situations. For me (with pacman inside tmux inside xfce4-terminal with TERM=xterm) I do not see version strings but huge gaps between package names. Looks like grey46 is round to just back, which is my background color. Instead use bright black, which is one of the 16 colors and *should* be visible with any configuration. Works for me[tm] and all configurations I tested. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 12fee64c..afbd677f 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -55,6 +55,8 @@ config_t *config = NULL; #define CYAN "\033[0;36m" #define WHITE "\033[0;37m" +#define BRIGHTBLACK "\033[0;30;1m" + #define BOLDBLACK "\033[1;30m" #define BOLDRED "\033[1;31m" #define BOLDGREEN "\033[1;32m" @@ -63,7 +65,6 @@ config_t *config = NULL; #define BOLDMAGENTA "\033[1;35m" #define BOLDCYAN "\033[1;36m" #define BOLDWHITE "\033[1;37m" -#define GREY46 "\033[38;5;243m" void enable_colors(int colors) { @@ -78,7 +79,7 @@ void enable_colors(int colors) colstr->meta = BOLDCYAN; colstr->warn = BOLDYELLOW; colstr->err = BOLDRED; - colstr->faint = GREY46; + colstr->faint = BRIGHTBLACK; colstr->nocolor = NOCOLOR; } else { colstr->colon = ":: ";

3 4