- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] repo-add: use more libmakepkg to handle common compression routines
by Eli Schwartz 12 Mar '19

12 Mar '19

Currently the list of supported formats for an archive, is maintained in two places. And repo-add does not actually get updated. :( In the process, remove some of the logical duplication when calling bsdtar/compress_as. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/repo-add.sh.in | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..0f9628ad 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -44,6 +44,7 @@ CLEAN_LOCK=0 USE_COLOR='y' # Import libmakepkg +source "$LIBRARY"/util/compress.sh source "$LIBRARY"/util/message.sh # ensure we have a sane umask set @@ -188,21 +189,12 @@ verify_signature() { } verify_repo_extension() { - local repofile=$1 - - case $repofile in - *.db.tar.gz) TAR_OPT="z" ;; - *.db.tar.bz2) TAR_OPT="j" ;; - *.db.tar.xz) TAR_OPT="J" ;; - *.db.tar.zst) TAR_OPT="--zstd" ;; - *.db.tar.Z) TAR_OPT="Z" ;; - *.db.tar) TAR_OPT="" ;; + case $1 in + *.db.tar.*|*.db.tar) ;; *) error "$(gettext "'%s' does not have a valid database archive extension.")" \ - "$repofile" + "$1" exit 1 ;; esac - - printf '%s' "$TAR_OPT" } # write an entry to the pacman database @@ -513,7 +505,6 @@ rotate_db() { } create_db() { - TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE") # $LOCKFILE is already guaranteed to be absolute so this is safe dirname=${LOCKFILE%/*} @@ -523,13 +514,13 @@ create_db() { tempname=$dirname/.tmp.$filename pushd "$tmpdir/$repo" >/dev/null - if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then - bsdtar -c${TAR_OPT}f "$tempname" * - else + local files=(*) + if [[ ${files[*]} = '*' ]]; then # we have no packages remaining? zip up some emptyness warning "$(gettext "No packages remain, creating empty database.")" - bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null + files=(-T /dev/null) fi + bsdtar -cf - "${files[@]}" | compress_as "$REPO_DB_SUFFIX" > "$tempname" popd >/dev/null create_signature "$tempname" @@ -644,7 +635,7 @@ else LOCKFILE=$PWD/$REPO_DB_FILE.lck fi -verify_repo_extension "$REPO_DB_FILE" >/dev/null +verify_repo_extension "$REPO_DB_FILE" REPO_DB_PREFIX=${REPO_DB_FILE##*/} REPO_DB_PREFIX=${REPO_DB_PREFIX%.db.*} -- 2.21.0

3 4

[pacman-dev] [PATCH] build: check for gpgme with pkg-config before gpgme-config
by Eli Schwartz 08 Mar '19

08 Mar '19

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> --- Since we seem headed for a release soon, I'd like to get this in now even though gpgme is still unreleased. configure.ac | 68 +++++++++++++++++++++------------------ lib/libalpm/libalpm.pc.in | 4 +-- meson.build | 49 +++++++++++++++------------- 3 files changed, 66 insertions(+), 55 deletions(-) diff --git a/configure.ac b/configure.ac index 2f345b5d..74bf8c1f 100644 --- a/configure.ac +++ b/configure.ac @@ -268,37 +268,43 @@ AS_IF([test "x$with_gpgme" != "xno"], [AC_MSG_RESULT([no])]) have_gpgme=no -AS_IF([test "x$with_gpgme" != "xno"], - [AM_PATH_GPGME([1.3.0], - [LIBS_save="$LIBS" - CPPFLAGS_save="$CPPFLAGS" - CFLAGS_save="$CFLAGS" - - LIBS="$LIBS $GPGME_LIBS" - CPPFLAGS="$CPPFLAGS $GPGME_CPPFLAGS" - CFLAGS="$CFLAGS $GPGME_CFLAGS" - - AC_MSG_CHECKING([for sane gpgme]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <gpgme.h>]], - [[return gpgme_check_version("1.3.0");]])], - [AC_MSG_RESULT([yes]) - have_gpgme=yes - AC_DEFINE([HAVE_LIBGPGME], [1], [Define if gpgme should be used to provide GPG signature support.])], - [AC_MSG_RESULT([no]) - have_gpgme=no - unset GPGME_LIBS - unset GPGME_CFLAGS] - AS_IF([test "x$with_gpgme" = "xyes"], - [AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed for GPG signature support])]) - ) - - LIBS="$LIBS_save" - CPPFLAGS="$CPPFLAGS_save" - CFLAGS="$CFLAGS_save" - unset CPPFLAGS_save - unset CFLAGS_save],)]) +if test "x$with_gpgme" != "xno"; then + PKG_CHECK_MODULES(GPGME, [gpgme], + [AC_DEFINE([HAVE_LIBGPGME], [1], [Define if gpgme should be used to provide GPG signature support.]) + AC_SUBST(pc_gpgme, [gpgme]) + have_gpgme=yes], + [AM_PATH_GPGME([1.3.0], + [LIBS_save="$LIBS" + CPPFLAGS_save="$CPPFLAGS" + CFLAGS_save="$CFLAGS" + + LIBS="$LIBS $GPGME_LIBS" + CPPFLAGS="$CPPFLAGS $GPGME_CPPFLAGS" + CFLAGS="$CFLAGS $GPGME_CFLAGS" + + AC_MSG_CHECKING([for sane gpgme]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <gpgme.h>]], + [[return gpgme_check_version("1.3.0");]])], + [AC_MSG_RESULT([yes]) + have_gpgme=yes + AC_DEFINE([HAVE_LIBGPGME], [1], [Define if gpgme should be used to provide GPG signature support.]) + AC_SUBST(pc_gpgme_libs, ["$GPGME_LIBS"])], + [AC_MSG_RESULT([no]) + have_gpgme=no + unset GPGME_LIBS + unset GPGME_CFLAGS] + AS_IF([test "x$with_gpgme" = "xyes"], + [AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed for GPG signature support])]) + ) + + LIBS="$LIBS_save" + CPPFLAGS="$CPPFLAGS_save" + CFLAGS="$CFLAGS_save" + unset CPPFLAGS_save + unset CFLAGS_save],)]) +fi AS_IF([test "x$have_gpgme" = xno -a "x$with_gpgme" = xyes], [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])]) diff --git a/lib/libalpm/libalpm.pc.in b/lib/libalpm/libalpm.pc.in index 6b905747..126a6e6a 100644 --- a/lib/libalpm/libalpm.pc.in +++ b/lib/libalpm/libalpm.pc.in @@ -7,7 +7,7 @@ Name: libalpm Description: Arch Linux package management library URL: http://www.archlinux.org/pacman/ Version: @LIB_VERSION@ -Requires.private: libarchive @pc_crypto@ @pc_libcurl@ +Requires.private: libarchive @pc_crypto@ @pc_libcurl@ @pc_gpgme@ Cflags: -I${includedir} @LFS_CFLAGS@ Libs: -L${libdir} -lalpm -Libs.private: @LIBS@ @GPGME_LIBS@ +Libs.private: @LIBS@ @pc_gpgme_libs@ diff --git a/meson.build b/meson.build index b810e2fb..5512913a 100644 --- a/meson.build +++ b/meson.build @@ -98,29 +98,34 @@ libcurl = dependency('libcurl', conf.set('HAVE_LIBCURL', libcurl.found()) want_gpgme = get_option('gpgme') -gpgme_config = find_program('gpgme-config', required : want_gpgme) -if not want_gpgme.disabled() and gpgme_config.found() - gpgme_version = run_command(gpgme_config, '--version').stdout().strip() - - needed_gpgme_version = '>=1.3.0' - have = gpgme_version.version_compare(needed_gpgme_version) - if want_gpgme.enabled() and not have - error('gpgme @0@ is needed for GPG signature support'.format(needed_gpgme_version)) +gpgme = dependency('gpgme', + required : false, + static : get_option('buildstatic')) +# gpgme recently began providing a pkg-config file. Create a fake dependency +# object if it cannot be found, by manually searching for libs. +if not want_gpgme.disabled() and not gpgme.found() + gpgme_config = find_program('gpgme-config', required : want_gpgme) + if gpgme_config.found() + gpgme_version = run_command(gpgme_config, '--version').stdout().strip() + + needed_gpgme_version = '>=1.3.0' + if gpgme_version.version_compare(needed_gpgme_version) + gpgme_libs = [ + cc.find_library('gpgme', + dirs : [get_option('gpgme-libdir')]), + cc.find_library('gpg-error', + dirs : [get_option('gpgme-libdir')]), + cc.find_library('assuan', + dirs : [get_option('gpgme-libdir')]), + ] + gpgme = declare_dependency(dependencies : gpgme_libs) + endif endif +endif - gpgme_libs = [ - cc.find_library('gpgme', required : have, - dirs : [get_option('gpgme-libdir')]), - cc.find_library('gpg-error', required : have, - dirs : [get_option('gpgme-libdir')]), - cc.find_library('assuan', required : have, - dirs : [get_option('gpgme-libdir')]), - ] - - conf.set('HAVE_LIBGPGME', have) -else - gpgme_libs = [] - conf.set('HAVE_LIBGPGME', false) +conf.set('HAVE_LIBGPGME', gpgme.found()) +if want_gpgme.enabled() and not conf.get('HAVE_LIBGPGME') + error('gpgme @0@ is needed for GPG signature support'.format(needed_gpgme_version)) endif want_crypto = get_option('crypto') @@ -359,7 +364,7 @@ libalpm_a = static_library( 'alpm', libalpm_sources, include_directories : includes, - dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + dependencies : [crypto_provider, libarchive, libcurl, gpgme], link_with : [libcommon], install : true) -- 2.21.0

1 0

[pacman-dev] Upcoming pacman-5.3.0 release
by Allan McRae 07 Mar '19

07 Mar '19

Hi all, I intend to release pacman-5.2.0 soon. Looking at patchwork, there is a few patches that should be handled before then, but these are mostly minor: https://patchwork.archlinux.org/project/pacman/list/?state=* Our bug tracker looks clear for 5.2.0: https://bugs.archlinux.org/roadmap/proj3 Please respond to this email with any bugs or patches not on those lists that should be considered before 5.2.0. I will update transifex so translators can get a head start before the final freeze soon. Allan

1 1

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

07 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 c0e9be7973be6c81b22fde91516fb8991e7bb07b (commit) via e7bb0f8824a916c1537dd83735cd8aeccdcd0f3f (commit) via 40391c564a97b10362ee7cbcf07faac03549d2ca (commit) via 2883b869c72102bf00b4dc14f663c2f322736bc0 (commit) via 9adb0d5b37df7ca668e23877e85431dabeea005e (commit) via 377d47142f7aaa01ca782e6587f2d4caf663865b (commit) via 298bcf7986ca5500c8891ec412d65d8a8f5b9a4f (commit) via e03752e6adc86cbb4cb4f52a38f6e3e98cbe9dd5 (commit) via 0113214db9a9e9ae48bffa3c3e7b39be16e8272a (commit) from d197d8ab82cf10650487518fb968067897a12775 (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 c0e9be7973be6c81b22fde91516fb8991e7bb07b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 2 18:57:20 2019 +1000 Remove support for deltas from libalpm Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e7bb0f8824a916c1537dd83735cd8aeccdcd0f3f Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 2 18:40:19 2019 +1000 Make pacman forget deltas exist Dummy callbacks are still present to prevent compiler warnings until libalpm is delta free. Also remove Delta parsing from pacman.conf. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 40391c564a97b10362ee7cbcf07faac03549d2ca Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 2 15:41:25 2019 +1000 Remove cleanupdelta Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2883b869c72102bf00b4dc14f663c2f322736bc0 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 2 15:38:50 2019 +1000 Remove pkgdelta Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9adb0d5b37df7ca668e23877e85431dabeea005e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 2 15:34:56 2019 +1000 Remove delta support from repo-add Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 377d47142f7aaa01ca782e6587f2d4caf663865b Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Thu Feb 21 13:20:19 2019 +0100 doc: add man page for pacman-conf Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 298bcf7986ca5500c8891ec412d65d8a8f5b9a4f Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Thu Feb 21 13:22:31 2019 +0100 doc: set rootdir correctly in man pages If an alternative rootdir is specified in either meson or configure it's not respected in the generated man pages. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e03752e6adc86cbb4cb4f52a38f6e3e98cbe9dd5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Feb 15 11:38:18 2019 -0500 makepkg: add new checksum algorithm via coreutils b2sum coreutils 8.26 in December 2016 added this new hashing method which is compatible with the existing md5sum and sha*sum tool usage, while using the blake2 hash algorithm. makepkg uses coreutils to provide source file integrity checks via ${integ}sum binaries and it makes sense to offer this as an additional option. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0113214db9a9e9ae48bffa3c3e7b39be16e8272a Author: morganamilo <morganamilo(a)gmail.com> Date: Wed Mar 6 22:52:19 2019 +0000 pacman: fix segfault when Usage is specified without a value And extract all the common code to a macro. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 1 - doc/Makefile.am | 8 +- doc/PKGBUILD.5.asciidoc | 2 +- doc/index.asciidoc | 1 - doc/makepkg.conf.5.asciidoc | 2 +- doc/meson.build | 3 +- doc/pacman-conf.8.asciidoc | 67 +++++++ doc/pacman.8.asciidoc | 2 +- doc/pacman.conf.5.asciidoc | 8 - doc/pkgdelta.8.asciidoc | 53 ----- doc/repo-add.8.asciidoc | 22 +-- etc/makepkg.conf.in | 2 +- etc/pacman.conf.in | 1 - lib/libalpm/Makefile.am | 1 - lib/libalpm/alpm.h | 53 ----- lib/libalpm/be_sync.c | 21 +- lib/libalpm/delta.c | 361 ----------------------------------- lib/libalpm/delta.h | 33 ---- lib/libalpm/error.c | 5 - lib/libalpm/handle.c | 20 -- lib/libalpm/handle.h | 5 - lib/libalpm/meson.build | 1 - lib/libalpm/package.c | 14 -- lib/libalpm/package.h | 2 - lib/libalpm/po/POTFILES.in | 1 - lib/libalpm/sync.c | 207 +------------------- meson.build | 8 - scripts/.gitignore | 1 - scripts/Makefile.am | 3 - scripts/libmakepkg/util/schema.sh.in | 2 +- scripts/makepkg.sh.in | 2 +- scripts/meson.build | 1 - scripts/pkgdelta.sh.in | 234 ----------------------- scripts/po/POTFILES.in | 1 - scripts/repo-add.sh.in | 168 +--------------- src/pacman/callback.c | 19 -- src/pacman/conf.c | 63 ++---- src/pacman/conf.h | 1 - src/pacman/pacman-conf.c | 13 -- src/pacman/po/POTFILES.in | 1 - src/pacman/sync.c | 5 +- src/util/.gitignore | 2 - src/util/Makefile.am | 5 +- src/util/cleanupdelta.c | 135 ------------- src/util/meson.build | 1 - 45 files changed, 126 insertions(+), 1435 deletions(-) create mode 100644 doc/pacman-conf.8.asciidoc delete mode 100644 doc/pkgdelta.8.asciidoc delete mode 100644 lib/libalpm/delta.c delete mode 100644 lib/libalpm/delta.h delete mode 100644 scripts/pkgdelta.sh.in delete mode 100644 src/util/cleanupdelta.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] doc: add man page for pacman-conf
by Jelle van der Waa 07 Mar '19

07 Mar '19

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- doc/Makefile.am | 3 +- doc/pacman-conf.8.asciidoc | 60 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 doc/pacman-conf.8.asciidoc diff --git a/doc/Makefile.am b/doc/Makefile.am index de87c409..f68f4ea0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,7 +16,8 @@ MANPAGES = \ makepkg.conf.5 \ pacman.conf.5 \ libalpm.3 \ - BUILDINFO.5 + BUILDINFO.5 \ + pacman-conf.8 DOXYGEN_MANS = $(wildcard man3/*.3) diff --git a/doc/pacman-conf.8.asciidoc b/doc/pacman-conf.8.asciidoc new file mode 100644 index 00000000..0e4c96be --- /dev/null +++ b/doc/pacman-conf.8.asciidoc @@ -0,0 +1,60 @@ +pacman-conf(8) +============== + +Name +---- +pacman-conf - query pacman's configuration file + + +Synopsis +-------- +'pacman-conf' [options] [<directive> ...] + + +Description +----------- +The 'pacman-conf' utility is created since parsing pacman's configuration file +is non-trivial and extremely difficult to do correctly from scripts. It makes it +easy for scripts to get the same configuration value which pacman itself would +use. + + +Options +------- +*-c, \--config* <path>:: + Specify an alternate configuration file. + +*-R, \--rootdir* <path>:: + Specify an alternate installation root (default is `/`). + +*-r, \--repo* <remote>:: + Query options for a specific repository. + +*-v, \--verbose*:: + Always shown directive names. + +*-l, \--repo-list*:: + List configured repositories. + +*-V, \--version*:: + Display version and exit. + +*-h, \--help*:: + Output syntax and command line options. + + +Examples +-------- + +pacman-conf -r core Usage:: + Show the value of the Usage configuration option for core repository. + +pacman-conf HoldPkg:: + Show the value of the HoldPkg configuration option. + + +See Also +-------- +linkman:pacman.conf[5] + +include::footer.asciidoc[] -- 2.20.1

3 6

[pacman-dev] [PATCH] doc: set rootdir correctly in man pages
by Jelle van der Waa 07 Mar '19

07 Mar '19

If an alternative rootdir is specified in either meson or configure it's not respected in the generated man pages. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- doc/Makefile.am | 3 ++- doc/meson.build | 1 + doc/pacman.8.asciidoc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index de87c409..e03d6ab8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -112,7 +112,8 @@ ASCIIDOC_OPTS = \ -a pkgdatadir=$(pkgdatadir) \ -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) \ - -a datarootdir=$(datarootdir) + -a datarootdir=$(datarootdir) \ + -a rootdir=$(ROOTDIR) A2X_OPTS = \ --no-xmllint \ diff --git a/doc/meson.build b/doc/meson.build index b7514ef7..d6403bae 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -31,6 +31,7 @@ asciidoc_opts = [ '-a', 'localstatedir=@0@'.format(LOCALSTATEDIR), '-a', 'sysconfdir=@0@'.format(SYSCONFDIR), '-a', 'datarootdir=@0@'.format(DATAROOTDIR), + '-a', 'rootdir=@0@'.format(ROOTDIR), ] html_targets = [] diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 6b2d9172..fe95178d 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -131,7 +131,7 @@ Options not automatically prepended. *-r, \--root* <path>:: - Specify an alternative installation root (default is `/`). This should + Specify an alternative installation root (default is +{rootdir}+). This should not be used as a way to install software into `/usr/local` instead of `/usr`. *NOTE*: If database path or log file are not specified on either the -- 2.20.1

2 1

[pacman-dev] [PATCH 1/2] libmakepkg: migrate to schema.sh for integsums
by Eli Schwartz 07 Mar '19

07 Mar '19

We cannot use most of the arrays defined there as srcinfo is dependent on the order, but migrate the hashes for now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/srcinfo.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in index 509c4860..b9eeb817 100644 --- a/scripts/libmakepkg/srcinfo.sh.in +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -24,6 +24,7 @@ LIBMAKEPKG_SRCINFO_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/pkgbuild.sh" +source "$LIBRARY/util/schema.sh" srcinfo_open_section() { printf '%s = %s\n' "$1" "$2" @@ -63,7 +64,7 @@ srcinfo_write_section_details() { local attr package_arch a local multivalued_arch_attrs=(source provides conflicts depends replaces optdepends makedepends checkdepends - {md5,sha{1,224,256,384,512}}sums) + "${known_hash_algos[@]/%/sums}") for attr in "${singlevalued[@]}"; do pkgbuild_extract_to_srcinfo "$1" "$attr" 0 -- 2.20.1

2 5

[pacman-dev] [PATCH] pacman: fix segfault when Usage is specified without a value
by morganamilo 07 Mar '19

07 Mar '19

And extract all the common code to a macro. Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/conf.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 29f69052..cca3657e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -844,28 +844,28 @@ static int _parse_repo(const char *key, char *value, const char *file, int ret = 0; config_repo_t *repo = section->repo; +#define CHECK_VALUE(val) do { \ + if(!val) { \ + pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), \ + file, line, key); \ + return 1; \ + } \ +} while(0) + if(strcmp(key, "Server") == 0) { - if(!value) { - pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), - file, line, key); - ret = 1; - } else { - repo->servers = alpm_list_add(repo->servers, strdup(value)); - } + CHECK_VALUE(value); + repo->servers = alpm_list_add(repo->servers, strdup(value)); } else if(strcmp(key, "SigLevel") == 0) { - if(!value) { - pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), - file, line, key); - } else { - alpm_list_t *values = NULL; - setrepeatingoption(value, "SigLevel", &values); - if(values) { - ret = process_siglevel(values, &repo->siglevel, - &repo->siglevel_mask, file, line); - FREELIST(values); - } + CHECK_VALUE(value); + alpm_list_t *values = NULL; + setrepeatingoption(value, "SigLevel", &values); + if(values) { + ret = process_siglevel(values, &repo->siglevel, + &repo->siglevel_mask, file, line); + FREELIST(values); } } else if(strcmp(key, "Usage") == 0) { + CHECK_VALUE(value); alpm_list_t *values = NULL; setrepeatingoption(value, "Usage", &values); if(values) { @@ -881,6 +881,8 @@ static int _parse_repo(const char *key, char *value, const char *file, file, line, key, repo->name); } +#undef CHECK_VALUE + return ret; } -- 2.21.0

2 2

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.1.3, created. v5.1.3
by Allan McRae 01 Mar '19

01 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 annotated tag, v5.1.3 has been created at d0ccd3d47473a73794bf62fc5530acefc1725f02 (tag) tagging 1bf767234363f7ad5933af3f7ce267c123017bde (commit) replaces v5.1.2 tagged by Allan McRae on Fri Mar 1 11:30:34 2019 +1000 - Log ----------------------------------------------------------------- v5.1.3 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEZkWwqMcAXnjbHXhk+Z/+D+rpmb0FAlx4i3kACgkQ+Z/+D+rp mb07+AgAgkU/SbvNS3yXQMB7hOe7I7TUz4OzZsNnBdqBXmE8qvOmmyiJBLBEFo2u i3b7uWg3bYbYP9INvx3lNLgU6CjmXo3a+3uh0BpyArY9w6JL5a/mFdcK3QHApoAc 76m3MRYGR2kxQiztTUyxJMYdMe5VSC3HayKghHLJjGkNNcwcNMjeAuJY/yFPVwyF quIr518LkDJFTqFqfWoaKfGCcTkeXLvlhqeyvNLpBIwJ1RRzosZB1pwNqj4czGMi Lf0RacJLRsC5XlTeC0SXTq6U8aGOPZ+cc8sb3YyVSYiHIhfvFZRm0M3fFXhwF97+ bnr2LZUR1jDh/LPlRevnxVWCoPTK9w== =G8+y -----END PGP SIGNATURE----- Allan McRae (1): Release v5.1.3 Andrew Gregory (1): Sanitize file name received from Content-Disposition header ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.3
by Allan McRae 01 Mar '19

01 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, release/5.1.x has been updated via 1bf767234363f7ad5933af3f7ce267c123017bde (commit) via 9702703633bec2c007730006de2aeec8587dfc84 (commit) from 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 (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 1bf767234363f7ad5933af3f7ce267c123017bde Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 1 11:28:42 2019 +1000 Release v5.1.3 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9702703633bec2c007730006de2aeec8587dfc84 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Mar 1 11:23:20 2019 +1000 Sanitize file name received from Content-Disposition header When installing a remote package with "pacman -U <url>", pacman renames the downloaded package file to match the name given in the Content-Disposition header. However, pacman does not sanitize this name, which may contain slashes, before calling rename(). A malicious server (or a network MitM if downloading over HTTP) can send a content-disposition header to make pacman place the file anywhere in the filesystem, potentially leading to arbitrary root code execution. Notably, this bypasses pacman's package signature checking. For example, a malicious package-hosting server (or a network man-in-the-middle, if downloading over HTTP) could serve the following header: Content-Disposition: filename=../../../../../../usr/share/libalpm/hooks/evil.hook and pacman would move the downloaded file to /usr/share/libalpm/hooks/evil.hook. This invocation of "pacman -U" would later fail, unable to find the downloaded package in the cache directory, but the hook file would remain in place. The commands in the malicious hook would then be run (as root) the next time any package is installed. Discovered-by: Adam Suhl <asuhl(a)mit.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit d197d8ab82cf10650487518fb968067897a12775) ----------------------------------------------------------------------- Summary of changes: NEWS | 2 ++ configure.ac | 4 ++-- lib/libalpm/dload.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

01 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 d197d8ab82cf10650487518fb968067897a12775 (commit) from adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 (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 d197d8ab82cf10650487518fb968067897a12775 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Mar 1 11:23:20 2019 +1000 Sanitize file name received from Content-Disposition header When installing a remote package with "pacman -U <url>", pacman renames the downloaded package file to match the name given in the Content-Disposition header. However, pacman does not sanitize this name, which may contain slashes, before calling rename(). A malicious server (or a network MitM if downloading over HTTP) can send a content-disposition header to make pacman place the file anywhere in the filesystem, potentially leading to arbitrary root code execution. Notably, this bypasses pacman's package signature checking. For example, a malicious package-hosting server (or a network man-in-the-middle, if downloading over HTTP) could serve the following header: Content-Disposition: filename=../../../../../../usr/share/libalpm/hooks/evil.hook and pacman would move the downloaded file to /usr/share/libalpm/hooks/evil.hook. This invocation of "pacman -U" would later fail, unable to find the downloaded package in the cache directory, but the hook file would remain in place. The commands in the malicious hook would then be run (as root) the next time any package is installed. Discovered-by: Adam Suhl <asuhl(a)mit.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Discrepancies with keyring locations in pacman-key manual.
by Gabriel Hansson 27 Feb '19

27 Feb '19

Hello, Working on a project which requires me to learn a bit about package signing in Arch. Anyway, read the manual which states that keyrings are stored in /usr/local/share/keyrings since that is where --populate looks when used with pacman-key. Yet as far as I know, key can be perfectly stored in /usr/share/keyrings and found with populate. So sending this mail mostly as a question whether a correction should be made in the manual or if there is something that I'm missing :) Best regards, Gabriel Hansson

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-139-gadb961a8
by Allan McRae 23 Feb '19

23 Feb '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 adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 (commit) via ba7a41031c201b20d26cb69aa8b25acfb55c56bd (commit) via 3c774252ef11fd71270895bbbe892c81093aac77 (commit) via 656e851f0a3947a997d852da267e06e47355d134 (commit) via 4b83bcfcee46b6adcb80fc7a9fb85d3af58fb741 (commit) from 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a (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 adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 Author: Sever Oraz <severoraz(a)gmail.com> Date: Tue Feb 12 23:27:05 2019 +0100 Use standard, consistent units in the download progress. Rather than use M/s which can be either MB or MiB, specify that it uses MiB (consistent with the displayed total size). Fixes FS#59201 Signed-off-by: Sever Oraz <severoraz(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ba7a41031c201b20d26cb69aa8b25acfb55c56bd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 13 13:10:27 2019 -0500 meson: fix static/shared split again shared_library does not generate a sane pkg-config file because it assumes we don't want dependencies. Additionally, since we key off of buildstatic, when *not* using buildstatic but attempting to build libalpm on its own as static using -Ddefault_library=static, we are building and linking to a shared libalpm anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3c774252ef11fd71270895bbbe892c81093aac77 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Feb 15 11:38:17 2019 -0500 libmakepkg: migrate to schema.sh for integsums We cannot use most of the arrays defined in schema.sh as srcinfo is dependent on the order, but migrate the hashes for now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 656e851f0a3947a997d852da267e06e47355d134 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 20 20:55:44 2019 -0500 makepkg: simplify run_pacman logic We don't need to check the options twice, since it is the same check both times. Instead, merge the conditionals. As far as I can tell, the only reason the checks for: - PACMAN_OPTS and - whether to use sudo were ever separated is due to the historic existence of --asroot, since the second check included a check for (( ! ASROOT )) until it was cleaned up in commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b83bcfcee46b6adcb80fc7a9fb85d3af58fb741 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 20 21:35:19 2019 -0500 makepkg: implement locking for pacman commands When pacman is run as root to do -S, -U, or -R, it would immediately abort if pacman is not ready for use. Instead, poll the lockfile and wait until it becomes available. Implements FS#28840 Original-patch-by: Georges Dubus <georges.dubus(a)compiletoi.net> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: meson.build | 4 ++-- scripts/libmakepkg/srcinfo.sh.in | 3 ++- scripts/makepkg.sh.in | 17 ++++++++++++----- src/pacman/callback.c | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fixes bug FS 59201
by Sever Oraz 21 Feb '19

21 Feb '19

Signed-off-by: Sever Oraz <severoraz(a)gmail.com> --- src/pacman/callback.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index ee75297c..c0f5ade1 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -837,16 +837,16 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) xfered_human = humanize_size(xfered, '\0', -1, &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); - /* We will show 1.62M/s, 11.6M/s, but 116K/s and 1116K/s */ + /* We will show 1.62 MiB/s, 11.6 MiB/s, but 116 KiB/s and 1116 KiB/s */ if(rate_human < 9.995) { - printf("%6.1f %3s %4.2f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.2f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } else if(rate_human < 99.95) { - printf("%6.1f %3s %4.1f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.1f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } else { - printf("%6.1f %3s %4.f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } if(eta_h == 0) { printf("%02u:%02u", eta_m, eta_s); -- 2.20.1

3 7

[pacman-dev] [PATCH] meson: fix static/shared split again
by Eli Schwartz 21 Feb '19

21 Feb '19

shared_library does not generate a sane pkg-config file because it assumes we don't want dependencies. Additionally, since we key off of buildstatic, when *not* using buildstatic but attempting to build libalpm on its own as static using -Ddefault_library=static, we are building and linking to a shared libalpm anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8e9dbd71..0f706c64 100644 --- a/meson.build +++ b/meson.build @@ -363,8 +363,8 @@ libalpm_a = static_library( link_with : [libcommon], install : true) -if not get_option('buildstatic') - libalpm = shared_library( +if get_option('default_library') != 'static' + libalpm = library( 'alpm', version : libalpm_version, link_whole: [libalpm_a], -- 2.20.1

2 1

[pacman-dev] [PATCH] makepkg: simplify run_pacman logic
by Eli Schwartz 21 Feb '19

21 Feb '19

We don't need to check the options twice, since it is the same check both times. Instead, merge the conditionals. As far as I can tell, the only reason the checks for: - PACMAN_OPTS and - whether to use sudo were ever separated is due to the historic existence of --asroot, since the second check included a check for (( ! ASROOT )) until it was cleaned up in commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 25700b09..c51fec45 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -217,12 +217,10 @@ missing_source_file() { run_pacman() { local cmd - if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then - cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") - else + if [[ $1 = -@(T|Q)*([[:alpha:]]) ]]; then cmd=("$PACMAN_PATH" "$@") - fi - if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then + else + cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else -- 2.20.1

2 1

[pacman-dev] [PATCH] makepkg: implement locking for pacman commands
by Eli Schwartz 21 Feb '19

21 Feb '19

When pacman is run as root to do -S, -U, or -R, it would immediately abort if pacman is not ready for use. Instead, poll the lockfile and wait until it becomes available. Implements FS#28840 Original-patch-by: Georges Dubus <georges.dubus(a)compiletoi.net> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cf30c302..25700b09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -228,6 +228,14 @@ run_pacman() { else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi + + local lockfile="$(pacman-conf DBPath)/db.lck" + if [[ -f $lockfile ]]; then + msg "$(gettext "Pacman is currently in use, please wait...")" + while [[ -f $lockfile ]]; do + sleep 3 + done + fi fi "${cmd[@]}" } -- 2.20.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-134-g477a66cd
by Allan McRae 12 Feb '19

12 Feb '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 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a (commit) via 86004227d14bef059f71290b3c0454ad88ea0f86 (commit) from db102c67efe9cfd4367a9110c8f97ceff5afcbe3 (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 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Feb 11 11:19:26 2019 -0500 build: link vercmp with a static copy of libalpm This has historically been the case in autotools since we want vercmp to not break mid-transaction in an install script. For convenience, we create libalpm.a and use this to optionally generate libalpm.so (when not configured with -Dbuildstatic=true) as well as to link any binary which explicitly wishes to be built statically "with libalpm", but does not care where a function is defined. meson then treats this correctly: it builds the object file only once for both libraries, and the compiler strips out unused functionality from the final static binary. Currently the only binary which requires this is vercmp. Fixes FS#61719 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 86004227d14bef059f71290b3c0454ad88ea0f86 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 12 11:17:30 2019 +1000 Add implicit fall through warning Requires modification to our comment about fall through to match compilers expectations. Works for GCC and Clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + meson.build | 16 +++++++++++++--- src/pacman/pacman.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] build: link vercmp with a static copy of libalpm
by Eli Schwartz 12 Feb '19

12 Feb '19

This has historically been the case in autotools since we want vercmp to not break mid-transaction in an install script. For convenience, we create libalpm.a and use this to optionally generate libalpm.so (when not configured with -Dbuildstatic=true) as well as to link any binary which explicitly wishes to be built statically "with libalpm", but does not care where a function is defined. meson then treats this correctly: it builds the object file only once for both libraries, and the compiler strips out unused functionality from the final static binary. Currently the only binary which requires this is vercmp. Fixes FS#61719 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- This is based on my initial suggestion via IRC for how to solve the vercmp build issue using two libalpm libraries. The important distinction is that in order to not be an error when buildstatic is used, we cannot try to create multiple rules that generate libalpm.a -- and also we don't want to install /usr/lib/libalpm_a.a meson.build | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..4a74786b 100644 --- a/meson.build +++ b/meson.build @@ -354,15 +354,24 @@ libcommon = static_library( include_directories : includes, install : false) -libalpm = library( +libalpm_a = static_library( 'alpm', libalpm_sources, - version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, link_with : [libcommon], install : true) +if not get_option('buildstatic') + libalpm = shared_library( + 'alpm', + version : libalpm_version, + link_whole: [libalpm_a], + install : true) +else + libalpm = libalpm_a +endif + install_headers( 'lib/libalpm/alpm.h', 'lib/libalpm/alpm_list.h') @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

2 1

[pacman-dev] [PATCH] Add implicit fall through warning
by Allan McRae 12 Feb '19

12 Feb '19

Requires modification to our comment about fall through to match compilers expectations. Works for GCC and Clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 1 + meson.build | 1 + src/pacman/pacman.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 415ed3cb..2f345b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -462,6 +462,7 @@ if test "x$warningflags" = "xyes" ; then CFLAGS_ADD([-Wformat-nonliteral], [WARNING_CFLAGS]) CFLAGS_ADD([-Wformat-security], [WARNING_CFLAGS]) CFLAGS_ADD([-Wignored-qualifiers], [WARNING_CFLAGS]) + CFLAGS_ADD([-Wimplicit-fallthrough], [WARNING_CFLAGS]) CFLAGS_ADD([-Winit-self], [WARNING_CFLAGS]) CFLAGS_ADD([-Wlogical-op], [WARNING_CFLAGS]) CFLAGS_ADD([-Wmissing-declarations], [WARNING_CFLAGS]) diff --git a/meson.build b/meson.build index 0a710653..02a3a3d3 100644 --- a/meson.build +++ b/meson.build @@ -220,6 +220,7 @@ if get_option('buildtype').startswith('debug') '-Wformat-nonliteral', '-Wformat-security', '-Wignored-qualifiers', + '-Wimplicit-fallthrough', '-Winit-self', '-Wlogical-op', '-Wmissing-declarations', diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index a2a420b6..3bb622e6 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -196,7 +196,7 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); - /* pass through */ + /* fall through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); addlist(_(" --assume-installed <package=version>\n" -- 2.20.1

1 0

[pacman-dev] [PATCH] build: link vercmp staticly with libalpm
by Dave Reisner 11 Feb '19

11 Feb '19

This makes the meson-built vercmp equivalent to the autotools build. Employ an intermediate archive of libalpm which our generic library rule can slurp in. Other alpm-only binaries (specifically we care about vercmp) can then link this in for alpm functionality without caring exactly where the function is defined. meson passes the right flags to ensure that unused data is stripped out of the executable. ref: FS#61719 --- meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..5c1efd73 100644 --- a/meson.build +++ b/meson.build @@ -354,12 +354,21 @@ libcommon = static_library( include_directories : includes, install : false) +libalpm_a = static_library( + 'alpm_a', + libalpm_sources, + version : libalpm_version, + include_directories : includes, + dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_with : [libcommon], + install : true) + libalpm = library( 'alpm', - libalpm_sources, version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_whole : [libalpm_a], link_with : [libcommon], install : true) @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-132-gdb102c67
by Allan McRae 06 Feb '19

06 Feb '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 db102c67efe9cfd4367a9110c8f97ceff5afcbe3 (commit) via 714a1b4e4eaf7ffde5f30eccb476f59979fac44e (commit) from 04e77591d6333002815e9276ca08c01230fcf212 (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 db102c67efe9cfd4367a9110c8f97ceff5afcbe3 Author: Mark Ulrich <mark.ulrich.86(a)gmail.com> Date: Wed Feb 6 08:36:51 2019 -0600 libalpm: prevent 301 redirect loop from hanging the process If a mirror responds with a 301 redirect to itself, it will create an infinite redirect loop. This will cause pacman to hang, unresponsive to even a SIGINT. The result is pacman being unable to sync or download any package from a particular repo if its current mirror is stuck in a redirect loop. Setting libcurl's MAXREDIRS option effectively prevents a redirect loop from hanging the process. Signed-off-by: Mark Ulrich <mark.ulrich.86(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 714a1b4e4eaf7ffde5f30eccb476f59979fac44e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 4 10:32:50 2019 +1000 I blame everyone but me for this Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- lib/libalpm/dload.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: prevent 301 redirect loop from hanging the process
by Mark Ulrich 06 Feb '19

06 Feb '19

If a mirror responds with a 301 redirect to itself, it will create an infinite redirect loop. This will cause pacman to hang, unresponsive to even a SIGINT. The result is pacman being unable to sync or download any package from a particular repo if its current mirror is stuck in a redirect loop. Setting libcurl's MAXREDIRS option effectively prevents a redirect loop from hanging the process. Signed-off-by: Mark Ulrich <mark.ulrich.86(a)gmail.com> --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 36ae4ee1..d04a5e46 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -259,6 +259,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, 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_MAXREDIRS, 1L); curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); -- 2.20.1

3 4

[pacman-dev] Pacman failing with existing symlinks on the install path
by Peter Kehl 04 Feb '19

04 Feb '19

Dear Pacman maintainers, On current 4.19.16-1-MANJARO x64, I had /opt as symlink to /share/opt. I went to install current Google Chrome 72.0.3626.81-1 from https://aur.archlinux.org/packages/google-chrome (either by GNOME's Add/Remove Software, or by sudo pacman -U google-chrome-72.0.3626.81-1- x86_64.pkg.tar.xz). It failed with: error: failed to commit transaction (conflicting files) google-chrome: /opt exists in filesystem Knut Ahlers, the maintainer of AUR Google Chrome package, responded that the package doesn't check for the symlinks. Hence it's probably pacman. Have you/would you consider supporting existing symlinks on the install paths, please? Thanks in advance, -Peter Kehl Vancouver, B.C., Canada

3 3

[pacman-dev] [PATCH] libalpm: Check cachedir access before re-creating
by David Phillips 04 Feb '19

04 Feb '19

If users have mounted a filesystem such as sshfs or NFS that doesn't allow root access by default for security reasons, _alpm_filecache_setup will blindly try and re-create the components of the cachedir path, eating EACCES (to be liek mkdir -p). Then, it will return this path as if it is valid when it may not be readable by root, causing alpm_check_downloadspace to trigger a FPE since it assumes the cachedir is R/W and uses fsinfo which may be zero. This patch adds a check before trying to re-create the cachedir in order to determine if creating it will result in EACCES, and outputs a warning if so. It also discards the current cachedir from being considered. This causes a more meaningful and graceful failure than a FPE. --- lib/libalpm/util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d33eef2a..d4375593 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -849,12 +849,16 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) for(i = handle->cachedirs; i; i = i->next) { cachedir = i->data; if(stat(cachedir, &buf) != 0) { - /* cache directory does not exist.... try creating it */ - _alpm_log(handle, ALPM_LOG_WARNING, _("no %s cache exists, creating...\n"), - cachedir); - if(_alpm_makepath(cachedir) == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); - return cachedir; + if (errno == EACCES) { + _alpm_log(handle, ALPM_LOG_WARNING, _("failed to stat %s: %s\n"), cachedir, strerror(errno)); + } else { + /* cache directory does not exist.... try creating it */ + _alpm_log(handle, ALPM_LOG_WARNING, _("no %s cache exists, creating...\n"), + cachedir); + if(_alpm_makepath(cachedir) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); + return cachedir; + } } } else if(!S_ISDIR(buf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, -- 2.20.1

3 2