- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix clang 8 string-plus-int warnings
by Rikard Falkeborn 08 May '19

08 May '19

Clang 8 warns that adding a string to an integer does not append to string. Indeed it doesn't, but that was not the intentetion. Use array indexing as suggested by the compiler to silence the warning. There should be no functional change. Example of warning message: alpm.c:71:54: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1); ~~~~~~~~~~~^~~ alpm.c:71:54: note: use array indexing to silence this warning sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1); ^ & [ ] 1 warning generated. --- lib/libalpm/alpm.c | 2 +- src/pacman/conf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 0f3db6f4..bd7a129a 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -68,7 +68,7 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, * with a slash) correctly, we skip SYSHOOKDIR[0]; the regular +1 therefore * disappears from the allocation */ MALLOC(hookdir, strlen(myhandle->root) + strlen(SYSHOOKDIR), goto nomem); - sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1); + sprintf(hookdir, "%s%s", myhandle->root, &SYSHOOKDIR[1]); myhandle->hookdirs = alpm_list_add(NULL, hookdir); /* set default database extension */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3b79fbc7..2d8518c4 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -975,11 +975,11 @@ int setdefaults(config_t *c) if(c->rootdir) { char path[PATH_MAX]; if(!c->dbpath) { - snprintf(path, PATH_MAX, "%s/%s", c->rootdir, DBPATH + 1); + snprintf(path, PATH_MAX, "%s/%s", c->rootdir, &DBPATH[1]); SETDEFAULT(c->dbpath, strdup(path)); } if(!c->logfile) { - snprintf(path, PATH_MAX, "%s/%s", c->rootdir, LOGFILE + 1); + snprintf(path, PATH_MAX, "%s/%s", c->rootdir, &LOGFILE[1]); SETDEFAULT(c->logfile, strdup(path)); } } else { -- 2.21.0

3 2

[pacman-dev] [PATCH] makepkg: correctly handle hg sources with updates on a non-default branch
by Eli Schwartz 08 May '19

08 May '19

The "tip" ref actually signifies the most recently updated branch. hg does not support a default branch named anything other than "default", except by creating a "@" bookmark. The correct way to explicitly update to the default clone ref, is therefore to use one of these, rather than "tip". Fixes FS#62092 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/source/hg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in index 4984883e..2fe32bab 100644 --- a/scripts/libmakepkg/source/hg.sh.in +++ b/scripts/libmakepkg/source/hg.sh.in @@ -79,7 +79,11 @@ extract_hg() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" pushd "$srcdir" &>/dev/null - local ref=tip + local ref=default + # Is the repository configured to checkout some ref other than 'default'? + if hg identify -r @ "$dir" >/dev/null 2>&1; then + ref=@ + fi if [[ -n $fragment ]]; then case ${fragment%%=*} in branch|revision|tag) -- 2.21.0

2 1

[pacman-dev] [PATCH] repo-add: should have option to prevent downgrading
by ekardnam 28 Apr '19

28 Apr '19

Hello, following this report #FS17752 (link at [0]) I made a patch to repo-add From 972a5e88df392042d60e5aea1e52e8c5dd113a69 Mon Sep 17 00:00:00 2001 From: ekardnam <lucabertozzi.pub(a)gmail.com> Date: Tue, 26 Mar 2019 21:28:39 +0000 Subject: [PATCH] Added --dont-downgrade flag to repo-add as stated in issue #17752 --- scripts/repo-add.sh.in | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..f8748f08 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ REPO_DB_SUFFIX= LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' +DONT_DOWNGRADE=0 # Import libmakepkg source "$LIBRARY"/util/message.sh @@ -63,6 +64,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -R, --remove remove old package file from disk after updating database\n")" + printf -- "$(gettext " --dont-downgrade do not add package to database if a newer version is already present\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename> ...\n")" printf -- "\n" @@ -248,9 +250,17 @@ db_write_entry() { return 0 fi else - if (( RMEXISTING )); then - pkgentry=$(find_pkgentry "$pkgname") - if [[ -n $pkgentry ]]; then + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + + local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc") + if (( "$(vercmp $version $pkgver)" > "0" )); then + warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname" + if (( DONT_DOWNGRADE )); then + return 0 + fi + fi + if (( RMEXISTING )); then local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")" local oldfile="$(dirname "$1")/$oldfilename" fi @@ -618,6 +628,9 @@ while (( $# )); do -v|--verify) VERIFY=1 ;; + --dont-downgrade) + DONT_DOWNGRADE=1 + ;; *) args+=("$1") ;; -- 2.19.2 ----------Links and stuff--------------- [0] https://bugs.archlinux.org/task/17752?project=3 ekardnam

4 6

[pacman-dev] [PATCH] libmakepkg: add routine for linting $SOURCE_DATE_EPOCH
by Eli Schwartz 16 Apr '19

16 Apr '19

This can only ever be an int, and the specification states that a malformed timestamp should be considered a fatal error. https://reproducible-builds.org/specs/source-date-epoch/ Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 1 + .../lint_config/source_date_epoch.sh.in | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 scripts/libmakepkg/lint_config/source_date_epoch.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 54a8d215..255aee2b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -71,6 +71,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_config.sh \ libmakepkg/lint_config/paths.sh \ + libmakepkg/lint_config/source_date_epoch.sh \ libmakepkg/lint_config/variable.sh \ libmakepkg/lint_package.sh \ libmakepkg/lint_package/build_references.sh \ diff --git a/scripts/libmakepkg/lint_config/source_date_epoch.sh.in b/scripts/libmakepkg/lint_config/source_date_epoch.sh.in new file mode 100755 index 00000000..38fbfd77 --- /dev/null +++ b/scripts/libmakepkg/lint_config/source_date_epoch.sh.in @@ -0,0 +1,37 @@ +#!/bin/bash +# +# source_date_epoch.sh - Check that reproducible builds timestamp is valid +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n $LIBMAKEPKG_LINT_CONFIG_SOURCE_DATE_EPOCH_SH ]] && return +LIBMAKEPKG_LINT_CONFIG_SOURCE_DATE_EPOCH_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_config_functions+=('lint_source_date_epoch') + + +lint_source_date_epoch() { + if [[ $SOURCE_DATE_EPOCH = *[^[:digit:]]* ]]; then + error "$(gettext "%s contains invalid characters: %s")" \ + "\$SOURCE_DATE_EPOCH" "${SOURCE_DATE_EPOCH//[[:digit:]]}" + return 1 + fi +} -- 2.20.1

2 6

[pacman-dev] Running pacman with at(1).
by Ralph Corderoy 14 Apr '19

14 Apr '19

Hi, Due to bandwidth charges varying depending on the time of day, I've used at(1) in the past to `pacman -S' when I'm AFK. My recollection is something like this is sufficient; a `pacman -Syuw --noconfirm' will have run a little beforehand. sudo -i at '04:45 tomorrow' <<<'pacman -Sw foo...' But that didn't work last night; it gave similar output to running in a TTY with EOF on stdin. $ sudo -i pacman -Sw dbeaver </dev/null resolving dependencies... :: There are 3 providers available for java-runtime>=8: :: Repository extra 1) jre-openjdk 2) jre10-openjdk 3) jre8-openjdk Enter a number (default=1): Package (5) New Version Net Change Download Size extra/java-runtime-common 3-1 0.01 MiB extra/jre-openjdk 11.0.3.u4-1 0.52 MiB 0.17 MiB extra/jre-openjdk-headless 11.0.3.u4-1 156.57 MiB 29.18 MiB extra/libnet 1.1.6-3 0.34 MiB community/dbeaver 6.0.1-1 62.90 MiB 54.53 MiB Total Download Size: 83.88 MiB :: Proceed with download? [Y/n] $ Notice how the first prompt, that defaults to `1', seemed not to mind EOF and went with that default. The second prompt, to proceed with the download, also has a default, `Y', but EOF that time halts pacman. That seems inconsistent. Skipping the first prompt doesn't bless the second one with the first's behaviour of continuing. $ sudo -i pacman -Sw libnet </dev/null resolving dependencies... Package (1) New Version Net Change Download Size extra/libnet 1.1.6-3 0.34 MiB 0.09 MiB Total Download Size: 0.09 MiB :: Proceed with download? [Y/n] $ $ echo $? 1 $ Has this behaviour changed in the last few months? Or quite possibly my recollection is wrong. pacman(1) has --noconfirm Bypass any and all “Are you sure?” messages. It’s not a good idea to do this unless you want to run pacman from a script. Given the first prompt isn't a simple binary choice of confirmation, the man page could do with being a bit more explicit, perhaps The prompt is still displayed, but the default choice is always taken. -- Cheers, Ralph.

2 1

[pacman-dev] [PATCH] Add config var to limit repo connection timeout
by Nathan Aclander 07 Apr '19

07 Apr '19

New ConnectionTimeout variable sets the amount of time trying to connect to a repository, before timing out and trying the next one. Signed-off-by: Nathan Aclander <nathan.aclander(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 3 +++ etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 3 +++ lib/libalpm/dload.c | 2 +- lib/libalpm/handle.c | 7 +++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 7 +++++++ src/pacman/conf.h | 1 + 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index b297e332..dee5139e 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -205,6 +205,9 @@ Options Disable defaults for low speed limit and timeout on downloads. Use this if you have issues downloading files with proxy and/or security gateway. +*ConnectionTimeout*:: + Set the amount of time trying to connect to a repository, before timnig + out and trying the next one. Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7446944f..899ad18f 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -34,6 +34,7 @@ Architecture = auto #TotalDownload CheckSpace #VerbosePkgLists +#ConnectionTimeout = 10 # PGP signature checking #SigLevel = Optional diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ffb2ad96..e0bf12ca 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -890,6 +890,9 @@ int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level); int alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout); +/** Sets the timeout for the curl connect phase. */ +int alpm_option_set_connecttimeout(alpm_handle_t *handle, unsigned int timeout); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 05813c40..4e0703b4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -258,7 +258,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_reset(curl); curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer); - curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, handle->connecttimeout); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10L); curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 476779c4..92bc9038 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -556,6 +556,13 @@ int SYMEXPORT alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog) return 0; } +int SYMEXPORT alpm_option_set_connecttimeout(alpm_handle_t *handle, unsigned int timeout) +{ + CHECK_HANDLE(handle, return -1); + handle->connecttimeout = timeout; + return 0; +} + static int _alpm_option_strlist_add(alpm_handle_t *handle, alpm_list_t **list, const char *str) { char *dup; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 14d20bbe..9defbc1b 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -103,6 +103,7 @@ struct __alpm_handle_t { upgrade operations */ int remotefilesiglevel; /* Signature verification level for remote file upgrade operations */ + unsigned int connecttimeout; /* timeout for the connect phase */ /* error code */ alpm_errno_t pm_errno; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3b79fbc7..2cdc157e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -513,6 +513,8 @@ static int _parse_options(const char *key, char *value, setrepeatingoption(value, "IgnoreGroup", &(config->ignoregrp)); } else if(strcmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); + } else if(strcmp(key, "ConnectionTimeout") == 0) { + config->connecttimeout = atoi(value); } else if(strcmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); } else if(strcmp(key, "HookDir") == 0) { @@ -739,6 +741,10 @@ static int setup_libalpm(void) alpm_option_set_totaldlcb(handle, cb_dl_total); } + if(!config->connecttimeout) { + alpm_option_set_connecttimeout(handle, 10L); + } + alpm_option_set_arch(handle, config->arch); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); @@ -749,6 +755,7 @@ static int setup_libalpm(void) alpm_option_set_noextracts(handle, config->noextract); alpm_option_set_disable_dl_timeout(handle, config->disable_dl_timeout); + alpm_option_set_connecttimeout(handle, config->connecttimeout); for(i = config->assumeinstalled; i; i = i->next) { char *entry = i->data; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f45ed436..e1f9934e 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -118,6 +118,7 @@ typedef struct __config_t { /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; + unsigned int connecttimeout; alpm_list_t *ignorepkg; alpm_list_t *ignoregrp; alpm_list_t *assumeinstalled; -- 2.21.0

4 6

[pacman-dev] [PATCH] Style: Removing unecessary indentation level.
by Leonardo Bras 06 Apr '19

06 Apr '19

Signed-off-by: Leonardo Bras <leobras.c(a)gmail.com> --- src/pacman/sync.c | 84 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 7dc69079..9e35053f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -816,49 +816,51 @@ int sync_prepare_execute(void) goto cleanup; } - if(alpm_trans_commit(config->handle, &data) == -1) { - alpm_errno_t err = alpm_errno(config->handle); - pm_printf(ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), - alpm_strerror(err)); - switch(err) { - case ALPM_ERR_FILE_CONFLICTS: - for(i = data; i; i = alpm_list_next(i)) { - alpm_fileconflict_t *conflict = i->data; - switch(conflict->type) { - case ALPM_FILECONFLICT_TARGET: - printf(_("%s exists in both '%s' and '%s'\n"), - conflict->file, conflict->target, conflict->ctarget); - break; - case ALPM_FILECONFLICT_FILESYSTEM: - if(conflict->ctarget[0]) { - printf(_("%s: %s exists in filesystem (owned by %s)\n"), - conflict->target, conflict->file, conflict->ctarget); - } else { - printf(_("%s: %s exists in filesystem\n"), - conflict->target, conflict->file); - } - break; - } - alpm_fileconflict_free(conflict); - } - break; - case ALPM_ERR_PKG_INVALID: - case ALPM_ERR_PKG_INVALID_CHECKSUM: - case ALPM_ERR_PKG_INVALID_SIG: - for(i = data; i; i = alpm_list_next(i)) { - char *filename = i->data; - printf(_("%s is invalid or corrupted\n"), filename); - free(filename); - } - break; - default: - break; - } - /* TODO: stderr? */ - printf(_("Errors occurred, no packages were upgraded.\n")); - retval = 1; + if(alpm_trans_commit(config->handle, &data) != -1) goto cleanup; + + alpm_errno_t err = alpm_errno(config->handle); + pm_printf(ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), + alpm_strerror(err)); + switch(err) { + case ALPM_ERR_FILE_CONFLICTS: + for(i = data; i; i = alpm_list_next(i)) { + alpm_fileconflict_t *conflict = i->data; + switch(conflict->type) { + case ALPM_FILECONFLICT_TARGET: + printf(_("%s exists in both '%s' and '%s'\n"), + conflict->file, conflict->target, conflict->ctarget); + break; + case ALPM_FILECONFLICT_FILESYSTEM: + if(conflict->ctarget[0]) { + printf(_("%s: %s exists in filesystem (owned by %s)\n"), + conflict->target, conflict->file, conflict->ctarget); + } else { + printf(_("%s: %s exists in filesystem\n"), + conflict->target, conflict->file); + } + break; + } + alpm_fileconflict_free(conflict); + } + break; + case ALPM_ERR_PKG_INVALID: + case ALPM_ERR_PKG_INVALID_CHECKSUM: + case ALPM_ERR_PKG_INVALID_SIG: + for(i = data; i; i = alpm_list_next(i)) { + char *filename = i->data; + printf(_("%s is invalid or corrupted\n"), filename); + free(filename); + } + break; + default: + break; } + /* TODO: stderr? */ + printf(_("Errors occurred, no packages were upgraded.\n")); + retval = 1; + goto cleanup; + /* Step 4: release transaction resources */ cleanup: -- 2.21.0

2 1

[pacman-dev] [PATCH] libmakepkg: fix migration to schema.sh for integsums
by Eli Schwartz 31 Mar '19

31 Mar '19

One of the callers was changed to use known_hash_algos, one was not. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/srcinfo.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in index b9eeb817..76cfb787 100644 --- a/scripts/libmakepkg/srcinfo.sh.in +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -90,7 +90,7 @@ srcinfo_write_global() { local multivalued=(arch groups license checkdepends makedepends depends optdepends provides conflicts replaces noextract options backup - source validpgpkeys {md5,sha{1,224,256,384,512}}sums) + source validpgpkeys "${known_hash_algos[@]/%/sums}") srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" srcinfo_write_section_details '' -- 2.21.0

1 0

[pacman-dev] [PATCH] libalpm: write {check, make}depends to localdb when installing package
by Denis Ollier 29 Mar '19

29 Mar '19

It is a follow up of commits 0994893 and f9eb2aa. Signed-off-by: Denis Ollier <larchunix(a)gmail.com> --- lib/libalpm/be_local.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5a03f257..a4b72776 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1033,6 +1033,8 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, int inforeq) write_deps(fp, "%REPLACES%", info->replaces); write_deps(fp, "%DEPENDS%", info->depends); write_deps(fp, "%OPTDEPENDS%", info->optdepends); + write_deps(fp, "%MAKEDEPENDS%", info->makedepends); + write_deps(fp, "%CHECKDEPENDS%", info->checkdepends); write_deps(fp, "%CONFLICTS%", info->conflicts); write_deps(fp, "%PROVIDES%", info->provides); -- 2.21.0

3 2

[pacman-dev] should repo-add handle *.links.db?
by Erich Eckner 27 Mar '19

27 Mar '19

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I'm looking into creating links databases for archlinux32 and saw (thanks, Eli) that they are created asynchronously by systemd timers here: https://git.archlinux.org/infrastructure.git/tree/roles/sogrep/files I was wondering, if it wouldn't be better to create them during repo-add (and repo-remove) at a similar point, where *.files.db entries are created - - ignoring deltas (can we ignore deltas already?), this would be somewhere down in db_write_entry() in repo-add - but even including deltas, it should not need changes at too many places. However, before I start trying to patch repo-add and repo-remove to maintain a *.links.db, I wanted to ask if there are any objections to include this functionality there. Cheers, Erich -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAlyaLrQACgkQCu7JB1Xa e1o26g/+PU80nwWnMcT/zwhzWuuTAP8hwIlb1dvovfFp5vkq9XjPC/A3yApfSg6m nUPb7Vjq9w3KGoKCMTwBWYO6jXLjLhvcB2gSBmhFlblDrMgGTnABrjNdfcaSUwcB hqF7cYDhSDJuUb+SyMBYKLoGDZL/Rxye/BAItiqBXfgitbxAcPWbNyZCKk3DYOBz /WHCHn3hMHJndxC7FJ9hfpGukES9Um2EW4bB8DGrz44AJwzyA8EyDO9e86QtR64z PX6qC2qEuAix55Ggvk2GILErPaea/5IuwhmyrZy6UtTEDysDfdkMSKWqV+r8wHJY 61fO7RGZnJH6F4h6YEpTncdEI4jnuIuR7FrheWauV83jMJ4E/X4nvNTNBlPDZUIt DC8Nj1nsSrTeD7HZmi6QiKHhPLpA5ZiE0ls+jdb/CcE0RaB+kqRtMRShanKDNiJi E4lhLO7nj6frNtpWhU3Iqb2O7azampIpL7VyCHDAfkuWPrIHfMGSRnwWmG2DW0G/ UTxHqDKqVFTDwBF2h6+4+J/xFO2T1uqm5OrAnR9ZsjGG6UMZEbsNvO0KxFiOdlYc UFPJJlwVn7OS28H94010tRU73LfE1xwZqRKiWxiR2NckjB9fvOf5lPUV5neZfeS1 O9yS9omfa9QzVH6dD/wDJArnt4RGj8mHBEXa3vwOZGEfXaF+waQ= =ny8G -----END PGP SIGNATURE-----

3 7

[pacman-dev] Man page translations
by Mario Blättermann 25 Mar '19

25 Mar '19

Hello, I've just read at [1] that nobody is working on man page translations for Pacman, but translations would be welcome anyway. That's great, because there are only a few developers who are really willing to consider localized man pages as an important part of a good user experience. I've already translated the current man pages based on the latest release into German, and they are currently maintained in the manpages-de project [2]. But this external approach has a few disadvantages: There's some delay between upstream release of the packages where we get the original man pages from, then translation, release of a tarball and finally packaging for the currently upported distributions (Archlinux and Debian unstable, support for Mageia is under construction). Moreover, we translate only into *one* language... It would be better to maintain the localized manpages in Pacman's git repo itself. We don't have that many options to setup i18n for man pages. In my opinion po4a [3] is the best software which can handle such things. We use it also in the manpages-de project. Well, we use it there with Groff and Mdoc, but it is also able to work with Asciidoc (says the documentation, I haven't tested it). I could setup a po4a toolchain in Pacman which takes the asciidoc files, puts the contents in pot templates and merges then the resuting po files back to the asciidoc source format. I've also some basic experience with Meson, but I'm afraid I won't be able to get it working with the GNU Autotools. The translations itself can be maintained at Transifex, as usual, but of course in separate templates for each asiidoc source file. What do you think about this idea? If it's OK for you, then I need some playground for my changes. I consider to fork the git repo at Github. @Allan, it is OK to fork your personal repo, or should I use the main repo at git.archlinux.org? Processing merge requests is maybe easier within Github. [1] https://www.archlinux.org/pacman/translation-help.html [2] https://salsa.debian.org/manpages-de-team/manpages-de [3]https://po4a.org/index.php Best Regards, Mario

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-160-gd37e6d40
by Allan McRae 25 Mar '19

25 Mar '19

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 d37e6d40a19dadf41a223dcb1fde36c6fa622958 (commit) via 7a598d0845fda08e195e1a709297c761b68d79f4 (commit) from 9f5412d809a50a7ad18013222582d5b943216ae1 (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 d37e6d40a19dadf41a223dcb1fde36c6fa622958 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Mar 7 23:22:49 2019 -0500 bash-completion: support file redirection completions The current completions don't properly handle redirection operators, and attempt to complete command completions rather than completing filenames to redirect to. bash-completion provides both _get_comp_words_by_ref and a higher-level wrapper _init_completion, but the latter provides handling of redirection operators, so switch to using that. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7a598d0845fda08e195e1a709297c761b68d79f4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 20 09:58:16 2019 +1000 Use bug tracker to track bugs The mailing list requires subscription. So does the bug tracker, but that is more obvious. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/footer.asciidoc | 5 +++-- scripts/completion/bash_completion.in | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] ask permission for forking pacman file manager
by dimension breaker 23 Mar '19

23 Mar '19

introduce me Purnomo Hadi I am the Chief Developer at Dracos-linux, one of the founders of LFS Indonesia. founder and developer kolomonggo linux dracOS linux and kolomonggo linux is a LFS based OS https://dracos-linux.org/ the purpose of sending this email is for forking pacman package manager to be a custom file manager with the name we will use. I am as the developer of dracOs linux and columnonggo linux request permission from the Pacman Development Team Thank you for your attention sory for my bad english -- dracOs linux - dev team -- dracOs linux - dev team

3 2

[pacman-dev] Version comparison algorithm.
by Richard Dodd 20 Mar '19

20 Mar '19

I'm writing to ask about the version comparison function `rpmvercmp` in `libalpm/version.cL83`. The algorithm is complex and I'm trying to understand its behavior. I want to hash using the package name and version as a key, and so I need a hash function where `i1 == i2 => hash(i1) == hash(i2)` according to the version comparison operation. I'll describe how the algorithm behaves and then ask my questions. The algorithm works on a byte string and uses ascii comparison rules (no unicode). - First, split the input up into blocks of *alpha*, *digit* or *non-alphanum*. - For each pair of blocks - If the types are different, then *non-alphanum* is newer than *numeric*, which is newer than *alpha* - If the types are the same, then the rules are - For *non-alphanum*, compare lengths, longer is newer, equal lengths are equal segments (so *--* and *::* are the same) - For *alpha* just do a lexicographic comparison (so *b* is newer than *a* etc.) - For *numeric*, do a numeric comparison. (this can be done by skipping leading zeros, then comparing length, then comparing lexicographically, to avoid overflow on integer conversion) - If one input is longer than the other, and all sections so far have been equal, then if the next section of the longer is *alpha*, it is older, and if it is *numeric* it is newer. (so "1a" is older than "1", "a1" is newer than "a"). - If the inputs have the same number of sections that are all equal, then they are equal. Questions: 1. Is the algorithm correctly described here. 2. This should mean that if I hash length for *non-numeric*, the string with stripped zeros for *numeric*, and just the string for *alpha*, the has law should be upheld. Is this correct? Thanks Rich

4 4

[pacman-dev] [PATCH] Use bug tracker to track bugs
by Allan McRae 19 Mar '19

19 Mar '19

The mailing list requires subscription. So does the bug tracker, but that is more obvious. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/footer.asciidoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/footer.asciidoc b/doc/footer.asciidoc index 5812aa72..cdaba40c 100644 --- a/doc/footer.asciidoc +++ b/doc/footer.asciidoc @@ -6,8 +6,9 @@ information on pacman and its related tools. Bugs ---- Bugs? You must be kidding; there are no bugs in this software. But if we -happen to be wrong, send us an email with as much detail as possible to -mailto:pacman-dev@archlinux.org[]. +happen to be wrong, submit a bug report with as much detail as possible +at the https://bugs.archlinux.org/index.php?project=3[Arch Linux Bug Tracker] +in the Pacman section. Authors -- 2.21.0

1 0

[pacman-dev] [PATCH] build: remove references to variable replacements from pacman-optimize
by Eli Schwartz 19 Mar '19

19 Mar '19

MODECMD and OWNERCMD are not used by pacman itself, so we don't need to check for and replace them now that pacman-optimize is removed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- build-aux/edit-script.sh.in | 2 -- configure.ac | 10 ---------- meson.build | 2 -- scripts/Makefile.am | 2 -- 4 files changed, 16 deletions(-) diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 3b0058ce..a25218cb 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -19,8 +19,6 @@ mode=$3 -e "s|@TEMPLATE_DIR[@]|@TEMPLATE_DIR@|g" \ -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ -e "s|@INODECMD[@]|@INODECMD@|g" \ - -e "s|@OWNERCMD[@]|@OWNERCMD@|g" \ - -e "s|@MODECMD[@]|@MODECMD@|g" \ -e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \ -e "s|@SEDPATH[@]|@SEDPATH@|g" \ -e "s|@DUFLAGS[@]|@DUFLAGS@|g" \ diff --git a/configure.ac b/configure.ac index 74bf8c1f..6d2b2410 100644 --- a/configure.ac +++ b/configure.ac @@ -354,24 +354,18 @@ GCC_VISIBILITY_CC DEFAULT_DUFLAGS=" -sk --apparent-size" DEFAULT_SEDINPLACEFLAGS=" --follow-symlinks -i" INODECMD="stat -c '%i %n'" -OWNERCMD="stat -c '%u:%g'" -MODECMD="stat -c '%a'" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) INODECMD="stat -f '%i %N'" - OWNERCMD="stat -f '%u:%g'" - MODECMD="stat -f '%Lp'" DEFAULT_SEDINPLACEFLAGS=" -i \"\"" DEFAULT_DUFLAGS=" -sk" ;; darwin*) host_os_darwin=yes INODECMD="/usr/bin/stat -f '%i %N'" - OWNERCMD="/usr/bin/stat -f '%u:%g'" - MODECMD="/usr/bin/stat -f '%Lp'" DEFAULT_SEDINPLACEFLAGS=" -i ''" DEFAULT_DUFLAGS=" -sk" STRIP_BINARIES="" @@ -383,8 +377,6 @@ AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_PATH_PROGS([SEDPATH], [sed], [sed], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) -AC_SUBST(OWNERCMD) -AC_SUBST(MODECMD) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) @@ -576,8 +568,6 @@ ${PACKAGE_NAME}: Architecture : ${CARCH} Host Type : ${CHOST} File inode command : ${INODECMD} - File owner command : ${OWNERCMD} - File mode command : ${MODECMD} In-place sed command : ${SEDPATH} ${SEDINPLACEFLAGS} libalpm version : ${LIB_VERSION} diff --git a/meson.build b/meson.build index 8db8c68e..4d96e5ff 100644 --- a/meson.build +++ b/meson.build @@ -319,8 +319,6 @@ substs.set('BUILDSCRIPT', BUILDSCRIPT) substs.set('TEMPLATE_DIR', get_option('makepkg-template-dir')) substs.set('DEBUGSUFFIX', get_option('debug-suffix')) substs.set('INODECMD', inodecmd) -substs.set('OWNERCMD', ownercmd) -substs.set('MODECMD', modecmd) substs.set('SEDINPLACEFLAGS', sedinplaceflags) substs.set('SEDPATH', SED.path()) substs.set('DUFLAGS', duflags) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7fffd93b..2964d1b7 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -177,8 +177,6 @@ edit = sed \ -e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ - -e "s|@OWNERCMD[@]|$(OWNERCMD)|g" \ - -e "s|@MODECMD[@]|$(MODECMD)|g" \ -e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \ -e 's|@SEDPATH[@]|$(SEDPATH)|g' \ -e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \ -- 2.21.0

2 2

[pacman-dev] [PATCH] bash-completion: support file redirection completions
by Eli Schwartz 19 Mar '19

19 Mar '19

The current completions don't properly handle redirection operators, and attempt to complete command completions rather than completing filenames to redirect to. bash-completion provides both _get_comp_words_by_ref and a higher-level wrapper _init_completion, but the latter provides handling of redirection operators, so switch to using that. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/completion/bash_completion.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in index c3249cd0..a1ab9fec 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -41,9 +41,9 @@ _pacman_keyids() { } _pacman_key() { - local o cur opts prev wantfiles - COMPREPLY=() - _get_comp_words_by_ref cur prev + local o opts wantfiles + local cur prev words cword + _init_completion || return opts=('add config delete edit-key export finger gpgdir help import import-trustdb init keyserver list-keys list-sigs lsign-key nocolor populate recv-keys refresh-keys updatedb @@ -72,9 +72,9 @@ _pacman_key() { _makepkg() { compopt +o default - local cur opts prev - COMPREPLY=() - _get_comp_words_by_ref cur prev + local opts + local cur prev words cword + _init_completion || return if [[ $prev = @(-p|--config) ]]; then compopt -o default elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vh]) ]]; then @@ -105,9 +105,9 @@ _pacman_repo_list() { _pacman() { compopt -o default - local common core cur database files prev query remove sync upgrade o - COMPREPLY=() - _get_comp_words_by_ref cur prev + local common core database files query remove sync upgrade o + local cur prev words cword + _init_completion || return database=('asdeps asexplicit') files=('list machinereadable owns search refresh regex' 'l o s x y') query=('changelog check deps explicit file foreign groups info list native owns -- 2.21.0

2 2

[pacman-dev] [PATCH] makepkg: use "shared" git clones when checking out sources
by Eli Schwartz 19 Mar '19

19 Mar '19

In order to cache sources offline, makpekg creates *two* copies of every git repo. This is a useful tradeoff for network time, but comes at the cost of increased disk space. Normally, git can smooth this over automagically. Whenever possible, git objects are hardlinked to save space, but this does not work when SRCDEST and BUILDDIR are on separate filesystems. When the repo in question is both very large (linux.git for example is 2.2 GB) and crosses filesystem boundaries, this results in a lot of extra disk space being used; the most likely scenario is where BUILDDIR is a tmpfs for bonus ouch. git(1) has a builtin feature which serves this case handily: the --shared flag will create the info/alternates file instructing git to not copy or hardlink or create objects/packs at all, but merely look for them in an external location (that being the source of the clone). The downside of using shared clones, is that if you modify and drop commits from the original repo, or simply delete the whole repo altogether, you break the copy. But we don't care about that here, because 1) the BUILDDIR copy is meant to be a temporary copy strictly derived via PKGBUILD syntax from the SRCDEST, and must be able to be recreated at any time, 2) if the SRCDEST disappears, makepkg will redownload it, thus restoring the objects needed by the BUILDDIR clone, 3) if the user does non-default things like hacking on the BUILDDIR copy then deleting and re-cloning the SRCDEST may result in momentary breakage, but ultimately should be fine -- the unique objects they created will be stored in the BUILDDIR copy. While it's theoretically possible that upstream will force-push to overwrite the base tree from which makepkg is building (which they should not do), *and* the user deleted their SRCDEST which they should not do, *and* they saved work in makepkg's working directory which they should not do either... ... this is an unlikely chain of events for which we should not care. Using --shared is therefore helpful in immediately useful ways and IMHO has no actual downsides; we should use it. An alternative implementation would be to use worktrees. I've rejected this since it is essentially the same as shared clones, except adding additional restrictions on the branch namespace, and could potentially break existing use cases such as manually handling the SRCDEST in order to share repositories with normal working copies. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/source/git.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 497a668c..96d79623 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -91,7 +91,7 @@ extract_git() { exit 1 fi cd_safe "$srcdir" - elif ! git clone "$dir" "${dir##*/}"; then + elif ! git clone -s "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.21.0

2 2

[pacman-dev] [PATCH 1/3] doc: describe when and why the prepare function should be used
by Eli Schwartz 19 Mar '19

19 Mar '19

We don't want people to run architecture/OS/makepkg.conf specific processes during prepare() and in fact it's been observed that makepkg by design doesn't even run prepare_buildenv() for it, so the prohibition against this is now baked into makepkg. Reflect this differentiation in the documentation on just what, exactly, a prepare() function is. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- This patch coincides with quequotion's clarification of the options=() array, so thanks for inspiring me to write this! I believe that both patches have merit independent of each other. doc/PKGBUILD.5.asciidoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index e8ce691f..285627ab 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -342,9 +342,12 @@ files into the packaging directory, with optional `prepare()`, `build()`, and *prepare() Function*:: An optional `prepare()` function can be specified in which operations to prepare the sources for building, such as patching, are performed. This - function is run after the source extraction and before the `build()` - function. The `prepare()` function is skipped when source extraction - is skipped. + function is run exactly once, after the source extraction and before the + `build()` function. The `prepare()` function is skipped when source + extraction is skipped. No system-specific or build-specific commands should + be run during `prepare()` under any circumstances, as they are meant to run + exclusively during `build()`, and features like `buildflags` or `makeflags` + are expressly not available. *build() Function*:: The optional `build()` function is use to compile and/or adjust the source -- 2.21.0

2 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-158-g9f5412d8
by Allan McRae 19 Mar '19

19 Mar '19

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 9f5412d809a50a7ad18013222582d5b943216ae1 (commit) via 7b15918b6526b52823b869050e430b24b30c3ca1 (commit) via ee5f24e50ca5792d37cfbdcbb134fb58777d3eb8 (commit) via 35a0d5e744d1c3f93d4f4f79b2ca2e3e411fdd5a (commit) via 0a72874734ceafdf0a9f9e7a96c8b3f88507a54b (commit) via 226d2c124884c7318b7fb86c2e6bdf792eddd1a9 (commit) via bbfb75fd292e3f2818cdc0eae68c292bb3fbc50b (commit) via f26cb61cb6a16c8ce85f33e6090763aced0118c3 (commit) via c61cd050f9b6475ea128a1da02e88b284ac509b5 (commit) from c0e9be7973be6c81b22fde91516fb8991e7bb07b (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 9f5412d809a50a7ad18013222582d5b943216ae1 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Mar 12 13:01:13 2019 -0400 doc: generalize description of the bash nature of PKGBUILD functions Currently this is scoped to the build() function, which is simply wrong as it equally applies to any function. Simply moving the paragraphs up to the main manpage section makes this clear. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b15918b6526b52823b869050e430b24b30c3ca1 Author: Que Quotion <quequotion(a)gmail.com> Date: Wed Mar 13 01:01:43 2019 +0900 Clarify that build_options only apply during build() Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ee5f24e50ca5792d37cfbdcbb134fb58777d3eb8 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Mar 12 13:28:27 2019 -0400 libmakepkg: fix reporting of invalid archive extensions in compress.sh In commit 1825bd6716c2a51c92642e8b96beac0101e83805 this was split out from makepkg, but the warning was not properly migrated; $ext did not ever exist. As a result, no matter what you did, the only possible warning was: ==> WARNING: '' is not a valid archive extension. Fix to filter based on the presence of .tar in the argument, and building the $ext variable for all checking and messaging purposes within the function. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 35a0d5e744d1c3f93d4f4f79b2ca2e3e411fdd5a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Mar 7 23:18:23 2019 -0500 makepkg: use "shared" git clones when checking out sources In order to cache sources offline, makepkg creates *two* copies of every git repo. This is a useful tradeoff for network time, but comes at the cost of increased disk space. Normally, git can smooth this over automagically. Whenever possible, git objects are hardlinked to save space, but this does not work when SRCDEST and BUILDDIR are on separate filesystems. When the repo in question is both very large (linux.git for example is 2.2 GB) and crosses filesystem boundaries, this results in a lot of extra disk space being used; the most likely scenario is where BUILDDIR is a tmpfs for bonus ouch. git(1) has a builtin feature which serves this case handily: the --shared flag will create the info/alternates file instructing git to not copy or hardlink or create objects/packs at all, but merely look for them in an external location (that being the source of the clone). The downside of using shared clones, is that if you modify and drop commits from the original repo, or simply delete the whole repo altogether, you break the copy. But we don't care about that here, because 1) the BUILDDIR copy is meant to be a temporary copy strictly derived via PKGBUILD syntax from the SRCDEST, and must be able to be recreated at any time, 2) if the SRCDEST disappears, makepkg will redownload it, thus restoring the objects needed by the BUILDDIR clone, 3) if the user does non-default things like hacking on the BUILDDIR copy then deleting and re-cloning the SRCDEST may result in momentary breakage, but ultimately should be fine -- the unique objects they created will be stored in the BUILDDIR copy. While it's theoretically possible that upstream will force-push to overwrite the base tree from which makepkg is building (which they should not do), *and* the user deleted their SRCDEST which they should not do, *and* they saved work in makepkg's working directory which they should not do either... ... this is an unlikely chain of events for which we should not care. Using --shared is therefore helpful in immediately useful ways and IMHO has no actual downsides; we should use it. An alternative implementation would be to use worktrees. I've rejected this since it is essentially the same as shared clones, except adding additional restrictions on the branch namespace, and could potentially break existing use cases such as manually handling the SRCDEST in order to share repositories with normal working copies. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0a72874734ceafdf0a9f9e7a96c8b3f88507a54b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Mar 7 23:10:38 2019 -0500 build: check for gpgme with pkg-config before gpgme-config gpgme in git master now supports pkg-config and with the next release we can and should prefer its use. However, retain the legacy code that enables building with older versions of gpgme, as a fallback. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 226d2c124884c7318b7fb86c2e6bdf792eddd1a9 Author: Santiago Torres <santiago(a)archlinux.org> Date: Mon Mar 11 21:18:16 2019 -0400 drop DU* config variables Since DUFLAGS and DUPATH are not needed anymore remove them from the source Signed-off-by: Santiago Torres <santiago(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bbfb75fd292e3f2818cdc0eae68c292bb3fbc50b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Mar 7 22:07:55 2019 -0500 build: remove references to variable replacements from pacman-optimize MODECMD and OWNERCMD are not used by pacman itself, so we don't need to check for and replace them now that pacman-optimize is removed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f26cb61cb6a16c8ce85f33e6090763aced0118c3 Author: Santiago Torres <santiago(a)archlinux.org> Date: Mon Mar 11 22:24:35 2019 -0400 Make makepkg compute sizes properly Makepkg used to use du --apparent-size to compute the size of the package. Unfortunately, this would result in different sizes depending on the filesystem used (e.g., btrfs vs ext4), which would affect reproducible builds. Use a wc-based approach to compute sizes Signed-off-by: Santiago Torres <santiago(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c61cd050f9b6475ea128a1da02e88b284ac509b5 Author: Florian Wehner <florian(a)whnr.de> Date: Thu Mar 7 20:14:55 2019 -0500 Reformatting log timestamp to include time-zone The time logged is currently given as localtime without any timezone information. This is confusing in various scenarios. Examples: * If one is travelling across time-zones and the timestamps in the log appear out of order. * Comparing dates with `datediff` gives an offset by the time-zone This patch would reformat the time-stamp to a full ISO-8601 version. It includes the 'T' separating date and time including seconds. Old: [2019-03-04 16:15] New: [2019-03-04T16:15:45-05:00] Signed-off-by: Florian Wehner <florian(a)whnr.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: build-aux/edit-script.sh.in | 4 -- configure.ac | 88 ++++++++++++++-------------------- doc/PKGBUILD.5.asciidoc | 25 +++++----- lib/libalpm/libalpm.pc.in | 4 +- lib/libalpm/log.c | 8 ++-- meson.build | 70 +++++++++++---------------- meson_options.txt | 3 -- scripts/Makefile.am | 4 -- scripts/libmakepkg/source/git.sh.in | 2 +- scripts/libmakepkg/util/compress.sh.in | 26 +++++----- scripts/makepkg.sh.in | 3 +- 11 files changed, 99 insertions(+), 138 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Clarify that build_options only apply during build()
by Que Quotion 19 Mar '19

19 Mar '19

From: Que Quotion <quequotion(a)gmail.com> The word 'build' can be vague: as a verb in can be used to describe the entire process of rendering a package tarball from a PKGBUILD, while on these lines it refers to a specific PKGBUILD function. We need to more effectively discourage packagers from doing things like generating makefiles in prepare(), where the scripts these options trigger are not called to set or unset their flags. Signed-off-by: Que Quotion <quequotion(a)gmail.com> --- doc/PKGBUILD.5.asciidoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index e8ce691f..416a86a7 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -296,23 +296,23 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'. Compress man and info pages with gzip. *ccache*;; - Allow the use of ccache during build. More useful in its negative + Allow the use of ccache during build(). More useful in its negative form `!ccache` with select packages that have problems building with ccache. *distcc*;; - Allow the use of distcc during build. More useful in its negative + Allow the use of distcc during build(). More useful in its negative form `!distcc` with select packages that have problems building with distcc. *buildflags*;; Allow the use of user-specific buildflags (CPPFLAGS, CFLAGS, CXXFLAGS, - LDFLAGS) during build as specified in linkman:makepkg.conf[5]. More + LDFLAGS) during build() as specified in linkman:makepkg.conf[5]. More useful in its negative form `!buildflags` with select packages that have problems building with custom buildflags. *makeflags*;; - Allow the use of user-specific makeflags during build as specified + Allow the use of user-specific makeflags during build() as specified in linkman:makepkg.conf[5]. More useful in its negative form `!makeflags` with select packages that have problems building with custom makeflags such as `-j2` (or higher). -- 2.21.0

2 2

[pacman-dev] [PATCH 0/2] [WIP] Fix du filesize computation
by Santiago Torres 19 Mar '19

19 Mar '19

This patchset is a WIP that tries to address FS#61717[1]. This is my first patch for pacman, so I may be missing a couple of the heuristics of proper pacman develoment. Namely, I'm worried about the use of xargs (I went down this road because I wanted to have the minimal set of changes). I'm not sure what're the heuristics for what I can assume (e.g., can findutils be assumed to exist?). As a followup of this, I removed the configure.ac stuff related to DUPATH and DUFLAGS. I'm not sure if we'd want to add XARGSPATH or so. I opted to not do that just yet. Thanks, -Santiago. [1] https://bugs.archlinux.org/task/61717 Santiago Torres (2): Make makepkg compute sizes properly configure.ac: drop DU* config configure.ac | 10 ---------- scripts/makepkg.sh.in | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) -- 2.21.0

4 9

[pacman-dev] [PATCH] Reformatting log timestamp to include time-zone
by Florian Wehner 19 Mar '19

19 Mar '19

The time logged is currently given as localtime without any time-zone information. This is confusing in various scenarios. Examples: * If one is travelling across time-zones and the timestamps in the log appear out of order. * Comparing dates with `datediff` gives an offset by the time-zone This patch would reformat the time-stamp to a full ISO-8601 version. It includes the 'T' separating date and time. This could be removed. Old: [2019-03-04 16:15] New: [2019-03-04T16:15-05:00] Signed-off-by: Florian Wehner <florian(a)whnr.de> --- lib/libalpm/log.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index e46ad3c3..cf869a08 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdarg.h> +#include <stdlib.h> #include <errno.h> #include <syslog.h> @@ -37,12 +38,17 @@ static int _alpm_log_leader(FILE *f, const char *prefix) { time_t t = time(NULL); + int tz_h, tz_m; struct tm *tm = localtime(&t); + /* Calculate the timezone offset ±hh:mm */ + tz_h = tm->tm_gmtoff/3600; + tz_m = abs(tm->tm_gmtoff - (tz_h*3600))/60; + /* Use ISO-8601 date format */ - return fprintf(f, "[%04d-%02d-%02d %02d:%02d] [%s] ", + return fprintf(f, "[%04d-%02d-%02dT%02d:%02d%+03d:%02d] [%s] ", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, - tm->tm_hour, tm->tm_min, prefix); + tm->tm_hour, tm->tm_min, tz_h, tz_m, prefix); } /** A printf-like function for logging. -- 2.21.0

4 8

[pacman-dev] New Optional Dependencies Aren't Logged.
by Ralph Corderoy 17 Mar '19

17 Mar '19

`pacman -Su' suggested an optional dependency of gst-plugins-bad. I looked to see what that was and didn't want it. Later, due to discussion on the local LUG IRC, I wanted to look up what package had the new optional depends but found /var/log/pacman.log didn't record it. Please consider logging them. Looking at the optional depends of all the upgraded packages, I think it was webkit2gtk, but if it were logged then I could check if there were any new optional depends in the more general case, e.g. looking back in time. -- Cheers, Ralph.

3 8

[pacman-dev] [PATCH] scripts: update gitignore for currently noisy files
by Eli Schwartz 12 Mar '19

12 Mar '19

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/.gitignore b/scripts/.gitignore index b8bb1f83..c511f889 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,7 +1,9 @@ +.lib/ makepkg makepkg-template pacman-db-upgrade pacman-key +pkgdelta repo-add repo-elephant repo-remove -- 2.21.0

1 1