- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add support for multiple 'Architecture' values
by Allan McRae 22 Apr '21

22 Apr '21

From: Dan McGee <dan(a)archlinux.org> This allows architecture to be multivalued. On x86-64 machines, this could be something like: Architecture = x86-64-v3 x86-64 We use the first specified Architecture value in mirrorlist $arch variable replacement, as this is backwards-compatible and sane. Original-patch-by: Dan McGee <dan(a)archlinux.org> Patch-updated-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Here is the link to Dan's original patch from 2012! https://code.toofishes.net/cgit/dan/pacman.git/commit/?h=multiarch&id=673c7… Getting this patch to apply did not require much effort, so I left Dan as the author. We guess the original patch did not get applied because it got lost due to no-one pushing it for inclusion. doc/pacman.conf.5.asciidoc | 10 +++--- lib/libalpm/alpm.h | 30 ++++++++++++----- lib/libalpm/handle.c | 30 +++++++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/trans.c | 21 ++++++++++-- src/pacman/conf.c | 33 ++++++++++++------- src/pacman/conf.h | 4 +-- src/pacman/pacman-conf.c | 4 +-- src/pacman/pacman.c | 2 +- test/pacman/meson.build | 2 ++ test/pacman/tests/multiple-architectires01.py | 14 ++++++++ test/pacman/tests/multiple-architectires02.py | 16 +++++++++ 12 files changed, 127 insertions(+), 41 deletions(-) create mode 100644 test/pacman/tests/multiple-architectires01.py create mode 100644 test/pacman/tests/multiple-architectires02.py diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 9bd31916..11ca1e4f 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -113,9 +113,9 @@ Options general configuration options. Wildcards in the specified paths will get expanded based on linkman:glob[7] rules. -*Architecture =* auto | i686 | x86_64 | ...:: - If set, pacman will only allow installation of packages of the given - architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will +*Architecture =* auto &| i686 &| x86_64 | ...:: + If set, pacman will only allow installation of packages with the given + architectures (e.g. 'i686', 'x86_64', etc). The special value 'auto' will use the system architecture, provided via ``uname -m''. If unset, no architecture checks are made. *NOTE*: Packages with the special architecture 'any' can always be installed, as they are meant to be @@ -252,8 +252,8 @@ number. During parsing, pacman will define the `$repo` variable to the name of the current section. This is often utilized in files specified using the 'Include' directive so all repositories can use the same mirrorfile. pacman also defines -the `$arch` variable to the value of `Architecture`, so the same mirrorfile can -even be used for different architectures. +the `$arch` variable to the first (or only) value of the `Architecture` option, +so the same mirrorfile can even be used for different architectures. *SigLevel =* ...:: Set the signature verification level for this repository. For more diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..2e99d4d8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2016,25 +2016,37 @@ int alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const alpm_depend_ /** @} */ -/** @name Accessors for the configured architecture - * - * libalpm will only install packages that match the configured architecture. - * The architecture does not need to match the physical architecture. - * It can just be treated as a label. +/** @name Accessors to the list of allowed architectures. + * libalpm will only install packages that match one of the configured + * architectures. The architectures do not need to match the physical + architecture. They can just be treated as a label. * @{ */ /** Returns the allowed package architecture. * @param handle the context handle - * @return the configured package architecture + * @return the configured package architectures */ -const char *alpm_option_get_arch(alpm_handle_t *handle); +alpm_list_t *alpm_option_get_architectures(alpm_handle_t *handle); -/** Sets the allowed package architecture. +/** Adds an allowed package architecture. * @param handle the context handle * @param arch the architecture to set */ -int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); +int alpm_option_add_architecture(alpm_handle_t *handle, const char *arch); + +/** Sets the allowed package architecture. + * @param handle the context handle + * @param arches the architecture to set + */ +int alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches); + +/** Removes an allowed package architecture. + * @param handle the context handle + * @param arch the architecture to remove + */ +int alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch); + /* End of arch accessors */ /** @} */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7b8cb1da..46224a25 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -77,7 +77,7 @@ void _alpm_handle_free(alpm_handle_t *handle) FREELIST(handle->hookdirs); FREE(handle->logfile); FREE(handle->lockfile); - FREE(handle->arch); + FREELIST(handle->architectures); FREE(handle->gpgdir); FREELIST(handle->noupgrade); FREELIST(handle->noextract); @@ -276,10 +276,10 @@ alpm_list_t SYMEXPORT *alpm_option_get_assumeinstalled(alpm_handle_t *handle) return handle->assumeinstalled; } -const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle) +alpm_list_t SYMEXPORT *alpm_option_get_architectures(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); - return handle->arch; + return handle->architectures; } int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) @@ -720,11 +720,29 @@ int SYMEXPORT alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const al return 0; } -int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) +int SYMEXPORT alpm_option_add_architecture(alpm_handle_t *handle, const char *arch) { + handle->architectures = alpm_list_add(handle->architectures, strdup(arch)); + return 0; +} + +int SYMEXPORT alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches) +{ + CHECK_HANDLE(handle, return -1); + if(handle->architectures) FREELIST(handle->architectures); + handle->architectures = alpm_list_strdup(arches); + return 0; +} + +int SYMEXPORT alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch) +{ + char *vdata = NULL; CHECK_HANDLE(handle, return -1); - if(handle->arch) FREE(handle->arch); - STRDUP(handle->arch, arch, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + handle->architectures = alpm_list_remove_str(handle->architectures, arch, &vdata); + if(vdata != NULL) { + FREE(vdata); + return 1; + } return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 2d8d0f9e..52dc2125 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -96,7 +96,7 @@ struct __alpm_handle_t { alpm_list_t *assumeinstalled; /* List of virtual packages used to satisfy dependencies */ /* options */ - char *arch; /* Architecture of packages we should allow */ + alpm_list_t *architectures; /* Architectures of packages we should allow */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ char *dbext; /* Sync DB extension */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c6ec7eea..939ab05a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -71,14 +71,29 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) alpm_list_t *i; alpm_list_t *invalid = NULL; - const char *arch = handle->arch; - if(!arch) { + if(!handle->architectures) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping architecture checks\n"); return NULL; } for(i = pkgs; i; i = i->next) { alpm_pkg_t *pkg = i->data; + alpm_list_t *j; + int found = 0; const char *pkgarch = alpm_pkg_get_arch(pkg); - if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) { + + /* always allow non-architecture packages and those marked "any" */ + if(!pkgarch || strcmp(pkgarch, "any") == 0) { + continue; + } + + for(j = handle->architectures; j; j = j->next) { + if(strcmp(pkgarch, j->data) == 0) { + found = 1; + break; + } + } + + if(!found) { char *string; const char *pkgname = pkg->name; const char *pkgver = pkg->version; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cde96716..9578daa3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -159,7 +159,7 @@ int config_free(config_t *oldconfig) FREELIST(oldconfig->cachedirs); free(oldconfig->xfercommand); free(oldconfig->print_format); - free(oldconfig->arch); + FREELIST(oldconfig->architectures); wordsplit_free(oldconfig->xfercommand_argv); free(oldconfig); @@ -394,16 +394,19 @@ cleanup: } -int config_set_arch(const char *arch) +int config_add_architecture(char *arch) { if(strcmp(arch, "auto") == 0) { struct utsname un; + char *newarch; uname(&un); - config->arch = strdup(un.machine); - } else { - config->arch = strdup(arch); + newarch = strdup(un.machine); + free(arch); + arch = newarch; } - pm_printf(ALPM_LOG_DEBUG, "config: arch: %s\n", config->arch); + + pm_printf(ALPM_LOG_DEBUG, "config: arch: %s\n", arch); + config->architectures = alpm_list_add(config->architectures, arch); return 0; } @@ -638,9 +641,12 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "HookDir") == 0) { setrepeatingoption(value, "HookDir", &(config->hookdirs)); } else if(strcmp(key, "Architecture") == 0) { - if(!config->arch) { - config_set_arch(value); + alpm_list_t *i, *arches = NULL; + setrepeatingoption(value, "Architecture", &arches); + for(i = arches; i; i = alpm_list_next(i)) { + config_add_architecture(i->data); } + alpm_list_free(arches); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -751,17 +757,20 @@ static int _parse_options(const char *key, char *value, static char *replace_server_vars(config_t *c, config_repo_t *r, const char *s) { - if(c->arch == NULL && strstr(s, "$arch")) { + if(c->architectures == NULL && strstr(s, "$arch")) { pm_printf(ALPM_LOG_ERROR, _("mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"), s, "$arch", "Architecture"); return NULL; } - if(c->arch) { + /* use first specified architecture */ + if(c->architectures) { char *temp, *replaced; + alpm_list_t *i = config->architectures; + const char *arch = i->data; - replaced = strreplace(s, "$arch", c->arch); + replaced = strreplace(s, "$arch", arch); temp = replaced; replaced = strreplace(temp, "$repo", r->name); @@ -893,7 +902,7 @@ static int setup_libalpm(void) pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } - alpm_option_set_arch(handle, config->arch); + alpm_option_set_architectures(handle, config->architectures); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 1b9fb337..316c8d0f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,7 +57,6 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; unsigned short disable_dl_timeout; - char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library * because they can come from both the command line or config file, and we @@ -70,6 +69,7 @@ typedef struct __config_t { char *sysroot; alpm_list_t *hookdirs; alpm_list_t *cachedirs; + alpm_list_t *architectures; unsigned short op_q_isfile; unsigned short op_q_info; @@ -244,7 +244,7 @@ int config_free(config_t *oldconfig); void config_repo_free(config_repo_t *repo); -int config_set_arch(const char *arch); +int config_add_architecture(char *arch); int parseconfig(const char *file); int parseconfigfile(const char *file); int setdefaults(config_t *c); diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index f8fac75d..6ca21119 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -258,7 +258,7 @@ static void dump_config(void) show_list_str("NoUpgrade", config->noupgrade); show_list_str("NoExtract", config->noextract); - show_str("Architecture", config->arch); + show_list_str("Architecture", config->architectures); show_str("XferCommand", config->xfercommand); show_bool("UseSyslog", config->usesyslog); @@ -364,7 +364,7 @@ static int list_directives(void) } else if(strcasecmp(i->data, "Architecture") == 0) { - show_str("Architecture", config->arch); + show_list_str("Architecture", config->architectures); } else if(strcasecmp(i->data, "XferCommand") == 0) { show_str("XferCommand", config->xfercommand); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b2aabc08..7e810127 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -377,7 +377,7 @@ static int parsearg_global(int opt) { switch(opt) { case OP_ARCH: - config_set_arch(optarg); + config_add_architecture(strdup(optarg)); break; case OP_ASK: config->noask = 1; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 52ff9b9a..60722a8a 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -85,6 +85,8 @@ pacman_tests = [ 'tests/mode001.py', 'tests/mode002.py', 'tests/mode003.py', + 'tests/multiple-architectires01.py', + 'tests/multiple-architectires02.py', 'tests/noupgrade-inverted.py', 'tests/overwrite-files-match-negated.py', 'tests/overwrite-files-match.py', diff --git a/test/pacman/tests/multiple-architectires01.py b/test/pacman/tests/multiple-architectires01.py new file mode 100644 index 00000000..39f3e1f7 --- /dev/null +++ b/test/pacman/tests/multiple-architectires01.py @@ -0,0 +1,14 @@ +self.description = "Install a package (multiple Architecture options, wrong)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.arch = 'i686' +self.addpkg(p) + +self.option["Architecture"] = ['i586', 'i486', 'i386'] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=dummy") diff --git a/test/pacman/tests/multiple-architectires02.py b/test/pacman/tests/multiple-architectires02.py new file mode 100644 index 00000000..18625ec6 --- /dev/null +++ b/test/pacman/tests/multiple-architectires02.py @@ -0,0 +1,16 @@ +self.description = "Install a package (multiple Architecture options)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.arch = 'i486' +self.addpkg(p) + +self.option["Architecture"] = ['i586', 'i486', 'i386'] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) \ No newline at end of file -- 2.31.1

3 3

[pacman-dev] [Proposal] --ignore-externals for svn source
by Erich Eckner 20 Apr '21

20 Apr '21

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I'm trying to put an svn source into a PKGBUILD, but unfortunately, the source has many large externals, that I'd like to ignore. If I read scripts/libmakepkg/source/svn.sh.in correctly, the cloning of all externals is (currently) hard coded. I would like to implement some option to disable that. What would be the best format for that? The only thing, I could come up with, is a source in the form: "$local_name::svn+https://$url#$revision?ignore_externals" However, this looks totally wrong, as "ignore_externals" is nothing, that should be done with the tree after cloning (in contrast to "signed" for git), but rather something, that should be inherent to the source (like a different protocol). Or is there already some nice trick to achieve, what I want? (I tried to put "ignore-externals" into .makepkg/config inside the svn tree, but it didn't change anything.) regards, Erich -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAmB+uZEACgkQCu7JB1Xa e1oXFg/+MVWKx3whEHs1uvEpuT2WXUSGVPuwUXdzfsVN7kTy80lzREIcFWx6O6Gy WyxtqCixNlZ4eOW6EseIeuVIQtgLPUN0HHUPiPRIlRWEJv4Jhys3blneeosjMzg8 cbUEawpdRs2Txgo3wYH6WhY+JeVI3uaw7YT1gStQhdsepPNUnhBnwqK5PiEiAwUg pBGivY4Ma40PgdjByW21abBlV4RGCiDniRLlvmvHRXOeeq7aOsKL5YzetAFrdxfl IpSDIC7es9KHFu48b0TTHFlbgr/mTLQY/YsHmXYZmJzPAW++ooD+ebUj+6eIYGUL OnyUjUY3v+uyGI6Eo2B8qQQ98nDfIAksrOjzgjAwmQG9PgN5HGXP4C2WYigOrl8s +mGQ69mFDb+T4t0SSl0mIiID0l7UMmvFs7iZ4aeuAeJCNWvV7fWAlXudpgZ19TEY McdVZa+0AlFS0x9/jo1h8b71kWb/N3rr5gCeOyePDKKuBA49AtwhvK/Miz77OVOz KoOkc/vwNXLkIyhfvlmi12FlWcKU5BblYkwJ/NQBv+SpE0ZroPT7V3+VuydmipTx NoUJmOVS61ZTJFgSJd14vHroRKY0lSJzQ3Jvv5Vtn1FNP1oNmwF1ZYfeXorvWtG/ f8zIxPtcsSSif6gd4YJ2QxSteKnbH658F+rRooB/FD/0UP5+o+E= =FiDa -----END PGP SIGNATURE-----

2 2

[pacman-dev] [PATCH 0/4] Various fixes for FreeBSD (and perhaps others)
by Mark Weiman 20 Apr '21

20 Apr '21

This is a patch set that fixes a few issues when attempting to build on FreeBSD. Mark Weiman (4): Fix check for FSSTATSTYPE meson.build: Fix detection of symbols Add an include for signal.h when needed Fix build error when SIGPOLL is not available lib/libalpm/util.c | 10 +++++++++- meson.build | 34 +++++++++++++++++++++++++++++++--- src/pacman/conf.c | 4 ++++ 3 files changed, 44 insertions(+), 4 deletions(-) -- 2.31.1

6 32

[pacman-dev] [PATCH 1/3] Always enable TotalDownload
by morganamilo 20 Apr '21

20 Apr '21

Previously TotalDownload would switch the % download from per package to overall. Meaning you had a choice of which information to dispplay. Now with parallel downloads TotalDownload adds an extra progress bar. There's no reason to have this an off by default feature. Let's just make it always on. --- README | 4 ++-- doc/pacman.conf.5.asciidoc | 5 ----- etc/pacman.conf.in | 1 - scripts/completion/zsh_completion.in | 1 - src/pacman/callback.c | 2 +- src/pacman/conf.c | 3 --- src/pacman/conf.h | 3 --- src/pacman/pacman-conf.c | 3 --- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/README b/README index 470ccf3c..4465432a 100644 --- a/README +++ b/README @@ -194,8 +194,8 @@ remove.c and sync.c). The frontend is using a configuration file, usually "/etc/pacman.conf". Some of these options are only useful for the frontend only (mainly the ones used to -control the output like totaldownload, or the behavior with cleanmethod and -syncfirst). The rest is used to configure the library. +control the output like verbosepkglist, or the behavior with cleanmethod). +The rest is used to configure the library. [UPGRADE/REMOVE/SYNC] diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 9bd31916..a024c3a7 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -190,11 +190,6 @@ Options Disables progress bars. This is useful for terminals which do not support escape characters. -*TotalDownload*:: - When downloading, display an extra progress bar with the amount downloaded, - download rate, ETA, and completed percentage of the entire download list. - This option won't work if XferCommand is used. - *CheckSpace*:: Performs an approximate check for adequate available disk space before installing packages. diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 634ecc06..1799efc7 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -32,7 +32,6 @@ Architecture = auto #UseSyslog #Color #NoProgressBar -#TotalDownload CheckSpace #VerbosePkgLists ParallelDownloads = 5 diff --git a/scripts/completion/zsh_completion.in b/scripts/completion/zsh_completion.in index e4bf3312..5fd8aebc 100644 --- a/scripts/completion/zsh_completion.in +++ b/scripts/completion/zsh_completion.in @@ -511,7 +511,6 @@ _pacman_conf_general_directives=( 'XferCommand' 'UseSyslog' 'Color' - 'TotalDownload' 'CheckSpace' 'VerbosePkgLists' 'DisableDownloadTimeout' diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a28a79a9..2b79812e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -340,7 +340,7 @@ void cb_event(alpm_event_t *event) on_progress = 1; list_total_pkgs = event->pkg_retrieve.num; list_total = event->pkg_retrieve.total_size; - total_enabled = config->totaldownload && list_total; + total_enabled = list_total; if(total_enabled) { init_total_progressbar(); } diff --git a/src/pacman/conf.c b/src/pacman/conf.c index a4f2ba35..2349e638 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -601,9 +601,6 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); - } else if(strcmp(key, "TotalDownload") == 0) { - config->totaldownload = 1; - pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); } else if(strcmp(key, "CheckSpace") == 0) { config->checkspace = 1; } else if(strcmp(key, "Color") == 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 1b9fb337..773fb6a9 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -113,9 +113,6 @@ typedef struct __config_t { unsigned short chomp; /* format target pkg lists as table */ unsigned short verbosepkglists; - /* When downloading, display the amount downloaded, rate, ETA, and percent - * downloaded of the total download list */ - unsigned short totaldownload; /* number of parallel download streams */ unsigned int parallel_downloads; /* select -Sc behavior */ diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index f8fac75d..91986ba4 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -263,7 +263,6 @@ static void dump_config(void) show_bool("UseSyslog", config->usesyslog); show_bool("Color", config->color); - show_bool("TotalDownload", config->totaldownload); show_bool("CheckSpace", config->checkspace); show_bool("VerbosePkgLists", config->verbosepkglists); show_bool("DisableDownloadTimeout", config->disable_dl_timeout); @@ -372,8 +371,6 @@ static int list_directives(void) show_bool("UseSyslog", config->usesyslog); } else if(strcasecmp(i->data, "Color") == 0) { show_bool("Color", config->color); - } else if(strcasecmp(i->data, "TotalDownload") == 0) { - show_bool("TotalDownload", config->totaldownload); } else if(strcasecmp(i->data, "CheckSpace") == 0) { show_bool("CheckSpace", config->checkspace); } else if(strcasecmp(i->data, "VerbosePkgLists") == 0) { -- 2.31.1

2 4

[pacman-dev] [PATCH v2] meson: make our symlinking script more portable
by Eli Schwartz 20 Apr '21

20 Apr '21

We do not need the --relative case as it is dead code (we only ever link a filename without directory components). For the rest, GNU-specific ln -T does two things: - if the link name is an existing directory, ln fails instead of creating a surprising link inside the directory - if the link name is a symlink to a directory, ln treats it as a file, and due to -f, unlinks it The second case can be portably solved by ln -n, and both cases can be solved by doing what the original autotools Makefile did: rm -f && ln -s If the file exists, it will be removed. If it cannot be removed, it must be an ordinary directory, and the script aborts with an error. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- v2: autotools had an elegant way to solve this which is very portable and also super simple. build-aux/meson-make-symlink.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build-aux/meson-make-symlink.sh b/build-aux/meson-make-symlink.sh index 501cd43d4..3e3aa7ba2 100644 --- a/build-aux/meson-make-symlink.sh +++ b/build-aux/meson-make-symlink.sh @@ -5,8 +5,6 @@ set -eu # and we need to create the target directory... mkdir -vp "$(dirname "${DESTDIR:-}$2")" -if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" -else - ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -fi + +rm -f "${DESTDIR:-}$2" +ln -vs "$1" "${DESTDIR:-}$2" -- 2.31.1

1 0

[pacman-dev] [PATCH] meson: make our symlinking script more portable
by Eli Schwartz 19 Apr '21

19 Apr '21

We do not need the --relative case as it is dead code (we only ever link a filename without directory components). For the rest, GNU-specific ln -T does two things: - if the link name is an existing directory, ln fails instead of creating a surprising link inside the directory - if the link name is a symlink to a directory, ln treats it as a file, and due to -f, unlinks it The second case can be portably solved by ln -n, and the first case is not actually currently functional, but we can portably replace the error message with rmdir, so, why not? Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- build-aux/meson-make-symlink.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build-aux/meson-make-symlink.sh b/build-aux/meson-make-symlink.sh index 501cd43d4..27d068efe 100644 --- a/build-aux/meson-make-symlink.sh +++ b/build-aux/meson-make-symlink.sh @@ -5,8 +5,11 @@ set -eu # and we need to create the target directory... mkdir -vp "$(dirname "${DESTDIR:-}$2")" -if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" -else - ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" + +# ln -T is neither portable, nor useful if we would like to actually succeed +# ln -F is nice, but BSD only +if [ ! -L "${DESTDIR:-}$2" ] && [ -d "${DESTDIR:-}$2" ]; then + rmdir "${DESTDIR:-}$2" fi + +ln -vnfs "$1" "${DESTDIR:-}$2" -- 2.31.1

2 3

[pacman-dev] Missing spaces in Swedish translation string
by Víctor López Juan 19 Apr '21

19 Apr '21

Hi all, I run pacman v5.2.2 with Swedish localization. When removing a package with dependencies, the string … > Att ta bort XXXXförstör beroendet 'YYYY' som krävs avZZZZ … is displayed, which loosely translates as: > Removing XXXXdestroys dependency 'YYYY' which is needed byZZZZ There should be a space before "förstör" and after "av", like this: > Att ta bort XXXX förstör beroendet 'YYYY' som krävs av ZZZZ which loosely corresponds to: > Removing XXXX destroys dependency 'YYYY' which is needed by ZZZZ I have attached an example of the command output (log.txt). I have tried to fix this on Transifex, but I was unable to join the Pacman translation team for Swedish. My username there is lopezjuan. Best regards, Víctor

3 3

[pacman-dev] [PATCH] meson: make -uninstalled.pc correct
by Eli Schwartz 19 Apr '21

19 Apr '21

This pkg-config file is automatically created in the meson-uninstalled/ directory of the build tree, and points to the built artifacts there. If this directory is added to PKG_CONFIG_PATH, it will be preferred over an installed copy. Making this work properly means it becomes trivially possible to build a private copy of libalpm, and then compile other projects using it rather than the system copy. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I've been using this in combination with some custom patches to pyalpm (to actually use pkg-config), to generate statically linked pyalpm wheels that don't break every time the pacman-git ABI breaks. meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 579ff2ed8..7b833571f 100644 --- a/meson.build +++ b/meson.build @@ -319,6 +319,7 @@ libalpm = library( 'alpm', version : libalpm_version, objects: libalpm_a.extract_all_objects(recursive: true), + include_directories : includes, dependencies : alpm_deps, install : true) -- 2.31.1

2 1

[pacman-dev] [PATCH] makepkg: --source should download repos with PGP signatures
by Eli Schwartz 08 Apr '21

08 Apr '21

We optimize this out for sourceballs since VCS sources don't get their checksums verified. But this logic is broken ever since we implemented PGP signature checking for git sources -- if the git source is signed, we still check it, but we don't make sure to download it first. makepkg then fails to generate a sourceball unless you previously ran --verifysource or attempted to build. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/source.sh.in | 5 ++++- scripts/libmakepkg/source/git.sh.in | 9 ++++++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index a0c6b662..b95e6be8 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -35,7 +35,7 @@ done download_sources() { local netfile all_sources - local get_source_fn=get_all_sources_for_arch get_vcs=1 + local get_source_fn=get_all_sources_for_arch get_vcs=1 get_pgp=0 msg "$(gettext "Retrieving sources...")" @@ -47,6 +47,9 @@ download_sources() { novcs) get_vcs=0 ;; + getpgp) + (( SKIPPGPCHECK )) || get_pgp=1 + ;; *) break ;; diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 7d191b8d..d090f14e 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -29,13 +29,16 @@ source "$LIBRARY/util/pkgbuild.sh" download_git() { + local netfile=$1 + local query=$(get_uri_query "$netfile") + # abort early if parent says not to fetch if declare -p get_vcs > /dev/null 2>&1; then - (( get_vcs )) || return + if (( ! get_pgp )) || [[ $query != signed ]]; then + (( get_vcs )) || return + fi fi - local netfile=$1 - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e8d6805..c9940f0a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1416,7 +1416,7 @@ if (( SOURCEONLY )); then download_sources allarch elif ( (( ! SKIPCHECKSUMS )) || \ ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ); then - download_sources allarch novcs + download_sources allarch novcs getpgp fi check_source_integrity all cd_safe "$startdir" -- 2.28.0

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-86-gc294b7cb
by Allan McRae 08 Apr '21

08 Apr '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c294b7cb4c3a160cbbbe404baeaa23a3c8290a99 (commit) via f09047f0b0ed1dfeeceb08432514b3e4c7a18d13 (commit) from 2535611d6c3cbf951408c50ab35953efaf32f686 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c294b7cb4c3a160cbbbe404baeaa23a3c8290a99 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Wed Apr 7 21:43:27 2021 +0200 Update urls to not use www. for archlinux.org www.archlinux.org now redirects to archlinux.org. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f09047f0b0ed1dfeeceb08432514b3e4c7a18d13 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Wed Apr 7 21:43:26 2021 +0200 test: update mailing list url The Arch Linux mailing lists are these days served from the lists subdomain. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/footer.asciidoc | 2 +- doc/index.asciidoc | 2 +- lib/libalpm/libalpm.pc.in | 2 +- meson.build | 2 +- scripts/libmakepkg.pc.in | 2 +- test/pacman/ChangeLog | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0