- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] makepkg: refactor archive compression for reusability
by Eli Schwartz 19 Sep '18

19 Sep '18

This allows for more easily extending the list of allowed compression methods, as it has to be modified in only one place. Also allow the user to specify their own preferred command + options for source packages in addition to compiled packages. Currently, makepkg.conf(5) erroneously claims this is already possible. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I'm not 100% sure how to handle this, perhaps it should encompass bsdtar/$pkg_file as well? scripts/makepkg.sh.in | 57 ++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 20e9dd7e..a5c216dd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -698,6 +698,26 @@ list_package_files() { sed -e 's|^\./||' | tr '\n' '\0' } +# Wrapper around many stream compression formats, for use in the middle of a +# pipeline. A tar archive is passed on stdin and compressed to stdout. +compress_as() { + # $1: final archive filename extension for compression type detection + + local ext="$1" + + case "$ext" in + *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; + *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; + *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; + *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; + *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; + *tar) cat ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$ext"; cat ;; + esac +} + create_package() { (( NOARCHIVE )) && return @@ -748,21 +768,8 @@ create_package() { msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail - # bsdtar's gzip compression always saves the time stamp, making one - # archive created using the same command line distinct from another. - # Disable bsdtar compression and use gzip -n for now. list_package_files | LANG=C bsdtar -cnf - --null --files-from - | - case "$PKGEXT" in - *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; - *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; - *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; - *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; - *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; - *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; - *tar) cat ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$PKGEXT"; cat ;; - esac > "${pkg_file}" || ret=$? + compress_as "$PKGEXT" > "${pkg_file}" || ret=$? shopt -u -o pipefail @@ -843,26 +850,20 @@ create_srcpackage() { done done - local TAR_OPT - case "$SRCEXT" in - *tar.gz) TAR_OPT="-z" ;; - *tar.bz2) TAR_OPT="-j" ;; - *tar.xz) TAR_OPT="-J" ;; - *tar.lrz) TAR_OPT="--lrzip" ;; - *tar.lzo) TAR_OPT="--lzop" ;; - *tar.Z) TAR_OPT="-Z" ;; - *tar) TAR_OPT="" ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$SRCEXT" ;; - esac - local fullver=$(get_full_version) local pkg_file="$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" cd_safe "${srclinks}" - if ! LANG=C bsdtar -cL ${TAR_OPT} -f "$pkg_file" ${pkgbase}; then + + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + LANG=C bsdtar -cLf - ${pkgbase} | compress_as "$SRCEXT" > "${pkg_file}" || ret=$? + + shopt -u -o pipefail + + if (( ret )); then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 2.14.1

2 18

[pacman-dev] [PATCH 1/4] pacman/conf: Remove unused include
by Dave Reisner 19 Sep '18

19 Sep '18

--- src/pacman/conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 9a37dcea..29f69052 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -35,7 +35,6 @@ #include "conf.h" #include "ini.h" #include "util.h" -#include "pacman.h" #include "callback.h" /* global config variable */ -- 2.18.0

4 8

[pacman-dev] [PATCH 1/2] User-visible log when validity check fails due to access
by David Phillips 19 Sep '18

19 Sep '18

Currently, if checking the validity of packages fails due to an access error on one or more packages, the user must sift through debug output in order to find the culprit package(s). This patch adds a call to _alpm_log in such a case to make the culprits more easily visible. --- lib/libalpm/sync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 696a5131..85f70200 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1187,6 +1187,10 @@ static int check_validity(alpm_handle_t *handle, prompt_to_delete(handle, v->path, v->error); } else if(v->error == ALPM_ERR_PKG_INVALID_CHECKSUM) { prompt_to_delete(handle, v->path, v->error); + } else if(v->error == ALPM_ERR_PKG_NOT_FOUND || + v->error == ALPM_ERR_BADPERMS || + v->error == ALPM_ERR_PKG_OPEN) { + _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), v->path, alpm_strerror(v->error)); } alpm_siglist_cleanup(v->siglist); free(v->siglist); -- 2.18.0

2 5

[pacman-dev] [PATCH v3 0/2] Make -Fs behave like -Ss and output group-membership and installation-state
by morganamilo 19 Sep '18

19 Sep '18

I realized that in my previous patch[1] I totally forgot about groups. Reading through the bugtracker I also realized there's already a task open on it FS#47948. This patchset Includes the install status and the group status patches. PS. I'm not too sure on what to do when adding a patch to an existing one. Should I have resent the first? Should this be v3 or v1? If anyone can clear that up I'd appreciate it. [1] https://lists.archlinux.org/pipermail/pacman-dev/2018-August/022769.html morganamilo (2): Show install status during file search Show group status during file search src/pacman/files.c | 7 ++++++- src/pacman/package.c | 34 +++++++++++++++++++--------------- src/pacman/package.h | 1 + 3 files changed, 26 insertions(+), 16 deletions(-) -- 2.18.0

3 5

[pacman-dev] [PATCH] libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint
by Eli Schwartz 19 Sep '18

19 Sep '18

Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_config/variable.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 14bd0e05..55ed6d6d 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -25,10 +25,10 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" -lint_config_functions+=('lint_variable') +lint_config_functions+=('lint_config_variables') -lint_variable() { +lint_config_variables() { local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ COMPRESSLRZ COMPRESSLZO COMPRESSZ) -- 2.18.0

2 1

[pacman-dev] [PATCH] pacman: check versioned optdepends in -Qi operation
by Eli Schwartz 19 Sep '18

19 Sep '18

Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/pacman/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index e80c5953..ee43dca7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -170,7 +170,7 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) alpm_depend_t *optdep = i->data; char *depstring = alpm_dep_compute_string(optdep); if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) { - if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), depstring)) { const char *installed = _(" [installed]"); depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1); strcpy(depstring + strlen(depstring), installed); -- 2.19.0

2 1

[pacman-dev] [PATCH] scripts: deduplicate localized copyright messages
by Eli Schwartz 18 Sep '18

18 Sep '18

Fixes FS#58452 Also consistently add a blank line after the copyright and before the license terms. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Do the email address lines need to be translated? Anyway, currently updating the pacman copyright year dirties the translations. It could be interpolated but then the copyright year updating code needs to be as well. scripts/makepkg.sh.in | 5 +++-- scripts/pacman-db-upgrade.sh.in | 3 ++- scripts/pacman-key.sh.in | 3 ++- scripts/pkgdelta.sh.in | 3 ++- scripts/repo-add.sh.in | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 299f9f7f..b4d8fed4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1192,9 +1192,10 @@ usage() { version() { printf "makepkg (pacman) %s\n" "$makepkg_version" + printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf -- "$(gettext "Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ -Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 9f27a2a2..55a3e8f7 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -54,8 +54,9 @@ usage() { version() { printf "pacman-db-upgrade (pacman) %s\n" "$myver" + printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ff460363..dd837c3f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -92,8 +92,9 @@ usage() { version() { printf "pacman-key (pacman) %s\n" "${myver}" + printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 2dc12c28..72e063b0 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -70,8 +70,9 @@ This delta file can then be added to a database using repo-add.\n")" version() { printf "pkgdelta (pacman) %s\n" "$myver" + printf -- "$(gettext "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3f181404..86bf9a88 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -93,8 +93,9 @@ See %s(8) for more details and descriptions of the available options.\n")" $cmd version() { cmd=${0##*/} printf "%s (pacman) %s\n\n" "$cmd" "$myver" + printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } -- 2.17.0

2 5

[pacman-dev] [PATCH] pacman-conf: add missing DisableDownloadTimeout
by morganamilo 18 Sep '18

18 Sep '18

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/pacman-conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index baa72d97..56196f79 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -266,6 +266,7 @@ static void dump_config(void) show_bool("TotalDownload", config->totaldownload); show_bool("CheckSpace", config->checkspace); show_bool("VerbosePkgLists", config->verbosepkglists); + show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); show_float("UseDelta", config->deltaratio); @@ -376,6 +377,8 @@ static int list_directives(void) show_bool("CheckSpace", config->checkspace); } else if(strcasecmp(i->data, "VerbosePkgLists") == 0) { show_bool("VerbosePkgLists", config->verbosepkglists); + } else if(strcasecmp(i->data, "DisableDownloadTimeout") == 0) { + show_bool("DisableDownloadTimeout", config->disable_dl_timeout); } else if(strcasecmp(i->data, "UseDelta") == 0) { show_float("UseDelta", config->deltaratio); -- 2.18.0

2 1

[pacman-dev] [PATCH 2/2] Change if-else chain to switch
by David Phillips 10 Sep '18

10 Sep '18

--- lib/libalpm/sync.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 85f70200..faef7b56 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1176,21 +1176,28 @@ static int check_validity(alpm_handle_t *handle, if(errors) { for(i = errors; i; i = i->next) { struct validity *v = i->data; - if(v->error == ALPM_ERR_PKG_MISSING_SIG) { + switch(v->error) { + case ALPM_ERR_PKG_MISSING_SIG: _alpm_log(handle, ALPM_LOG_ERROR, _("%s: missing required signature\n"), v->pkg->name); - } else if(v->error == ALPM_ERR_PKG_INVALID_SIG) { + break; + case ALPM_ERR_PKG_INVALID_SIG: _alpm_process_siglist(handle, v->pkg->name, v->siglist, v->siglevel & ALPM_SIG_PACKAGE_OPTIONAL, v->siglevel & ALPM_SIG_PACKAGE_MARGINAL_OK, v->siglevel & ALPM_SIG_PACKAGE_UNKNOWN_OK); + /* fallthrough */ + case ALPM_ERR_PKG_INVALID_CHECKSUM: prompt_to_delete(handle, v->path, v->error); - } else if(v->error == ALPM_ERR_PKG_INVALID_CHECKSUM) { - prompt_to_delete(handle, v->path, v->error); - } else if(v->error == ALPM_ERR_PKG_NOT_FOUND || - v->error == ALPM_ERR_BADPERMS || - v->error == ALPM_ERR_PKG_OPEN) { + break; + case ALPM_ERR_PKG_NOT_FOUND: + case ALPM_ERR_BADPERMS: + case ALPM_ERR_PKG_OPEN: _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), v->path, alpm_strerror(v->error)); + break; + default: + /* ignore */ + break; } alpm_siglist_cleanup(v->siglist); free(v->siglist); -- 2.18.0

1 0

[pacman-dev] [PATCH] libalpm/sync.c: restrict alpm_sync_newversion by USAGE_UPGRADE
by morganamilo 31 Aug '18

31 Aug '18

Commit 106d0fc54 Added the usage option for databases and alpm_sync_newversion was restricted by USAGE_SEARCH instead of USAGE_UPGRADE. USAGE_UPGRADE should be used instead. This means packages only show up in commands such as `pacman -Qu` if the database Has the Upgrade option. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 696a5131..23b0ccfa 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -61,7 +61,7 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn for(i = dbs_sync; !spkg && i; i = i->next) { alpm_db_t *db = i->data; - if(!(db->usage & ALPM_DB_USAGE_SEARCH)) { + if(!(db->usage & ALPM_DB_USAGE_UPGRADE)) { continue; } -- 2.18.0

7 13