pacman: refactor transaction code to one path

This refactors the -S, -U and -R code to share the same implementation.

The goal here is to firstly simplify all transactoions into one code path,
then eventually allow pacman to perform multiple kinds of transactions in
one command.

.editorconfig

@@ -16,5 +16,9 @@ indent_style = tab
 [{NEWS,HACKING}]
 indent_style = space
 
+[meson.build]
+indent_style = space
+indent_size = 2
+
 [*.py]
 indent_style = space

.gitignore

@@ -1,24 +1,3 @@
 *~
 *.o
-ABOUT-NLS
-aclocal.m4
-autom4te.cache
-config.h
-config.h.in
-config.log
-config.status
-config.status.lineno
-configure
-configure.lineno
-cov-int
-cscope.in.out
-cscope.out
-cscope.po.out
-intl
-libtool
-Makefile
-Makefile.in
 pacman-*.tar.gz
-root
-stamp-h1
-tags

.gitlab-ci.yml

@@ -0,0 +1,119 @@
+variables:
+  MAKEFLAGS: "-j10"
+  VERBOSE: 1
+
+default:
+  after_script:
+    - build-aux/print-failed-test-output build/meson-logs/testlog.json
+
+.arch-test:
+  image: archlinux:base-devel
+  before_script:
+    - >
+      pacman -Syu --needed --noconfirm
+      git
+      gpgme libarchive curl
+      python
+      fakeroot fakechroot
+      meson
+  artifacts:
+      when: always
+      paths:
+        - build/meson-logs/meson-log.txt
+
+arch:
+  extends: .arch-test
+  script:
+    - meson setup build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+arch-debug:
+  extends: .arch-test
+  script:
+    - meson setup --buildtype=debug --werror build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+arch-docs:
+  extends: .arch-test
+  script:
+    - pacman -Syu --needed --noconfirm asciidoc
+    - meson setup -Ddoc=enabled build
+    - ninja -C build
+
+arch-clang:
+  extends: .arch-test
+  script:
+    - pacman -Syu --needed --noconfirm clang
+    - CC=clang meson setup build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+#arch-valgrind:
+#  extends: .arch-test
+#  script:
+#    - pacman -Syu --needed --noconfirm valgrind
+#    - pacman -U --noconfirm https://geo.mirror.pkgbuild.com/core-debug/os/x86_64/glibc-debug-$(pacman -S --print-format %v glibc)-x86_64.pkg.tar.zst
+#    - meson setup build
+#    - ninja -C build
+#    - PACTEST_VALGRIND=1 fakechroot meson test -C build
+
+arch-nettle:
+  extends: .arch-test
+  script:
+    - meson setup -Dcrypto=nettle --buildtype=debug build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+arch-no-gpg:
+  extends: .arch-test
+  script:
+    - meson setup -Dgpgme=disabled --buildtype=debug build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+arch-no-curl:
+  extends: .arch-test
+  script:
+    - meson setup -Dcurl=disabled --buildtype=debug build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+arch-no-nls:
+  extends: .arch-test
+  script:
+    - meson setup -Di18n=false --buildtype=debug build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+debian:
+  image: debian:bullseye
+  before_script:
+    - apt update
+    - >
+      apt -y install --no-install-recommends
+      git pkg-config meson gcc libtool
+      libgpgme-dev libarchive-dev libcurl4-openssl-dev libssl-dev curl
+      gettext python3 python3-setuptools dash gawk ca-certificates
+      fakeroot fakechroot
+  script:
+    - meson setup --buildtype=debug build
+    - ninja -C build
+    - fakechroot meson test -C build
+
+fedora:
+  image: fedora
+  before_script:
+    - >
+      dnf -y install
+      git findutils patch sed
+      meson gcc libtool bsdtar
+      gpgme-devel libarchive-devel libcurl-devel openssl-devel gettext-devel
+      asciidoc python3 dash gawk
+      fakeroot fakechroot
+      perl-Module-Load-Conditional
+  script:
+    - meson setup --buildtype=debug build
+    - ninja -C build
+    - fakechroot meson test -C build

.mailmap

@@ -20,6 +20,7 @@ Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> <jotapesan@gmail.com>
 Manuel Tortosa <manutortosa@chakra-project.org> <manutortosa@gmail.com>
 Marc - A. Dahlhaus <mad@wol.de>
 Matthias Gorissen <matthias@archlinux.de> <siquame@web.de>
+morganamilo <morganamilo@archlinux.org> <morganamilo@gmail.com>
 Laszlo Papp <djszapi@archlinux.us> <djszapi2@gmail.com>
 Nagy Gabor <ngaba@bibl.u-szeged.hu> <ngaba@petra.hos.u-szeged.hu>
 Nagy Gabor <ngaba@bibl.u-szeged.hu> <ngaba at bibl.u-szeged.hu>

.tx/config

@@ -1,17 +1,17 @@
 [main]
 host = https://www.transifex.com
 
-[archlinux-pacman.libalpm-pot]
+[o:toofishes:p:archlinux-pacman:r:libalpm-pot]
 file_filter = lib/libalpm/po/<lang>.po
 source_file = lib/libalpm/po/libalpm.pot
 source_lang = en
 
-[archlinux-pacman.pacman-pot]
+[o:toofishes:p:archlinux-pacman:r:pacman-pot]
 file_filter = src/pacman/po/<lang>.po
 source_file = src/pacman/po/pacman.pot
 source_lang = en
 
-[archlinux-pacman.pacman-scripts-pot]
+[o:toofishes:p:archlinux-pacman:r:pacman-scripts-pot]
 file_filter = scripts/po/<lang>.po
 source_file = scripts/po/pacman-scripts.pot
 source_lang = en

.ycm_extra_conf.py

@@ -1,250 +0,0 @@
-#!/usr/bin/env python
-
-# SPDX-License-Identifier: Unlicense
-#
-# Based on the template file provided by the 'YCM-Generator' project authored by
-# Reuben D'Netto.
-# Jiahui Xie has re-reformatted and expanded the original script in accordance
-# to the requirements of the PEP 8 style guide and 'systemd' project,
-# respectively.
-#
-# The original license is preserved as it is.
-#
-#
-# This is free and unencumbered software released into the public domain.
-#
-# Anyone is free to copy, modify, publish, use, compile, sell, or
-# distribute this software, either in source code form or as a compiled
-# binary, for any purpose, commercial or non-commercial, and by any
-# means.
-#
-# In jurisdictions that recognize copyright laws, the author or authors
-# of this software dedicate any and all copyright interest in the
-# software to the public domain. We make this dedication for the benefit
-# of the public at large and to the detriment of our heirs and
-# successors. We intend this dedication to be an overt act of
-# relinquishment in perpetuity of all present and future rights to this
-# software under copyright law.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# For more information, please refer to <http://unlicense.org/>
-
-"""
-YouCompleteMe configuration file tailored to support the 'meson' build system
-used by the 'systemd' project.
-"""
-
-import glob
-import os
-import ycm_core
-
-
-SOURCE_EXTENSIONS = (".C", ".cpp", ".cxx", ".cc", ".c", ".m", ".mm")
-HEADER_EXTENSIONS = (".H", ".h", ".hxx", ".hpp", ".hh")
-
-
-def DirectoryOfThisScript():
-    """
-    Return the absolute path of the parent directory containing this
-    script.
-    """
-    return os.path.dirname(os.path.abspath(__file__))
-
-
-def GuessBuildDirectory():
-    """
-    Guess the build directory using the following heuristics:
-
-    1. Returns the current directory of this script plus 'build'
-    subdirectory in absolute path if this subdirectory exists.
-
-    2. Otherwise, probes whether there exists any directory
-    containing '.ninja_log' file two levels above the current directory;
-    returns this single directory only if there is one candidate.
-    """
-    result = os.path.join(DirectoryOfThisScript(), "build")
-
-    if os.path.exists(result):
-        return result
-
-    result = glob.glob(os.path.join(DirectoryOfThisScript(),
-                                    "..", "..", "*", ".ninja_log"))
-
-    if not result:
-        return ""
-
-    if 1 != len(result):
-        return ""
-
-    return os.path.split(result[0])[0]
-
-
-def TraverseByDepth(root, include_extensions):
-    """
-    Return a set of child directories of the 'root' containing file
-    extensions specified in 'include_extensions'.
-
-    NOTE:
-        1. The 'root' directory itself is excluded from the result set.
-        2. No subdirectories would be excluded if 'include_extensions' is left
-           to 'None'.
-        3. Each entry in 'include_extensions' must begin with string '.'.
-    """
-    is_root = True
-    result = set()
-    # Perform a depth first top down traverse of the given directory tree.
-    for root_dir, subdirs, file_list in os.walk(root):
-        if not is_root:
-            # print("Relative Root: ", root_dir)
-            # print(subdirs)
-            if include_extensions:
-                get_ext = os.path.splitext
-                subdir_extensions = {
-                    get_ext(f)[-1] for f in file_list if get_ext(f)[-1]
-                }
-                if subdir_extensions & include_extensions:
-                    result.add(root_dir)
-            else:
-                result.add(root_dir)
-        else:
-            is_root = False
-
-    return result
-
-
-_project_src_dir = os.path.join(DirectoryOfThisScript(), "src")
-_include_dirs_set = TraverseByDepth(_project_src_dir, frozenset({".h"}))
-flags = [
-    "-x",
-    "c"
-    # The following flags are partially redundant due to the existence of
-    # 'compile_commands.json'.
-    #    '-Wall',
-    #    '-Wextra',
-    #    '-Wfloat-equal',
-    #    '-Wpointer-arith',
-    #    '-Wshadow',
-    #    '-std=gnu99',
-]
-
-for include_dir in _include_dirs_set:
-    flags.append("-I" + include_dir)
-
-# Set this to the absolute path to the folder (NOT the file!) containing the
-# compile_commands.json file to use that instead of 'flags'. See here for
-# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
-#
-# You can get CMake to generate this file for you by adding:
-#   set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
-# to your CMakeLists.txt file.
-#
-# Most projects will NOT need to set this to anything; you can just change the
-# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
-compilation_database_folder = GuessBuildDirectory()
-
-if os.path.exists(compilation_database_folder):
-    database = ycm_core.CompilationDatabase(compilation_database_folder)
-else:
-    database = None
-
-
-def MakeRelativePathsInFlagsAbsolute(flags, working_directory):
-    """
-    Iterate through 'flags' and replace the relative paths prefixed by
-    '-isystem', '-I', '-iquote', '--sysroot=' with absolute paths
-    start with 'working_directory'.
-    """
-    if not working_directory:
-        return list(flags)
-    new_flags = []
-    make_next_absolute = False
-    path_flags = ["-isystem", "-I", "-iquote", "--sysroot="]
-    for flag in flags:
-        new_flag = flag
-
-        if make_next_absolute:
-            make_next_absolute = False
-            if not flag.startswith("/"):
-                new_flag = os.path.join(working_directory, flag)
-
-        for path_flag in path_flags:
-            if flag == path_flag:
-                make_next_absolute = True
-                break
-
-            if flag.startswith(path_flag):
-                path = flag[len(path_flag):]
-                new_flag = path_flag + os.path.join(working_directory, path)
-                break
-
-        if new_flag:
-            new_flags.append(new_flag)
-    return new_flags
-
-
-def IsHeaderFile(filename):
-    """
-    Check whether 'filename' is considered as a header file.
-    """
-    extension = os.path.splitext(filename)[1]
-    return extension in HEADER_EXTENSIONS
-
-
-def GetCompilationInfoForFile(filename):
-    """
-    Helper function to look up compilation info of 'filename' in the 'database'.
-    """
-    # The compilation_commands.json file generated by CMake does not have
-    # entries for header files. So we do our best by asking the db for flags for
-    # a corresponding source file, if any. If one exists, the flags for that
-    # file should be good enough.
-    if not database:
-        return None
-
-    if IsHeaderFile(filename):
-        basename = os.path.splitext(filename)[0]
-        for extension in SOURCE_EXTENSIONS:
-            replacement_file = basename + extension
-            if os.path.exists(replacement_file):
-                compilation_info = \
-                    database.GetCompilationInfoForFile(replacement_file)
-                if compilation_info.compiler_flags_:
-                    return compilation_info
-        return None
-    return database.GetCompilationInfoForFile(filename)
-
-
-def FlagsForFile(filename, **kwargs):
-    """
-    Callback function to be invoked by YouCompleteMe in order to get the
-    information necessary to compile 'filename'.
-
-    It returns a dictionary with a single element 'flags'. This element is a
-    list of compiler flags to pass to libclang for the file 'filename'.
-    """
-    if database:
-        # Bear in mind that compilation_info.compiler_flags_ does NOT return a
-        # python list, but a "list-like" StringVec object
-        compilation_info = GetCompilationInfoForFile(filename)
-        if not compilation_info:
-            return None
-
-        final_flags = MakeRelativePathsInFlagsAbsolute(
-            compilation_info.compiler_flags_,
-            compilation_info.compiler_working_dir_)
-
-    else:
-        relative_to = DirectoryOfThisScript()
-        final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to)
-
-    return {
-        "flags": final_flags,
-        "do_cache": True
-    }

HACKING

@@ -176,16 +176,3 @@ For pacman:
 -------------------------------------------
 
 Never directly include config.h. This will always be added via Makefiles.
-
-GDB and Valgrind Usage
-~~~~~~~~~~~~~~~~~~~~~~
-
-When using GDB or valgrind on pacman, you will want to run it on the actual
-binary rather than the shell script wrapper produced by libtool. The actual
-binary lives at `src/pacman/.libs/lt-pacman`, and will exist after running
-`./src/pacman/pacman` at least once.
-
-For example, to run valgrind:
-
-    ./src/pacman/pacman
-    valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu

INSTALL

@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.

Makefile.am

@@ -1,85 +0,0 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util test/scripts
-if WANT_DOC
-SUBDIRS += doc
-endif
-
-DIST_SUBDIRS = $(SUBDIRS) src/common
-
-ACLOCAL_AMFLAGS = -I m4 --install
-AM_MAKEFLAGS = --no-print-directory
-
-# Make sure we test and build manpages when doing distcheck
-DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version \
-		bashcompdir='$${prefix}/share/bash-completion/completions'
-
-# Some files automatically included, so they aren't specified below:
-#   AUTHORS, COPYING, NEWS, README
-EXTRA_DIST = \
-	HACKING test/tap.sh \
-	meson.build meson_options.txt \
-	build-aux/edit-script.sh.in \
-	build-aux/meson-install-script.sh \
-	build-aux/meson-make-symlink.sh \
-	build-aux/script-wrapper.sh.in
-
-
-# Sample makepkg prototype files
-pkgdatadir = ${datadir}/${PACKAGE}
-dist_pkgdata_DATA = \
-	proto/PKGBUILD.proto \
-	proto/PKGBUILD-split.proto \
-	proto/PKGBUILD-vcs.proto \
-	proto/proto.install
-
-$(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py)
-	@printf "TESTS += %s\n" $^ | LC_ALL=C sort -u > "$@"
-
-TESTS =  test/scripts/parseopts_test.sh \
-				 test/scripts/human_to_size_test.sh \
-				 test/scripts/makepkg-template_test.sh \
-				 test/scripts/pacman-db-upgrade-v9.py \
-				 test/util/vercmptest.sh
-include $(top_srcdir)/test/pacman/tests/TESTS
-
-TEST_SUITE_LOG = test/test-suite.log
-TEST_EXTENSIONS = .py
-AM_TESTS_ENVIRONMENT = \
-	PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \
-	PMTEST_SCRIPT_DIR=$(top_builddir)/scripts/; export PMTEST_SCRIPT_DIR; \
-	PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; \
-	PMTEST_LIBMAKEPKG_DIR=$(top_builddir)/scripts/libmakepkg/; export PMTEST_LIBMAKEPKG_DIR;
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-								 $(top_srcdir)/build-aux/tap-driver.sh
-PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-								 $(top_srcdir)/build-aux/tap-driver.sh
-PY_LOG_COMPILER = $(PYTHON) $(top_srcdir)/test/pacman/pactest.py
-AM_PY_LOG_FLAGS = \
-		--scriptlet-shell $(SCRIPTLET_SHELL) \
-		--ldconfig $(LDCONFIG) \
-		--bindir $(top_builddir)/src/pacman \
-		--bindir $(top_builddir)/scripts
-if !HAVE_LIBGPGME
-AM_PY_LOG_FLAGS += --without-gpg
-endif
-if !HAVE_LIBCURL
-AM_PY_LOG_FLAGS += --without-curl
-endif
-
-# create the pacman DB, cache, makepkg-template and system hook directories upon install
-install-data-local:
-	for dir in "$(DESTDIR)$(localstatedir)/lib/pacman" "$(DESTDIR)$(localstatedir)/cache/pacman/pkg" \
-	           "$(DESTDIR)$(datarootdir)/makepkg-template" "$(DESTDIR)$(datarootdir)/libalpm/hooks"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-
-update-po:
-	$(MAKE) -C lib/libalpm/po update-po
-	$(MAKE) -C scripts/po update-po
-	$(MAKE) -C src/pacman/po update-po
-
-update-copyright:
-	for file in $(shell sh -c 'git grep -l "Copyright .* Pacman Development" | grep -v "\.po"'); do \
-	  sed -i -e "/Copyright (/s/-$(OLD)/-$(NEW)/" -e "/Copyright (/s/ $(OLD)/ $(OLD)-$(NEW)/" "$$file"; \
-	done
-
-.PHONY: update-po update-copyright

NEWS

@@ -1,5 +1,110 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+6.0.1         - Prevent download error pages ending up in package files
+                (FS#71083)
+              - Give -U downloads a random .part file name if needed
+                (FS#71464)
+              - Fix downloading signatures with redirecting URLs (FS#71148)
+              - Fix double free when importing PGP keys (FS#71107)
+              - Ensure signature files are named after original file
+                following redirects (FS#71274)
+              - Order downloads by size - largest to smallest (FS#70172)
+              - Fix reproducibility of man pages (FS#71154)
+              - makepkg:
+                - Fix stripping debug symbols with binutils 2.37 (FS#71722)
+                - Export PYTHONHASHSEED for reproducible python packages
+              - pacman-key:
+                - Quieten trust db checks.
+6.0.0         - internal downloader can retrieve files in parallel (FS#20056)
+              - an additional progress bar is added to track total download
+                progress.  This replaces the previous TotalDownload option.
+              - fix download rates becoming negative
+              - skip mirror servers with too many errors (FS#29293)
+              - package signatures are always retrieved even if signature is
+                embedded in repo database or package is in cache (FS#33992)
+              - detached package signatures found in CacheDir can be used to
+                verify packages if signature is not in the database. Also
+                verify packages checksums from repo db when using detached
+                signatures.
+              - add support for multiple 'Architecture' values
+              - -Qkk now validates file checksums in addition to date/size
+              - colored upgrade summary now dulls version numbers for contrast
+              - libalpm frontends can now supply context to callbacks (FS#12721)
+              - support xattr when extracting packages
+              - allow setting --noprogressbar in pacman.conf
+              - fix output alignment for CJK translated text (FS#59229)
+              - fix reading targets from stdin when using --sysroot (FS#68630)
+              - fix deleting signatures for existing databases with -Sc
+              - check for and forbid duplicate download filenames (FS#67850)
+              - -Fx now reports error for invalid regex
+              - remove support for the autotools build system
+              - meson: properly compile internal symbols as hidden
+              - meson: make -uninstalled.pc correct
+              - fix build errors on systems like FreeBSD
+              - makepkg:
+                - add link time optimization support to makepkg
+                - add support for sources using the fossil VCS
+                - allow specifying alternative authentication commands when
+                  running pacman as root (FS#32621)
+                - support zstd decompression for sources
+                - strip: fix removing file attributes such as xattr
+                - switch to CRC as default integrity checksum
+                - record $startdir for reproducible builds
+                - record name of build orchestration tool for reproducible builds
+                - fix signing of source packages
+                - add optional argument support to parseopts
+                - reduce dependency on file for detecting ELF files
+                - remove dependency on GNU sed
+                - avoid trailing whitespace in --printsrcinfo output
+                - libprovides: don't provide both versioned and unversioned
+                  sonames
+                - don't double-layer distcc on ccache
+                - fix detection of source file names for debug packages with
+                  gcc 11
+                - strip: silence warnings emitted by readelf while detecting
+                  source filenames
+                - fix use of spaces in source file renaming (FS#70254)
+              - pacman-key:
+                - --refresh-keys queries WKD before keyserver
+                - be less noisy when populating the keyring (FS#64142)
+                - warn about time taken for master key generation
+              - repo-add:
+                - support the same compression methods as makepkg
+              - zsh completion: add pacman-conf support
+              - various documentation updates
+              - after a decade and a half of promising libalpm.3 documentation
+                "once we get around to doing good Doxygen documentation", it
+                has happened!
+5.2.2         - fix pacman test suite under python 3.8
+              - only prompt to import new keys once in a transaction
+              - fix handling of fully downloaded .part files
+              - increase maximum database size (FS#65197)
+              - fix segfault in alpm_option_set_assumeinstalled
+              - change config parsing warnings to errors to match actual
+                behavior
+              - fix key extraction for signatures with two-octet sub-packet
+                headers
+              - fix documentation typos (FS#67000)
+              - change master signing key to RSA4096
+              - improve error message when building without autoconf-archive
+              - pacman-conf:
+                - allow querying ILoveCandy individually
+                - fix querying NoExtract individually
+              - makepkg:
+                - fix seccmp-related error while stripping binaries (FS#65100)
+                - fix extraction of file:// sources (FS#64648)
+                - allow $pkgname in install and changelog file names (FS#64932)
+                - sort libprovides for reproducibility
+                - strip: don't re-add the same debug source multiple times
+                - error on empty refspecs in git sources
+                - correctly handle missing download clients
+                - fix splitting multi-line error messages across stdout and
+                  stderr
+                - handle GPGKEY with spaces (FS#66949)
+                - do not accept public-only keys for signing
+              - repo-add:
+                - handle GPGKEY with spaces (FS#66949)
+                - do not accept public-only keys for signing
 5.2.1         - fix segfault on importing PGP keys for -U operations
               - fix distribution of meson files
               - fix inode command for darwin/bsd
@@ -10,7 +115,7 @@ VERSION         DESCRIPTION
                 - do not warn about PACKAGER format if not set
                 - only run --clean when a package is built
               - repo-add:
-                - fix compression of databases with zstd
+                - fix compression of databases with zstd (FS#64213)
 5.2.0         - completely remove delta support (CVE-2019-18183)
               - add support to pacman and pacman-key for downloading PGP
                 signing keys using the WKD protocol (FS#63171)

README

@@ -52,7 +52,6 @@ library is initialized.
 * logcb: The callback function for "log" operations.
 * dlcb: The callback function for download progress of each package.
 * fetchcb: Callback for custom download function.
-* totaldlcb: The callback function for overall download progress.
 * eventcb: Callback for transaction messages.
 * questioncb: Callback for selecting amongst choices.
 * progresscb: Callback to handle display of transaction progress.
@@ -195,8 +194,8 @@ remove.c and sync.c).
 
 The frontend is using a configuration file, usually "/etc/pacman.conf".  Some
 of these options are only useful for the frontend only (mainly the ones used to
-control the output like totaldownload, or the behavior with cleanmethod and
-syncfirst).  The rest is used to configure the library.
+control the output like verbosepkglist, or the behavior with cleanmethod).
+The rest is used to configure the library.
 
 
 [UPGRADE/REMOVE/SYNC]
@@ -655,3 +654,46 @@ API CHANGES BETWEEN 5.1 AND 5.2
 - alpm_errno_t - added member ALPM_ERR_MISSING_CAPABILITY_SIGNATURES
 - alpm_sync_newversion() replaced with alpm_sync_get_new_version() which
   does not filter on any ALPM_DB_USAGE_*.
+
+
+API CHANGES BETWEEN 5.2 AND 6.0
+===============================
+
+[REMOVED]
+- ALPM_EVENT_PKGDOWNLOAD_START, ALPM_EVENT_PKGDOWNLOAD_DONE, ALPM_EVENT_PKGDOWNLOAD_FAILED
+- ALPM_ERR_PKG_REPO_NOT_FOUND
+- old TotalDownload implementation
+ - alpm_cb_totaldl
+ - alpm_option_get_totaldlcb()
+ - alpm_option_set_totaldlcb()
+
+[CHANGED]
+- alpm_db_update() now accepts a list of databases rather than a single database.
+- alpm_fetch_pkgurl() accepts a list of packages to download.
+- alpm_db_search() now has an additional parameter and returns success status
+- ALPM_EVENT_RETRIEVE_* -> ALPM_EVENT_DB_RETRIEVE_* and ALPM_EVENT_PKG_RETRIEVE_*
+- alpm_cb_download pass event and data
+- multi architecture support
+ - alpm_option_get_arch() -> alpm_option_get_architectures()
+ - alpm_option_set_arch() -> alpm_option_set_architectures()
+- alpm_db_get_servers() copies parameter data
+
+[ADDED]
+- parallel download support
+ - alpm_option_set_parallel_downloads()
+ - alpm_option_get_parallel_downloads()
+- file download events
+ - alpm_download_event_type_t
+ - alpm_download_event_init_t
+ - alpm_download_event_progress_t
+ - alpm_download_event_completed_t
+- download misc
+ - ALPM_DOWNLOAD_RETRY
+ - alpm_download_event_retry_t
+ - alpm_event_pkg_retrieve_t
+- multiarchitecture support
+ - alpm_option_add_architecture()
+ - alpm_option_remove_architecture()
+- misc
+ - alpm_pkg_get_sig()
+- callbacks add front-end provided context

RELEASE

@@ -1,22 +1,21 @@
 The following checklist should be used for making a pacman release.
 
-- Ensure "make distcheck" succeeds
+- Ensure "ninja dist" succeeds
 - Call a freeze to development.
 - Send translation updates to Transifex at least two weeks before a major
   release (see below).  At this stage, strings can only be changed for a
   major issue.
 - Update NEWS and README files
 - Pull translation updates from Transifex
-- Update version in configure.ac as described in file
+- Update version in meson.build as described in file
 - Update doc/index.asciidoc
 - Create a signed git tag (git tag -s vX.Y.Z -m "commit message")
-- Create and sign release tarballs (generate with "make distcheck")
-  - In addition to the standard autotools toolchain, autoconf-archive is needed
+- Create and sign release tarballs (generate with "ninja dist")
 - Update pacman website
 
 Transifex updates are handled using the transifex client. The basic process is:
-- Pull updates from transifex ("tx pull -a -f --minimum-perc 75")
-- Update po files ("make update-po")
+- Pull updates from transifex ("tx pull -f --minimum-perc 75")
+- Update po files ("./build-aux/update-po")
 - Fix all translation errors found
 - Add any new locales to the relevant LINGUAS file
 - Optional: Make any manual changes needed (e.g. fixing spacing in a string)

autogen.sh

@@ -1,6 +0,0 @@
-#!/bin/sh -x
-
-autoreconf -i
-patch -d build-aux -Np0 -i ltmain-asneeded.patch
-
-exit 0

build-aux/cat-test-file

@@ -0,0 +1,11 @@
+#!/usr/bin/python3
+
+import sys
+
+for path in sys.argv[1:]:
+    print('# -----------------------------------')
+    print('# ' + path + ':')
+    print('# -----------------------------------')
+    with open(path, 'r') as f:
+        for line in f:
+            print('# ' + line, end='')

build-aux/edit-script.sh.in

@@ -4,13 +4,14 @@ input=$1
 output=$2
 mode=$3
 
-"@SED@" \
+sed \
   -e "s|@rootdir[@]|@ROOTDIR@|g" \
   -e "s|@localedir[@]|@LOCALEDIR@|g" \
   -e "s|@sysconfdir[@]|@sysconfdir@|g" \
   -e "s|@localstatedir[@]|@localstatedir@|g" \
   -e "s|@libmakepkgdir[@]|@LIBMAKEPKGDIR@|g" \
   -e "s|@pkgdatadir[@]|@PKGDATADIR@|g" \
+  -e "s|@keyringdir[@]|@KEYRINGDIR@|g" \
   -e "s|@prefix[@]|@PREFIX@|g" \
   -e "1s|#!/bin/bash|#!@BASH@|g" \
   -e "s|@PACKAGE_VERSION[@]|@PACKAGE_VERSION@|g" \
@@ -20,9 +21,7 @@ mode=$3
   -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \
   -e "s|@INODECMD[@]|@INODECMD@|g" \
   -e "s|@FILECMD[@]|@FILECMD@|g" \
-  -e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \
-  -e "s|@SEDPATH[@]|@SEDPATH@|g" \
-  -e "s|@configure_input[@]|Generated from ${input##*/}; do not edit by hand.|g" \
+  -e "s|@BSDTAR_NO_READ_SPARSE[@]|@BSDTAR_NO_READ_SPARSE@|g" \
   "$input" >"$output"
 
 if [[ $mode ]]; then

build-aux/ltmain-asneeded.patch

@@ -1,33 +0,0 @@
---- ltmain.sh.orig	2013-06-26 14:31:53.472627840 +1000
-+++ ltmain.sh	2013-06-26 14:30:56.137038936 +1000
-@@ -5800,6 +5800,14 @@
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,*--as-needed*)
-+	deplibs="$deplibs $wl--as-needed"
-+	;;
-+
-+      -Wl,*--no-as-needed*)
-+	deplibs="$deplibs $wl--no-as-needed"
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -6160,6 +6168,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed|-Wl,--no-as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test "$linkmode,$pass" = "prog,link"; then

build-aux/meson-install-script.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-built_script=$1
-dest_path=$2
-
-install -Dm755 "$built_script" "$DESTDIR/$dest_path"

build-aux/meson-make-symlink.sh

@@ -5,8 +5,6 @@ set -eu
 # and we need to create the target directory...
 
 mkdir -vp "$(dirname "${DESTDIR:-}$2")"
-if [ "$(dirname $1)" = . ]; then
-        ln -vfs -T "$1" "${DESTDIR:-}$2"
-else
-        ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
-fi
+
+rm -f "${DESTDIR:-}$2"
+ln -vs "$1" "${DESTDIR:-}$2"

build-aux/print-failed-test-output

@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+import json
+import sys
+
+def print_result(result):
+    print('==================================================================')
+    print(result['name'])
+    print(' '.join(result['command']))
+    print('==================================================================')
+    print(result['stdout'])
+
+with open(sys.argv[1], 'r') as f:
+    for line in f:
+        result = json.loads(line)
+        if result['result'] == 'FAIL':
+            print_result(result)

build-aux/update-copyright

@@ -0,0 +1,8 @@
+#! /bin/sh
+
+OLD=$1
+NEW=$2
+
+for file in $(git grep -l "Copyright .* Pacman Development" | grep -v "\.po"); do \
+	sed -i -e "/Copyright (/s/-${OLD}/-${NEW}/" -e "/Copyright (/s/ ${OLD}/ ${OLD}-${NEW}/" "$file"
+done

configure.ac

@@ -1,604 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-# Minimum version of autoconf required
-AC_PREREQ(2.64)
-
-# UPDATING VERSION NUMBERS FOR RELEASES
-#
-# libalpm:
-# current
-#   The most recent interface number that this library implements.
-# revision
-#   The implementation number of the current interface.
-# age
-#   The difference between the newest and oldest interfaces that this library
-#   implements. In other words, the library implements all the interface
-#   numbers in the range from number current - age to current.
-#
-# 1. Start with version information of `0:0:0' for each libtool library.
-# 2. Update the version information only immediately before a public release of
-#    your software. More frequent updates are unnecessary, and only guarantee
-#    that the current interface number gets larger faster.
-# 3. If the library source code has changed at all since the last update, then
-#    increment revision (`c:r:a' becomes `c:r+1:a').
-# 4. If any interfaces have been added, removed, or changed since the last
-#    update, increment current, and set revision to 0.
-# 5. If any interfaces have been added since the last public release, then
-#    increment age.
-# 6. If any interfaces have been removed since the last public release, then
-#    set age to 0.
-#
-# pacman:
-#   Extreme huge major changes:
-#     pacman_version_major += 1
-#     pacman_version_minor = 0
-#     pacman_version_micro = 0
-#
-#   Real releases:
-#     pacman_version_minor += 1
-#     pacman_version_micro = 0
-#
-#   Bugfix releases:
-#     pacman_version_micro += 1
-
-m4_define([lib_current], [12])
-m4_define([lib_revision], [1])
-m4_define([lib_age], [0])
-
-m4_define([pacman_version_major], [5])
-m4_define([pacman_version_minor], [2])
-m4_define([pacman_version_micro], [1])
-m4_define([pacman_version],
-          [pacman_version_major.pacman_version_minor.pacman_version_micro])
-
-# Autoconf initialization
-AC_INIT([pacman], [pacman_version], [pacman-dev@archlinux.org])
-AC_CONFIG_SRCDIR([config.h.in])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
-
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([1.11 foreign])
-AM_SILENT_RULES([yes])
-
-LT_INIT
-LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision
-LIB_VERSION_INFO="lib_current:lib_revision:lib_age"
-
-# Respect empty CFLAGS during compiler tests
-if test "x$CFLAGS" = "x"; then
-  CFLAGS=""
-fi
-
-# Set substitution values for version stuff in Makefiles and anywhere else,
-# and put LIB_VERSION in config.h
-AC_SUBST(LIB_VERSION)
-AC_SUBST(LIB_VERSION_INFO)
-AC_DEFINE_UNQUOTED([LIB_VERSION], ["$LIB_VERSION"], [libalpm version number])
-
-# Help line for root directory
-AC_ARG_WITH(root-dir,
-	AS_HELP_STRING([--with-root-dir=path], [set the location of the root operating directory]),
-	[ROOTDIR=$withval], [ROOTDIR=/])
-
-# Help line for package extension
-AC_ARG_WITH(pkg-ext,
-	AS_HELP_STRING([--with-pkg-ext=ext], [set the file extension used by packages]),
-	[PKGEXT=$withval], [PKGEXT=.pkg.tar.gz])
-
-# Help line for source package directory
-AC_ARG_WITH(src-ext,
-	AS_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]),
-	[SRCEXT=$withval], [SRCEXT=.src.tar.gz])
-
-# Help line for buildscript filename
-AC_ARG_WITH(buildscript,
-	AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]),
-	[BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD])
-
-# Help line for buildscript filename
-AC_ARG_WITH(makepkg-template-dir,
-	AS_HELP_STRING([--with-makepkg-template-dir=name], [set the template dir used by makepkg-template]),
-	[TEMPLATE_DIR=$withval], [TEMPLATE_DIR=${datarootdir}/makepkg-template])
-
-# Help line for debug package suffix
-AC_ARG_WITH(debug-suffix,
-	AS_HELP_STRING([--with-debug-suffix=name], [set the suffix for split debugging symbol packages used by makepkg]),
-	[DEBUGSUFFIX=$withval], [DEBUGSUFFIX=debug])
-
-# Help line for changing shell used to run install scriptlets
-AC_ARG_WITH(scriptlet-shell,
-	AS_HELP_STRING([--with-scriptlet-shell=shell],
-		[set the full path to the shell used to run install scriptlets]),
-	[SCRIPTLET_SHELL=$withval], [SCRIPTLET_SHELL=/bin/sh])
-
-# Help line for ldconfig path
-AC_ARG_WITH(ldconfig,
-	AS_HELP_STRING([--with-ldconfig=path],
-		[set the full path to ldconfig]),
-	[LDCONFIG=$withval], [LDCONFIG=/sbin/ldconfig])
-
-# Help line for determining whether file is seccomp-enabled
-AC_ARG_WITH(file-seccomp,
-	AS_HELP_STRING([--with-file-seccomp={yes|no|auto}],
-		[determine whether file is seccomp-enabled @<:@default=auto@:>@]),
-	[with_file_seccomp=$withval], [with_file_seccomp=auto])
-
-# Help line for selecting a crypto library
-AC_ARG_WITH(crypto,
-	AS_HELP_STRING([--with-crypto={openssl|nettle}],
-		[select crypto implementation @<:@default=openssl@:>@]),
-	[with_crypto=$withval], [with_crypto=openssl])
-
-# Help line for using gpgme
-AC_ARG_WITH(gpgme,
-	AS_HELP_STRING([--with-gpgme], [use GPGME for PGP signature verification]),
-	[], [with_gpgme=check])
-
-# Help line for using libcurl
-AC_ARG_WITH(libcurl,
-	AS_HELP_STRING([--with-libcurl], [use libcurl for the internal downloader]),
-	[], [with_libcurl=check])
-
-# Help line for documentation
-AC_ARG_ENABLE(doc,
-	AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]),
-	[wantdoc=$enableval], [wantdoc=yes])
-
-# Help line for doxygen
-AC_ARG_ENABLE(doxygen,
-	AS_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]),
-	[wantdoxygen=$enableval], [wantdoxygen=no])
-
-# Help line for debug
-AC_ARG_ENABLE(debug,
-	AS_HELP_STRING([--enable-debug], [enable debugging support]),
-	[debug=$enableval], [debug=no])
-
-# Help line for compiler warning flags
-AC_ARG_ENABLE(warningflags,
-	AS_HELP_STRING([--enable-warningflags], [enable extra compiler warning flags]),
-	[warningflags=$enableval], [warningflags=no])
-
-# Help line for using git version in pacman version string
-AC_ARG_ENABLE(git-version,
-	AS_HELP_STRING([--enable-git-version],
-		[enable use of git version in version string if available]),
-	[wantgitver=$enableval], [wantgitver=no])
-
-# Enable large file support if available (must be enabled before
-# testing compilation against gpgme).
-AC_SYS_LARGEFILE
-
-# Record large file flags in pkgconfig file
-if test "$enable_largefile" != no; then
-	if test "$ac_cv_sys_file_offset_bits" != 'no'; then
-		LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-	fi
-fi
-AC_SUBST(LFS_CFLAGS)
-
-
-# Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC_C99
-AC_PROG_INSTALL
-AC_CHECK_PROGS([PYTHON], [python3 python], [false])
-AC_PATH_PROGS([BASH_SHELL], [bash bash4], [false])
-
-# check for perl 5.10.1 (needed by makepkg-template)
-AC_PATH_PROG([PERL],[perl])
-AC_DEFUN([AX_PROG_PERL_VERSION],
-	[AC_CACHE_CHECK([for Perl version $1 or later], [ax_cv_prog_perl_version],
-		[AS_IF(["$PERL" -e 'require v$1;' >/dev/null 2>&1],
-			[ax_cv_prog_perl_version=yes],
-			[ax_cv_prog_perl_version=no])])
-	AS_IF([test x"$ax_cv_prog_perl_version" = xyes], [$2], [$3])])
-AX_PROG_PERL_VERSION([5.10.1], [], [AC_MSG_ERROR([perl is too old])])
-
-AS_IF([test "x$BASH_SHELL" = "xfalse"],
-	AC_MSG_WARN([*** bash >= 4.4.0 is required for pacman scripts]),
-	[bash_version_major=`$BASH_SHELL -c 'echo "${BASH_VERSINFO[[0]]}"'`
-	bash_version_minor=`$BASH_SHELL -c 'echo "${BASH_VERSINFO[[1]]}"'`
-	ok=yes
-	if test "$bash_version_major" -lt 4; then
-		ok=no
-	fi
-	if test "$bash_version_major" -eq 4 && test "$bash_version_minor" -lt 4; then
-		ok=no
-	fi
-	if test "$ok" = "no"; then
-		AC_MSG_ERROR([*** bash >= 4.4.0 is required for pacman scripts])
-	fi
-	unset bash_version_major bash_version_minor ok])
-
-# find installed gettext
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.13.1)
-
-AC_CHECK_LIB([m], [fabs], ,
-	AC_MSG_ERROR([libm is needed to compile pacman!]))
-
-PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
-	bashcompdir="${datarootdir}/bash-completion/completions")
-
-# Check for libarchive
-PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], ,
-	AC_MSG_ERROR([*** libarchive >= 3.0.0 is needed to compile pacman!]))
-
-# Check file for seccomp
-if test "x$with_file_seccomp" = "xauto"; then
-	file_version="$(file --version| sed -n 's/^file-\(.*\)/\1/p')"
-	AX_COMPARE_VERSION([$file_version], [ge], [5.38], [with_file_seccomp=yes])
-fi
-if test "x$with_file_seccomp" = "xyes"; then
-	FILECMD="file -S"
-else
-	FILECMD="file"
-fi
-AC_SUBST(FILECMD)
-
-# Check for OpenSSL
-have_openssl=no
-have_nettle=no
-if test "x$with_crypto" = "xnettle"; then
-	AC_SUBST(pc_crypto, [nettle])
-	PKG_CHECK_MODULES(NETTLE, [nettle],
-		[AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no)
-	if test "x$have_nettle" = xno -a "x$with_crypto" = xnettle; then
-		AC_MSG_ERROR([*** nettle support requested but libraries not found])
-	fi
-else if test "x$with_crypto" = "xopenssl"; then
-	AC_SUBST(pc_crypto, [libcrypto])
-	PKG_CHECK_MODULES(LIBSSL, [libcrypto],
-		[AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no)
-	if test "x$have_openssl" = xno; then
-		AC_MSG_ERROR([*** openssl support requested but libraries not found])
-	fi
-else
-	AC_MSG_ERROR([*** unknown crypto support library requested - $with_crypto])
-fi
-fi
-AM_CONDITIONAL(HAVE_LIBSSL, [test "$have_openssl" = "yes"])
-AM_CONDITIONAL(HAVE_LIBNETTLE, [test "$have_nettle" = "yes"])
-
-# Check for libcurl
-have_libcurl=no
-if test "x$with_libcurl" != "xno"; then
-	PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.32.0],
-		[AC_DEFINE(HAVE_LIBCURL, 1, [Define if libcurl is available]) have_libcurl=yes], have_libcurl=no)
-	if test "x$have_libcurl" = xno -a "x$with_libcurl" = xyes; then
-		AC_MSG_ERROR([*** libcurl >= 7.32.0 is required for internal downloader support])
-	fi
-fi
-AM_CONDITIONAL(HAVE_LIBCURL, [test "$have_libcurl" = "yes"])
-# used to generate libalpm.pc
-if test "x$have_libcurl" = xyes; then
-	AC_SUBST(pc_libcurl, [libcurl])
-fi
-
-# Check for gpgme
-AC_MSG_CHECKING(whether to link with libgpgme)
-AS_IF([test "x$with_gpgme" != "xno"],
-	[AC_MSG_RESULT([yes])],
-	[AC_MSG_RESULT([no])])
-
-have_gpgme=no
-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])])
-AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$have_gpgme" = "xyes"])
-
-# Checks for header files.
-AC_CHECK_HEADERS([fcntl.h float.h glob.h langinfo.h libintl.h limits.h \
-                  locale.h mntent.h netinet/in.h netinet/tcp.h \
-                  stddef.h string.h sys/ioctl.h \
-                  sys/mnttab.h sys/mount.h \
-                  sys/param.h sys/statvfs.h sys/time.h sys/types.h \
-                  sys/ucred.h syslog.h termios.h wchar.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT64_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_STRUCT_TM
-AC_TYPE_UID_T
-AC_STRUCT_DIRENT_D_TYPE
-PATH_MAX_DEFINED
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_FUNC_GETMNTENT
-AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
-AC_CHECK_FUNCS([dup2 getcwd getmntinfo gettimeofday memmove memset \
-                mkdir realpath regcomp rmdir setenv setlocale strcasecmp \
-                strchr strcspn strdup strerror strndup strnlen strrchr \
-                strsep strstr strtol swprintf tcflush wcwidth uname])
-AC_CHECK_MEMBERS([struct stat.st_blksize],,,[[#include <sys/stat.h>]])
-
-# For the diskspace code
-FS_STATS_TYPE
-AC_CHECK_MEMBERS([struct statvfs.f_flag],,,[[#include <sys/statvfs.h>]])
-AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h>
-                  #include <sys/mount.h>]])
-
-# Check if we can use symbol visibility support in GCC
-GCC_VISIBILITY_CC
-
-# Host-dependant definitions
-DEFAULT_SEDINPLACEFLAGS=" --follow-symlinks -i"
-INODECMD="stat -c '%i %n'"
-STRIP_BINARIES="--strip-all"
-STRIP_SHARED="--strip-unneeded"
-STRIP_STATIC="--strip-debug"
-case "${host_os}" in
-	*bsd*)
-		INODECMD="stat -f '%i %N'"
-		DEFAULT_SEDINPLACEFLAGS=" -i \"\""
-		;;
-	darwin*)
-		host_os_darwin=yes
-		INODECMD="/usr/bin/stat -f '%i %N'"
-		DEFAULT_SEDINPLACEFLAGS=" -i ''"
-		STRIP_BINARIES=""
-		STRIP_SHARED="-S"
-		STRIP_STATIC="-S"
-		;;
-esac
-AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
-AC_PATH_PROGS([SEDPATH], [sed], [sed], [/usr/bin$PATH_SEPARATOR/bin] )
-AC_SUBST(INODECMD)
-AC_SUBST(STRIP_BINARIES)
-AC_SUBST(STRIP_SHARED)
-AC_SUBST(STRIP_STATIC)
-
-# Flags for sed in place
-if test "${SEDINPLACEFLAGS+set}" != "set"; then
-    SEDINPLACEFLAGS="${DEFAULT_SEDINPLACEFLAGS}"
-fi
-AC_ARG_VAR(SEDINPLACEFLAGS, [flags for sed, overriding the default])
-
-# Variables plugged into makepkg.conf
-CARCH="${host%%-*}"
-CHOST="${host}"
-AC_SUBST(CARCH)
-AC_SUBST(CHOST)
-
-# Check for documentation support and status
-AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
-AC_MSG_CHECKING([for building documentation])
-if test "x$wantdoc" = "xyes" ; then
-	if test $ASCIIDOC ; then
-		AC_MSG_RESULT([yes, enabled by configure])
-	else
-		asciidoc="(warning : asciidoc not installed)"
-		AC_MSG_RESULT([yes $asciidoc])
-	fi
-	wantdoc=yes
-else
-	AC_MSG_RESULT([no, disabled by configure])
-	wantdoc=no
-fi
-AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes")
-
-# Check for doxygen support and status
-AC_CHECK_PROGS([DOXYGEN], [doxygen])
-AC_MSG_CHECKING([for doxygen])
-if test "x$wantdoxygen" = "xyes" ; then
-	if test $DOXYGEN ; then
-		AC_MSG_RESULT([yes])
-		usedoxygen=yes
-	else
-		AC_MSG_RESULT([no, doxygen missing])
-		usedoxygen=no
-	fi
-else
-	AC_MSG_RESULT([no, disabled by configure])
-	usedoxygen=no
-fi
-AM_CONDITIONAL(USE_DOXYGEN, test "x$usedoxygen" = "xyes")
-
-# Enable or disable debug code
-AC_MSG_CHECKING(for debug mode request)
-if test "x$debug" = "xyes" ; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([PACMAN_DEBUG], , [Enable debug code])
-	# Check for -fstack-protector availability
-	GCC_STACK_PROTECT_LIB
-	GCC_STACK_PROTECT_CC
-	GCC_STACK_CLASH_PROTECTION
-	GCC_FORTIFY_SOURCE_CC
-	WARNING_CFLAGS="-g -Wall -Werror"
-else
-	AC_MSG_RESULT(no)
-	WARNING_CFLAGS="-Wall"
-fi
-
-# Enable or disable compiler warning flags
-AC_MSG_CHECKING(for excessive compiler warning flags)
-if test "x$warningflags" = "xyes" ; then
-	AC_MSG_RESULT(yes)
-	CFLAGS_ADD([-Wcast-align], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wclobbered], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wempty-body], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wfloat-equal], [WARNING_CFLAGS])
-	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])
-	CFLAGS_ADD([-Wmissing-field-initializers], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wmissing-parameter-type], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wmissing-prototypes], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wold-style-declaration], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Woverride-init], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wpointer-arith], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wredundant-decls], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wshadow], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wsign-compare], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wstrict-aliasing], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wstrict-overflow=5], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wstrict-prototypes], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wtype-limits], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wuninitialized], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wunused-but-set-parameter], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wunused-parameter], [WARNING_CFLAGS])
-	CFLAGS_ADD([-Wwrite-strings], [WARNING_CFLAGS])
-else
-	AC_MSG_RESULT(no)
-fi
-
-# Enable or disable use of git version in pacman version string
-AC_MSG_CHECKING(whether to use git version if available)
-if test "x$wantgitver" = "xyes" ; then
-	AC_CHECK_PROGS([GIT], [git])
-	AC_CHECK_FILE([.git/], hasgitdir=yes)
-	usegitver=$ac_cv_file__git_
-	if test $GIT -a "x$hasgitdir" = "xyes"; then
-		AC_DEFINE([USE_GIT_VERSION], , [Use GIT version in version string])
-	fi
-else
-	AC_MSG_RESULT([no, disabled by configure])
-	usegitver=no
-fi
-AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes")
-
-# Set root directory
-AC_SUBST(ROOTDIR)
-AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [The location of the root operating directory])
-# Set package file extension
-AC_SUBST(PKGEXT)
-AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
-# Set source package file extension
-AC_SUBST(SRCEXT)
-AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman source packages])
-# Set makepkg build script name
-AC_SUBST(BUILDSCRIPT)
-AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg])
-# Set makepkg-template template directory
-AC_SUBST(TEMPLATE_DIR)
-AC_DEFINE_UNQUOTED([TEMPLATE_DIR], "$TEMPLATE_DIR", [The template directory used by makepkg-teplate])
-# Set makepkg split debugging symbol package suffix
-AC_SUBST(DEBUGSUFFIX)
-AC_DEFINE_UNQUOTED([DEBUGSUFFIX], "$DEBUGSUFFIX", [The suffix for debugging symbol packages used by makepkg])
-# Set shell used by install scriptlets
-AC_SUBST(SCRIPTLET_SHELL)
-AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The full path of the shell used to run install scriptlets])
-# Set ldconfig path
-AC_SUBST(LDCONFIG)
-AC_DEFINE_UNQUOTED([LDCONFIG], "$LDCONFIG", [The full path to ldconfig])
-
-
-# Configuration files
-AC_CONFIG_FILES([
-lib/libalpm/Makefile
-lib/libalpm/po/Makefile.in
-lib/libalpm/libalpm.pc
-src/common/Makefile
-src/pacman/Makefile
-src/pacman/po/Makefile.in
-src/util/Makefile
-scripts/Makefile
-scripts/po/Makefile.in
-doc/Makefile
-etc/Makefile
-test/pacman/Makefile
-test/pacman/tests/Makefile
-test/scripts/Makefile
-test/util/Makefile
-Makefile
-])
-AC_OUTPUT
-
-echo "
-${PACKAGE_NAME}:
-
-  Build information:
-    source code location   : ${srcdir}
-    prefix                 : ${prefix}
-    sysconfdir             : $(eval echo ${sysconfdir})
-       conf file           : $(eval echo ${sysconfdir})/pacman.conf
-    localstatedir          : $(eval echo ${localstatedir})
-       database dir        : $(eval echo ${localstatedir})/lib/pacman/
-       cache dir           : $(eval echo ${localstatedir})/cache/pacman/pkg/
-
-    compiler               : ${CC}
-    preprocessor flags     : ${CPPFLAGS}
-    compiler flags         : ${WARNING_CFLAGS} ${CFLAGS}
-    library flags          : ${LIBS} ${LIBSSL_LIBS} ${NETTLE_LIBS} ${LIBARCHIVE_LIBS} ${LIBCURL_LIBS} ${GPGME_LIBS}
-    linker flags           : ${LDFLAGS}
-
-    Architecture           : ${CARCH}
-    Host Type              : ${CHOST}
-    File inode command     : ${INODECMD}
-    In-place sed command   : ${SEDPATH} ${SEDINPLACEFLAGS}
-    File seccomp command   : ${FILECMD}
-
-    libalpm version        : ${LIB_VERSION}
-    libalpm version info   : ${LIB_VERSION_INFO}
-    pacman version         : ${PACKAGE_VERSION}
-    using git version      : ${usegitver}
-
-  Directory and file information:
-    root working directory : ${ROOTDIR}
-    package extension      : ${PKGEXT}
-    source pkg extension   : ${SRCEXT}
-    build script name      : ${BUILDSCRIPT}
-    template directory     : ${TEMPLATE_DIR}
-
-  Compilation options:
-    Use libcurl            : ${have_libcurl}
-    Use GPGME              : ${have_gpgme}
-    Use OpenSSL            : ${have_openssl}
-    Use nettle             : ${have_nettle}
-    Run make in doc/ dir   : ${wantdoc} ${asciidoc}
-    Doxygen support        : ${usedoxygen}
-    debug support          : ${debug}
-    extra warning flags    : ${warningflags}
-    use git version        : ${wantgitver}
-"

doc/BUILDINFO.5.asciidoc

@@ -1,6 +1,3 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
-/////
 BUILDINFO(5)
 ============
 
@@ -21,7 +18,7 @@ value.
 Description
 -----------
 
-This is a description of the contents of version '1' of the
+This is a description of the contents of version '2' of the
 BUILDINFO file format.
 
 *format*::
@@ -53,6 +50,18 @@ BUILDINFO file format.
 *builddir*::
 	The directory where the package was built.
 
+*startdir*::
+	The directory from which makepkg was executed.
+
+*buildtool*::
+	The name of the tool ecosystem used to set up the build environment. Used
+	for defining a spec for reproducible builds, e.g. the source of the
+	linkman:makepkg.conf[5] used.
+
+*buildtoolver*::
+	The full version of the 'buildtool', for example:
+	"$pkgver-$pkgrel-$pkgarch".
+
 *buildenv (array)*::
 	The build environment specified in makepkg.conf.
 

doc/Doxyfile.in

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.2
+# Doxyfile 1.9.3
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -10,6 +10,7 @@ PROJECT_BRIEF          = "Arch Linux Package Manager Library"
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = @OUTPUT_DIRECTORY@
 CREATE_SUBDIRS         = NO
+ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
@@ -31,41 +32,47 @@ STRIP_FROM_PATH        =
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
+JAVADOC_BANNER         = NO
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
+PYTHON_DOCSTRING       = YES
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 4
 ALIASES                =
-TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
 EXTENSION_MAPPING      =
 MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
 AUTOLINK_SUPPORT       = YES
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
 SUBGROUPING            = YES
 INLINE_GROUPED_CLASSES = NO
-INLINE_SIMPLE_STRUCTS  = NO
-TYPEDEF_HIDES_STRUCT   = NO
-SYMBOL_CACHE_SIZE      = 0
+INLINE_SIMPLE_STRUCTS  = YES
+TYPEDEF_HIDES_STRUCT   = YES
 LOOKUP_CACHE_SIZE      = 0
+NUM_PROC_THREADS       = 1
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = NO
+EXTRACT_PRIV_VIRTUAL   = NO
 EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = NO
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
 EXTRACT_ANON_NSPACES   = NO
+RESOLVE_UNNAMED_PARAMS = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -73,7 +80,10 @@ HIDE_IN_BODY_DOCS      = YES
 INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_HEADERFILE        = YES
 SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
@@ -95,26 +105,30 @@ FILE_VERSION_FILTER    =
 LAYOUT_FILE            =
 CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
+WARN_IF_INCOMPLETE_DOC = YES
 WARN_NO_PARAMDOC       = NO
+WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           =
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../lib/libalpm/
+INPUT                  = @INPUT_DIRECTORY@/../lib/libalpm/alpm.h \
+                         @INPUT_DIRECTORY@/../lib/libalpm/alpm_list.h
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = _alpm_* \
+                         __alpm_*
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
@@ -123,8 +137,9 @@ INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
@@ -132,16 +147,16 @@ STRIP_CODE_COMMENTS    = NO
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
 REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = NO
 HTML_OUTPUT            = html
@@ -155,10 +170,12 @@ HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80
 HTML_TIMESTAMP         = YES
+HTML_DYNAMIC_MENUS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_FEEDURL         =
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 DOCSET_PUBLISHER_NAME  = Publisher
@@ -181,36 +198,51 @@ GENERATE_ECLIPSEHELP   = NO
 ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 GENERATE_TREEVIEW      = NO
+FULL_SIDEBAR           = NO
 ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
+OBFUSCATE_EMAILS       = YES
+HTML_FORMULA_FORMAT    = png
 FORMULA_FONTSIZE       = 10
-FORMULA_TRANSPARENT    = YES
+FORMULA_MACROFILE      =
 USE_MATHJAX            = NO
+MATHJAX_VERSION        = MathJax_2
+MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
 SEARCHENGINE           = NO
 SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = letter
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
 LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
-LATEX_SOURCE_CODE      = NO
 LATEX_BIB_STYLE        = plain
+LATEX_TIMESTAMP        = NO
+LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
@@ -219,26 +251,31 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 GENERATE_MAN           = YES
 MAN_OUTPUT             = .
 MAN_EXTENSION          = .3
+MAN_SUBDIR             =
 MAN_LINKS              = NO
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             =
-XML_DTD                =
 XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
@@ -254,7 +291,6 @@ SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = ../..
 INCLUDE_FILE_PATTERNS  = *.h
 PREDEFINED             = HAVE_CONFIG_H= \
-                         SYMHIDDEN= \
                          SYMEXPORT= \
                          HAVE_LIBARCHIVE \
                          HAVE_LIBCURL \
@@ -262,29 +298,28 @@ PREDEFINED             = HAVE_CONFIG_H= \
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
 GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
+EXTERNAL_PAGES         = YES
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-MSCGEN_PATH            =
+DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
 DOT_NUM_THREADS        = 0
-DOT_FONTNAME           = Helvetica
-DOT_FONTSIZE           = 10
 DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
 UML_LIMIT_NUM_FIELDS   = 10
+DOT_UML_DETAILS        = NO
+DOT_WRAP_THRESHOLD     = 17
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
@@ -292,14 +327,18 @@ CALL_GRAPH             = NO
 CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
+DIR_GRAPH_MAX_DEPTH    = 1
 DOT_IMAGE_FORMAT       = png
 INTERACTIVE_SVG        = NO
 DOT_PATH               =
 DOTFILE_DIRS           =
 MSCFILE_DIRS           =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 3
-DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES

doc/Makefile.am

@@ -1,151 +0,0 @@
-# We have to do some funny stuff here with the manpages. In order to ensure
-# a dist tarball doesn't get put out there without manpages, we keep those
-# files listed in EXTRA_DIST no matter what. However, we only add them to
-# man_MANS if --enable-asciidoc and/or --enable-doxygen are used.
-
-MANPAGES = \
-	alpm-hooks.5 \
-	pacman.8 \
-	makepkg.8 \
-	makepkg-template.1 \
-	repo-add.8 \
-	vercmp.8 \
-	pacman-key.8 \
-	PKGBUILD.5 \
-	makepkg.conf.5 \
-	pacman.conf.5 \
-	libalpm.3 \
-	BUILDINFO.5 \
-	pacman-conf.8
-
-DOXYGEN_MANS = $(wildcard man3/*.3)
-
-HTML_MANPAGES = $(addsuffix .html,$(MANPAGES))
-ASCIIDOC_MANPAGES = $(addsuffix .asciidoc,$(MANPAGES))
-
-HTML_OTHER = \
-	index.html \
-	submitting-patches.html \
-	translation-help.html \
-	HACKING.html
-
-HTML_DOCS = \
-	$(HTML_MANPAGES) \
-	$(HTML_OTHER)
-
-EXTRA_DIST = \
-	meson.build \
-	asciidoc.conf \
-	asciidoc-override.css \
-	PKGBUILD-example.txt \
-	footer.asciidoc \
-	index.asciidoc \
-	submitting-patches.asciidoc \
-	translation-help.asciidoc \
-	$(ASCIIDOC_MANPAGES) \
-	$(MANPAGES) \
-	$(DOXYGEN_MANS)
-
-# Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = *.xml $(MANPAGES) $(HTML_DOCS) repo-remove.8 website.tar.gz
-
-# Ensure manpages are fresh when building a dist tarball
-dist-hook:
-	$(MAKE) $(AM_MAKEFLAGS) clean
-	$(MAKE) $(AM_MAKEFLAGS) all
-
-if USE_GIT_VERSION
-GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')
-REAL_PACKAGE_VERSION = $(GIT_VERSION)
-else
-REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
-endif
-
-man_MANS =
-dist_man_MANS = $(MANPAGES)
-
-if USE_DOXYGEN
-man_MANS += $(DOXYGEN_MANS)
-
-all-local: doxygen.in
-
-Doxyfile: Doxyfile.in
-	sed 's,@OUTPUT_DIRECTORY@,./,' Doxyfile.in >Doxyfile
-
-doxygen.in: Doxyfile
-	$(DOXYGEN) $(srcdir)/Doxyfile
-endif
-
-man: $(MANPAGES)
-html: $(HTML_DOCS)
-
-website: website.tar.gz
-
-.PHONY: html website
-
-website.tar.gz: html
-	$(AM_V_GEN)bsdtar czf $@ $(HTML_DOCS) \
-		asciidoc-override.css \
-		-C /etc/asciidoc/stylesheets/ \
-		asciidoc.css \
-		-C /etc/asciidoc/javascripts/ \
-		asciidoc.js \
-		-C /etc/asciidoc/ \
-		images
-
-pkgdatadir = ${datadir}/${PACKAGE}
-
-ASCIIDOC_OPTS = \
-	-f $(srcdir)/asciidoc.conf \
-	-a pacman_version="$(REAL_PACKAGE_VERSION)" \
-	-a pacman_date="`date +%Y-%m-%d`" \
-	-a srcext="$(SRCEXT)" \
-	-a pkgext="$(PKGEXT)" \
-	-a pkgdatadir=$(pkgdatadir) \
-	-a localstatedir=$(localstatedir) \
-	-a sysconfdir=$(sysconfdir) \
-	-a datarootdir=$(datarootdir) \
-	-a rootdir=$(ROOTDIR)
-
-A2X_OPTS = \
-	--no-xmllint \
-	-d manpage \
-	-f manpage \
-	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
-
-# Generate manpages
-%: %.asciidoc asciidoc.conf footer.asciidoc Makefile.am
-	$(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.asciidoc
-
-# Generate HTML pages
-%.html: %.asciidoc asciidoc.conf footer.asciidoc Makefile.am
-	$(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.asciidoc | \
-		sed -e 's/\r$$//' > $@
-
-HACKING.html: ../HACKING
-	$(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - ../HACKING | \
-		sed -e 's/\r$$//' > $@
-
-# Customizations for certain HTML docs
-%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css
-%.8.html: ASCIIDOC_OPTS += -d manpage
-%.5.html: ASCIIDOC_OPTS += -d manpage
-%.3.html: ASCIIDOC_OPTS += -d manpage
-
-# Custom dependency rules
-PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.asciidoc PKGBUILD-example.txt
-
-# Manpages as symlinks
-repo-remove.8: repo-add.8
-	$(RM) repo-remove.8
-	$(LN_S) repo-add.8 repo-remove.8
-
-install-data-hook:
-	cd $(DESTDIR)$(mandir)/man8 && \
-		$(RM) repo-remove.8 && \
-		( $(LN_S) repo-add.8 repo-remove.8 || \
-		ln repo-add.8 repo-remove.8 || \
-		cp repo-add.8 repo-remove.8 )
-
-uninstall-hook:
-	$(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8

doc/PKGBUILD-example.txt

@@ -12,8 +12,8 @@ depends=('glibc')
 makedepends=('ed')
 optdepends=('ed: for "patch -e" functionality')
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-md5sums=('e9ae5393426d3ad783a300a338c09b72'
-         'SKIP')
+sha256sums=('9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb'
+            'SKIP')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"

doc/PKGBUILD.5.asciidoc

@@ -3,7 +3,7 @@ PKGBUILD(5)
 
 Name
 ----
-PKGBUILD - Arch Linux package build description file
+PKGBUILD - Package build description file
 
 
 Synopsis
@@ -84,14 +84,7 @@ systems (see below).
 
 *license (array)*::
 	This field specifies the license(s) that apply to the package.
-	Commonly used licenses can be found in '/usr/share/licenses/common'. If you
-	see the package's license there, simply reference it in the license
-	field (e.g., `license=('GPL')`). If the package provides a license not
-	available in '/usr/share/licenses/common', then you should include it
-	in the package itself and set `license=('custom')` or
-	`license=('custom:LicenseName')`. The license should be placed in
-	'$pkgdir/usr/share/licenses/$pkgname/' when building the package. If
-	multiple licenses are applicable, list all of them:
+	If multiple licenses are applicable, list all of them:
 	`license=('GPL' 'FDL')`.
 
 *install*::
@@ -118,7 +111,7 @@ systems (see below).
 +
 Additional architecture-specific sources can be added by appending an
 underscore and the architecture name e.g., 'source_x86_64=()'. There must be a
-corresponding integrity array with checksums, e.g. 'md5sums_x86_64=()'.
+corresponding integrity array with checksums, e.g. 'cksums_x86_64=()'.
 +
 It is also possible to change the name of the downloaded file, which is helpful
 with weird URLs and for handling multiple source files with the same
@@ -146,17 +139,19 @@ contain whitespace characters.
 	listed here will not be extracted with the rest of the source files. This
 	is useful for packages that use compressed data directly.
 
-*md5sums (array)*::
-	This array contains an MD5 hash for every source file specified in the
+*cksums (array)*::
+	This array contains CRC checksums for every source file specified in the
 	source array (in the same order). makepkg will use this to verify source
 	file integrity during subsequent builds. If 'SKIP' is put in the array
 	in place of a normal hash, the integrity check for that source file will
-	be skipped. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''.
-	If desired, move the md5sums line to an appropriate location.
+	be skipped. To easily generate cksums, run ``makepkg -g >> PKGBUILD''.
+	If desired, move the cksums line to an appropriate location.  Note that
+	checksums generated by "makepkg -g" should be verified using checksum
+	values provided by the software developer.
 
-*sha1sums, sha224sums, sha256sums, sha384sums, sha512sums, b2sums (arrays)*::
+*md5sums, sha1sums, sha224sums, sha256sums, sha384sums, sha512sums, b2sums (arrays)*::
 	Alternative integrity checks that makepkg supports; these all behave
-	similar to the md5sums option described above. To enable use and generation
+	similar to the cksums option described above. To enable use and generation
 	of these checksums, be sure to set up the `INTEGRITY_CHECK` option in
 	linkman:makepkg.conf[5].
 
@@ -185,11 +180,6 @@ contain whitespace characters.
 	than or equal to), `<=` (less than or equal to), `=` (equal to), `>`
 	(greater than), or `<` (less than).
 +
-If the dependency name appears to be a library (ends with .so), makepkg will
-try to find a binary that depends on the library in the built package and
-append the version needed by the binary. Appending the version yourself
-disables automatic detection.
-+
 Additional architecture-specific depends can be added by appending an
 underscore and the architecture name e.g., 'depends_x86_64=()'.
 
@@ -243,10 +233,6 @@ example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' dependency of
 other packages. Provisions involving the `>` and `<` operators are invalid as
 only specific versions of a package may be provided.
 +
-If the provision name appears to be a library (ends with .so), makepkg will
-try to find the library in the built package and append the correct
-version. Appending the version yourself disables automatic detection.
-+
 Additional architecture-specific provides can be added by appending an
 underscore and the architecture name e.g., 'provides_x86_64=()'.
 
@@ -323,6 +309,10 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'.
 		When used in combination with the `strip' option, a separate package
 		containing the debug symbols is created.
 
+	*lto*;;
+		Enable building packages using link time optimization. Adds '-flto'
+		to both CFLAGS and CXXFLAGS.
+
 
 Packaging Functions
 -------------------
@@ -355,7 +345,7 @@ function.
 	is skipped.
 
 *build() Function*::
-	The optional `build()` function is use to compile and/or adjust the source
+	The optional `build()` function is used to compile and/or adjust the source
 	files in preparation to be installed by the `package()` function.
 
 *check() Function*::
@@ -466,11 +456,16 @@ reference with all of the available functions defined.
 Using VCS Sources[[VCS]]
 ------------------------
 Building a developmental version of a package using sources from a version
-control system (VCS) is enabled by specifying the source in the form
-`source=('directory::url#fragment?query')`. Currently makepkg supports the
-Bazaar, Git, Subversion, and Mercurial version control systems. For other
-version control systems, manual cloning of upstream repositories must be done
-in the `prepare()` function.
+control system (VCS) is enabled by specifying the source in the form:
+
+	source=('directory::url#fragment?query')
+
+Currently makepkg supports the Bazaar, Git, Subversion, Fossil and Mercurial
+version control systems. For other version control systems, manual cloning of
+upstream repositories must be done in the `prepare()` function.
+
+Some <<VCS,VCS Sources>> like Git support pinning the checkout by a checksum of
+its content using deterministic export functionality like ``git archive''.
 
 The source URL is divided into four components:
 
@@ -488,13 +483,16 @@ The source URL is divided into four components:
 
 *fragment*::
 	(optional) Allows specifying a revision number or branch for makepkg to checkout
-	from the VCS. For example, to checkout a given revision, the source line would
-	have the format `source=(url#revision=123)`. The available fragments depends on
-	the VCS being used:
+	from the VCS. A fragment has the form `type=value`, for example to checkout a
+	given revision the source line would be `source=(url#revision=123)`. The
+	available types depends on the VCS being used:
 
 	*bzr*;;
 		revision (see `'bzr help revisionspec'` for details)
 
+	*fossil*;;
+		branch, commit, tag
+
 	*git*;;
 		branch, commit, tag
 
@@ -513,8 +511,7 @@ The source URL is divided into four components:
 Example
 -------
 The following is an example PKGBUILD for the 'patch' package. For more
-examples, look through the build files of your distribution's packages. For
-those using Arch Linux, consult the Arch Build System (ABS) tree.
+examples, look through the build files of your distribution's packages.
 
 [source,sh]
 -------------------------------

doc/asciidoc.conf

@@ -50,7 +50,7 @@ ifdef::backend-docbook[]
 template::[header-declarations]
 <refentry>
 <refentryinfo>
-<date>{pacman_date}</date>
+<date>{localdate}</date>
 </refentryinfo>
 <refmeta>
 <refentrytitle>{mantitle}</refentrytitle>

doc/footer.asciidoc

@@ -1,5 +1,5 @@
 
-See the pacman website at https://www.archlinux.org/pacman/[] for current
+See the pacman website at https://archlinux.org/pacman/[] for current
 information on pacman and its related tools.
 
 
@@ -18,16 +18,18 @@ Current maintainers:
 
 * Allan McRae <allan@archlinux.org>
 * Andrew Gregory <andrew.gregory.8@gmail.com>
-* Dan McGee <dan@archlinux.org>
-* Dave Reisner <dreisner@archlinux.org>
+* Eli Schwartz <eschwartz@archlinux.org>
+* Morgan Adamiec <morganamilo@archlinux.org>
 
 Past major contributors:
 
 * Judd Vinet <jvinet@zeroflux.org>
 * Aurelien Foret <aurelien@archlinux.org>
 * Aaron Griffin <aaron@archlinux.org>
+* Dan McGee <dan@archlinux.org>
 * Xavier Chantry <shiningxc@gmail.com>
 * Nagy Gabor <ngaba@bibl.u-szeged.hu>
+* Dave Reisner <dreisner@archlinux.org>
 
 For additional contributors, use `git shortlog -s` on the pacman.git
 repository.

doc/index.asciidoc

@@ -59,11 +59,11 @@ configuration files dealing with pacman.
 Changelog
 ~~~~~~~~~
 For a good idea of what is going on in pacman development, take a look at the
-link:https://git.archlinux.org/pacman.git/[Git summary page] for the
+link:https://gitlab.archlinux.org/pacman/pacman[Git summary page] for the
 project.
 
 See the most recent
-link:https://git.archlinux.org/pacman.git/tree/NEWS[NEWS]
+link:https://gitlab.archlinux.org/pacman/pacman/-/blob/master/NEWS[NEWS]
 file for a not-as-frequently-updated list of changes. However, this should
 contain the biggest changes in a format more concise than the commit log.
 
@@ -77,6 +77,9 @@ Releases
 [frame="topbot",grid="none",options="header,autowidth"]
 !======
 !Version !Date
+!6.0.1  !2021-09-04
+!6.0.0  !2021-05-20
+!6.0.0alpha1 !2020-12-04
 !5.2.1  !2019-11-01
 !5.2.0  !2019-10-21
 !5.1.3  !2019-03-01
@@ -193,11 +196,11 @@ link:https://sources.archlinux.org/other/pacman/[]. To install, download the new
 available source tarball, unpack it in a directory, and run the three magic
 commands:
 
-	$ ./configure
-	$ make
-	# make install
+	$ meson build
+	$ ninja -C build
+	# ninja -C build install
 
-You may wish to read the options presented by `./configure --help` in order to
+You may wish to read the options presented by `meson` in order to
 set appropriate paths and build options that are correct for your system.
 
 Development
@@ -218,12 +221,11 @@ these trees).
 
 The current development tree can be fetched with the following command:
 
-	git clone git://git.archlinux.org/pacman.git pacman
+	git clone https://gitlab.archlinux.org/pacman/pacman.git
 
 which will fetch the full development history into a directory named pacman.
 You can browse the source as well using
-link:https://git.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also
-available for cloning purposes; these URLs are listed at the above page.
+link:https://gitlab.archlinux.org/pacman/pacman/[gitlab].
 
 If you are interested in hacking on pacman, it is highly recommended you join
 the mailing list mentioned above, as well as take a quick glance at our
@@ -235,24 +237,10 @@ you speak a foreign language, you can help by either creating or updating a
 translation file for your native language. Instructions can be found in
 link:translation-help.html[translation-help].
 
-Other Utilities
-~~~~~~~~~~~~~~~
-Although the package manager itself is quite simple, many scripts have been
-developed that help automate building and installing packages. These are used
-extensively in link:https://www.archlinux.org/[Arch Linux]. Most of these utilities
-are available in the Arch Linux projects
-link:https://git.archlinux.org/[code browser].
-
-Utilities available:
-
-* link:https://git.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories
-* link:https://git.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking
-* link:https://git.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python
-
 Bugs
 ----
 If you find bugs (which is quite likely), please email them to the pacman-dev
-mailing last at mailto:pacman-dev@archlinux.org[] with specific information
+mailing last at mailto:pacman-dev@lists.archlinux.org[] with specific information
 such as your command-line, the nature of the bug, and even the package database
 if it helps.
 
@@ -262,7 +250,7 @@ bugs under the Pacman project.
 
 Copyright
 ---------
-pacman is Copyright (C) 2006-2019 Pacman Development Team
-<pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet
+pacman is Copyright (C) 2006-2022 Pacman Development Team
+<pacman-dev@lists.archlinux.org> and Copyright (C) 2002-2006 Judd Vinet
 <jvinet@zeroflux.org> and is licensed through the GNU General Public License,
 version 2 or later.

doc/libalpm.3.asciidoc

@@ -1,37 +0,0 @@
-libalpm(3)
-==========
-
-Name
-----
-libalpm - Arch Linux Package Management (ALPM) library
-
-
-Synopsis
---------
-For ease of access, the libalpm manual has been split up into several sections.
-
-*TODO:* Yes, this man page needs a lot of work. Once we get around to doing
-good Doxygen documentation, it will improve. We promise.
-
-*alpm_databases*:: Database Functions
-*alpm_interface*:: Interface Functions
-*alpm_list*::      List Functions
-*alpm_log*::       Logging Functions
-*alpm_misc*::      Miscellaneous Functions
-*alpm_packages*::  Package Functions
-*alpm_sync*::      Sync Functions
-*alpm_trans*::     Transaction Functions
-
-
-Configuration
--------------
-See linkman:pacman.conf[5] for more details on configuring libalpm using the
-'pacman.conf' file.
-
-
-See Also
---------
-linkman:alpm-hooks[5], linkman:makepkg[8], linkman:pacman[8],
-linkman:pacman.conf[5]
-
-include::footer.asciidoc[]

doc/makepkg-template.1.asciidoc

@@ -85,7 +85,7 @@ Example PKGBUILD
 	license=('PerlArtistic' 'GPL')
 	depends=('perl')
 	source=("http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/Config-Simple-${pkgver}.tar.gz")
-	md5sums=('f014aec54f0a1e2e880d317180fce502')
+	sha256sums=('dd9995706f0f9384a15ccffe116c3b6e22f42ba2e58d8f24ed03c4a0e386edb4')
 	_distname="Config-Simple"
 
 	# template start; name=perl-module; version=1.0;

doc/makepkg.8.asciidoc

@@ -75,7 +75,7 @@ Options
 	For each source file in the source array of PKGBUILD, download the file
 	if required and generate integrity checks. The integrity checks generated
 	are determined by the checks present in the PKGBUILD, falling back to the
-	value of the INTEGRITY_CHECK array in makepkg.conf(5) if these are absent
+	value of the INTEGRITY_CHECK array in makepkg.conf(5) if these are absent.
 	This output can be redirected into your PKGBUILD for source validation
 	using "`makepkg -g >> PKGBUILD`".
 
@@ -146,6 +146,9 @@ Options
 *-C, \--cleanbuild*::
 	Remove the $srcdir before building the package.
 
+*-D* <dir>, *\--dir* <dir> ::
+	Change to directory <dir> before reading the PKGBUILD or doing anything else.
+	
 *\--allsource*::
 	Do not actually build the package, but build a source-only tarball that
 	includes all sources, including those that are normally downloaded via
@@ -274,11 +277,23 @@ Environment Variables
 
 **GPGKEY=**"keyid"::
 	Specify a key to use when signing packages, overriding the GPGKEY setting
-	in linkman:makepkg.conf[5]
+	in linkman:makepkg.conf[5].
 
 **SOURCE_DATE_EPOCH=**"<date>"::
 	Used for link:https://reproducible-builds.org/docs/[Reproducible Builds].
 
+**BUILDTOOL=**"<name>"::
+	The name of a tool ecosystem used to set up the build environment. Used for
+	defining a spec for reproducible builds, e.g. the linkman:makepkg.conf[5]
+	used.
+
+**BUILDTOOLVER=**"<version>"::
+	The version of the '$BUILDTOOL' used.
+
+**GITFLAGS**::
+	The options to pass when checking out git sources, replacing the default
+        "--mirror".
+
 Configuration
 -------------
 See linkman:makepkg.conf[5] for more details on configuring makepkg using the
@@ -299,7 +314,7 @@ On exit, makepkg will return one of the following error codes.
 	Error in configuration file.
 
 3::
-	User specified an invalid option
+	User specified an invalid option.
 
 4::
 	Error in user-supplied function in PKGBUILD.

doc/makepkg.conf.5.asciidoc

@@ -81,6 +81,11 @@ Options
 	usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on
 	available linker flags.
 
+**LTOFLAGS=**"ltoflags"::
+	Additional compiler and linker flags appended to `CFLAGS`, `CXXFLAGS`
+	and `LDFLAGS` when building with link time optimization. If empty,
+	``-flto'' is used.
+
 **MAKEFLAGS=**"makeflags"::
 	This is often used to set the number of jobs used; for example, `-j2`.
 	Other flags that make accepts can also be passed.
@@ -189,10 +194,20 @@ Options
 		DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate
 		package containing the debug symbols when used with `strip'.
 
+	*lto*;;
+		Enable building packages using link time optimization. Adds the
+		flags specified in LTOFLAGS to CFLAGS, CXXFLAGS and LDFLAGS (or
+		``-flto'' if LTOFLAGS is empty).
+
+	*autodeps*;;
+		Enable the automatic addition of libraries to the depends and
+		provides arrays. Search library directories are controlled by
+		the LIB_DIRS variable defined below.
+
 **INTEGRITY_CHECK=(**check1 ...**)**::
 	File integrity checks to use. Multiple checks may be specified; this
 	affects both generation and checking. The current valid options are:
-	`md5`, `sha1`, `sha224`, `sha256`, `sha384`, `sha512`, and `b2`.
+	`ck`, `md5`, `sha1`, `sha224`, `sha256`, `sha384`, `sha512`, and `b2`.
 
 **STRIP_BINARIES=**"--strip-all"::
 	Options to be used when stripping binaries. See linkman:strip[1]
@@ -219,6 +234,12 @@ Options
 	that are located in opt/, you may need to add the directory to this
 	array. *NOTE:* Do not add the leading slash to the directory name.
 
+**LIB_DIRS=(**lib:usr/lib ...**)**::
+	If `autodeps` is specified in the `OPTIONS` array, this variable will
+	instruct makepkg where to look to find libraries to add to the `provides`
+	array. The format is "prefix:path", where provides will be added for
+	libraries found in "path" with the specified prefix added.
+
 **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**::
 	If `purge` is specified in the `OPTIONS` array, this variable will
 	instruct makepkg which files to remove from the package. This is
@@ -270,9 +291,18 @@ Options
 
 **PKGEXT=**"{pkgext}", **SRCEXT=**"{srcext}"::
 	Sets the compression used when making compiled or source packages.
-	Valid suffixes are `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.tar.zst`,
-	`.tar.lzo`, `.tar.lrz`, `.tar.lz4`, `.tar.lz` and `.tar.Z`, or
-	simply `.tar` to disable compression entirely.
+	Valid suffixes are `.pkg` or `.src` (for PKGEXT and SRCEXT resepectively)
+	followed by one of `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.tar.zst`, `.tar.lzo`,
+	`.tar.lrz`, `.tar.lz4`, `.tar.lz` and `.tar.Z`, or simply `.tar` to
+	disable compression entirely.
+
+**PACMAN_AUTH=()**::
+	Specify a command prefix for running pacman as root. If unset, makepkg will
+	check for the presence of sudo(8) and su(1) in turn, and try the first one
+	it finds.
+	+
+	If present, `%c` will be replaced with the shell-quoted form of the command
+	to run. Otherwise, the command to run is appended to the auth command.
 
 
 

doc/meson.build

@@ -5,11 +5,12 @@ manpages = [
   { 'name': 'makepkg-template.1' },
   { 'name': 'repo-add.8' },
   { 'name': 'vercmp.8' },
+  { 'name': 'testpkg.8' },
   { 'name': 'pacman-key.8' },
+  { 'name': 'pacman-db-upgrade.8' },
   { 'name': 'PKGBUILD.5', 'extra_depends' : [ 'PKGBUILD-example.txt' ] },
   { 'name': 'makepkg.conf.5' },
   { 'name': 'pacman.conf.5' },
-  { 'name': 'libalpm.3' },
   { 'name': 'BUILDINFO.5' },
   { 'name': 'pacman-conf.8' },
 ]
@@ -26,10 +27,10 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf')
 asciidoc_opts = [
  '-f', asciidoc_conf,
  '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION),
- '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()),
  '-a', 'srcext=@0@'.format(get_option('src-ext')),
  '-a', 'pkgext=@0@'.format(get_option('pkg-ext')),
  '-a', 'pkgdatadir=@0@'.format(PKGDATADIR),
+ '-a', 'keyringdir=@0@'.format(KEYRINGDIR),
  '-a', 'localstatedir=@0@'.format(LOCALSTATEDIR),
  '-a', 'sysconfdir=@0@'.format(SYSCONFDIR),
  '-a', 'datarootdir=@0@'.format(DATAROOTDIR),
@@ -129,9 +130,14 @@ meson.add_install_script(MESON_MAKE_SYMLINK,
                          'repo-add.8',
                          join_paths(MANDIR, 'man8/repo-remove.8'))
 
+meson.add_install_script(MESON_MAKE_SYMLINK,
+                         'alpm-hooks.5',
+                         join_paths(MANDIR, 'man5/pacman-hooks.5'))
+
 doxygen = find_program('doxygen', required : get_option('doxygen'))
 if doxygen.found() and not get_option('doxygen').disabled()
   doxyconf = configuration_data()
+  doxyconf.set('INPUT_DIRECTORY', meson.current_source_dir())
   doxyconf.set('OUTPUT_DIRECTORY', meson.current_build_dir())
   doxyfile = configure_file(
     input : 'Doxyfile.in',

doc/pacman-conf.8.asciidoc

@@ -34,7 +34,7 @@ Options
 *-R, \--rootdir* <path>::
 	Specify an alternate installation root (default is `/`).
 
-*-r, \--repo* <remote>::
+*-r, \--repo* <repository>::
 	Query options for a specific repository.
 
 *-v, \--verbose*::

doc/pacman-db-upgrade.8.asciidoc

@@ -0,0 +1,36 @@
+pacman-db-upgrade(8)
+====================
+
+Name
+----
+pacman-db-upgrade - upgrade the local pacman database to a newer format
+
+Synopsis
+--------
+'pacman-db-upgrade' [options]
+
+Description
+-----------
+'pacman-db-upgrade' is a script that upgrades the local database used
+by linkman:pacman[8] to a newer format.
+
+Options
+--------------
+*-h, \--help*::
+Show the built-in help message and exit.
+*-V, \--version*::
+Show version information and exit.
+*-d, \--dbpath* <path>::
+Set an alternate database location.
+*-r, \--root* <path>::
+Set an alternate installation root.
+*\--config* <path>::
+Set an alternate configuration file.
+*\--nocolor*::
+Remove color from output.
+
+See Also
+--------
+linkman:pacman[8]
+
+include::footer.asciidoc[]

doc/pacman-key.8.asciidoc

@@ -86,7 +86,7 @@ Operations
 
 *\--populate*::
 	Reload the default keys from the (optionally provided) keyrings in
-	+{pkgdatadir}/keyrings+. For more information, see
+	+{keyringdir}+. For more information, see
 	<<PK,Providing a Keyring for Import>> below.
 
 *-u, \--updatedb*::
@@ -129,7 +129,7 @@ A distribution or other repository provided may want to provide a set of
 PGP keys used in the signing of its packages and repository databases that can
 be readily imported into the pacman keyring. This is achieved by providing a
 PGP keyring file `foo.gpg` that contains the keys for the foo keyring in the
-directory +{pkgdatadir}/keyrings+.
+directory +{keyringdir}+.
 
 Optionally, the file `foo-trusted` can be provided containing a list of trusted
 key IDs for that keyring. This is a file in a format compatible with 'gpg

doc/pacman.8.asciidoc

@@ -141,7 +141,7 @@ Options
 	guest system. See '\--sysroot' instead.
 
 *-v, \--verbose*::
-	Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
+	Output paths such as the Root, Conf File, DB Path, Cache Dirs, etc.
 
 *\--arch* <arch>::
 	Specify an alternate architecture.
@@ -212,7 +212,7 @@ Transaction Options (apply to '-S', '-R' and '-U')
 
 *\--assume-installed* <package=version>::
 	Add a virtual package "package" with version "version" to the transaction
-	to satisfy dependencies. This allows to disable specific dependency checks
+	to satisfy dependencies. This allows disabling the specific dependency checks
 	without affecting all dependency checks. To disable all dependency
 	checking, see the '\--nodeps' option.
 
@@ -235,12 +235,22 @@ Transaction Options (apply to '-S', '-R' and '-U')
 
 *\--print-format* <format>::
 	Specify a printf-like format to control the output of the '\--print'
-	operation. The possible attributes are: "%n" for pkgname, "%v" for pkgver,
-	"%l" for location, "%r" for repository, and "%s" for size. Implies '\--print'.
+	operation. The possible attributes are: "%a" for arch, "%b" for
+	builddate, "%d" for description, "%e" for pkgbase, "%f" for filename,
+	"%g" for base64 encoded PGP signature, "%h" for sha256sum, "%m" for
+	md5sum, "%n" for pkgname, "%p" for packager, "%v" for pkgver, "%l" for
+	location, "%r" for repository, "%s" for size, "%C" for checkdepends,
+	"%D" for depends, "%G" for groups, "%H" for conflicts, "%L" for
+	licenses, "%M" for makedepends, "%O" for optional depends, "%P" for
+	provides and "%R" for replaces.
+	Implies '\--print'.
 
 
 Upgrade Options (apply to '-S' and '-U')[[UO]]
 ----------------------------------------------
+*-w, \--downloadonly*::
+	Retrieve all packages from the server, but do not install/upgrade anything.
+
 *\--asdeps*::
 	Install packages non-explicitly; in other words, fake their install reason
 	to be installed as a dependency. This is useful for makepkg and other
@@ -445,15 +455,12 @@ can be useful when the user switches from a testing repository to a stable one.
 Additional targets can also be specified manually, so that '-Su foo' will do a
 system upgrade and install/upgrade the "foo" package in the same operation.
 
-*-w, \--downloadonly*::
-	Retrieve all packages from the server, but do not install/upgrade anything.
-
 *-y, \--refresh*::
-	Download a fresh copy of the master package database from the server(s)
-	defined in linkman:pacman.conf[5]. This should typically be used each time
-	you use	'\--sysupgrade' or '-u'. Passing two '\--refresh' or '-y' flags
-	will force a refresh of all package databases, even if they appear to be
-	up-to-date.
+	Download a fresh copy of the master package databases '(repo.db)' from the
+	server(s) defined in linkman:pacman.conf[5]. This should typically be used
+	each time you use '\--sysupgrade' or '-u'. Passing two '\--refresh' or '-y'
+	flags will force a refresh of all package databases, even if they appear to
+	be up-to-date.
 
 
 Database Options (apply to '-D')[[QO]]
@@ -464,7 +471,7 @@ Database Options (apply to '-D')[[QO]]
 
 *\--asexplicit* <package>::
 	Mark a package as explicitly installed; in other words, set their install
-	reason to be explicitly installed. This is useful it you want to keep a
+	reason to be explicitly installed. This is useful if you want to keep a
 	package installed even when it was initially installed as a dependency
 	of another package.
 
@@ -482,8 +489,8 @@ Database Options (apply to '-D')[[QO]]
 File Options (apply to '-F')[[FO]]
 ----------------------------------
 *-y, --refresh*::
-	Download fresh package databases from the server. Use twice to force a
-	refresh even if databases are up to date.
+	Download fresh package file databases '(repo.files)' from the server.
+	Use twice to force a refresh even if databases are up to date.
 
 *-l, \--list*::
 	List the files owned by the queried package.

doc/pacman.conf.5.asciidoc

@@ -113,15 +113,15 @@ Options
 	general configuration options. Wildcards in the specified paths will get
 	expanded based on linkman:glob[7] rules.
 
-*Architecture =* auto | i686 | x86_64 | ...::
-	If set, pacman will only allow installation of packages of the given
-	architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will
+*Architecture =* auto &| i686 &| x86_64 | ...::
+	If set, pacman will only allow installation of packages with the given
+	architectures (e.g. 'i686', 'x86_64', etc). The special value 'auto' will
 	use the system architecture, provided via ``uname -m''. If unset, no
 	architecture checks are made. *NOTE*: Packages with the special
 	architecture 'any' can always be installed, as they are meant to be
 	architecture independent.
 
-*XferCommand =* /path/to/command %u::
+*XferCommand =* /path/to/command %u [%o]::
 	If set, an external program will be used to download all remote files.
 	All instances of `%u` will be replaced with the download URL. If present,
 	instances of `%o` will be replaced with the local filename, plus a
@@ -186,12 +186,9 @@ Options
 *Color*::
 	Automatically enable colors only when pacman's output is on a tty.
 
-*TotalDownload*::
-	When downloading, display the amount downloaded, download rate, ETA,
-	and completed percentage of the entire download list rather
-	than the percent of each individual download target. The progress
-	bar is still based solely on the current file download.
-	This option won't work if XferCommand is used.
+*NoProgressBar*::
+	Disables progress bars. This is useful for terminals which do
+	not support escape characters.
 
 *CheckSpace*::
 	Performs an approximate check for adequate available disk space before
@@ -205,6 +202,11 @@ 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.
 
+*ParallelDownloads =* ...::
+	Specifies number of concurrent download streams. The value needs to be a
+	positive integer. If this config option is not set then only one download
+	stream is used (i.e. downloads happen sequentially).
+
 
 Repository Sections
 -------------------
@@ -245,8 +247,8 @@ number.
 During parsing, pacman will define the `$repo` variable to the name of the
 current section. This is often utilized in files specified using the 'Include'
 directive so all repositories can use the same mirrorfile. pacman also defines
-the `$arch` variable to the value of `Architecture`, so the same mirrorfile can
-even be used for different architectures.
+the `$arch` variable to the first (or only) value of the `Architecture` option,
+so the same mirrorfile can even be used for different architectures.
 
 *SigLevel =* ...::
 	Set the signature verification level for this repository. For more

doc/repo-add.8.asciidoc

@@ -70,6 +70,8 @@ repo-add Options
 	Remove old package files from the disk when updating their entry in the
 	database.
 
+*\--include-sigs*::
+	Include package PGP signatures in the repository database (if available)
 
 Example
 -------

doc/submitting-patches.asciidoc

@@ -20,7 +20,7 @@ started with GIT if you have not worked with it before.
 
 The pacman code can be fetched using the following command:
 
-	git clone git://git.archlinux.org/pacman.git
+	git clone https://gitlab.archlinux.org/pacman/pacman.git
 
 
 Creating your patch

doc/testpkg.8.asciidoc

@@ -0,0 +1,20 @@
+testpkg(8)
+==========
+
+Name
+----
+testpkg - test a pacman package for validity
+
+Synopsis
+--------
+'testpkg' <package file>
+
+Description
+-----------
+'testpkg' is a script used to make sure that a pacman package is valid.
+
+See Also
+--------
+linkman:pacman[8]
+
+include::footer.asciidoc[]

doc/translation-help.asciidoc

@@ -55,7 +55,7 @@ Pre-release Updates
 ~~~~~~~~~~~~~~~~~~~
 
 A week or two before each release, the codebase will go into a string freeze
-and an email will be sent to the mailto:pacman-dev@archlinux.org[pacman-dev]
+and an email will be sent to the mailto:pacman-dev@lists.archlinux.org[pacman-dev]
 mailing list asking for translations. This email will have a prefix of
 *[translation]* for anyone looking to set up an email filter.
 
@@ -78,7 +78,7 @@ Incremental Updates
 If you have more advanced needs you will have to get a copy of the pacman
 repository.
 
-	git clone git://git.archlinux.org/pacman.git pacman
+	git clone https://gitlab.archlinux.org/pacman/pacman.git
 
 Next, you will need to run `./autogen.sh` and `./configure` in the base
 directory to generate the correct Makefiles. At this point, all necessary
@@ -150,4 +150,4 @@ There are currently no efforts underway to include translated manual pages in
 the pacman codebase. However, this is not to say translations are unwelcome. If
 someone has experience with i18n man pages and how to best include them with our
 source, please contact the pacman-dev mailing list at
-mailto:pacman-dev@archlinux.org[].
+mailto:pacman-dev@lists.archlinux.org[].

etc/Makefile.am

@@ -1,27 +0,0 @@
-dist_sysconf_DATA = makepkg.conf pacman.conf
-EXTRA_DIST = makepkg.conf.in pacman.conf.in
-
-# Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = $(dist_sysconf_DATA)
-
-SED_PROCESS = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED) \
-	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-	-e 's|@localstatedir[@]|$(localstatedir)|g' \
-	-e 's|@prefix[@]|$(prefix)|g' \
-	-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
-	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
-	-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
-	-e 's|@SRCEXT[@]|$(SRCEXT)|g' \
-	-e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \
-	-e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \
-	-e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \
-	-e 's|@CARCH[@]|$(CARCH)|g' \
-	-e 's|@CHOST[@]|$(CHOST)|g' \
-	-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
-	-e 's|@ROOTDIR[@]|$(ROOTDIR)|g' \
-	< $< > $@
-
-%.conf: %.conf.in Makefile
-	$(SED_PROCESS)

etc/makepkg.conf.d/rust.conf.in

@@ -0,0 +1,11 @@
+#!/hint/bash
+#
+# @sysconfdir@/makepkg.conf.d/rust.conf
+#
+
+#########################################################################
+# RUST LANGUAGE SUPPORT
+#########################################################################
+#
+#RUSTFLAGS="-C opt-level=2"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"

etc/makepkg.conf.in

@@ -9,10 +9,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -23,7 +23,8 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
+VCSCLIENTS=('bzr::breezy'
+            'fossil::fossil'
             'git::git'
             'hg::mercurial'
             'svn::subversion')
@@ -40,19 +41,18 @@ CHOST="@CHOST@"
 #CFLAGS="-O2 -pipe"
 #CXXFLAGS="-O2 -pipe"
 #LDFLAGS=""
-#RUSTFLAGS="-C opt-level=2"
+#LTOFLAGS="-flto"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 #DEBUG_CFLAGS="-g"
 #DEBUG_CXXFLAGS="-g"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -75,7 +75,8 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
+# Makepkg defaults:
+# OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -86,11 +87,13 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
+#-- lto:        Add compile flags for building with link time optimization
+#-- autodeps:   Automatically add depends/provides
 #
-OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug)
+OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug !lto !autodeps)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
-INTEGRITY_CHECK=(md5)
+#-- File integrity checks to use. Valid: ck, md5, sha1, sha224, sha256, sha384, sha512, b2
+INTEGRITY_CHECK=(ck)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="@STRIP_BINARIES@"
 #-- Options to be used when stripping shared libraries. See `man strip' for details.
@@ -105,6 +108,8 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #-- Directory to store source code in for debug packages
 DBGSRCDIR="/usr/src/debug"
+#-- Prefix and directories for library autodeps
+LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -145,3 +150,10 @@ COMPRESSLZ=(lzip -c -f)
 #
 PKGEXT='@PKGEXT@'
 SRCEXT='@SRCEXT@'
+
+#########################################################################
+# OTHER
+#########################################################################
+#
+#-- Command used to run pacman as root, instead of trying sudo and su
+PACMAN_AUTH=()

etc/pacman.conf.in

@@ -31,9 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
+#NoProgressBar
 CheckSpace
 #VerbosePkgLists
+ParallelDownloads = 5
 
 # PGP signature checking
 #SigLevel = Optional
@@ -73,4 +74,4 @@ CheckSpace
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#Server = file:///home/packages

lib/libalpm/Makefile.am

@@ -1,78 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = po
-
-EXTRA_DIST = meson.build po/meson.build
-
-lib_LTLIBRARIES = libalpm.la
-include_HEADERS = alpm_list.h alpm.h
-
-AM_CPPFLAGS = \
-	-imacros $(top_builddir)/config.h \
-	-DSYSHOOKDIR=\"@datarootdir@/libalpm/hooks/\" \
-	-DLOCALEDIR=\"@localedir@\"
-
-AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS)
-
-if ENABLE_VISIBILITY_CC
-if DARWIN
-AM_CFLAGS += -fvisibility=hidden
-else
-AM_CFLAGS += -fvisibility=internal
-endif
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libalpm.pc
-
-libalpm_la_SOURCES = \
-	add.h add.c \
-	alpm.h alpm.c \
-	alpm_list.h alpm_list.c \
-	backup.h backup.c \
-	base64.h base64.c \
-	be_local.c \
-	be_package.c \
-	be_sync.c \
-	conflict.h conflict.c \
-	db.h db.c \
-	deps.h deps.c \
-	diskspace.h diskspace.c \
-	dload.h dload.c \
-	error.c \
-	filelist.h filelist.c \
-	graph.h graph.c \
-	group.h group.c \
-	handle.h handle.c \
-	hook.h hook.c \
-	ini.h ini.c \
-	libarchive-compat.h \
-	log.h log.c \
-	package.h package.c \
-	pkghash.h pkghash.c \
-	rawstr.c \
-	remove.h remove.c \
-	signing.c signing.h \
-	sync.h sync.c \
-	trans.h trans.c \
-	util.h util.c \
-	util-common.h util-common.c \
-	version.c
-
-libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
-
-libalpm_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GPGME_CFLAGS) \
-	$(LIBARCHIVE_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
-	$(LIBSSL_CFLAGS) \
-	$(NETTLE_CFLAGS)
-
-libalpm_la_LIBADD = \
-	$(LTLIBINTL) \
-	$(GPGME_LIBS) \
-	$(LIBARCHIVE_LIBS) \
-	$(LIBCURL_LIBS) \
-	$(LIBSSL_LIBS) \
-	$(NETTLE_LIBS)

lib/libalpm/add.c

@@ -1,7 +1,7 @@
 /*
  *  add.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,6 @@
 #include "remove.h"
 #include "handle.h"
 
-/** Add a package to the transaction. */
 int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg)
 {
 	const char *pkgname, *pkgver;
@@ -120,6 +119,7 @@ static int perform_extraction(alpm_handle_t *handle, struct archive *archive,
 	                          ARCHIVE_EXTRACT_PERM |
 	                          ARCHIVE_EXTRACT_TIME |
 	                          ARCHIVE_EXTRACT_UNLINK |
+	                          ARCHIVE_EXTRACT_XATTR |
 	                          ARCHIVE_EXTRACT_SECURE_SYMLINKS;
 
 	archive_entry_set_pathname(entry, filename);
@@ -484,8 +484,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 		/* set up fake remove transaction */
 		if(_alpm_remove_single_package(handle, oldpkg, newpkg, 0, 0) == -1) {
 			handle->pm_errno = ALPM_ERR_TRANS_ABORT;
-			ret = -1;
-			goto cleanup;
+			return -1;
 		}
 	}
 
@@ -496,15 +495,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 				"error: could not create database entry %s-%s\n",
 				newpkg->name, newpkg->version);
 		handle->pm_errno = ALPM_ERR_DB_WRITE;
-		ret = -1;
-		goto cleanup;
+		return -1;
 	}
 
 	fd = _alpm_open_archive(db->handle, pkgfile, &buf,
 			&archive, ALPM_ERR_PKG_OPEN);
 	if(fd < 0) {
-		ret = -1;
-		goto cleanup;
+		return -1;
 	}
 
 	/* save the cwd so we can restore it later */
@@ -522,8 +519,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 			close(cwdfd);
 		}
 		close(fd);
-		ret = -1;
-		goto cleanup;
+		return -1;
 	}
 
 	if(trans->flags & ALPM_TRANS_FLAG_DBONLY) {
@@ -607,8 +603,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 				"error: could not update database entry %s-%s\n",
 				newpkg->name, newpkg->version);
 		handle->pm_errno = ALPM_ERR_DB_WRITE;
-		ret = -1;
-		goto cleanup;
+		return -1;
 	}
 
 	if(_alpm_db_add_pkgincache(db, newpkg) == -1) {
@@ -654,7 +649,6 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 	event.type = ALPM_EVENT_PACKAGE_OPERATION_DONE;
 	EVENT(handle, &event);
 
-cleanup:
 	return ret;
 }
 

lib/libalpm/add.h

@@ -1,7 +1,7 @@
 /*
  *  add.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/alpm.c

@@ -1,7 +1,7 @@
 /*
  *  alpm.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -32,19 +32,6 @@
 #include "log.h"
 #include "util.h"
 
-/** \addtogroup alpm_interface Interface Functions
- * @brief Functions to initialize and release libalpm
- * @{
- */
-
-/** Initializes the library.
- * Creates handle, connects to database and creates lockfile.
- * This must be called before any other functions are called.
- * @param root the root path for all filesystem operations
- * @param dbpath the absolute path to the libalpm database
- * @param err an optional variable to hold any error return codes
- * @return a context handle on success, NULL on error, err will be set if provided
- */
 alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
 		alpm_errno_t *err)
 {
@@ -83,6 +70,13 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
 		goto cleanup;
 	}
 
+#ifdef HAVE_LIBCURL
+	curl_global_init(CURL_GLOBAL_ALL);
+	myhandle->curlm = curl_multi_init();
+#endif
+
+	myhandle->parallel_downloads = 1;
+
 #ifdef ENABLE_NLS
 	bindtextdomain("libalpm", LOCALEDIR);
 #endif
@@ -99,14 +93,6 @@ cleanup:
 	return NULL;
 }
 
-/** Release the library.
- * Disconnects from the database, removes handle and lockfile
- * This should be the last alpm call you make.
- * After this returns, handle should be considered invalid and cannot be reused
- * in any way.
- * @param myhandle the context handle
- * @return 0 on success, -1 on error
- */
 int SYMEXPORT alpm_release(alpm_handle_t *myhandle)
 {
 	int ret = 0;
@@ -125,33 +111,23 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle)
 		ret = -1;
 	}
 
+#ifdef HAVE_LIBCURL
+	curl_multi_cleanup(myhandle->curlm);
+	curl_global_cleanup();
+	FREELIST(myhandle->server_errors);
+#endif
+
 	_alpm_handle_unlock(myhandle);
 	_alpm_handle_free(myhandle);
 
-#ifdef HAVE_LIBCURL
-	curl_global_cleanup();
-#endif
-
 	return ret;
 }
 
-/** @} */
-
-/** @defgroup alpm_misc Miscellaneous Functions
- * @brief Various libalpm functions
- */
-
-/** Get the version of library.
- * @return the library version, e.g. "6.0.4"
- * */
 const char SYMEXPORT *alpm_version(void)
 {
 	return LIB_VERSION;
 }
 
-/** Get the capabilities of the library.
- * @return a bitmask of the capabilities
- * */
 int SYMEXPORT alpm_capabilities(void)
 {
 	return 0

lib/libalpm/alpm_list.c

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -30,25 +30,9 @@
 
 /* check exported library symbols with: nm -C -D <lib> */
 #define SYMEXPORT __attribute__((visibility("default")))
-#define SYMHIDDEN __attribute__((visibility("internal")))
-
-/**
- * @addtogroup alpm_list List Functions
- * @brief Functions to manipulate alpm_list_t lists.
- *
- * These functions are designed to create, destroy, and modify lists of
- * type alpm_list_t. This is an internal list type used by libalpm that is
- * publicly exposed for use by frontends if desired.
- *
- * @{ */
 
 /* Allocation */
 
-/**
- * @brief Free a list, but not the contained data.
- *
- * @param list the list to free
- */
 void SYMEXPORT alpm_list_free(alpm_list_t *list)
 {
 	alpm_list_t *it = list;
@@ -60,12 +44,6 @@ void SYMEXPORT alpm_list_free(alpm_list_t *list)
 	}
 }
 
-/**
- * @brief Free the internal data of a list structure.
- *
- * @param list the list to free
- * @param fn   a free function for the internal data
- */
 void SYMEXPORT alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn)
 {
 	alpm_list_t *it = list;
@@ -83,28 +61,12 @@ void SYMEXPORT alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn)
 
 /* Mutators */
 
-/**
- * @brief Add a new item to the end of the list.
- *
- * @param list the list to add to
- * @param data the new item to be added to the list
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data)
 {
 	alpm_list_append(&list, data);
 	return list;
 }
 
-/**
- * @brief Add a new item to the end of the list.
- *
- * @param list the list to add to
- * @param data the new item to be added to the list
- *
- * @return the newly added item
- */
 alpm_list_t SYMEXPORT *alpm_list_append(alpm_list_t **list, void *data)
 {
 	alpm_list_t *ptr;
@@ -131,14 +93,6 @@ alpm_list_t SYMEXPORT *alpm_list_append(alpm_list_t **list, void *data)
 	return ptr;
 }
 
-/**
- * @brief Duplicate and append a string to a list.
- *
- * @param list the list to append to
- * @param data the string to duplicate and append
- *
- * @return the newly added item
- */
 alpm_list_t SYMEXPORT *alpm_list_append_strdup(alpm_list_t **list, const char *data)
 {
 	alpm_list_t *ret;
@@ -151,15 +105,6 @@ alpm_list_t SYMEXPORT *alpm_list_append_strdup(alpm_list_t **list, const char *d
 	}
 }
 
-/**
- * @brief Add items to a list in sorted order.
- *
- * @param list the list to add to
- * @param data the new item to be added to the list
- * @param fn   the comparison function to use to determine order
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn)
 {
 	if(!fn || !list) {
@@ -202,17 +147,6 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_
 	}
 }
 
-/**
- * @brief Join two lists.
- * The two lists must be independent. Do not free the original lists after
- * calling this function, as this is not a copy operation. The list pointers
- * passed in should be considered invalid after calling this function.
- *
- * @param first  the first list
- * @param second the second list
- *
- * @return the resultant joined list
- */
 alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
 {
 	alpm_list_t *tmp;
@@ -235,15 +169,6 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second)
 	return first;
 }
 
-/**
- * @brief Merge the two sorted sublists into one sorted list.
- *
- * @param left  the first list
- * @param right the second list
- * @param fn    comparison function for determining merge order
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right,
 		alpm_list_fn_cmp fn)
 {
@@ -305,15 +230,6 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right,
 	return newlist;
 }
 
-/**
- * @brief Sort a list of size `n` using mergesort algorithm.
- *
- * @param list the list to sort
- * @param n    the size of the list
- * @param fn   the comparison function for determining order
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n,
 		alpm_list_fn_cmp fn)
 {
@@ -339,15 +255,6 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n,
 	return list;
 }
 
-/**
- * @brief Remove an item from the list.
- * item is not freed; this is the responsibility of the caller.
- *
- * @param haystack the list to remove the item from
- * @param item the item to remove from the list
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_remove_item(alpm_list_t *haystack,
 		alpm_list_t *item)
 {
@@ -385,17 +292,6 @@ alpm_list_t SYMEXPORT *alpm_list_remove_item(alpm_list_t *haystack,
 	return haystack;
 }
 
-
-/**
- * @brief Remove an item from the list.
- *
- * @param haystack the list to remove the item from
- * @param needle   the data member of the item we're removing
- * @param fn       the comparison function for searching
- * @param data     output parameter containing data of the removed item
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack,
 		const void *needle, alpm_list_fn_cmp fn, void **data)
 {
@@ -430,15 +326,6 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack,
 	return haystack;
 }
 
-/**
- * @brief Remove a string from a list.
- *
- * @param haystack the list to remove the item from
- * @param needle   the data member of the item we're removing
- * @param data     output parameter containing data of the removed item
- *
- * @return the resultant list
- */
 alpm_list_t SYMEXPORT *alpm_list_remove_str(alpm_list_t *haystack,
 		const char *needle, char **data)
 {
@@ -446,15 +333,6 @@ alpm_list_t SYMEXPORT *alpm_list_remove_str(alpm_list_t *haystack,
 			(alpm_list_fn_cmp)strcmp, (void **)data);
 }
 
-/**
- * @brief Create a new list without any duplicates.
- *
- * This does NOT copy data members.
- *
- * @param list the list to copy
- *
- * @return a new list containing non-duplicate items
- */
 alpm_list_t SYMEXPORT *alpm_list_remove_dupes(const alpm_list_t *list)
 {
 	const alpm_list_t *lp = list;
@@ -471,13 +349,6 @@ alpm_list_t SYMEXPORT *alpm_list_remove_dupes(const alpm_list_t *list)
 	return newlist;
 }
 
-/**
- * @brief Copy a string list, including data.
- *
- * @param list the list to copy
- *
- * @return a copy of the original list
- */
 alpm_list_t SYMEXPORT *alpm_list_strdup(const alpm_list_t *list)
 {
 	const alpm_list_t *lp = list;
@@ -492,13 +363,6 @@ alpm_list_t SYMEXPORT *alpm_list_strdup(const alpm_list_t *list)
 	return newlist;
 }
 
-/**
- * @brief Copy a list, without copying data.
- *
- * @param list the list to copy
- *
- * @return a copy of the original list
- */
 alpm_list_t SYMEXPORT *alpm_list_copy(const alpm_list_t *list)
 {
 	const alpm_list_t *lp = list;
@@ -513,16 +377,6 @@ alpm_list_t SYMEXPORT *alpm_list_copy(const alpm_list_t *list)
 	return newlist;
 }
 
-/**
- * @brief Copy a list and copy the data.
- * Note that the data elements to be copied should not contain pointers
- * and should also be of constant size.
- *
- * @param list the list to copy
- * @param size the size of each data element
- *
- * @return a copy of the original list, data copied as well
- */
 alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list,
 		size_t size)
 {
@@ -546,13 +400,6 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list,
 	return newlist;
 }
 
-/**
- * @brief Create a new list in reverse order.
- *
- * @param list the list to copy
- *
- * @return a new list in reverse order
- */
 alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list)
 {
 	const alpm_list_t *lp;
@@ -580,14 +427,6 @@ alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list)
 
 /* Accessors */
 
-/**
- * @brief Return nth element from list (starting from 0).
- *
- * @param list the list
- * @param n    the index of the item to find (n < alpm_list_count(list) IS needed)
- *
- * @return an alpm_list_t node for index `n`
- */
 alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, size_t n)
 {
 	const alpm_list_t *i = list;
@@ -597,13 +436,6 @@ alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, size_t n)
 	return (alpm_list_t *)i;
 }
 
-/**
- * @brief Get the next element of a list.
- *
- * @param node the list node
- *
- * @return the next element, or NULL when no more elements exist
- */
 inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node)
 {
 	if(node) {
@@ -613,13 +445,6 @@ inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node)
 	}
 }
 
-/**
- * @brief Get the previous element of a list.
- *
- * @param list the list head
- *
- * @return the previous element, or NULL when no previous element exist
- */
 inline alpm_list_t SYMEXPORT *alpm_list_previous(const alpm_list_t *list)
 {
 	if(list && list->prev->next) {
@@ -629,13 +454,6 @@ inline alpm_list_t SYMEXPORT *alpm_list_previous(const alpm_list_t *list)
 	}
 }
 
-/**
- * @brief Get the last item in the list.
- *
- * @param list the list
- *
- * @return the last element in the list
- */
 alpm_list_t SYMEXPORT *alpm_list_last(const alpm_list_t *list)
 {
 	if(list) {
@@ -647,13 +465,6 @@ alpm_list_t SYMEXPORT *alpm_list_last(const alpm_list_t *list)
 
 /* Misc */
 
-/**
- * @brief Get the number of items in a list.
- *
- * @param list the list
- *
- * @return the number of list items
- */
 size_t SYMEXPORT alpm_list_count(const alpm_list_t *list)
 {
 	size_t i = 0;
@@ -665,15 +476,6 @@ size_t SYMEXPORT alpm_list_count(const alpm_list_t *list)
 	return i;
 }
 
-/**
- * @brief Find an item in a list.
- *
- * @param needle   the item to search
- * @param haystack the list
- * @param fn       the comparison function for searching (!= NULL)
- *
- * @return `needle` if found, NULL otherwise
- */
 void SYMEXPORT *alpm_list_find(const alpm_list_t *haystack, const void *needle,
 		alpm_list_fn_cmp fn)
 {
@@ -693,30 +495,12 @@ static int ptr_cmp(const void *p, const void *q)
 	return (p != q);
 }
 
-/**
- * @brief Find an item in a list.
- *
- * Search for the item whose data matches that of the `needle`.
- *
- * @param needle   the data to search for (== comparison)
- * @param haystack the list
- *
- * @return `needle` if found, NULL otherwise
- */
 void SYMEXPORT *alpm_list_find_ptr(const alpm_list_t *haystack,
 		const void *needle)
 {
 	return alpm_list_find(haystack, needle, ptr_cmp);
 }
 
-/**
- * @brief Find a string in a list.
- *
- * @param needle   the string to search for
- * @param haystack the list
- *
- * @return `needle` if found, NULL otherwise
- */
 char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack,
 		const char *needle)
 {
@@ -724,20 +508,6 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack,
 			(alpm_list_fn_cmp)strcmp);
 }
 
-/**
- * @brief Find the differences between list `left` and list `right`
- *
- * The two lists must be sorted. Items only in list `left` are added to the
- * `onlyleft` list. Items only in list `right` are added to the `onlyright`
- * list.
- *
- * @param left      the first list
- * @param right     the second list
- * @param fn        the comparison function
- * @param onlyleft  pointer to the first result list
- * @param onlyright pointer to the second result list
- *
- */
 void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left,
 		const alpm_list_t *right, alpm_list_fn_cmp fn,
 		alpm_list_t **onlyleft, alpm_list_t **onlyright)
@@ -782,15 +552,6 @@ void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left,
 }
 
 
-/**
- * @brief Find the items in list `lhs` that are not present in list `rhs`.
- *
- * @param lhs the first list
- * @param rhs the second list
- * @param fn  the comparison function
- *
- * @return a list containing all items in `lhs` not present in `rhs`
- */
 alpm_list_t SYMEXPORT *alpm_list_diff(const alpm_list_t *lhs,
 		const alpm_list_t *rhs, alpm_list_fn_cmp fn)
 {
@@ -809,17 +570,6 @@ alpm_list_t SYMEXPORT *alpm_list_diff(const alpm_list_t *lhs,
 	return ret;
 }
 
-/**
- * @brief Copy a list and data into a standard C array of fixed length.
- * Note that the data elements are shallow copied so any contained pointers
- * will point to the original data.
- *
- * @param list the list to copy
- * @param n    the size of the list
- * @param size the size of each data element
- *
- * @return an array version of the original list, data copied as well
- */
 void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n,
 		size_t size)
 {
@@ -840,5 +590,3 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n,
 	}
 	return array;
 }
-
-/** @} */

lib/libalpm/alpm_list.h

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+
 #ifndef ALPM_LIST_H
 #define ALPM_LIST_H
 
@@ -31,63 +33,346 @@ extern "C" {
 #endif
 
 /**
- * @brief Linked list type used by libalpm.
+ * @ingroup libalpm
+ * @addtogroup libalpm_list libalpm_list(3)
+ * @brief Functions to manipulate alpm_list_t lists.
+ *
+ * These functions are designed to create, destroy, and modify lists of
+ * type alpm_list_t. This is an internal list type used by libalpm that is
+ * publicly exposed for use by frontends if desired.
  *
  * It is exposed so front ends can use it to prevent the need to reimplement
  * lists of their own; however, it is not required that the front end uses
  * it.
+ * @{
  */
-typedef struct __alpm_list_t {
+
+/** A doubly linked list */
+typedef struct _alpm_list_t {
 	/** data held by the list node */
 	void *data;
 	/** pointer to the previous node */
-	struct __alpm_list_t *prev;
+	struct _alpm_list_t *prev;
 	/** pointer to the next node */
-	struct __alpm_list_t *next;
+	struct _alpm_list_t *next;
 } alpm_list_t;
 
+/** Frees a list and its contents */
 #define FREELIST(p) do { alpm_list_free_inner(p, free); alpm_list_free(p); p = NULL; } while(0)
 
-typedef void (*alpm_list_fn_free)(void *); /* item deallocation callback */
-typedef int (*alpm_list_fn_cmp)(const void *, const void *); /* item comparison callback */
+/** item deallocation callback.
+ * @param item the item to free
+ */
+typedef void (*alpm_list_fn_free)(void * item);
+
+/** item comparison callback */
+typedef int (*alpm_list_fn_cmp)(const void *, const void *);
 
 /* allocation */
+
+/** Free a list, but not the contained data.
+ *
+ * @param list the list to free
+ */
 void alpm_list_free(alpm_list_t *list);
+
+/** Free the internal data of a list structure but not the list itself.
+ *
+ * @param list the list to free
+ * @param fn a free function for the internal data
+ */
 void alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn);
 
 /* item mutators */
+
+/** Add a new item to the end of the list.
+ *
+ * @param list the list to add to
+ * @param data the new item to be added to the list
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_add(alpm_list_t *list, void *data);
+
+/**
+ * @brief Add a new item to the end of the list.
+ *
+ * @param list the list to add to
+ * @param data the new item to be added to the list
+ *
+ * @return the newly added item
+ */
 alpm_list_t *alpm_list_append(alpm_list_t **list, void *data);
+
+/**
+ * @brief Duplicate and append a string to a list.
+ *
+ * @param list the list to append to
+ * @param data the string to duplicate and append
+ *
+ * @return the newly added item
+ */
 alpm_list_t *alpm_list_append_strdup(alpm_list_t **list, const char *data);
+
+/**
+ * @brief Add items to a list in sorted order.
+ *
+ * @param list the list to add to
+ * @param data the new item to be added to the list
+ * @param fn   the comparison function to use to determine order
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn);
+
+/**
+ * @brief Join two lists.
+ * The two lists must be independent. Do not free the original lists after
+ * calling this function, as this is not a copy operation. The list pointers
+ * passed in should be considered invalid after calling this function.
+ *
+ * @param first  the first list
+ * @param second the second list
+ *
+ * @return the resultant joined list
+ */
 alpm_list_t *alpm_list_join(alpm_list_t *first, alpm_list_t *second);
+
+/**
+ * @brief Merge the two sorted sublists into one sorted list.
+ *
+ * @param left  the first list
+ * @param right the second list
+ * @param fn    comparison function for determining merge order
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn);
+
+/**
+ * @brief Sort a list of size `n` using mergesort algorithm.
+ *
+ * @param list the list to sort
+ * @param n    the size of the list
+ * @param fn   the comparison function for determining order
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn);
+
+/**
+ * @brief Remove an item from the list.
+ * item is not freed; this is the responsibility of the caller.
+ *
+ * @param haystack the list to remove the item from
+ * @param item the item to remove from the list
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_remove_item(alpm_list_t *haystack, alpm_list_t *item);
+
+/**
+ * @brief Remove an item from the list.
+ *
+ * @param haystack the list to remove the item from
+ * @param needle   the data member of the item we're removing
+ * @param fn       the comparison function for searching
+ * @param data     output parameter containing data of the removed item
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_remove(alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn, void **data);
+
+/**
+ * @brief Remove a string from a list.
+ *
+ * @param haystack the list to remove the item from
+ * @param needle   the data member of the item we're removing
+ * @param data     output parameter containing data of the removed item
+ *
+ * @return the resultant list
+ */
 alpm_list_t *alpm_list_remove_str(alpm_list_t *haystack, const char *needle, char **data);
+
+/**
+ * @brief Create a new list without any duplicates.
+ *
+ * This does NOT copy data members.
+ *
+ * @param list the list to copy
+ *
+ * @return a new list containing non-duplicate items
+ */
 alpm_list_t *alpm_list_remove_dupes(const alpm_list_t *list);
+
+/**
+ * @brief Copy a string list, including data.
+ *
+ * @param list the list to copy
+ *
+ * @return a copy of the original list
+ */
 alpm_list_t *alpm_list_strdup(const alpm_list_t *list);
+
+/**
+ * @brief Copy a list, without copying data.
+ *
+ * @param list the list to copy
+ *
+ * @return a copy of the original list
+ */
 alpm_list_t *alpm_list_copy(const alpm_list_t *list);
+
+/**
+ * @brief Copy a list and copy the data.
+ * Note that the data elements to be copied should not contain pointers
+ * and should also be of constant size.
+ *
+ * @param list the list to copy
+ * @param size the size of each data element
+ *
+ * @return a copy of the original list, data copied as well
+ */
 alpm_list_t *alpm_list_copy_data(const alpm_list_t *list, size_t size);
+
+/**
+ * @brief Create a new list in reverse order.
+ *
+ * @param list the list to copy
+ *
+ * @return a new list in reverse order
+ */
 alpm_list_t *alpm_list_reverse(alpm_list_t *list);
 
 /* item accessors */
+
+
+/**
+ * @brief Return nth element from list (starting from 0).
+ *
+ * @param list the list
+ * @param n    the index of the item to find (n < alpm_list_count(list) IS needed)
+ *
+ * @return an alpm_list_t node for index `n`
+ */
 alpm_list_t *alpm_list_nth(const alpm_list_t *list, size_t n);
+
+/**
+ * @brief Get the next element of a list.
+ *
+ * @param list the list node
+ *
+ * @return the next element, or NULL when no more elements exist
+ */
 alpm_list_t *alpm_list_next(const alpm_list_t *list);
+
+/**
+ * @brief Get the previous element of a list.
+ *
+ * @param list the list head
+ *
+ * @return the previous element, or NULL when no previous element exist
+ */
 alpm_list_t *alpm_list_previous(const alpm_list_t *list);
+
+/**
+ * @brief Get the last item in the list.
+ *
+ * @param list the list
+ *
+ * @return the last element in the list
+ */
 alpm_list_t *alpm_list_last(const alpm_list_t *list);
 
 /* misc */
+
+/**
+ * @brief Get the number of items in a list.
+ *
+ * @param list the list
+ *
+ * @return the number of list items
+ */
 size_t alpm_list_count(const alpm_list_t *list);
+
+/**
+ * @brief Find an item in a list.
+ *
+ * @param needle   the item to search
+ * @param haystack the list
+ * @param fn       the comparison function for searching (!= NULL)
+ *
+ * @return `needle` if found, NULL otherwise
+ */
 void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn);
+
+/**
+ * @brief Find an item in a list.
+ *
+ * Search for the item whose data matches that of the `needle`.
+ *
+ * @param needle   the data to search for (== comparison)
+ * @param haystack the list
+ *
+ * @return `needle` if found, NULL otherwise
+ */
 void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle);
+
+/**
+ * @brief Find a string in a list.
+ *
+ * @param needle   the string to search for
+ * @param haystack the list
+ *
+ * @return `needle` if found, NULL otherwise
+ */
 char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle);
-alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn);
+
+/**
+ * @brief Find the differences between list `left` and list `right`
+ *
+ * The two lists must be sorted. Items only in list `left` are added to the
+ * `onlyleft` list. Items only in list `right` are added to the `onlyright`
+ * list.
+ *
+ * @param left      the first list
+ * @param right     the second list
+ * @param fn        the comparison function
+ * @param onlyleft  pointer to the first result list
+ * @param onlyright pointer to the second result list
+ *
+ */
 void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right,
 		alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright);
+
+/**
+ * @brief Find the items in list `lhs` that are not present in list `rhs`.
+ *
+ * @param lhs the first list
+ * @param rhs the second list
+ * @param fn  the comparison function
+ *
+ * @return a list containing all items in `lhs` not present in `rhs`
+ */
+
+alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn);
+
+/**
+ * @brief Copy a list and data into a standard C array of fixed length.
+ * Note that the data elements are shallow copied so any contained pointers
+ * will point to the original data.
+ *
+ * @param list the list to copy
+ * @param n    the size of the list
+ * @param size the size of each data element
+ *
+ * @return an array version of the original list, data copied as well
+ */
 void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size);
 
+/* End of alpm_list */
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

lib/libalpm/backup.c

@@ -1,7 +1,7 @@
 /*
  *  backup.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2005 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>

lib/libalpm/backup.h

@@ -1,7 +1,7 @@
 /*
  *  backup.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/be_local.c

@@ -1,7 +1,7 @@
 /*
  *  be_local.c : backend for the local database
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -195,6 +195,12 @@ static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg)
 	return pkg->backup;
 }
 
+static alpm_list_t *_cache_get_xdata(alpm_pkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC);
+	return pkg->xdata;
+}
+
 /**
  * Open a package changelog for reading. Similar to fopen in functionality,
  * except that the returned 'file stream' is from the database.
@@ -256,8 +262,7 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg)
 	}
 
 	if((mtree = archive_read_new()) == NULL) {
-		pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-		goto error;
+		GOTO_ERR(pkg->handle, ALPM_ERR_LIBARCHIVE, error);
 	}
 
 	_alpm_archive_read_support_filter_all(mtree);
@@ -266,9 +271,8 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg)
 	if((r = _alpm_archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) {
 		_alpm_log(pkg->handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"),
 					mtfile, archive_error_string(mtree));
-		pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE;
 		_alpm_archive_read_free(mtree);
-		goto error;
+		GOTO_ERR(pkg->handle, ALPM_ERR_LIBARCHIVE, error);
 	}
 
 	free(mtfile);
@@ -284,12 +288,26 @@ error:
  * @param pkg the package that the mtree file is being read from
  * @param archive the archive structure reading from the mtree file
  * @param entry an archive_entry to store the entry header information
- * @return 0 if end of archive is reached, non-zero otherwise.
+ * @return 0 on success, 1 if end of archive is reached, -1 otherwise.
  */
 static int _cache_mtree_next(const alpm_pkg_t UNUSED *pkg,
 		struct archive *mtree, struct archive_entry **entry)
 {
-	return archive_read_next_header(mtree, entry);
+	int ret;
+	ret = archive_read_next_header(mtree, entry);
+
+	switch(ret) {
+		case ARCHIVE_OK:
+			return 0;
+			break;
+		case ARCHIVE_EOF:
+			return 1;
+			break;
+		default:
+			break;
+	}
+
+	return -1;
 }
 
 /**
@@ -314,7 +332,7 @@ static int _cache_force_load(alpm_pkg_t *pkg)
  * lazy accessor methods that handle any backend loading and caching
  * logic.
  */
-static struct pkg_operations local_pkg_ops = {
+static const struct pkg_operations local_pkg_ops = {
 	.get_base = _cache_get_base,
 	.get_desc = _cache_get_desc,
 	.get_url = _cache_get_url,
@@ -337,6 +355,7 @@ static struct pkg_operations local_pkg_ops = {
 	.get_replaces = _cache_get_replaces,
 	.get_files = _cache_get_files,
 	.get_backup = _cache_get_backup,
+	.get_xdata = _cache_get_xdata,
 
 	.changelog_open = _cache_changelog_open,
 	.changelog_read = _cache_changelog_read,
@@ -680,7 +699,7 @@ char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info,
 static int local_db_read(alpm_pkg_t *info, int inforeq)
 {
 	FILE *fp = NULL;
-	char line[1024];
+	char line[1024] = {0};
 	alpm_db_t *db = info->origin_data.db;
 
 	/* bitmask logic here:
@@ -703,9 +722,6 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
 			"loading package data for %s : level=0x%x\n",
 			info->name, inforeq);
 
-	/* clear out 'line', to be certain - and to make valgrind happy */
-	memset(line, 0, sizeof(line));
-
 	/* DESC */
 	if(inforeq & INFRQ_DESC && !(info->infolevel & INFRQ_DESC)) {
 		char *path = _alpm_local_db_pkgpath(db, info, "desc");
@@ -795,6 +811,18 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
 				READ_AND_SPLITDEP(info->conflicts);
 			} else if(strcmp(line, "%PROVIDES%") == 0) {
 				READ_AND_SPLITDEP(info->provides);
+			} else if(strcmp(line, "%XDATA%") == 0) {
+				alpm_list_t *i, *lines = NULL;
+				READ_AND_STORE_ALL(lines);
+				for(i = lines; i; i = i->next) {
+					alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(i->data);
+					if(pd == NULL || !alpm_list_append(&info->xdata, pd)) {
+						_alpm_pkg_xdata_free(pd);
+						FREELIST(lines);
+						goto error;
+					}
+				}
+				FREELIST(lines);
 			}
 		}
 		fclose(fp);
@@ -832,12 +860,7 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
 				}
 				/* attempt to hand back any memory we don't need */
 				if(files_count > 0) {
-					alpm_file_t *newfiles;
-
-					newfiles = realloc(files, sizeof(alpm_file_t) * files_count);
-					if(newfiles != NULL) {
-						files = newfiles;
-					}
+					REALLOC(files, sizeof(alpm_file_t) * files_count, (void)0);
 				} else {
 					FREE(files);
 				}
@@ -1036,6 +1059,15 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, int inforeq)
 		write_deps(fp, "%CONFLICTS%", info->conflicts);
 		write_deps(fp, "%PROVIDES%", info->provides);
 
+		if(info->xdata) {
+			fputs("%XDATA%\n", fp);
+			for(lp = info->xdata; lp; lp = lp->next) {
+				alpm_pkg_xdata_t *pd = lp->data;
+				fprintf(fp, "%s=%s\n", pd->name, pd->value);
+			}
+			fputc('\n', fp);
+		}
+
 		fclose(fp);
 		fp = NULL;
 	}
@@ -1154,7 +1186,7 @@ int SYMEXPORT alpm_pkg_set_reason(alpm_pkg_t *pkg, alpm_pkgreason_t reason)
 	return 0;
 }
 
-struct db_operations local_db_ops = {
+static const struct db_operations local_db_ops = {
 	.validate         = local_db_validate,
 	.populate         = local_db_populate,
 	.unregister       = _alpm_db_unregister,

lib/libalpm/be_package.c

@@ -1,7 +1,7 @@
 /*
  *  be_package.c : backend for packages
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -134,11 +134,10 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp)
 }
 
 /** Package file operations struct accessor. We implement this as a method
- * rather than a static struct as in be_files because we want to reuse the
- * majority of the default_pkg_ops struct and add only a few operations of
- * our own on top.
+ * because we want to reuse the majority of the default_pkg_ops struct and
+ * add only a few operations of our own on top.
  */
-static struct pkg_operations *get_file_pkg_ops(void)
+static const struct pkg_operations *get_file_pkg_ops(void)
 {
 	static struct pkg_operations file_pkg_ops;
 	static int file_pkg_ops_initialized = 0;
@@ -164,9 +163,8 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t *
 	char *ptr = NULL;
 	char *key = NULL;
 	int ret, linenum = 0;
-	struct archive_read_buffer buf;
+	struct archive_read_buffer buf = {0};
 
-	memset(&buf, 0, sizeof(buf));
 	/* 512K for a line length seems reasonable */
 	buf.max_line_size = 512 * 1024;
 
@@ -202,11 +200,15 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t *
 			} else if(strcmp(key, "pkgdesc") == 0) {
 				STRDUP(newpkg->desc, ptr, return -1);
 			} else if(strcmp(key, "group") == 0) {
-				newpkg->groups = alpm_list_add(newpkg->groups, strdup(ptr));
+				char *tmp = NULL;
+				STRDUP(tmp, ptr, return -1);
+				newpkg->groups = alpm_list_add(newpkg->groups, tmp);
 			} else if(strcmp(key, "url") == 0) {
 				STRDUP(newpkg->url, ptr, return -1);
 			} else if(strcmp(key, "license") == 0) {
-				newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr));
+				char *tmp = NULL;
+				STRDUP(tmp, ptr, return -1);
+				newpkg->licenses = alpm_list_add(newpkg->licenses, tmp);
 			} else if(strcmp(key, "builddate") == 0) {
 				newpkg->builddate = _alpm_parsedate(ptr);
 			} else if(strcmp(key, "packager") == 0) {
@@ -242,10 +244,12 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t *
 				CALLOC(backup, 1, sizeof(alpm_backup_t), return -1);
 				STRDUP(backup->name, ptr, FREE(backup); return -1);
 				newpkg->backup = alpm_list_add(newpkg->backup, backup);
-			} else if(strcmp(key, "force") == 0) {
-				/* deprecated, skip it */
-			} else if(strcmp(key, "makepkgopt") == 0) {
-				/* not used atm */
+			} else if(strcmp(key, "xdata") == 0) {
+				alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(ptr);
+				if(pd == NULL || !alpm_list_append(&newpkg->xdata, pd)) {
+					_alpm_pkg_xdata_free(pd);
+					return -1;
+				}
 			} else {
 				_alpm_log(handle, ALPM_LOG_DEBUG, "%s: unknown key '%s' in description file line %d\n",
 									newpkg->name ? newpkg->name : "error", key, linenum);
@@ -308,7 +312,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle,
 		}
 	}
 
-	if(syncpkg && !has_sig) {
+	if(syncpkg && (!has_sig || !syncpkg->base64_sig)) {
 		if(syncpkg->md5sum && !syncpkg->sha256sum) {
 			_alpm_log(handle, ALPM_LOG_DEBUG, "md5sum: %s\n", syncpkg->md5sum);
 			_alpm_log(handle, ALPM_LOG_DEBUG, "checking md5sum for %s\n", pkgfile);
@@ -448,18 +452,15 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str
 	char *mtree_data = NULL;
 	struct archive *mtree;
 	struct archive_entry *mtree_entry = NULL;
-	alpm_filelist_t filelist;
+	alpm_filelist_t filelist = {0};
 
 	_alpm_log(handle, ALPM_LOG_DEBUG,
 			"found mtree for package %s, getting file list\n", pkg->filename);
 
-	memset(&filelist, 0, sizeof(alpm_filelist_t));
-
 	/* create a new archive to parse the mtree and load it from archive into memory */
 	/* TODO: split this into a function */
 	if((mtree = archive_read_new()) == NULL) {
-		handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-		goto error;
+		GOTO_ERR(handle, ALPM_ERR_LIBARCHIVE, error);
 	}
 
 	_alpm_archive_read_support_filter_all(mtree);
@@ -478,8 +479,7 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str
 		if(size < 0) {
 			_alpm_log(handle, ALPM_LOG_DEBUG, _("error while reading package %s: %s\n"),
 					pkg->filename, archive_error_string(archive));
-			handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-			goto error;
+			GOTO_ERR(handle, ALPM_ERR_LIBARCHIVE, error);
 		}
 		if(size == 0) {
 			break;
@@ -492,8 +492,7 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str
 		_alpm_log(handle, ALPM_LOG_DEBUG,
 				_("error while reading mtree of package %s: %s\n"),
 				pkg->filename, archive_error_string(mtree));
-		handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-		goto error;
+		GOTO_ERR(handle, ALPM_ERR_LIBARCHIVE, error);
 	}
 
 	while((ret = archive_read_next_header(mtree, &mtree_entry)) == ARCHIVE_OK) {
@@ -516,8 +515,7 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str
 	if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occurred */
 		_alpm_log(handle, ALPM_LOG_DEBUG, _("error while reading mtree of package %s: %s\n"),
 				pkg->filename, archive_error_string(mtree));
-		handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-		goto error;
+		GOTO_ERR(handle, ALPM_ERR_LIBARCHIVE, error);
 	}
 
 	/* throw away any files we loaded directly from the archive */
@@ -582,11 +580,9 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 
 	newpkg = _alpm_pkg_new();
 	if(newpkg == NULL) {
-		handle->pm_errno = ALPM_ERR_MEMORY;
-		goto error;
+		GOTO_ERR(handle, ALPM_ERR_MEMORY, error);
 	}
-	STRDUP(newpkg->filename, pkgfile,
-			handle->pm_errno = ALPM_ERR_MEMORY; goto error);
+	STRDUP(newpkg->filename, pkgfile, GOTO_ERR(handle, ALPM_ERR_MEMORY, error));
 	newpkg->size = st.st_size;
 
 	_alpm_log(handle, ALPM_LOG_DEBUG, "starting package load for %s\n", pkgfile);
@@ -636,8 +632,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 		if(archive_read_data_skip(archive)) {
 			_alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"),
 					pkgfile, archive_error_string(archive));
-			handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-			goto error;
+			GOTO_ERR(handle, ALPM_ERR_LIBARCHIVE, error);
 		}
 
 		/* if we are not doing a full read, see if we have all we need */
@@ -649,8 +644,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 	if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occurred */
 		_alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"),
 				pkgfile, archive_error_string(archive));
-		handle->pm_errno = ALPM_ERR_LIBARCHIVE;
-		goto error;
+		GOTO_ERR(handle, ALPM_ERR_LIBARCHIVE, error);
 	}
 
 	if(!config) {
@@ -659,11 +653,10 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 	}
 
 	_alpm_archive_read_free(archive);
-	close(fd);
 
 	/* internal fields for package struct */
 	newpkg->origin = ALPM_PKG_FROM_FILE;
-	newpkg->origin_data.file = strdup(pkgfile);
+	STRDUP(newpkg->origin_data.file, pkgfile, goto error);
 	newpkg->ops = get_file_pkg_ops();
 	newpkg->handle = handle;
 	newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET;
@@ -672,8 +665,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 	if(full) {
 		if(newpkg->files.files) {
 			/* attempt to hand back any memory we don't need */
-			newpkg->files.files = realloc(newpkg->files.files,
-					sizeof(alpm_file_t) * newpkg->files.count);
+			REALLOC(newpkg->files.files, sizeof(alpm_file_t) * newpkg->files.count, (void)0);
 			/* "checking for conflicts" requires a sorted list, ensure that here */
 			_alpm_log(handle, ALPM_LOG_DEBUG,
 					"sorting package filelist for %s\n", pkgfile);
@@ -683,6 +675,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 		newpkg->infolevel |= INFRQ_FILES;
 	}
 
+	close(fd);
 	return newpkg;
 
 pkg_invalid:
@@ -732,7 +725,6 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful
 	int validation = 0;
 	char *sigpath;
 	alpm_pkg_t *pkg_temp;
-	char *packager;
 
 	CHECK_HANDLE(handle, return -1);
 	ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
@@ -758,13 +750,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful
 					char *key = k->data;
 					if(_alpm_key_in_keychain(handle, key) == 0) {
 						pkg_temp = _alpm_pkg_load_internal(handle, filename, full);
-						if(pkg_temp) {
-							packager = pkg_temp->packager;
-
-						} else {
-							packager = NULL;
-						}
-						if(_alpm_key_import(handle, packager, key) == -1) {
+						if(_alpm_key_import(handle, NULL, key) == -1) {
 							fail = 1;
 						}
 						_alpm_pkg_free(pkg_temp);

lib/libalpm/be_sync.c

@@ -1,7 +1,7 @@
 /*
  *  be_sync.c : backend for sync databases
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -136,178 +136,90 @@ valid:
 	return 0;
 }
 
-/** Update a package database
- *
- * An update of the package database \a db will be attempted. Unless
- * \a force is true, the update will only be performed if the remote
- * database was modified since the last update.
- *
- * This operation requires a database lock, and will return an applicable error
- * if the lock could not be obtained.
- *
- * Example:
- * @code
- * alpm_list_t *syncs = alpm_get_syncdbs();
- * for(i = syncs; i; i = alpm_list_next(i)) {
- *     alpm_db_t *db = alpm_list_getdata(i);
- *     result = alpm_db_update(0, db);
- *
- *     if(result < 0) {
- *	       printf("Unable to update database: %s\n", alpm_strerrorlast());
- *     } else if(result == 1) {
- *         printf("Database already up to date\n");
- *     } else {
- *         printf("Database updated\n");
- *     }
- * }
- * @endcode
- *
- * @ingroup alpm_databases
- * @note After a successful update, the \link alpm_db_get_pkgcache()
- * package cache \endlink will be invalidated
- * @param force if true, then forces the update, otherwise update only in case
- * the database isn't up to date
- * @param db pointer to the package database to update
- * @return 0 on success, -1 on error (pm_errno is set accordingly), 1 if up to
- * to date
- */
-int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
-{
+int SYMEXPORT alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force) {
 	char *syncpath;
-	const char *dbext;
+	const char *dbext = handle->dbext;
 	alpm_list_t *i;
-	int updated = 0;
 	int ret = -1;
 	mode_t oldmask;
-	alpm_handle_t *handle;
-	int siglevel;
+	alpm_list_t *payloads = NULL;
+	alpm_event_t event;
 
 	/* Sanity checks */
-	ASSERT(db != NULL, return -1);
-	handle = db->handle;
+	CHECK_HANDLE(handle, return -1);
+	ASSERT(dbs != NULL, return -1);
 	handle->pm_errno = ALPM_ERR_OK;
-	ASSERT(db != handle->db_local, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
-	ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1));
-
-	if(!(db->usage & ALPM_DB_USAGE_SYNC)) {
-		return 0;
-	}
 
 	syncpath = get_sync_dir(handle);
-	if(!syncpath) {
-		return -1;
-	}
-
-	/* force update of invalid databases to fix potential mismatched database/signature */
-	if(db->status & DB_STATUS_INVALID) {
-		force = 1;
-	}
+	ASSERT(syncpath != NULL, return -1);
 
 	/* make sure we have a sane umask */
 	oldmask = umask(0022);
 
-	siglevel = alpm_db_get_siglevel(db);
-
 	/* attempt to grab a lock */
 	if(_alpm_handle_lock(handle)) {
-		free(syncpath);
-		umask(oldmask);
-		RET_ERR(handle, ALPM_ERR_HANDLE_LOCK, -1);
+		GOTO_ERR(handle, ALPM_ERR_HANDLE_LOCK, cleanup);
 	}
 
-	dbext = db->handle->dbext;
-
-	for(i = db->servers; i; i = i->next) {
-		const char *server = i->data, *final_db_url = NULL;
-		struct dload_payload payload;
+	for(i = dbs; i; i = i->next) {
+		alpm_db_t *db = i->data;
+		int dbforce = force;
+		struct dload_payload *payload = NULL;
 		size_t len;
-		int sig_ret = 0;
+		int siglevel;
 
-		memset(&payload, 0, sizeof(struct dload_payload));
+		if(!(db->usage & ALPM_DB_USAGE_SYNC)) {
+			continue;
+		}
 
-		/* set hard upper limit of 25MiB */
-		payload.max_size = 25 * 1024 * 1024;
+		ASSERT(db != handle->db_local, GOTO_ERR(handle, ALPM_ERR_WRONG_ARGS, cleanup));
+		ASSERT(db->servers != NULL, GOTO_ERR(handle, ALPM_ERR_SERVER_NONE, cleanup));
 
+		/* force update of invalid databases to fix potential mismatched database/signature */
+		if(db->status & DB_STATUS_INVALID) {
+			dbforce = 1;
+		}
+
+		siglevel = alpm_db_get_siglevel(db);
+
+		CALLOC(payload, 1, sizeof(*payload), GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup));
+		payload->servers = db->servers;
 		/* print server + filename into a buffer */
-		len = strlen(server) + strlen(db->treename) + strlen(dbext) + 2;
-		MALLOC(payload.fileurl, len,
-			{
-				free(syncpath);
-				umask(oldmask);
-				RET_ERR(handle, ALPM_ERR_MEMORY, -1);
-			}
-		);
-		snprintf(payload.fileurl, len, "%s/%s%s", server, db->treename, dbext);
-		payload.handle = handle;
-		payload.force = force;
-		payload.unlink_on_fail = 1;
-
-		ret = _alpm_download(&payload, syncpath, NULL, &final_db_url);
-		_alpm_dload_payload_reset(&payload);
-		updated = (updated || ret == 0);
-
-		if(ret != -1 && updated && (siglevel & ALPM_SIG_DATABASE)) {
-			/* an existing sig file is no good at this point */
-			char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db));
-			if(!sigpath) {
-				ret = -1;
-				break;
-			}
-			unlink(sigpath);
-			free(sigpath);
-
-
-			/* check if the final URL from internal downloader looks reasonable */
-			if(final_db_url != NULL) {
-				if(strlen(final_db_url) < 3
-						|| strcmp(final_db_url + strlen(final_db_url) - strlen(dbext),
-								dbext) != 0) {
-					final_db_url = NULL;
-				}
-			}
-
-			/* if we downloaded a DB, we want the .sig from the same server */
-			if(final_db_url != NULL) {
-				/* print final_db_url into a buffer (leave space for .sig) */
-				len = strlen(final_db_url) + 5;
-			} else {
-				/* print server + filename into a buffer (leave space for separator and .sig) */
-				len = strlen(server) + strlen(db->treename) + strlen(dbext) + 6;
-			}
-
-			MALLOC(payload.fileurl, len,
-				{
-					free(syncpath);
-					umask(oldmask);
-					RET_ERR(handle, ALPM_ERR_MEMORY, -1);
-				}
-			);
-
-			if(final_db_url != NULL) {
-				snprintf(payload.fileurl, len, "%s.sig", final_db_url);
-			} else {
-				snprintf(payload.fileurl, len, "%s/%s%s.sig", server, db->treename, dbext);
-			}
-
-			payload.handle = handle;
-			payload.force = 1;
-			payload.errors_ok = (siglevel & ALPM_SIG_DATABASE_OPTIONAL);
-
-			/* set hard upper limit of 16KiB */
-			payload.max_size = 16 * 1024;
-
-			sig_ret = _alpm_download(&payload, syncpath, NULL, NULL);
-			/* errors_ok suppresses error messages, but not the return code */
-			sig_ret = payload.errors_ok ? 0 : sig_ret;
-			_alpm_dload_payload_reset(&payload);
-		}
-
-		if(ret != -1 && sig_ret != -1) {
-			break;
-		}
+		len = strlen(db->treename) + strlen(dbext) + 1;
+		MALLOC(payload->filepath, len,
+			FREE(payload); GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup));
+		snprintf(payload->filepath, len, "%s%s", db->treename, dbext);
+		payload->handle = handle;
+		payload->force = dbforce;
+		payload->unlink_on_fail = 1;
+		payload->download_signature = (siglevel & ALPM_SIG_DATABASE);
+		payload->signature_optional = (siglevel & ALPM_SIG_DATABASE_OPTIONAL);
+		/* set hard upper limit of 128 MiB */
+		payload->max_size = 128 * 1024 * 1024;
+		payloads = alpm_list_add(payloads, payload);
+	}
+	if(payloads == NULL) {
+		ret = 0;
+		goto cleanup;
 	}
 
-	if(updated) {
+	event.type = ALPM_EVENT_DB_RETRIEVE_START;
+	EVENT(handle, &event);
+	ret = _alpm_download(handle, payloads, syncpath);
+	if(ret < 0) {
+		event.type = ALPM_EVENT_DB_RETRIEVE_FAILED;
+		EVENT(handle, &event);
+		goto cleanup;
+	}
+	event.type = ALPM_EVENT_DB_RETRIEVE_DONE;
+	EVENT(handle, &event);
+
+	for(i = dbs; i; i = i->next) {
+		alpm_db_t *db = i->data;
+		if(!(db->usage & ALPM_DB_USAGE_SYNC)) {
+			continue;
+		}
+
 		/* Cache needs to be rebuilt */
 		_alpm_db_free_pkgcache(db);
 
@@ -318,21 +230,29 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 		db->status &= ~DB_STATUS_MISSING;
 
 		/* if the download failed skip validation to preserve the download error */
-		if(ret != -1 && sync_db_validate(db) != 0) {
+		if(sync_db_validate(db) != 0) {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "failed to validate db: %s\n",
+					db->treename);
 			/* pm_errno should be set */
 			ret = -1;
 		}
 	}
 
+cleanup:
+	_alpm_handle_unlock(handle);
+
 	if(ret == -1) {
 		/* pm_errno was set by the download code */
-		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
+		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync dbs: %s\n",
 				alpm_strerror(handle->pm_errno));
 	} else {
 		handle->pm_errno = ALPM_ERR_OK;
 	}
 
-	_alpm_handle_unlock(handle);
+	if(payloads) {
+		alpm_list_free_inner(payloads, (alpm_list_fn_free)_alpm_dload_payload_reset);
+		FREELIST(payloads);
+	}
 	free(syncpath);
 	umask(oldmask);
 	return ret;
@@ -365,6 +285,22 @@ static int _sync_get_validation(alpm_pkg_t *pkg)
 	return pkg->validation;
 }
 
+/** Package sync operations struct accessor. We implement this as a method
+ * because we want to reuse the majority of the default_pkg_ops struct and
+ * add only a few operations of our own on top.
+ */
+static const struct pkg_operations *get_sync_pkg_ops(void)
+{
+	static struct pkg_operations sync_pkg_ops;
+	static int sync_pkg_ops_initalized = 0;
+	if(!sync_pkg_ops_initalized) {
+		sync_pkg_ops = default_pkg_ops;
+		sync_pkg_ops.get_validation = _sync_get_validation;
+		sync_pkg_ops_initalized = 1;
+	}
+	return &sync_pkg_ops;
+}
+
 static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname,
 		const char **entry_filename, alpm_pkg_t *likely_pkg)
 {
@@ -405,8 +341,7 @@ static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname,
 
 		pkg->origin = ALPM_PKG_FROM_SYNCDB;
 		pkg->origin_data.db = db;
-		pkg->ops = &default_pkg_ops;
-		pkg->ops->get_validation = _sync_get_validation;
+		pkg->ops = get_sync_pkg_ops();
 		pkg->handle = db->handle;
 
 		/* add to the collection */
@@ -501,9 +436,8 @@ static int sync_db_populate(alpm_db_t *db)
 
 	db->pkgcache = _alpm_pkghash_create(est_count);
 	if(db->pkgcache == NULL) {
-		db->handle->pm_errno = ALPM_ERR_MEMORY;
 		ret = -1;
-		goto cleanup;
+		GOTO_ERR(db->handle, ALPM_ERR_MEMORY, cleanup);
 	}
 
 	while((archive_ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
@@ -522,9 +456,8 @@ static int sync_db_populate(alpm_db_t *db)
 		_alpm_log(db->handle, ALPM_LOG_ERROR, _("could not read db '%s' (%s)\n"),
 				db->treename, archive_error_string(archive));
 		_alpm_db_free_pkgcache(db);
-		db->handle->pm_errno = ALPM_ERR_LIBARCHIVE;
 		ret = -1;
-		goto cleanup;
+		GOTO_ERR(db->handle, ALPM_ERR_LIBARCHIVE, cleanup);
 	}
 
 	count = alpm_list_count(db->pkgcache->list);
@@ -601,7 +534,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 {
 	const char *entryname, *filename;
 	alpm_pkg_t *pkg;
-	struct archive_read_buffer buf;
+	struct archive_read_buffer buf = {0};
 
 	entryname = archive_entry_pathname(entry);
 	if(entryname == NULL) {
@@ -613,7 +546,6 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 	_alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data from archive entry %s\n",
 			entryname);
 
-	memset(&buf, 0, sizeof(buf));
 	/* 512K for a line length seems reasonable */
 	buf.max_line_size = 512 * 1024;
 
@@ -727,13 +659,25 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 				}
 				/* attempt to hand back any memory we don't need */
 				if(files_count > 0) {
-					files = realloc(files, sizeof(alpm_file_t) * files_count);
+					REALLOC(files, sizeof(alpm_file_t) * files_count, (void)0);
 				} else {
 					FREE(files);
 				}
 				pkg->files.count = files_count;
 				pkg->files.files = files;
 				_alpm_filelist_sort(&pkg->files);
+			} else if(strcmp(line, "%DATA%") == 0) {
+				alpm_list_t *i, *lines = NULL;
+				READ_AND_STORE_ALL(lines);
+				for(i = lines; i; i = i->next) {
+					alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(i->data);
+					if(pd == NULL || !alpm_list_append(&pkg->xdata, pd)) {
+						_alpm_pkg_xdata_free(pd);
+						FREELIST(lines);
+						goto error;
+					}
+				}
+				FREELIST(lines);
 			}
 		}
 		if(ret != ARCHIVE_EOF) {

lib/libalpm/conflict.c

@@ -1,7 +1,7 @@
 /*
  *  conflict.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
@@ -50,10 +50,8 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2,
 
 	CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL);
 
-	conflict->package1_hash = pkg1->name_hash;
-	conflict->package2_hash = pkg2->name_hash;
-	STRDUP(conflict->package1, pkg1->name, goto error);
-	STRDUP(conflict->package2, pkg2->name, goto error);
+	ASSERT(_alpm_pkg_dup(pkg1, &conflict->package1) == 0, goto error);
+	ASSERT(_alpm_pkg_dup(pkg2, &conflict->package2) == 0, goto error);
 	conflict->reason = reason;
 
 	return conflict;
@@ -63,14 +61,12 @@ error:
 	return NULL;
 }
 
-/**
- * @brief Free a conflict and its members.
- */
 void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict)
 {
 	ASSERT(conflict != NULL, return);
-	FREE(conflict->package2);
-	FREE(conflict->package1);
+	_alpm_pkg_free(conflict->package1);
+	_alpm_pkg_free(conflict->package2);
+
 	FREE(conflict);
 }
 
@@ -82,10 +78,8 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict)
 	alpm_conflict_t *newconflict;
 	CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL);
 
-	newconflict->package1_hash = conflict->package1_hash;
-	newconflict->package2_hash = conflict->package2_hash;
-	STRDUP(newconflict->package1, conflict->package1, goto error);
-	STRDUP(newconflict->package2, conflict->package2, goto error);
+	ASSERT(_alpm_pkg_dup(conflict->package1, &newconflict->package1) == 0, goto error);
+	ASSERT(_alpm_pkg_dup(conflict->package2, &newconflict->package2) == 0, goto error);
 	newconflict->reason = conflict->reason;
 
 	return newconflict;
@@ -108,10 +102,10 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack)
 	alpm_list_t *i;
 	for(i = haystack; i; i = i->next) {
 		alpm_conflict_t *conflict = i->data;
-		if(needle->package1_hash == conflict->package1_hash
-				&& needle->package2_hash == conflict->package2_hash
-				&& strcmp(needle->package1, conflict->package1) == 0
-				&& strcmp(needle->package2, conflict->package2) == 0) {
+		if(needle->package1->name_hash == conflict->package1->name_hash
+				&& needle->package2->name_hash == conflict->package2->name_hash
+				&& strcmp(needle->package1->name, conflict->package1->name) == 0
+				&& strcmp(needle->package2->name, conflict->package2->name) == 0) {
 			return 1;
 		}
 	}
@@ -243,14 +237,6 @@ alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages)
 	return baddeps;
 }
 
-/**
- * @brief Check the package conflicts in a database
- *
- * @param handle the context handle
- * @param pkglist the list of packages to check
- *
- * @return an alpm_list_t of alpm_conflict_t
- */
 alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_handle_t *handle,
 		alpm_list_t *pkglist)
 {
@@ -300,9 +286,6 @@ error:
 	RET_ERR(handle, ALPM_ERR_MEMORY, conflicts);
 }
 
-/**
- * @brief Frees a conflict and its members.
- */
 void SYMEXPORT alpm_fileconflict_free(alpm_fileconflict_t *conflict)
 {
 	ASSERT(conflict != NULL, return);

lib/libalpm/conflict.h

@@ -1,7 +1,7 @@
 /*
  *  conflict.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/db.c

@@ -1,7 +1,7 @@
 /*
  *  db.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -37,12 +37,6 @@
 #include "package.h"
 #include "group.h"
 
-/** \addtogroup alpm_databases Database Functions
- * @brief Functions to query and manipulate the database of libalpm
- * @{
- */
-
-/** Register a sync database of packages. */
 alpm_db_t SYMEXPORT *alpm_register_syncdb(alpm_handle_t *handle,
 		const char *treename, int siglevel)
 {
@@ -81,7 +75,6 @@ void _alpm_db_unregister(alpm_db_t *db)
 	_alpm_db_free(db);
 }
 
-/** Unregister all package databases. */
 int SYMEXPORT alpm_unregister_all_syncdbs(alpm_handle_t *handle)
 {
 	alpm_list_t *i;
@@ -102,7 +95,6 @@ int SYMEXPORT alpm_unregister_all_syncdbs(alpm_handle_t *handle)
 	return 0;
 }
 
-/** Unregister a package database. */
 int SYMEXPORT alpm_db_unregister(alpm_db_t *db)
 {
 	int found = 0;
@@ -139,19 +131,23 @@ int SYMEXPORT alpm_db_unregister(alpm_db_t *db)
 	return 0;
 }
 
-/** Get the serverlist of a database. */
 alpm_list_t SYMEXPORT *alpm_db_get_servers(const alpm_db_t *db)
 {
 	ASSERT(db != NULL, return NULL);
 	return db->servers;
 }
 
-/** Set the serverlist of a database. */
 int SYMEXPORT alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers)
 {
+	alpm_list_t *i;
 	ASSERT(db != NULL, return -1);
 	FREELIST(db->servers);
-	db->servers = servers;
+	for(i = servers; i; i = i->next) {
+		char *url = i->data;
+		if(alpm_db_add_server(db, url) != 0) {
+			return -1;
+		}
+	}
 	return 0;
 }
 
@@ -168,11 +164,6 @@ static char *sanitize_url(const char *url)
 	return newurl;
 }
 
-/** Add a download server to a database.
- * @param db database pointer
- * @param url url of the server
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
 int SYMEXPORT alpm_db_add_server(alpm_db_t *db, const char *url)
 {
 	char *newurl;
@@ -193,12 +184,6 @@ int SYMEXPORT alpm_db_add_server(alpm_db_t *db, const char *url)
 	return 0;
 }
 
-/** Remove a download server from a database.
- * @param db database pointer
- * @param url url of the server
- * @return 0 on success, 1 on server not present,
- * -1 on error (pm_errno is set accordingly)
- */
 int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url)
 {
 	char *newurl, *vdata = NULL;
@@ -227,14 +212,18 @@ int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url)
 	return ret;
 }
 
-/** Get the name of a package database. */
+alpm_handle_t SYMEXPORT *alpm_db_get_handle(alpm_db_t *db)
+{
+	ASSERT(db != NULL, return NULL);
+	return db->handle;
+}
+
 const char SYMEXPORT *alpm_db_get_name(const alpm_db_t *db)
 {
 	ASSERT(db != NULL, return NULL);
 	return db->treename;
 }
 
-/** Get the signature verification level for a database. */
 int SYMEXPORT alpm_db_get_siglevel(alpm_db_t *db)
 {
 	ASSERT(db != NULL, return -1);
@@ -245,7 +234,6 @@ int SYMEXPORT alpm_db_get_siglevel(alpm_db_t *db)
 	}
 }
 
-/** Check the validity of a database. */
 int SYMEXPORT alpm_db_get_valid(alpm_db_t *db)
 {
 	ASSERT(db != NULL, return -1);
@@ -253,7 +241,6 @@ int SYMEXPORT alpm_db_get_valid(alpm_db_t *db)
 	return db->ops->validate(db);
 }
 
-/** Get a package entry from a package database. */
 alpm_pkg_t SYMEXPORT *alpm_db_get_pkg(alpm_db_t *db, const char *name)
 {
 	alpm_pkg_t *pkg;
@@ -269,7 +256,6 @@ alpm_pkg_t SYMEXPORT *alpm_db_get_pkg(alpm_db_t *db, const char *name)
 	return pkg;
 }
 
-/** Get the package cache of a package database. */
 alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(alpm_db_t *db)
 {
 	ASSERT(db != NULL, return NULL);
@@ -277,7 +263,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(alpm_db_t *db)
 	return _alpm_db_get_pkgcache(db);
 }
 
-/** Get a group entry from a package database. */
 alpm_group_t SYMEXPORT *alpm_db_get_group(alpm_db_t *db, const char *name)
 {
 	ASSERT(db != NULL, return NULL);
@@ -288,7 +273,6 @@ alpm_group_t SYMEXPORT *alpm_db_get_group(alpm_db_t *db, const char *name)
 	return _alpm_db_get_groupfromcache(db, name);
 }
 
-/** Get the group cache of a package database. */
 alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db)
 {
 	ASSERT(db != NULL, return NULL);
@@ -297,16 +281,16 @@ alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db)
 	return _alpm_db_get_groupcache(db);
 }
 
-/** Searches a database. */
-alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
+int SYMEXPORT alpm_db_search(alpm_db_t *db, const alpm_list_t *needles,
+		alpm_list_t **ret)
 {
-	ASSERT(db != NULL, return NULL);
+	ASSERT(db != NULL && ret != NULL && *ret == NULL,
+			RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, -1));
 	db->handle->pm_errno = ALPM_ERR_OK;
 
-	return _alpm_db_search(db, needles);
+	return _alpm_db_search(db, needles, ret);
 }
 
-/** Sets the usage bitmask for a repo */
 int SYMEXPORT alpm_db_set_usage(alpm_db_t *db, int usage)
 {
 	ASSERT(db != NULL, return -1);
@@ -314,7 +298,6 @@ int SYMEXPORT alpm_db_set_usage(alpm_db_t *db, int usage)
 	return 0;
 }
 
-/** Gets the usage bitmask for a repo */
 int SYMEXPORT alpm_db_get_usage(alpm_db_t *db, int *usage)
 {
 	ASSERT(db != NULL, return -1);
@@ -323,9 +306,6 @@ int SYMEXPORT alpm_db_get_usage(alpm_db_t *db, int *usage)
 	return 0;
 }
 
-
-/** @} */
-
 alpm_db_t *_alpm_db_new(const char *treename, int is_local)
 {
 	alpm_db_t *db;
@@ -396,13 +376,13 @@ int _alpm_db_cmp(const void *d1, const void *d2)
 	return strcmp(db1->treename, db2->treename);
 }
 
-alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
+int _alpm_db_search(alpm_db_t *db, const alpm_list_t *needles,
+		alpm_list_t **ret)
 {
 	const alpm_list_t *i, *j, *k;
-	alpm_list_t *ret = NULL;
 
 	if(!(db->usage & ALPM_DB_USAGE_SEARCH)) {
-		return NULL;
+		return 0;
 	}
 
 	/* copy the pkgcache- we will free the list var after each needle */
@@ -415,12 +395,15 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
 		if(i->data == NULL) {
 			continue;
 		}
-		ret = NULL;
+		*ret = NULL;
 		targ = i->data;
 		_alpm_log(db->handle, ALPM_LOG_DEBUG, "searching for target '%s'\n", targ);
 
 		if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) {
-			RET_ERR(db->handle, ALPM_ERR_INVALID_REGEX, NULL);
+			db->handle->pm_errno = ALPM_ERR_INVALID_REGEX;
+			alpm_list_free(list);
+			alpm_list_free(*ret);
+			return -1;
 		}
 
 		for(j = list; j; j = j->next) {
@@ -463,18 +446,18 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
 				_alpm_log(db->handle, ALPM_LOG_DEBUG,
 						"search target '%s' matched '%s' on package '%s'\n",
 						targ, matched, name);
-				ret = alpm_list_add(ret, pkg);
+				*ret = alpm_list_add(*ret, pkg);
 			}
 		}
 
 		/* Free the existing search list, and use the returned list for the
 		 * next needle. This allows for AND-based package searching. */
 		alpm_list_free(list);
-		list = ret;
+		list = *ret;
 		regfree(&reg);
 	}
 
-	return ret;
+	return 0;
 }
 
 /* Returns a new package cache from db.

lib/libalpm/db.h

@@ -1,7 +1,7 @@
 /*
  *  db.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -62,7 +62,7 @@ struct db_operations {
 };
 
 /* Database */
-struct __alpm_db_t {
+struct _alpm_db_t {
 	alpm_handle_t *handle;
 	char *treename;
 	/* do not access directly, use _alpm_db_path(db) for lazy access */
@@ -70,7 +70,7 @@ struct __alpm_db_t {
 	alpm_pkghash_t *pkgcache;
 	alpm_list_t *grpcache;
 	alpm_list_t *servers;
-	struct db_operations *ops;
+	const struct db_operations *ops;
 
 	/* bitfields for validity, local, loaded caches, etc. */
 	/* From _alpm_dbstatus_t */
@@ -87,7 +87,8 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local);
 void _alpm_db_free(alpm_db_t *db);
 const char *_alpm_db_path(alpm_db_t *db);
 int _alpm_db_cmp(const void *d1, const void *d2);
-alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles);
+int _alpm_db_search(alpm_db_t *db, const alpm_list_t *needles,
+		alpm_list_t **ret);
 alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle);
 alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
 		int level);

lib/libalpm/deps.c

@@ -1,7 +1,7 @@
 /*
  *  deps.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -286,12 +286,6 @@ static int no_dep_version(alpm_handle_t *handle)
 	return (handle->trans->flags & ALPM_TRANS_FLAG_NODEPVERSION);
 }
 
-/** Find a package satisfying a specified dependency.
- * The dependency can include versions with depmod operators.
- * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfier will be searched
- * @param depstring package or provision name, versioned or not
- * @return a alpm_pkg_t* satisfying depstring
- */
 alpm_pkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstring)
 {
 	alpm_depend_t *dep = alpm_dep_from_string(depstring);
@@ -303,15 +297,6 @@ alpm_pkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstri
 	return pkg;
 }
 
-/** Checks dependencies and returns missing ones in a list.
- * Dependencies can include versions with depmod operators.
- * @param handle the context handle
- * @param pkglist the list of local packages
- * @param remove an alpm_list_t* of packages to be removed
- * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade)
- * @param reversedeps handles the backward dependencies
- * @return an alpm_list_t* of alpm_depmissing_t pointers.
- */
 alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle,
 		alpm_list_t *pkglist, alpm_list_t *rem, alpm_list_t *upgrade,
 		int reversedeps)
@@ -763,18 +748,6 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep,
 	return NULL;
 }
 
-/** Find a package satisfying a specified dependency.
- * First look for a literal, going through each db one by one. Then look for
- * providers. The first satisfier that belongs to an installed package is
- * returned. If no providers belong to an installed package then an
- * alpm_question_select_provider_t is created to select the provider.
- * The dependency can include versions with depmod operators.
- *
- * @param handle the context handle
- * @param dbs an alpm_list_t* of alpm_db_t where the satisfier will be searched
- * @param depstring package or provision name, versioned or not
- * @return a alpm_pkg_t* satisfying depstring
- */
 alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle,
 		alpm_list_t *dbs, const char *depstring)
 {
@@ -889,11 +862,6 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs,
 	return ret;
 }
 
-/** Reverse of splitdep; make a dep string from a alpm_depend_t struct.
- * The string must be freed!
- * @param dep the depend to turn into a string
- * @return a string-formatted dependency with operator if necessary
- */
 char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep)
 {
 	const char *name, *opr, *ver, *desc_delim, *desc;

lib/libalpm/deps.h

@@ -1,7 +1,7 @@
 /*
  *  deps.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>

lib/libalpm/diskspace.c

@@ -1,7 +1,7 @@
 /*
  *  diskspace.c
  *
- *  Copyright (c) 2010-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2010-2022 Pacman Development Team <pacman-dev@lists.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
@@ -359,7 +359,7 @@ static int check_mountpoint(alpm_handle_t *handle, alpm_mountpoint_t *mp)
 }
 
 int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir,
-		size_t num_files, off_t *file_sizes)
+		size_t num_files, const off_t *file_sizes)
 {
 	alpm_list_t *mount_points;
 	alpm_mountpoint_t *cachedir_mp;

lib/libalpm/diskspace.h

@@ -1,7 +1,7 @@
 /*
  *  diskspace.h
  *
- *  Copyright (c) 2010-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2010-2022 Pacman Development Team <pacman-dev@lists.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
@@ -43,7 +43,7 @@ enum mount_fsinfo {
 	MOUNT_FSINFO_FAIL,
 };
 
-typedef struct __alpm_mountpoint_t {
+typedef struct _alpm_mountpoint_t {
 	/* mount point information */
 	char *mount_dir;
 	size_t mount_dir_len;
@@ -58,6 +58,6 @@ typedef struct __alpm_mountpoint_t {
 
 int _alpm_check_diskspace(alpm_handle_t *handle);
 int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir,
-		size_t num_files, off_t *file_sizes);
+		size_t num_files, const off_t *file_sizes);
 
 #endif /* ALPM_DISKSPACE_H */

lib/libalpm/dload.h

@@ -1,7 +1,7 @@
 /*
  *  dload.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,13 @@ struct dload_payload {
 	char *tempfile_name;
 	char *destfile_name;
 	char *content_disp_name;
+	/* client has to provide either
+	 *  1) fileurl - full URL to the file
+	 *  2) pair of (servers, filepath), in this case ALPM iterates over the
+	 *     server list and tries to download "$server/$filepath"
+	 */
 	char *fileurl;
+	char *filepath; /* download URL path */
 	alpm_list_t *servers;
 	long respcode;
 	off_t initial_size;
@@ -38,19 +44,24 @@ struct dload_payload {
 	off_t prevprogress;
 	int force;
 	int allow_resume;
+	int random_partfile;
 	int errors_ok;
 	int unlink_on_fail;
 	int trust_remote_name;
-	int cb_initialized;
+	int download_signature; /* specifies if an accompanion *.sig file need to be downloaded*/
+	int signature_optional; /* *.sig file is optional */
 #ifdef HAVE_LIBCURL
-	CURLcode curlerr;       /* last error produced by curl */
+	CURL *curl;
+	char error_buffer[CURL_ERROR_SIZE];
+	FILE *localf; /* temp download file */
+	int signature; /* specifies if this payload is for a signature file */
 #endif
 };
 
 void _alpm_dload_payload_reset(struct dload_payload *payload);
-void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload);
 
-int _alpm_download(struct dload_payload *payload, const char *localpath,
-		char **final_file, const char **final_url);
+int _alpm_download(alpm_handle_t *handle,
+		alpm_list_t *payloads /* struct dload_payload */,
+		const char *localpath);
 
 #endif /* ALPM_DLOAD_H */

lib/libalpm/error.c

@@ -1,7 +1,7 @@
 /*
  *  error.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -90,6 +90,8 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err)
 			return _("transaction not initialized");
 		case ALPM_ERR_TRANS_DUP_TARGET:
 			return _("duplicate target");
+		case ALPM_ERR_TRANS_DUP_FILENAME:
+			return _("duplicate filename");
 		case ALPM_ERR_TRANS_NOT_INITIALIZED:
 			return _("transaction not initialized");
 		case ALPM_ERR_TRANS_NOT_PREPARED:
@@ -123,8 +125,6 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err)
 			return _("package filename is not valid");
 		case ALPM_ERR_PKG_INVALID_ARCH:
 			return _("package architecture is not valid");
-		case ALPM_ERR_PKG_REPO_NOT_FOUND:
-			return _("could not find repository for target");
 		/* Signatures */
 		case ALPM_ERR_SIG_MISSING:
 			return _("missing PGP signature");

lib/libalpm/filelist.c

@@ -1,7 +1,7 @@
 /*
  *  filelist.c
  *
- *  Copyright (c) 2012-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2012-2022 Pacman Development Team <pacman-dev@lists.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
@@ -118,7 +118,7 @@ static int _alpm_files_cmp(const void *f1, const void *f2)
 	return strcmp(file1->name, file2->name);
 }
 
-alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist,
+alpm_file_t SYMEXPORT *alpm_filelist_contains(const alpm_filelist_t *filelist,
 		const char *path)
 {
 	alpm_file_t key;

lib/libalpm/filelist.h

@@ -1,7 +1,7 @@
 /*
  *  filelist.h
  *
- *  Copyright (c) 2012-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2012-2022 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/graph.c

@@ -1,7 +1,7 @@
 /*
  *  graph.c - helpful graph structure and setup/teardown methods
  *
- *  Copyright (c) 2007-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2007-2022 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/graph.h

@@ -1,7 +1,7 @@
 /*
  *  graph.h - helpful graph structure and setup/teardown methods
  *
- *  Copyright (c) 2007-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2007-2022 Pacman Development Team <pacman-dev@lists.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
@@ -23,19 +23,19 @@
 
 #include "alpm_list.h"
 
-enum __alpm_graph_vertex_state {
+enum _alpm_graph_vertex_state {
 	ALPM_GRAPH_STATE_UNPROCESSED,
 	ALPM_GRAPH_STATE_PROCESSING,
 	ALPM_GRAPH_STATE_PROCESSED
 };
 
-typedef struct __alpm_graph_t {
+typedef struct _alpm_graph_t {
 	void *data;
-	struct __alpm_graph_t *parent; /* where did we come from? */
+	struct _alpm_graph_t *parent; /* where did we come from? */
 	alpm_list_t *children;
 	alpm_list_t *iterator; /* used for DFS without recursion */
 	off_t weight; /* weight of the node */
-	enum __alpm_graph_vertex_state state;
+	enum _alpm_graph_vertex_state state;
 } alpm_graph_t;
 
 alpm_graph_t *_alpm_graph_new(void);

lib/libalpm/group.c

@@ -1,7 +1,7 @@
 /*
  *  group.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/group.h

@@ -1,7 +1,7 @@
 /*
  *  group.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/handle.c

@@ -1,7 +1,7 @@
 /*
  *  handle.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -64,11 +64,6 @@ void _alpm_handle_free(alpm_handle_t *handle)
 		closelog();
 	}
 
-#ifdef HAVE_LIBCURL
-	/* release curl handle */
-	curl_easy_cleanup(handle->curl);
-#endif
-
 #ifdef HAVE_LIBGPGME
 	FREELIST(handle->known_keys);
 #endif
@@ -82,7 +77,7 @@ void _alpm_handle_free(alpm_handle_t *handle)
 	FREELIST(handle->hookdirs);
 	FREE(handle->logfile);
 	FREE(handle->lockfile);
-	FREE(handle->arch);
+	FREELIST(handle->architectures);
 	FREE(handle->gpgdir);
 	FREELIST(handle->noupgrade);
 	FREELIST(handle->noextract);
@@ -105,7 +100,7 @@ int _alpm_handle_lock(alpm_handle_t *handle)
 	ASSERT(handle->lockfd < 0, return 0);
 
 	/* create the dir of the lockfile first */
-	dir = strdup(handle->lockfile);
+	STRDUP(dir, handle->lockfile, return -1);
 	ptr = strrchr(dir, '/');
 	if(ptr) {
 		*ptr = '\0';
@@ -123,12 +118,6 @@ int _alpm_handle_lock(alpm_handle_t *handle)
 	return (handle->lockfd >= 0 ? 0 : -1);
 }
 
-/** Remove the database lock file
- * @param handle the context handle
- * @return 0 on success, -1 on error
- *
- * @note Safe to call from inside signal handlers.
- */
 int SYMEXPORT alpm_unlock(alpm_handle_t *handle)
 {
 	ASSERT(handle != NULL, return -1);
@@ -173,22 +162,34 @@ alpm_cb_log SYMEXPORT alpm_option_get_logcb(alpm_handle_t *handle)
 	return handle->logcb;
 }
 
+void SYMEXPORT *alpm_option_get_logcb_ctx(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->logcb_ctx;
+}
+
 alpm_cb_download SYMEXPORT alpm_option_get_dlcb(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
 	return handle->dlcb;
 }
 
+void SYMEXPORT *alpm_option_get_dlcb_ctx(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->dlcb_ctx;
+}
+
 alpm_cb_fetch SYMEXPORT alpm_option_get_fetchcb(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
 	return handle->fetchcb;
 }
 
-alpm_cb_totaldl SYMEXPORT alpm_option_get_totaldlcb(alpm_handle_t *handle)
+void SYMEXPORT *alpm_option_get_fetchcb_ctx(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
-	return handle->totaldlcb;
+	return handle->fetchcb_ctx;
 }
 
 alpm_cb_event SYMEXPORT alpm_option_get_eventcb(alpm_handle_t *handle)
@@ -197,18 +198,36 @@ alpm_cb_event SYMEXPORT alpm_option_get_eventcb(alpm_handle_t *handle)
 	return handle->eventcb;
 }
 
+void SYMEXPORT *alpm_option_get_eventcb_ctx(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->eventcb_ctx;
+}
+
 alpm_cb_question SYMEXPORT alpm_option_get_questioncb(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
 	return handle->questioncb;
 }
 
+void SYMEXPORT *alpm_option_get_questioncb_ctx(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->questioncb_ctx;
+}
+
 alpm_cb_progress SYMEXPORT alpm_option_get_progresscb(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
 	return handle->progresscb;
 }
 
+void SYMEXPORT *alpm_option_get_progresscb_ctx(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return NULL);
+	return handle->progresscb_ctx;
+}
+
 const char SYMEXPORT *alpm_option_get_root(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
@@ -293,10 +312,10 @@ alpm_list_t SYMEXPORT *alpm_option_get_assumeinstalled(alpm_handle_t *handle)
 	return handle->assumeinstalled;
 }
 
-const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle)
+alpm_list_t SYMEXPORT *alpm_option_get_architectures(alpm_handle_t *handle)
 {
 	CHECK_HANDLE(handle, return NULL);
-	return handle->arch;
+	return handle->architectures;
 }
 
 int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle)
@@ -311,52 +330,57 @@ const char SYMEXPORT *alpm_option_get_dbext(alpm_handle_t *handle)
 	return handle->dbext;
 }
 
-int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb)
+int SYMEXPORT alpm_option_get_parallel_downloads(alpm_handle_t *handle)
+{
+	CHECK_HANDLE(handle, return -1);
+	return handle->parallel_downloads;
+}
+
+int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb, void *ctx)
 {
 	CHECK_HANDLE(handle, return -1);
 	handle->logcb = cb;
+	handle->logcb_ctx = ctx;
 	return 0;
 }
 
-int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb)
+int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb, void *ctx)
 {
 	CHECK_HANDLE(handle, return -1);
 	handle->dlcb = cb;
+	handle->dlcb_ctx = ctx;
 	return 0;
 }
 
-int SYMEXPORT alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb)
+int SYMEXPORT alpm_option_set_fetchcb(alpm_handle_t *handle, alpm_cb_fetch cb, void *ctx)
 {
 	CHECK_HANDLE(handle, return -1);
 	handle->fetchcb = cb;
+	handle->fetchcb_ctx = ctx;
 	return 0;
 }
 
-int SYMEXPORT alpm_option_set_totaldlcb(alpm_handle_t *handle, alpm_cb_totaldl cb)
-{
-	CHECK_HANDLE(handle, return -1);
-	handle->totaldlcb = cb;
-	return 0;
-}
-
-int SYMEXPORT alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb)
+int SYMEXPORT alpm_option_set_eventcb(alpm_handle_t *handle, alpm_cb_event cb, void *ctx)
 {
 	CHECK_HANDLE(handle, return -1);
 	handle->eventcb = cb;
+	handle->eventcb_ctx = ctx;
 	return 0;
 }
 
-int SYMEXPORT alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb)
+int SYMEXPORT alpm_option_set_questioncb(alpm_handle_t *handle, alpm_cb_question cb, void *ctx)
 {
 	CHECK_HANDLE(handle, return -1);
 	handle->questioncb = cb;
+	handle->questioncb_ctx = ctx;
 	return 0;
 }
 
-int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb)
+int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress cb, void *ctx)
 {
 	CHECK_HANDLE(handle, return -1);
 	handle->progresscb = cb;
+	handle->progresscb_ctx = ctx;
 	return 0;
 }
 
@@ -690,6 +714,7 @@ int SYMEXPORT alpm_option_set_assumeinstalled(alpm_handle_t *handle, alpm_list_t
 	if(handle->assumeinstalled) {
 		alpm_list_free_inner(handle->assumeinstalled, (alpm_list_fn_free)alpm_dep_free);
 		alpm_list_free(handle->assumeinstalled);
+		handle->assumeinstalled = NULL;
 	}
 	while(deps) {
 		if(alpm_option_add_assumeinstalled(handle, deps->data) != 0) {
@@ -737,11 +762,29 @@ int SYMEXPORT alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const al
 	return 0;
 }
 
-int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch)
+int SYMEXPORT alpm_option_add_architecture(alpm_handle_t *handle, const char *arch)
+{
+	handle->architectures = alpm_list_add(handle->architectures, strdup(arch));
+	return 0;
+}
+
+int SYMEXPORT alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches)
 {
 	CHECK_HANDLE(handle, return -1);
-	if(handle->arch) FREE(handle->arch);
-	STRDUP(handle->arch, arch, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+	if(handle->architectures) FREELIST(handle->architectures);
+	handle->architectures = alpm_list_strdup(arches);
+	return 0;
+}
+
+int SYMEXPORT alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch)
+{
+	char *vdata = NULL;
+	CHECK_HANDLE(handle, return -1);
+	handle->architectures = alpm_list_remove_str(handle->architectures, arch, &vdata);
+	if(vdata != NULL) {
+		FREE(vdata);
+		return 1;
+	}
 	return 0;
 }
 
@@ -854,10 +897,15 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle,
 		unsigned short disable_dl_timeout)
 {
 	CHECK_HANDLE(handle, return -1);
-#ifdef HAVE_LIBCURL
 	handle->disable_dl_timeout = disable_dl_timeout;
-#else
-	(void)disable_dl_timeout; /* silence unused variable warnings */
-#endif
+	return 0;
+}
+
+int SYMEXPORT alpm_option_set_parallel_downloads(alpm_handle_t *handle,
+		unsigned int num_streams)
+{
+	CHECK_HANDLE(handle, return -1);
+	ASSERT(num_streams >= 1, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
+	handle->parallel_downloads = num_streams;
 	return 0;
 }

lib/libalpm/handle.h

@@ -1,7 +1,7 @@
 /*
  *  handle.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 
 #include "alpm_list.h"
 #include "alpm.h"
+#include "trans.h"
 
 #ifdef HAVE_LIBCURL
 #include <curl/curl.h>
@@ -34,23 +35,23 @@
 #define EVENT(h, e) \
 do { \
 	if((h)->eventcb) { \
-		(h)->eventcb((alpm_event_t *) (e)); \
+		(h)->eventcb((h)->eventcb_ctx, (alpm_event_t *) (e)); \
 	} \
 } while(0)
 #define QUESTION(h, q) \
 do { \
 	if((h)->questioncb) { \
-		(h)->questioncb((alpm_question_t *) (q)); \
+		(h)->questioncb((h)->questioncb_ctx, (alpm_question_t *) (q)); \
 	} \
 } while(0)
 #define PROGRESS(h, e, p, per, n, r) \
 do { \
 	if((h)->progresscb) { \
-		(h)->progresscb(e, p, per, n, r); \
+		(h)->progresscb((h)->progresscb_ctx, e, p, per, n, r); \
 	} \
 } while(0)
 
-struct __alpm_handle_t {
+struct _alpm_handle_t {
 	/* internal usage */
 	alpm_db_t *db_local;    /* local db pointer */
 	alpm_list_t *dbs_sync;  /* List of (alpm_db_t *) */
@@ -59,22 +60,30 @@ struct __alpm_handle_t {
 
 #ifdef HAVE_LIBCURL
 	/* libcurl handle */
-	CURL *curl;             /* reusable curl_easy handle */
-	unsigned short disable_dl_timeout;
+	CURLM *curlm;
+	alpm_list_t *server_errors;
 #endif
 
+	unsigned short disable_dl_timeout;
+	unsigned int parallel_downloads; /* number of download streams */
+
 #ifdef HAVE_LIBGPGME
 	alpm_list_t *known_keys;  /* keys verified to be in our keychain */
 #endif
 
 	/* callback functions */
 	alpm_cb_log logcb;          /* Log callback function */
+	void *logcb_ctx;
 	alpm_cb_download dlcb;      /* Download callback function */
-	alpm_cb_totaldl totaldlcb;  /* Total download callback function */
+	void *dlcb_ctx;
 	alpm_cb_fetch fetchcb;      /* Download file callback function */
+	void *fetchcb_ctx;
 	alpm_cb_event eventcb;
+	void *eventcb_ctx;
 	alpm_cb_question questioncb;
+	void *questioncb_ctx;
 	alpm_cb_progress progresscb;
+	void *progresscb_ctx;
 
 	/* filesystem paths */
 	char *root;              /* Root path, default '/' */
@@ -94,7 +103,7 @@ struct __alpm_handle_t {
 	alpm_list_t *assumeinstalled;   /* List of virtual packages used to satisfy dependencies */
 
 	/* options */
-	char *arch;              /* Architecture of packages we should allow */
+	alpm_list_t *architectures; /* Architectures of packages we should allow */
 	int usesyslog;           /* Use syslog instead of logfile? */ /* TODO move to frontend */
 	int checkspace;          /* Check disk space before installing */
 	char *dbext;             /* Sync DB extension */

lib/libalpm/hook.c

@@ -1,7 +1,7 @@
 /*
  *  hook.c
  *
- *  Copyright (c) 2015-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2015-2022 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/hook.h

@@ -1,7 +1,7 @@
 /*
  *  hook.h
  *
- *  Copyright (c) 2015-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2015-2022 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/ini.c

@@ -1 +0,0 @@
-../../src/common/ini.c

lib/libalpm/ini.h

@@ -1 +0,0 @@
-../../src/common/ini.h

lib/libalpm/libalpm.pc.in

@@ -5,9 +5,9 @@ includedir=@includedir@
 
 Name: libalpm
 Description: Arch Linux package management library
-URL: http://www.archlinux.org/pacman/
+URL: http://archlinux.org/pacman/
 Version: @LIB_VERSION@
 Requires.private: libarchive @pc_crypto@ @pc_libcurl@ @pc_gpgme@
 Cflags: -I${includedir} @LFS_CFLAGS@
 Libs: -L${libdir} -lalpm
-Libs.private: @LIBS@ @pc_gpgme_libs@
+Libs.private: @LIBS@ @pc_gpgme_libs@ @LIBINTL@

lib/libalpm/libarchive-compat.h

@@ -4,7 +4,7 @@
 /*
  * libarchive-compat.h
  *
- *  Copyright (c) 2013-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2013-2022 Pacman Development Team <pacman-dev@lists.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
@@ -24,48 +24,28 @@
 
 static inline int _alpm_archive_read_free(struct archive *archive)
 {
-#if ARCHIVE_VERSION_NUMBER >= 3000000
 	return archive_read_free(archive);
-#else
-	return archive_read_finish(archive);
-#endif
 }
 
 static inline int64_t _alpm_archive_compressed_ftell(struct archive *archive)
 {
-#if ARCHIVE_VERSION_NUMBER >= 3000000
 	return archive_filter_bytes(archive, -1);
-#else
-	return archive_position_compressed(archive);
-#endif
 }
 
 static inline int _alpm_archive_read_open_file(struct archive *archive,
 		const char *filename, size_t block_size)
 {
-#if ARCHIVE_VERSION_NUMBER >= 3000000
 	return archive_read_open_filename(archive, filename, block_size);
-#else
-	return archive_read_open_file(archive, filename, block_size);
-#endif
 }
 
 static inline int _alpm_archive_filter_code(struct archive *archive)
 {
-#if ARCHIVE_VERSION_NUMBER >= 3000000
 	return archive_filter_code(archive, 0);
-#else
-	return archive_compression(archive);
-#endif
 }
 
 static inline int _alpm_archive_read_support_filter_all(struct archive *archive)
 {
-#if ARCHIVE_VERSION_NUMBER >= 3000000
 	return archive_read_support_filter_all(archive);
-#else
-	return archive_read_support_compression_all(archive);
-#endif
 }
 
 #endif /* LIBARCHIVE_COMPAT_H */

lib/libalpm/log.c

@@ -1,7 +1,7 @@
 /*
  *  log.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -30,11 +30,6 @@
 #include "util.h"
 #include "alpm.h"
 
-/** \addtogroup alpm_log Logging Functions
- * @brief Functions to log using libalpm
- * @{
- */
-
 static int _alpm_log_leader(FILE *f, const char *prefix)
 {
 	time_t t = time(NULL);
@@ -47,12 +42,6 @@ static int _alpm_log_leader(FILE *f, const char *prefix)
 	return fprintf(f, "[%s] [%s] ", timestamp, prefix);
 }
 
-/** A printf-like function for logging.
- * @param handle the context handle
- * @param prefix caller-specific prefix for the log
- * @param fmt output format
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
 int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix,
 		const char *fmt, ...)
 {
@@ -109,8 +98,6 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix,
 	return ret;
 }
 
-/** @} */
-
 void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...)
 {
 	va_list args;
@@ -120,6 +107,6 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...
 	}
 
 	va_start(args, fmt);
-	handle->logcb(flag, fmt, args);
+	handle->logcb(handle->logcb_ctx, flag, fmt, args);
 	va_end(args);
 }

lib/libalpm/log.h

@@ -1,7 +1,7 @@
 /*
  *  log.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/package.c

@@ -1,7 +1,7 @@
 /*
  *  package.c
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Christian Hamar <krics@linuxforum.hu>
@@ -34,12 +34,6 @@
 #include "handle.h"
 #include "deps.h"
 
-/** \addtogroup alpm_packages Package Functions
- * @brief Functions to manipulate libalpm packages
- * @{
- */
-
-/** Free a package. */
 int SYMEXPORT alpm_pkg_free(alpm_pkg_t *pkg)
 {
 	ASSERT(pkg != NULL, return -1);
@@ -52,7 +46,6 @@ int SYMEXPORT alpm_pkg_free(alpm_pkg_t *pkg)
 	return 0;
 }
 
-/** Check the integrity (with md5) of a package from the sync cache. */
 int SYMEXPORT alpm_pkg_checkmd5sum(alpm_pkg_t *pkg)
 {
 	char *fpath;
@@ -105,6 +98,7 @@ static alpm_list_t *_pkg_get_provides(alpm_pkg_t *pkg)   { return pkg->provides;
 static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg)   { return pkg->replaces; }
 static alpm_filelist_t *_pkg_get_files(alpm_pkg_t *pkg)  { return &(pkg->files); }
 static alpm_list_t *_pkg_get_backup(alpm_pkg_t *pkg)     { return pkg->backup; }
+static alpm_list_t *_pkg_get_xdata(alpm_pkg_t *pkg)      { return pkg->xdata; }
 
 static void *_pkg_changelog_open(alpm_pkg_t UNUSED *pkg)
 {
@@ -145,7 +139,7 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; }
 /** The standard package operations struct. Get fields directly from the
  * struct itself with no abstraction layer or any type of lazy loading.
  */
-struct pkg_operations default_pkg_ops = {
+const struct pkg_operations default_pkg_ops = {
 	.get_base        = _pkg_get_base,
 	.get_desc        = _pkg_get_desc,
 	.get_url         = _pkg_get_url,
@@ -169,6 +163,7 @@ struct pkg_operations default_pkg_ops = {
 	.get_replaces    = _pkg_get_replaces,
 	.get_files       = _pkg_get_files,
 	.get_backup      = _pkg_get_backup,
+	.get_xdata       = _pkg_get_xdata,
 
 	.changelog_open  = _pkg_changelog_open,
 	.changelog_read  = _pkg_changelog_read,
@@ -198,6 +193,12 @@ const char SYMEXPORT *alpm_pkg_get_base(alpm_pkg_t *pkg)
 	return pkg->ops->get_base(pkg);
 }
 
+alpm_handle_t SYMEXPORT *alpm_pkg_get_handle(alpm_pkg_t *pkg)
+{
+	ASSERT(pkg != NULL, return NULL);
+	return pkg->handle;
+}
+
 const char SYMEXPORT *alpm_pkg_get_name(alpm_pkg_t *pkg)
 {
 	ASSERT(pkg != NULL, return NULL);
@@ -275,6 +276,44 @@ const char SYMEXPORT *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg)
 	return pkg->base64_sig;
 }
 
+int SYMEXPORT alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len)
+{
+	ASSERT(pkg != NULL, return -1);
+
+	if(pkg->base64_sig) {
+		int ret = alpm_decode_signature(pkg->base64_sig, sig, sig_len);
+		if(ret != 0) {
+			RET_ERR(pkg->handle, ALPM_ERR_SIG_INVALID, -1);
+		}
+		return 0;
+	} else {
+		char *pkgpath = NULL, *sigpath = NULL;
+		alpm_errno_t err;
+		int ret = -1;
+
+		pkgpath = _alpm_filecache_find(pkg->handle, pkg->filename);
+		if(!pkgpath) {
+			GOTO_ERR(pkg->handle, ALPM_ERR_PKG_NOT_FOUND, cleanup);
+		}
+		sigpath = _alpm_sigpath(pkg->handle, pkgpath);
+		if(!sigpath || _alpm_access(pkg->handle, NULL, sigpath, R_OK)) {
+			GOTO_ERR(pkg->handle, ALPM_ERR_SIG_MISSING, cleanup);
+		}
+		err = _alpm_read_file(sigpath, sig, sig_len);
+		if(err == ALPM_ERR_OK) {
+			_alpm_log(pkg->handle, ALPM_LOG_DEBUG, "found detached signature %s with size %ld\n",
+				sigpath, *sig_len);
+		} else {
+			GOTO_ERR(pkg->handle, err, cleanup);
+		}
+		ret = 0;
+cleanup:
+		FREE(pkgpath);
+		FREE(sigpath);
+		return ret;
+	}
+}
+
 const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg)
 {
 	ASSERT(pkg != NULL, return NULL);
@@ -397,7 +436,6 @@ alpm_db_t SYMEXPORT *alpm_pkg_get_db(alpm_pkg_t *pkg)
 	return pkg->origin_data.db;
 }
 
-/** Open a package changelog for reading. */
 void SYMEXPORT *alpm_pkg_changelog_open(alpm_pkg_t *pkg)
 {
 	ASSERT(pkg != NULL, return NULL);
@@ -405,7 +443,6 @@ void SYMEXPORT *alpm_pkg_changelog_open(alpm_pkg_t *pkg)
 	return pkg->ops->changelog_open(pkg);
 }
 
-/** Read data from an open changelog 'file stream'. */
 size_t SYMEXPORT alpm_pkg_changelog_read(void *ptr, size_t size,
 		const alpm_pkg_t *pkg, void *fp)
 {
@@ -414,7 +451,6 @@ size_t SYMEXPORT alpm_pkg_changelog_read(void *ptr, size_t size,
 	return pkg->ops->changelog_read(ptr, size, pkg, fp);
 }
 
-/** Close a package changelog for reading. */
 int SYMEXPORT alpm_pkg_changelog_close(const alpm_pkg_t *pkg, void *fp)
 {
 	ASSERT(pkg != NULL, return -1);
@@ -422,7 +458,6 @@ int SYMEXPORT alpm_pkg_changelog_close(const alpm_pkg_t *pkg, void *fp)
 	return pkg->ops->changelog_close(pkg, fp);
 }
 
-/** Open a package mtree file for reading. */
 struct archive SYMEXPORT *alpm_pkg_mtree_open(alpm_pkg_t * pkg)
 {
 	ASSERT(pkg != NULL, return NULL);
@@ -430,7 +465,6 @@ struct archive SYMEXPORT *alpm_pkg_mtree_open(alpm_pkg_t * pkg)
 	return pkg->ops->mtree_open(pkg);
 }
 
-/** Read entry from an open mtree file. */
 int SYMEXPORT alpm_pkg_mtree_next(const alpm_pkg_t * pkg, struct archive *archive,
 	struct archive_entry **entry)
 {
@@ -439,7 +473,6 @@ int SYMEXPORT alpm_pkg_mtree_next(const alpm_pkg_t * pkg, struct archive *archiv
 	return pkg->ops->mtree_next(pkg, archive, entry);
 }
 
-/** Close a package mtree file for reading. */
 int SYMEXPORT alpm_pkg_mtree_close(const alpm_pkg_t * pkg, struct archive *archive)
 {
 	ASSERT(pkg != NULL, return -1);
@@ -454,6 +487,13 @@ int SYMEXPORT alpm_pkg_has_scriptlet(alpm_pkg_t *pkg)
 	return pkg->ops->has_scriptlet(pkg);
 }
 
+alpm_list_t SYMEXPORT *alpm_pkg_get_xdata(alpm_pkg_t *pkg)
+{
+	ASSERT(pkg != NULL, return NULL);
+	pkg->handle->pm_errno = ALPM_ERR_OK;
+	return pkg->ops->get_xdata(pkg);
+}
+
 static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs,
 		int optional)
 {
@@ -510,21 +550,16 @@ static alpm_list_t *compute_requiredby(alpm_pkg_t *pkg, int optional)
 	return reqs;
 }
 
-/** Compute the packages requiring a given package. */
 alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg)
 {
 	return compute_requiredby(pkg, 0);
 }
 
-/** Compute the packages optionally requiring a given package. */
 alpm_list_t SYMEXPORT *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg)
 {
 	return compute_requiredby(pkg, 1);
 }
 
-
-/** @} */
-
 alpm_file_t *_alpm_file_copy(alpm_file_t *dest,
 		const alpm_file_t *src)
 {
@@ -651,6 +686,30 @@ static void free_deplist(alpm_list_t *deps)
 	alpm_list_free(deps);
 }
 
+alpm_pkg_xdata_t *_alpm_pkg_parse_xdata(const char *string)
+{
+	alpm_pkg_xdata_t *pd;
+	const char *sep;
+	if(string == NULL || (sep = strchr(string, '=')) == NULL) {
+		return NULL;
+	}
+
+	CALLOC(pd, 1, sizeof(alpm_pkg_xdata_t), return NULL);
+	STRNDUP(pd->name, string, sep - string, FREE(pd); return NULL);
+	STRDUP(pd->value, sep + 1, FREE(pd->name); FREE(pd); return NULL);
+
+	return pd;
+}
+
+void _alpm_pkg_xdata_free(alpm_pkg_xdata_t *pd)
+{
+	if(pd) {
+		free(pd->name);
+		free(pd->value);
+		free(pd);
+	}
+}
+
 void _alpm_pkg_free(alpm_pkg_t *pkg)
 {
 	if(pkg == NULL) {
@@ -681,6 +740,8 @@ void _alpm_pkg_free(alpm_pkg_t *pkg)
 	}
 	alpm_list_free_inner(pkg->backup, (alpm_list_fn_free)_alpm_backup_free);
 	alpm_list_free(pkg->backup);
+	alpm_list_free_inner(pkg->xdata, (alpm_list_fn_free)_alpm_pkg_xdata_free);
+	alpm_list_free(pkg->xdata);
 	free_deplist(pkg->depends);
 	free_deplist(pkg->optdepends);
 	free_deplist(pkg->checkdepends);
@@ -764,16 +825,6 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle)
 	return NULL;
 }
 
-/** Test if a package should be ignored.
- *
- * Checks if the package is ignored via IgnorePkg, or if the package is
- * in a group ignored via IgnoreGroup.
- *
- * @param handle the context handle
- * @param pkg the package to test
- *
- * @return 1 if the package should be ignored, 0 otherwise
- */
 int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg)
 {
 	alpm_list_t *groups = NULL;

lib/libalpm/package.h

@@ -1,7 +1,7 @@
 /*
  *  package.h
  *
- *  Copyright (c) 2006-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
@@ -67,6 +67,8 @@ struct pkg_operations {
 	alpm_filelist_t *(*get_files) (alpm_pkg_t *);
 	alpm_list_t *(*get_backup) (alpm_pkg_t *);
 
+	alpm_list_t *(*get_xdata) (alpm_pkg_t *);
+
 	void *(*changelog_open) (alpm_pkg_t *);
 	size_t (*changelog_read) (void *, size_t, const alpm_pkg_t *, void *);
 	int (*changelog_close) (const alpm_pkg_t *, void *);
@@ -83,9 +85,9 @@ struct pkg_operations {
  * The actual definition is in package.c so it can have access to the
  * default accessor functions which are defined there.
  */
-extern struct pkg_operations default_pkg_ops;
+extern const struct pkg_operations default_pkg_ops;
 
-struct __alpm_pkg_t {
+struct _alpm_pkg_t {
 	unsigned long name_hash;
 	char *filename;
 	char *base;
@@ -121,7 +123,7 @@ struct __alpm_pkg_t {
 	alpm_list_t *removes; /* in transaction targets only */
 	alpm_pkg_t *oldpkg; /* in transaction targets only */
 
-	struct pkg_operations *ops;
+	const struct pkg_operations *ops;
 
 	alpm_filelist_t files;
 
@@ -136,6 +138,8 @@ struct __alpm_pkg_t {
 	alpm_pkgreason_t reason;
 	int scriptlet;
 
+	alpm_list_t *xdata;
+
 	/* Bitfield from alpm_dbinfrq_t */
 	int infolevel;
 	/* Bitfield from alpm_pkgvalidation_t */
@@ -158,4 +162,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 int _alpm_pkg_cmp(const void *p1, const void *p2);
 int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg);
 
+alpm_pkg_xdata_t *_alpm_pkg_parse_xdata(const char *string);
+void _alpm_pkg_xdata_free(alpm_pkg_xdata_t *pd);
+
 #endif /* ALPM_PACKAGE_H */

lib/libalpm/pkghash.c

@@ -1,7 +1,7 @@
 /*
  *  pkghash.c
  *
- *  Copyright (c) 2011-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2011-2022 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/pkghash.h

@@ -1,7 +1,7 @@
 /*
  *  pkghash.h
  *
- *  Copyright (c) 2011-2019 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2011-2022 Pacman Development Team <pacman-dev@lists.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
@@ -32,7 +32,7 @@
  * A combination of a hash table and a list, allowing for fast look-up
  * by package name but also iteration over the packages.
  */
-struct __alpm_pkghash_t {
+struct _alpm_pkghash_t {
 	/** data held by the hash table */
 	alpm_list_t **hash_table;
 	/** head node of the hash table data in normal list format */
@@ -45,7 +45,7 @@ struct __alpm_pkghash_t {
 	unsigned int limit;
 };
 
-typedef struct __alpm_pkghash_t alpm_pkghash_t;
+typedef struct _alpm_pkghash_t alpm_pkghash_t;
 
 alpm_pkghash_t *_alpm_pkghash_create(unsigned int size);
 

lib/libalpm/po/LINGUAS

@@ -1,6 +1,7 @@
 # Set of available languages.
 ar
 ast
+az_AZ
 bg
 br
 ca
@@ -17,6 +18,7 @@ eu_ES
 fi
 fr
 gl
+hi
 hr
 hu
 id

lib/libalpm/po/Makevars

@@ -15,7 +15,7 @@ XGETTEXT_OPTIONS = \
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
 # package.
-COPYRIGHT_HOLDER = Pacman Development Team <pacman-dev@archlinux.org>
+COPYRIGHT_HOLDER = Pacman Development Team <pacman-dev@lists.archlinux.org>
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings.

lib/libalpm/po/ar.po

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
 # kraim <biskraim@gmail.com>, 2013
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-07 08:12+0000\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 02:25+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/"
 "language/ar/)\n"
@@ -29,17 +29,17 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s محدّثة -- سأتجاوزها\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s محدّثة -- سأعيد تثبيتها\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "سأُنزِل الحزمة %s (من %s إلى %s)\n"
@@ -49,17 +49,17 @@ msgstr "سأُنزِل الحزمة %s (من %s إلى %s)\n"
 msgid "cannot allocate disk archive object"
 msgstr ""
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "تحذير عند الاستخراج %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "تعذّر استخراج %s (%s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "تعذر إعادة تسمية %s إلى %s (%s)\n"
@@ -102,137 +102,137 @@ msgstr "الاستخراج: عدم الكتابة فوق المجلد بالمل
 msgid "unable to extract %s.pacnew: path too long"
 msgstr ""
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "غير  قادر على جلب مجلد العمل الحالي\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "غير قادر على تحويل المجلد إلى %s (%s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "تعذر استعادة مجلد العمل (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "حدثت مشكلة أثناء ترقية %s\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "حدثت مشكلة أثناء تثبيت %s\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "غير قادر على تحديث مدخل قاعدة البيانات %s-%s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "غير قادر على إضافة المدخل '%s' إلى المخبئيات\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "خطأ أثناء قراءة الملف %s: %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "تجري إزالة قاعدة البيانات الغير صالحة: %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "غير قادر على إنشاء الدليل %s : %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "مدخل قاعدة بيانات غير صالح '%s'\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "مدخل قاعدة بيانات مكرر '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "مدخل قاعدة بيانات معطوب '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "غير قادر على فتح اللمف %s: %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "%s قاعدة البيانات غير متناسقة : اسم الحزمة غير مطابق %s\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr "%s قاعدة البيانات غير متناسقة : إصدار الحزمة غير مطابق %s\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "نوع التّحقق غير مألوف في الحزمة %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "خطأ أثناء قراءة الحزمة %s: %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "خطأ أثناء قراءة  mtree في الحزمة %s: %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "تعذّر تحليل ملف وصف الحزمة في %s\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "اسم الحزمة مفقود في %s\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "إصدارة الحزمة مفقودة في %s\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "إصدارة الحزمة غير صالح في  %s\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "معلومات الحزمة مفقودة في %s\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "فشل في قراءة ملف التّوقيع: %s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "مفتاح ضروري غير موجود في حلقة المفاتيح\n"
@@ -242,32 +242,32 @@ msgstr "مفتاح ضروري غير موجود في حلقة المفاتيح\n
 msgid "removing invalid file: %s\n"
 msgstr "يجري حذف ملف غير صالح: %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "تعذّر تحليل ملف وصف الحزمة '%s' من قاعدة البيانات '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr ""
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "%s قاعدة البيانات غير متناسقة : اسم ملف الحزمة غير قانوني %s\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "%s قاعدة البيانات غير متناسقة : اسم ملف الحزمة طويل جدًا %s\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "ملف قاعدة البيانات مجهول : %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "مسار قاعدة البيانات غير معروف\n"
@@ -287,12 +287,12 @@ msgstr "%s سيتم إزالتها بعد %s اعتمادياتها\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s سيتم تثبيتها قبل %s اعتمادياتها\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "تجاهل الحزمة %s-%s\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "تعذّر تحليل \"%s\"، اعتمادية لـ \"%s\"\n"
@@ -347,40 +347,66 @@ msgstr "غير قادر على تحديد نقطة وصل الجذر %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "القسم %s موصول بصفة القراءة فقط\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "القرص"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "غير قادر على إنشاء ملف مؤقت للتحميل\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "العنوان '%s' غير صالح\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "فشل في استقبال الملف '%s' من %s : %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr "فشل في استقبال الملف '%s' من %s : تم تجاوز حجم التحميل\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s يبدو غير موثوقًا: %jd/%jd بايت\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "tag td jpldg %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "العنوان '%s' غير صالح\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "تعذّر استقبال بعض الملفات\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -497,7 +523,7 @@ msgstr "لا يوجد خواديم مهيأة للمستودع"
 msgid "transaction already initialized"
 msgstr "المُبادلة مهيأة بالفعل"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr "لم يتم تهيئة المُبادلة"
@@ -507,86 +533,86 @@ msgstr "لم يتم تهيئة المُبادلة"
 msgid "duplicate target"
 msgstr "الهدف مكرر"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr ""
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "المُبادلة غير مجهزة"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "أحبطت المُبادلة"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "العملية غير متوافقة مع نوع المُبادلة"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr "تتم محاولة بدء المُبادلة عند إلغاء قفل قاعدة البيانات"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr ""
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "غير قادر على إيجاد أو قراءة الحزمة"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "ألغيت العملية بسبب حزمة متجاهلة"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "حزمة غير صالحة أو معطوبة"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "حزمة معطوبة أو غير صالحة (البصمة)"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "حزمة معطوبة أو غير صالحة (توقيع PGP)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "الحزمة مفقودة مطلوب توقيع"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "غير قادر على فتح ملف الحزمة"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "غير قادر على مسح جميع ملفات الجزمة"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "اسم ملف الحزمة غير سليم"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "معمارية الحزمة غير سليمة"
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "تعذّر العثور على المستودع الهدف"
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -652,12 +678,12 @@ msgstr ""
 msgid "unexpected error"
 msgstr "خطأ غير متوقع"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "الملف المغلق مفقود  %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "تعذّر إزالة ملف القفل %s\n"
@@ -729,7 +755,7 @@ msgstr ""
 msgid "unable to run hook %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "تعذّر فتح المجلد: %s: %s\n"
@@ -739,7 +765,7 @@ msgstr "تعذّر فتح المجلد: %s: %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr ""
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "تعذّر إحصاء الملف %s: %s\n"
@@ -749,185 +775,185 @@ msgstr "تعذّر إحصاء الملف %s: %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "غير قادر على استيراد معلومات الميتا للحزمة %s-%s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "لم يعثر على %s في قاعدة البيانات -- يجري التجاوز\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "يجري حذف %s من قائمة الأهداف\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
 "تعذر إزالة  الملف '%s': %s\n"
 "\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "تعذّر إزالة %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "تعذّر إزالة مدخل قاعدة البيانات %s-%s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "تعذر إزالة المدخل '%s' من المخبئيات\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "التوقيع المطلوب مفقود :%s\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: يجري تجاهل تحديث الحزمة (%s => %s) \n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s: يجري تجاهل إرجاع الحزمة (%s => %s) \n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s: يجري الإرجاع من الإصدار %s إلى الإصدار %s\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: (%s) المحلّي أحدث من  %s (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "يجري تجاهل استبدال الحزمة (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "تعذر استبدال %s بـ %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "حدثت تعارضات حزميّة تعذّر تحليلها\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr " يجري حذف '%s' من قائمة الأهداف بسبب تعارضها مع '%s'\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "تعذّر استقبال بعض الملفات\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
@@ -948,84 +974,84 @@ msgstr "تعذّر بدء مُبادلة الإزالة\n"
 msgid "could not commit transaction\n"
 msgstr "فشل في بدء المُبادلة\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "تعذّر إنشاء مجلد مؤقت\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "تعذّر نسخ الملف المؤقّت إلى %s (%s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr ""
 "تعذر إزالة %s\n"
 "\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "تعذّر إزالة المجلد المؤقّت %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "تعذّرت الكتابة إلى الأنبوب (%s)\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "تعذّرت القراءة من الأنبوب (%s)\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "غير قادر على إنشاء العبارة (%s)\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "تعذّر تفريع العملية إلى عملية جديدة (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "تعذّر التعديل على مجلد الجذر (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "تعذّر مخاطبة execv (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "تعذّر مخاطبةwaitpid  (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "فشل تطبيق الأمر بشكل صحيح\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "إشارة مجهوله"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "تم انهاء الامر بواسطة الاشارة  %d: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "لا يوجد %s مخبئي، يجري الإنشاء...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr "تعذّر إيجاد أو إنشاء مخبئية للحزم ، استخدم %s بدلًا عنها\n"

lib/libalpm/po/ast.po

@@ -1,18 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
-# enolp <enolp@softastur.org>, 2015-2016,2018-2019
-# Ḷḷumex03 <tornes@opmbx.org>, 2014
-# Ḷḷumex03 <tornes@opmbx.org>, 2014
-# Ḷḷumex03 <tornes@opmbx.org>, 2014-2015
+# enolp <enolp@softastur.org>, 2015-2016,2018-2020
+# Ḷḷumex03, 2014
+# Ḷḷumex03, 2014
+# Ḷḷumex03, 2014
+# Ḷḷumex03, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-07 08:12+0000\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 02:25+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Asturian (http://www.transifex.com/toofishes/archlinux-pacman/"
 "language/ast/)\n"
@@ -22,17 +23,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s ta anováu -- saltando\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s ta anováu -- reinstalando\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "baxando de versión el paquete %s (%s => %s)\n"
@@ -42,17 +43,17 @@ msgstr "baxando de versión el paquete %s (%s => %s)\n"
 msgid "cannot allocate disk archive object"
 msgstr "nun pue allugase l'oxetu del archivu del discu"
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "alvertencia dada al estrayer el paquete %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nun pudo estrayese %s (%s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "nun pudo renomase %s a %s (%s)\n"
@@ -97,139 +98,139 @@ msgstr "estración: nun pue sobrescribise'l direutoriu col ficheru %s\n"
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "nun pue estrayese %s.pacnew: camín perllargu"
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "nun pudo consiguise'l direutoriu de trabayu actual\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nun pudo cambiase'l direutoriu a %s (%s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "nun pudo restaurase'l direutoriu de trabayu (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "asocedió un problema al anovar %s\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "asocedió un problema al instalar %s\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "nun pudo anovase la entrada de base de datos %s-%s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "nun pudo amestase la entrada '%s' na caché\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "fallu al lleer el ficheru %s: %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "desaniciando base de datos non válida: %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "nun pudo crease'l direutoriu %s: %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome non válidu pa la base de datos '%s'\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "entrada de base de datos duplicada '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "entrada de base de datos toyida '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nun pudo abrise'l ficheru %s: %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr ""
 "la base de datos %s ye inconsistente: el nome nun concasa nel paquete %s\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr ""
 "la base de datos %s ye inconsistente: la versión nun concasa nel paquete %s\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "triba de validación desconocida pal paquete %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "fallu al lleer el paquete %s: %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "fallu al lleer el mtree del paquete %s: %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "nun pudo analizase'l ficheru de descripción del paquete en %s\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "nome de paquete faltante en %s\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "versión de paquete faltante en %s\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "versión del paquete non válida en %s\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "datos meta de paquete faltantes en %s\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "fallu al lleer el ficheru de robla: %s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "clave riquida del aniellu claves faltante\n"
@@ -239,36 +240,36 @@ msgstr "clave riquida del aniellu claves faltante\n"
 msgid "removing invalid file: %s\n"
 msgstr "desaniciando ficheru non válidu: %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
 "nun pudo analizase'l ficheru de descripción del paquete '%s' de la base de "
 "datos '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr ""
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr ""
 "la base de datos %s ye inconsistente: el nome del paquete %s ye illegal\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr ""
 "la base de datos %s ye inconsistente: el nome del paquete %s ye perllargu\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "ficheru de base de datos desconocíu: %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "nun ta definíu'l camín de la base de datos\n"
@@ -288,12 +289,12 @@ msgstr "%s desaniciaráse dempués de la so dependencia %s\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s desaniciaráse enantes de la so dependencia %s\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "inorando paquete %s-%s\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nun pue iguase \"%s\", una dependencia de \"%s\"\n"
@@ -348,40 +349,66 @@ msgstr "nun pudo determinase'l puntu de montaxe root %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "La partición %s ta montada como namái llectura\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "discu"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "fallu al crear el ficheru temporal pa la descarga\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'enllaz '%s' ye inválidu\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "fallu recibiendo'l ficheru '%s' de %s: %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr "fallu recibiendo'l ficheru '%s' de %s: tamañu de descarga superáu\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr ""
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "fallu al lleer %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "l'enllaz '%s' ye inválidu\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "fallu al recuperar dellos ficheros\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -498,7 +525,7 @@ msgstr "nun se configuró dengún sirvidor pal repositoriu"
 msgid "transaction already initialized"
 msgstr "yá s'anició la transaición"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr "nun s'anició la transaición"
@@ -508,86 +535,86 @@ msgstr "nun s'anició la transaición"
 msgid "duplicate target"
 msgstr "oxetivu duplicáu"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr ""
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "nun se tresnó la transaición"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "albortóse la transaición"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "la operación nun ye compatible cola triba de transaición"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr "intentu d'unviu de transaiciones al nun tar bloquiada la base de datos"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr "fallu al executar los gabitos de transaiciones"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "nun pudo alcontrase o lleese'l paquete"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "operación encaboxada pola mor de ignorepkg"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "paquete toriáu o non válidu"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "paquete toriáu o non válidu (suma de comprobación)"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "paquete toriáu o non válidu (robla PGP)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "el paquete rique una robla que falta"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "nun pue abrise'l ficheru de paquete"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "nun puen desaniciase tolos ficheros del paquete"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "el nome del paquete nun ye válidu"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "l'arquietctura del paquete nun ye válida"
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "nun pudo alcontrase'l repositoriu pal oxetivu"
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -653,12 +680,12 @@ msgstr ""
 msgid "unexpected error"
 msgstr "fallu inesperáu"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "falta'l ficheru de bloquéu %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "nun pudo desaniciase'l ficheru de bloquéu %s\n"
@@ -730,7 +757,7 @@ msgstr ""
 msgid "unable to run hook %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "nun pudo abrise'l direutoriu: %s: %s\n"
@@ -738,9 +765,9 @@ msgstr "nun pudo abrise'l direutoriu: %s: %s\n"
 #: lib/libalpm/hook.c:575
 #, c-format
 msgid "could not open file: %s%s: %s\n"
-msgstr ""
+msgstr "nun pudo abrise'l ficheru: %s%s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr ""
@@ -748,186 +775,186 @@ msgstr ""
 #: lib/libalpm/hook.c:621
 #, c-format
 msgid "could not read directory: %s: %s\n"
-msgstr ""
+msgstr "nun pudo lleese'l ficheru: %s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "nun pudieron cargase dafechu los datos meta pal paquete %s-%s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nun pudo alcontrase %s na base de datos -- saltando\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "desaniciando %s de la llista d'oxetivos\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nun pue desaniciase'l ficheru '%s': %s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "nun pue desaniciase %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "nun pudo desaniciase la entrada de la base de datos %s-%s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nun pudo desaniciase la entrada '%s' de la caché\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s: falta la robla riquida\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: inorando anovamientu del paquete (%s => %s)\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s: inorando baxada de versión del paquete (%s => %s)\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s: baxando de la versión %s a la %s\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: llocal (%s) ye más nuevu que %s (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "inorando troquéu de paquete (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "nun pue trocase %s por %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "deteutaos conflictos de paquete que nun puen iguase\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
 "desaniciando '%s' de la llista d'oxetivos porque ta en conflictu con '%s'\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "fallu al recuperar dellos ficheros\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
@@ -948,82 +975,82 @@ msgstr "nun pudo unviase la transaición de desaniciu\n"
 msgid "could not commit transaction\n"
 msgstr "nun pudo unviase la transaición\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "nun pudo creaase'l direutoriu temporal\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nun pudo copiase'l ficheru temporal a %s (%s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "nun pudo desaniciase %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nun pudo desaniciase'l direutoriu temporal %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr ""
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr ""
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr ""
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "Nun pudo bifurcase un procesu nuevu (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "nun pudo cambiase'l direutoriu root (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "llamada a execv fallida (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "llamada a waitpid fallida (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "el comandu falló al executase afayadizamente\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "Señal desconocida"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "comandu fináu pola señal %d: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "nun esiste'l caché %s, creando...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""

lib/libalpm/po/bg.po

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
 # Galin Iskrenov <loot270@abv.bg>, 2017-2019
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-11 13:05+0000\n"
-"Last-Translator: Galin Iskrenov <loot270@abv.bg>\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 02:25+0000\n"
+"Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/toofishes/archlinux-"
 "pacman/language/bg/)\n"
 "Language: bg\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s е актуален -- пропускане\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s е актуален -- преинсталиране\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "понижаване на пакет %s (%s => %s)\n"
@@ -40,17 +40,17 @@ msgstr "понижаване на пакет %s (%s => %s)\n"
 msgid "cannot allocate disk archive object"
 msgstr "не се открие указания архив на диск"
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "има предупреждение при извличане %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "не може да се извлече %s (%s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "не може да се преименува %s на %s (%s)\n"
@@ -95,137 +95,137 @@ msgstr "извличане: не се презаписва папка с фай
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "неспешно извличането на %s.pacnew: пътят е твърде дълъг"
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "не може да се разбере текущата директория\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "не може да се смени директория на %s (%s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "не може да се възстанови работната директория (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "възникнал проблем при подновяване %s\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "възникнал проблем при инсталиране %s\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "не може да се поднови запис в базата %s-%s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "не може да се добави запис '%s' в кеша\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "грешка при четене на файл %s: %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "премахване на невалидна база: %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "не се създава директория %s: %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "невалидно име за запис в базата '%s'\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "дублиран запис в базата '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "повреден запис в базата '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "не се отваря файл %s: %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "%s несъответствие в базата: името не съответства на пакета %s\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr "%s несъответствие в базата: версията не съответства на пакета %s\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "непознат валидиращ тип на пакета %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "грешка при четене на пакет %s: %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "грешка при зареждане на mtree на пакет %s: %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "не може да се анализира описателния файл в %s\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "липсващо име на пакет в %s\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "липсваща версия на пакет в %s\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "невалидна версия на пакет в %s\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "липсват метаданни за пакета %s\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "не се чете подписващият файл: %s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "нужния ключ липсва от keyring\n"
@@ -235,32 +235,32 @@ msgstr "нужния ключ липсва от keyring\n"
 msgid "removing invalid file: %s\n"
 msgstr "премахване невалиден файл: %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "не може да се анализира описателния файл '%s' от db '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr "не да се прочете db '%s' (%s)\n"
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "%s базата е непълна: името на пакета %s е  недопустимо\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "%s базата е непълна: името на пакета %s е твърде дълго\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "непознат датабаза файл: %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "пътя към базата е неопределен\n"
@@ -280,12 +280,12 @@ msgstr "%s ще бъде премахната след зависимостта
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s ще бъде инсталиран преди зависимостта %s\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "пренебрегване на пакет %s-%s\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "не може да се разреши \"%s\", зависи от \"%s\"\n"
@@ -342,42 +342,68 @@ msgstr "не може да се определи root mount point %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Дялът %s е монтиран само за четене\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "диск"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "не може да се създаде временен файл за сваляне\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' е невалиден\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "неуспех при извличане на файл '%s' от %s : %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr ""
 "неуспех при получаването на файл '%s' от %s : очакваният размер за сваляне е "
 "надвишен\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s изглежда частичен: %jd/%jd bytes\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "неуспех при сваляне на %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' е невалиден\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "неуспех при извличане на файлове\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -494,7 +520,7 @@ msgstr "няма конфигуриран сърър за източник"
 msgid "transaction already initialized"
 msgstr "транзакцията вече е инициализирана"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr " транзакцията не е инициализирана"
@@ -504,86 +530,86 @@ msgstr " транзакцията не е инициализирана"
 msgid "duplicate target"
 msgstr "дублирана цел"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr ""
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "транзакцията не е подготвена"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "транзакцията е преустановена"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "операцията е несъвместима с типа транзакция"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr "транзакцията иска достъп до незаключена база"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr "неуспех при пускането на транзакционни куки"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "няма или не се чете пакет"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "отменена операция според ignorepkg"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "невалиден или повреден пакет"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "невалиден или повреден пакет (checksum)"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "невалиден или повреден пакет (PGP signature)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "липсва изискващ се подпис на пакет"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "не се отваря пакетен файл"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "не се премахват всички файлове на пакета"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "името на пакета не е валидно"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "архитектурата на пакета не е валидна"
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "не може да се открие източник за целта"
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -649,12 +675,12 @@ msgstr "компилиран без поддръжка на подпис"
 msgid "unexpected error"
 msgstr "неочаквана грешка"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "липсва заключващ файл %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "не се премахва заключен файл %s\n"
@@ -726,7 +752,7 @@ msgstr "кука %s ред %d: невъзможно да се зададе оп
 msgid "unable to run hook %s: %s\n"
 msgstr "невъзможно е пускане на куката %s: %s\n"
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "не се отваря папка: %s: %s\n"
@@ -736,7 +762,7 @@ msgstr "не се отваря папка: %s: %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr "не може да се отвори файл: %s%s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "не се коригира %s: %s\n"
@@ -746,183 +772,183 @@ msgstr "не се коригира %s: %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr "не може да се прочете папката: %s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "не пълно извеждане на метаданни за пакет %s-%s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "няма %s в базата -- пропускане\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "премахване %s от списъка с целите\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "не се премахва файла '%s': %s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr "не може да се архивира %s поради препълване на PATH_MAX\n"
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "не се премахва %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "не може да се премахне запис в базата %s-%s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "не може да се премахне '%s' от кеша\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr "Публичният ключодържател не е открит; Ще пуснете ли '%s'?\n"
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr "GPGME грешка: %s\n"
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
 msgstr "търсене на ключ %s използвайки WKD\n"
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
 msgstr "gpg грешка: %s\n"
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr "ключодържателя не се записва\n"
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
 msgstr "ключ \"%s\" на ключов съвър\n"
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr "ключ \"%s\" не може да се внесе\n"
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr "ключ \"%s\" не може да се прегледа отдалечено\n"
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s: липсва изискващ се подпис\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr "%s: подписът от \"%s\" е изрично доверен\n"
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr "%s: подписът от \"%s\" е с непознато доверие\n"
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr "%s: подписът от \"%s\" никога да не се му вярва\n"
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr "%s: ключ \"%s\" е непознат\n"
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr "%s: ключа е \"%s\" е негоден\n"
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr "%s: подписът от \"%s\" е изтекъл\n"
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr "%s: подписът от \"%s\" е невалиден\n"
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr "%s: грешен формат на подписа\n"
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr "%s: неподдържан формат на подписа\n"
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: игнориране надграждането на пакет (%s => %s)\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s: игнориране на пакетен downgrade (%s => %s)\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s: снижаване на версията от %s към версия %s\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: текущият (%s) е по-нов от %s (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "игнориране замяната на пакет (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "не може да се замести %s от %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "засечени нерешени пакетни конфликти\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr "премахване '%s' от целевия списък заради конфликт с '%s'\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "неуспех при извличане на файлове\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
@@ -943,82 +969,82 @@ msgstr "не се потвърждава транзакцията по прем
 msgid "could not commit transaction\n"
 msgstr "не се потвърждава транзакцията\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "не се създава temp папка\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "не се копира tempfile в %s (%s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "не се премахва %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "не се премахва tmpdir %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "неъспешно записването в тръбата (%s)\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "неуспешно четенето от тръбата (%s)\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "не се създава pipe (%s)\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "could not fork a new process (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "не може да се промени root папката (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "неуспех при извикване execv (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "неуспех при извикване на waitpid (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "неуспешно правилно изпълнение на команда\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "Неизвестен сигнал"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "командата прекратена от сигнал %d: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "не %s съществуваш кеш, създаване...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr "не се открива или създава пакетен кеш, използва се %s\n"

lib/libalpm/po/br.po

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
 # Gwenn M <tornoz@laposte.net>, 2015
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-07 08:12+0000\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 02:25+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/"
 "language/br/)\n"
@@ -24,17 +24,17 @@ msgstr ""
 "19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 "
 "&& n % 1000000 == 0) ? 3 : 4);\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "hizivaet eo %s - %s -- laosket a-gostez\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "Hizivaet eo %s - %s -- adstaliadur\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "o pellgargañ ar pakad %s (%s => %s)\n"
@@ -44,17 +44,17 @@ msgstr "o pellgargañ ar pakad %s (%s => %s)\n"
 msgid "cannot allocate disk archive object"
 msgstr "n'haller ket derannañ an ergorenn kantenn diell"
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "ur galv diwall a zo bet roet en ur eztennañ %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "n'haller ket eztennañ %s (%s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "n'haller ket adenvel %s e %s (%s)\n"
@@ -99,138 +99,138 @@ msgstr "eztannadur : flastradur kavlec'h gant restr %s ebet \n"
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "n'haller ket eztennañ %s.pacnew : re hir eo an treug"
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "n'haller ket kaout ar c'havlec'h labour bremanel\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "n'haller ket kemmañ ar c'havlec'h da %s (%s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "n'haller ket assav ar c'havlec'h labour (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "ur fazi a zo bet en ur hizivaat %s\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "ur fazi a zo bet en ur staliañ %s\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "n'haller ket hizivaat an enankad stlennvon %s-%s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "n'haller ket ouzhpennañ an enankad '%s' er skurzer\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "fazi en ul lenn ar restr %s : %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "o dilemel ar stlennvon direizh : %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "n'haller ker krouiñ ar c'havlec'h %s : %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "anv direizh evit an enankad stlennvon '%s'\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "enankad stlennvon eilet '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "enankad stlennvon kontronet '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "n'haller ket digeriñ ar restr %s : %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "digantalc'hek eo ar stlennvon %s : digenglotus eo anvioù ar pakad %s\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr ""
 "digantalc'hek eo ar stlennvon %s : digenglotus eo handelvioù ar pakad %s\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "doare gwiriadur dianav evit ar pakad %s : %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "fazi en ul lenn ar pakad %s : %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "fazi en ul lenn mtree ar pakad %s : %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "n'haller ket dezrannañ restr deskrivañ ar pakad e %s\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "mankout a ra an anv pakad e %s\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "mankout a ra handelv ar pakad e %s\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "handelv pakad direizh e %s\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "mankout a ra metaroadennoù ar pakad e %s\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "fazi en ul lenn ar restr sinadur : %s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "mankout a ra an alc'hwez goulennet en droñsell\n"
@@ -240,34 +240,34 @@ msgstr "mankout a ra an alc'hwez goulennet en droñsell\n"
 msgid "removing invalid file: %s\n"
 msgstr "o dilemel ar restr direizh : %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
 "n'haller ket dezrannañ ar restr deskrivadur pakadoù '%s' adalek ar sv '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr "n'haller ket lenn ar stlennvon '%s' (%s)\n"
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr ""
 "digantalc'hek eo ar stlennvon %s : didalvoudek eo anv restr ar pakad %s\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "digantalc'hek eo ar stlennvon %s : re hir eo anv restr ar pakad %s\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "restr stlennvon dianav : %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "andespizet eo treug ar stlennvon\n"
@@ -287,12 +287,12 @@ msgstr "dilamet e vo %s goude e %s amzalc'h\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "staliet e vo %s goude e %s amzalc'h\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "o leuskel ar pakad %s - %s a-gostez\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "n'haller ket diskoulmañ \"%s\", un amzalc'h \"%s\"\n"
@@ -348,42 +348,68 @@ msgstr "n'haller ket despizañ poent kenstrollañ ar gwrizienn %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "E mod lenn nemetken eo kenstrollet ar parzhad %s\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "pladenn"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "fazi en ur c'hrouiñ ar restr padennek evit ar pellgargañ\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "direizh eo an url '%s'\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "fazi en ur adkavout ar restr '%s' adalek %s : %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr ""
 "fazi en ur adkavout ar restr '%s' adalek %s : re vras eo ment ar "
 "pellgargadur\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "krennet e seblant bezañ %s : %jd/%jd eizhbit\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "fazi en ur pellgargañ %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "direizh eo an url '%s'\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "c'hwitadenn war atoradur restroù 'zo\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -500,7 +526,7 @@ msgstr "n'eus dafariad ebet kefluniet evit ar mirlec'h"
 msgid "transaction already initialized"
 msgstr "deraouekaet eo bet an treuzkas"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr "n'eo ket bet deraouekaet an treuzkas"
@@ -510,87 +536,87 @@ msgstr "n'eo ket bet deraouekaet an treuzkas"
 msgid "duplicate target"
 msgstr "bukenn eilet"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr ""
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "n'eo ket bet prientet an treuzkas"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "dilezet eo bet an treuzkas"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "n'eo ket kenglotus an oberatadenn gant doare an treuzkas"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr ""
 "klasket eo bet erounit an treuzkas padal ne oa ket prennet ar stlennvon"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr "c'hwitadenn war erounezadur krogoù treuzkas"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "n'haller ket kavout pe lenn ar pakad"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "nullet eo bet an oberatadenn abalamour da ignorepkg"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "direizh pe kontronet eo ar pakad"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "direizh pe kontronet eo ar pakad (checksum)"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "direizh pe kontronet eo ar pakad (sinadur PGP)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "mankout a ra ar sinadur dleet gant ar pakad"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "n'haller ket digeriñ restr ar pakad"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "n'haller ket dilemel holl restroù ar pakad"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "direizh eo anv restr ar pakad"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "direizh eo savouriezh ar pakad"
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "n'haller ket kavout mirlec'h ar vukenn"
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -656,12 +682,12 @@ msgstr ""
 msgid "unexpected error"
 msgstr "fazi dic'hortoz"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "mankout a ra ar restr marilhañ %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "n'haller ket dilemel ar restr marilhañ %s\n"
@@ -733,7 +759,7 @@ msgstr "krog %s linenn %d: n'haller ket arventennañ an dibarzh (%s)\n"
 msgid "unable to run hook %s: %s\n"
 msgstr "n'haller ket lañsañ ar c'hrog %s: %s\n"
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "n'haller ket digeriñ ar c'havlec'h : %s : %s\n"
@@ -743,7 +769,7 @@ msgstr "n'haller ket digeriñ ar c'havlec'h : %s : %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr "n'haller ket digeriñ ar restr: %s %s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "n'heller ket kaout stad ar restr %s : %s\n"
@@ -753,183 +779,183 @@ msgstr "n'heller ket kaout stad ar restr %s : %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr "n'haller ket lenn ar c'havlec'h: %s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "n'haller ket kargañ ar metaroadennoù a-bezh evit ar pakad %s-%s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "n'haller ket kavout %s er stlennvon -- laosket a-gostez\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "o dilemel %s eus ar roll bukenn\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "n'heller ket dilemel ar restr '%s' : %s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr "n'haller ket gwarediñ %sabalamour d'an dic'hlann PATH_MAX\n"
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "n'heller ket dilemel %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "n'haller ket dilemel an enankad stlennvon %s-%s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "n'haller ket dilemel an enankad '%s' eus ar c'hrubuilh\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr "Ne gaver ket an droñsell foran; lañset ho peus '%s'?\n"
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr "Fazi GPGME: %s\n"
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr "n'haller ket skrivañ en droñsell\n"
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s : mankout a ra ar sinadur dleet\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr "%s: mentrezh ar sinadur \"%s\" n'eo ket fizius-tre\n"
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr "%s: dianav zo an alc'hwez \"%s\"\n"
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr ""
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr "%s: mentrezh sinadur anskor\n"
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s : o leuskel an hizivadenn pakad a-gostez (%s => %s)\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s : o leuskel a-gostez an distro d'an handelv kozhoc'h (%s => %s)\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s : o distreiñ eus an handelv %s betek an hini %s\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s : nevezoc'h eo an handelv lec'hel (%s) evit %s (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "o leuskel an erlec'hiadur pakad a-gostez (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "n'haller ket erlec'hiañ %s gant %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "tabutoù n'haller ket diskoulmañ a zo bet dinoet\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr "o dilemel '%s' eus ar roll bukenn dre m'en deus un tabut gant '%s'\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "c'hwitadenn war atoradur restroù 'zo\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
@@ -950,82 +976,82 @@ msgstr "n'haller ket erounit an treuzkas dilemel\n"
 msgid "could not commit transaction\n"
 msgstr "n'haller ket erounit an treuzkas\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "n'haller ket krouiñ ur c'havlec'h padennek\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "n'haller ket eilañ ar restr padennek e %s (%s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "n'haller ket dilemel %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "n'haller ket dilemel ar c'havlec'h padennek e %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "n'haller ket skrivañ er gorzenn (%s)\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "n'haller ket lenn ar gorzenn (%s)\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "n'haller ket krouiñ ar gorzenn (%s)\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "n'haller ket genel un araezad nevez (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "n'haller ket kemmañ ar c'havlec'h gwrizienn (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "c'hwitadenn war galv execv (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "c'hwitadenn war galv waitpid (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "c'hwitadenn war erounezadur an urzh\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "Arhent dianav"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "arsavet eo bet an urzh gant an arhent %d : %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "n'eus krubuilh %s ebet, o krouiñ...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""

lib/libalpm/po/ca.po

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
 # Alberto Sánchez Molero <alsamolero@gmail.com>, 2013
@@ -10,14 +10,14 @@
 # Josep <jpreales@gmail.com>, 2011,2013
 # Josep <jpreales@gmail.com>, 2011,2013
 # Josep <jpreales@gmail.com>, 2011
-# Davidmp <medipas@gmail.com>, 2015-2019
+# Davidmp <medipas@gmail.com>, 2015-2019,2021
 # Ramon Buldó <rbuldo@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-07 14:57+0000\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 08:01+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/"
 "language/ca/)\n"
@@ -27,17 +27,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s està al dia. S'omet.\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s està al dia. Es reinstal·larà.\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "Es degrada el paquet %s (%s => %s).\n"
@@ -47,17 +47,17 @@ msgstr "Es degrada el paquet %s (%s => %s).\n"
 msgid "cannot allocate disk archive object"
 msgstr "no es pot assignar l'objecte d'arxiu del disc."
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "avís en extreure %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "no s'ha pogut extreure %s (%s).\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "no s'ha pogut canviar el nom %s a %s (%s).\n"
@@ -102,140 +102,140 @@ msgstr "extracció: no se sobreescriurà el directori amb el fitxer %s.\n"
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "no es pot extreure %s.pacnew: camí massa llarg."
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "no s'ha pogut obtenir el directori de treball actual.\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "no s'ha pogut canviar el directori a %s (%s).\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "no s'ha pogut restaurar el directori de treball (%s).\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "ha ocorregut un problema en actualitzar %s.\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "ha ocorregut un problema en instal·lar %s.\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "no s'ha pogut actualitzar l'entrada de la base de dades %s-%s.\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "no s'ha pogut afegir l'entrada \"%s\" a la memòria cau.\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "error en llegir el fitxer %s: %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "Se suprimeix la base de dades no vàlida: %s.\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "no s'ha pogut crear el directori %s: %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nom no vàlid per a l'entrada de la base de dades \"%s\".\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "entrada de la base de dades duplicada \"%s\".\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "entrada de la base de dades corrupta \"%s'\".\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "no s'ha pogut obrir el fitxer %s: %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr ""
 "la base de dades %s és inconsistent: no coincidència de nom al paquet %s.\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr ""
 "la base de dades %s és inconsistent: no coincidència de versió al paquet "
 "%s.\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "tipus de validació desconeguda per al paquet %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "error en llegir el paquet %s: %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "error en llegir mtree del paquet %s: %s.\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "no s'ha pogut analitzar el fitxer de descripció de paquet a %s.\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "manca el nom del paquet a %s.\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "manca la versió del paquet a %s.\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "versió del paquet no vàlida a %s.\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "manquen les metadades del paquet a %s.\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "ha fallat llegir el fitxer de signatures: %s.\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "la clau requerida manca al clauer.\n"
@@ -245,35 +245,35 @@ msgstr "la clau requerida manca al clauer.\n"
 msgid "removing invalid file: %s\n"
 msgstr "Se suprimeix el fitxer no vàlid %s.\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr ""
 "no s'ha pogut analitzar el fitxer de descripció de paquet \"%s\" de la base "
 "de dades \"%s\".\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr "no s'ha pogut llegir la base de dades \"%s\" (%s).\n"
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "La base de dades %s és inconsistent: nom erroni al paquet %s.\\n\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr ""
 "La base de dades %s és inconsistent: el nom del paquet %s és massa llarg\\n\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "fitxer de base de dades desconegut: %s.\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "no s'ha definit el camí de la base de dades.\n"
@@ -293,12 +293,12 @@ msgstr "%s se suprimirà després de la seva dependència: %s.\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s s'instal·larà abans de la seva dependència: %s.\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "s'ignora el paquet %s-%s.\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "no es pot resoldre \"%s\", una dependència de \"%s\".\n"
@@ -357,42 +357,70 @@ msgstr ""
 msgid "Partition %s is mounted read only\n"
 msgstr "La partició %s està muntada només en mode de lectura.\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+"hi ha massa errors de %s, s'ometen per a la resta d'aquesta transacció\n"
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "disc"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "ha fallat crear un fitxer temporal per a la baixada.\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'url \"%s\" no és vàlid.\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "ha fallat la recuperació del fitxer \"%s\" des de %s: %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr ""
 "ha fallat recuperar el fitxer \"%s\" des de %s: mida de la baixada superior "
 "a l'esperada.\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s sembla que està truncat: %jd/%jd bytes.\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "ha fallat baixar %s.\n"
+msgid "url '%s' is invalid\n"
+msgstr "l'url \"%s\" no és vàlid.\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr "ha fallat configurar una càrrega de baixada per a %s\n"
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr "curl ha retornat l'error %d de la transferència\n"
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr "error de transferència de curl: %d\n"
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "ha fallat la recuperació d'alguns fitxers.\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
+"la baixada s'ha completat correctament però no hi ha cap fitxer a la cau\n"
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -509,7 +537,7 @@ msgstr "no s'ha configurat cap servidor per al repositori."
 msgid "transaction already initialized"
 msgstr "ja s'ha iniciat la transacció."
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr "no s'ha iniciat la transacció."
@@ -519,87 +547,87 @@ msgstr "no s'ha iniciat la transacció."
 msgid "duplicate target"
 msgstr "objectiu duplicat."
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr "nom de fitxer duplicat"
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "transacció no preparada."
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "transacció cancel·lada."
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "l'operació no és compatible amb el tipus de transacció."
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr ""
 "intent de publicació de la transacció amb la base de dades no bloquejada."
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr "ha fallat l'execució dels ganxos de la transacció."
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "no s'ha pogut trobar o llegir el paquet."
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "operació cancel·lada a causa d'ignorepkg."
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "paquet no vàlid o corrupte"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "paquet no vàlid o corrupte (suma de comprovació)."
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "paquet no vàlid o corrupte (signatura PGP)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "la signatura requerida manca al paquet."
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "no s'ha pogut obrir el fitxer del paquet."
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "no s'han pogut suprimir tots els fitxers del paquet."
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "el nom de fitxer del paquet no és vàlid."
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "l'arquitectura del paquet no és vàlida."
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "no s'ha pogut trobar el repositori per a l'objectiu."
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -665,12 +693,12 @@ msgstr "compilat sense suport de signatura."
 msgid "unexpected error"
 msgstr "error inesperat."
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "manca el fitxer de bloqueig %s.\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "no s'ha pogut suprimir el fitxer de bloqueig %s.\n"
@@ -742,7 +770,7 @@ msgstr "ganxo %s, línia %d: no es pot establir l'opció (%s).\n"
 msgid "unable to run hook %s: %s\n"
 msgstr "no es pot executar el ganxo %s: %s\n"
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "no s'ha pogut obrir el directori: %s: %s\n"
@@ -752,7 +780,7 @@ msgstr "no s'ha pogut obrir el directori: %s: %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr "no s'ha pogut obrir el fitxer: %s%s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "no s'ha pogut determinar l'estat del fitxer %s: %s\n"
@@ -762,188 +790,188 @@ msgstr "no s'ha pogut determinar l'estat del fitxer %s: %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr "no s'ha pogut llegir el directori: %s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr ""
 "no s'han pogut carregar completament les metadades per al paquet %s-%s.\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "No s'ha pogut trobar %s a la base de dades. S'omet.\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "Se suprimeix %s de la llista d'objectius.\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "no s'ha pogut suprimir el fitxer \"%s\": %s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr ""
 "no s'ha pogut fer una còpia de seguretat de %s a causa d'un desbordament de "
 "CAMÍ_MAX.\n"
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "no es pot suprimir %s (%s).\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "no s'ha pogut suprimir l'entrada de la base de dades %s-%s.\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "no s'ha pogut suprimir l'entrada \"%s\" de la memòria cau.\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr "No s'ha trobat el clauer públic. Heu executat \"%s\"?\n"
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr "error de GPGME: %s\n"
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
 msgstr "se cerca la clau %s amb WKD\n"
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
 msgstr "error de gpg: %s\n"
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr "el clauer no és escrivible.\n"
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
 msgstr "clau \"%s\" al servidor de claus\n"
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr "la clau \"%s\" no s'ha pogut importar.\n"
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr "la clau \"%s\" no s'ha pogut cercar remotament.\n"
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s: manca la signatura requerida.\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr "%s: la signatura de \"%s\" és de confiança marginal.\n"
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr "%s:  la signatura de \"%s\" és de confiança desconeguda.\n"
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr "%s: en la signatura de \"%s\" no s'hi hauria de confiar mai.\n"
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr "%s: la clau \"%s\" és desconeguda.\n"
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr "%s: la clau \"%s\" està inhabilitada.\n"
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr "%s: la signatura de \"%s\" està caducada.\n"
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr "%s: la signatura de \"%s\" no és vàlida.\n"
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr "%s: error de format de la signatura.\n"
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr "%s: format de la signatura no admès.\n"
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: s'ha ignorat l'actualització del paquet (%s => %s).\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s: s'ha ignorat la degradació del paquet (%s => %s).\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s: es degrada de la versió %s a la versió %s.\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: local (%s) és més nou que %s (%s).\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "S'ignora el reemplaçament del paquet (%s-%s => %s-%s).\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "no es pot reemplaçar %s per %s.\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr "els paquets %s i %s tenen el mateix nom de fitxer: %s\n"
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "s'han detectat conflictes de paquets impossibles de resoldre.\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
 "Se suprimeix \"%s\" de la llista d'objectius perquè té conflictes amb \"%s"
 "\".\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "ha fallat la recuperació d'alguns fitxers.\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
@@ -964,82 +992,82 @@ msgstr "no s'ha pogut fer la transacció de supressió.\n"
 msgid "could not commit transaction\n"
 msgstr "no s'ha pogut fer la transacció.\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "no s'ha pogut crear el directori temporal.\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "no s'ha pogut copiar el fitxer temporal a %s (%s).\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "no s'ha pogut suprimir %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "no s'ha pogut suprimir el directori temporal %s.\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "no es pot escriure al conducte (%s).\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "no es pot llegir des del conducte (%s).\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "no s'ha pogut crear el conducte (%s).\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "no s'ha pogut bifurcar un procés nou (%s).\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "no s'ha pogut canviar el directori d'arrel (%s).\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "la crida a execv ha fallat (%s).\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "ha fallat la crida a waitpid (%s).\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "l'ordre ha fallat executar-se correctament.\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "senyal desconegut"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "orde cancel·lada pel senyal %d: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no existeix la memòria cau %s, es crea...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""

lib/libalpm/po/cs.po

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -9,6 +9,7 @@
 # IAmNotImportant, 2017
 # Jaroslav Lichtblau <jlichtblau@seznam.cz>, 2014-2015
 # Jaroslav Lichtblau <jlichtblau@seznam.cz>, 2014
+# Lukáš Kucharczyk <lukas@kucharczyk.xyz>, 2020
 # mmm <markotahal@gmail.com>, 2013
 # mmm <markotahal@gmail.com>, 2011
 # IAmNotImportant, 2017
@@ -18,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-07 08:12+0000\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 02:25+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/"
 "language/cs/)\n"
@@ -30,17 +31,17 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
 "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s je aktuální -- vynechat\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s je aktuální -- přeinstalovat\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "snížení verze balíčku %s (%s => %s)\n"
@@ -50,17 +51,17 @@ msgstr "snížení verze balíčku %s (%s => %s)\n"
 msgid "cannot allocate disk archive object"
 msgstr "nedostatek paměti pro alokaci objektu"
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "varování při rozbalování %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "nelze rozbalit %s (%s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "nelze přejmenovat %s na %s (%s)\n"
@@ -104,137 +105,137 @@ msgstr "rozbalení: adresář nebyl přepsán souborem %s\n"
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "nelze rozbalit %s.pacnew: příliš dlouhá cesta"
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "nelze určit aktuální pracovní adresář\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nelze změnit adresář na %s (%s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "nelze obnovit pracovní adresář (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "nastal problém při aktualizaci %s\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "nastal problém při instalaci %s\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "nelze aktualizovat záznam databáze %s-%s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "nelze přidat položku '%s' do mezipaměti\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "chyba při čtení souboru %s: %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "odstraňuje se chybná databáze: %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "nelze změnit adresář %s: %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "chybný název záznamu v databázi '%s'\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "duplicitní záznam v databázi '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "poškozený záznam v databázi '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nelze otevřít soubor %s: %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "databáze %s je nekonzistentní: nesouhlasí jméno balíčku %s\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr "databáze %s je nekonzistentní: nesouhlasí verze balíčku %s\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "neznámý způsob ověření pro balíček %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "chyba při čtení balíčku %s: %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "chyba při čtení souboru mtree balíčku %s: %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "nelze zpracovat soubor s popisem balíčku v %s\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "chybí jméno balíčku v %s\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "chybí veze balíčku v %s\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "neplatná verze balíčku v %s\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "chybí metadata balíčku v %s\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "nelze načíst soubor s podpisy: %s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "požadovaný klíč není v klíčence\n"
@@ -244,32 +245,32 @@ msgstr "požadovaný klíč není v klíčence\n"
 msgid "removing invalid file: %s\n"
 msgstr "odstraněn neplatný soubor: %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "nelze načíst soubor s popisem balíčku '%s' z databáze '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr "nelze přečíst databázi '%s' (%s)\n"
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "databáze %s je nekonzistentní: jméno balíčku %s je nepřípustné\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "databáze %s je nekonzistentní: jméno balíčku %s je příliš dlouhé\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "neznámý soubor databáze: %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "cesta k databázi není definována\n"
@@ -289,12 +290,12 @@ msgstr "%s bude odstraněn po %s, na kterém závisí\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s bude nainstalován před %s, na kterém závisí\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "ignoruje se balíček %s-%s\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nelze vyřešit \"%s\", závislost \"%s\"\n"
@@ -349,42 +350,68 @@ msgstr "nepodařilo se určit kořen přípojného bodu %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Diskový oddíl %s je připojen jen pro čtení\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "nepodařilo se vytvořit dočasný soubor pro stahování\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' je chybná\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "selhalo získání souboru '%s' z %s: %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr ""
 "selhalo získání souboru '%s' z %s : překročení očekávané velikosti "
 "stahování\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s se zdá být zkrácen:  %jd/%jd bytů\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "selhalo stahování %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' je chybná\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "selhalo získání některých souborů\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -501,7 +528,7 @@ msgstr "pro repositář nejsou nastaveny žádné servery"
 msgid "transaction already initialized"
 msgstr "transakce inicializována"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr "transakce neinicializována"
@@ -511,86 +538,86 @@ msgstr "transakce neinicializována"
 msgid "duplicate target"
 msgstr "duplicitní cíl"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr ""
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "transakce není připravena"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "transakce byla zrušena"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operace není kompatibilní s typem transakce"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr "pokus o uskutečnění transakce v době, kdy není uzamčena databáze"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr "selhalo spuštění hooků transakce"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "nelze nalézt nebo přečíst balíček"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "operace byla zrušena kvůli ignorovanému balíčku"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "neplatný nebo poškozený balíček"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "neplatná nebo poškozená databáze (kontrolní součty)"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "neplatný nebo poškozený balíček (PGP podpis)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "balíčku chybí vyžadovaný podpis"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "nelze otevřít soubor balíčku"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "nelze odstranit všechny soubory balíčku"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "jméno souboru balíčku není platné"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "architektura balíčku není platná"
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "nelze nalézt repositář cíle"
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -649,19 +676,19 @@ msgstr "chyba volání externího programu pro stahování souborů"
 #: lib/libalpm/error.c:159
 #, c-format
 msgid "compiled without signature support"
-msgstr ""
+msgstr "zkompilováno bez podpory podepisování"
 
 #: lib/libalpm/error.c:162
 #, c-format
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "chybí soubor zámku %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "nelze odstranit zamykací soubor %s\n"
@@ -733,7 +760,7 @@ msgstr "v hooku %s na řádku %d: nelze nastavit volbu (%s)\n"
 msgid "unable to run hook %s: %s\n"
 msgstr "nelze spustit hook %s: %s\n"
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "nelze otevřít adresář %s: %s\n"
@@ -743,7 +770,7 @@ msgstr "nelze otevřít adresář %s: %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr "nelze otevřít soubor: %s%s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "nelze najít soubor %s: %s\n"
@@ -753,187 +780,187 @@ msgstr "nelze najít soubor %s: %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr "nelze přečíst adresář: %s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "nelze zcela načíst metadata pro balíček %s-%s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nelze nalézt %s v databázi -- vynechat\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "'%s' odstraněn ze seznamu cílů\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nelze odstranit soubor '%s': %s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr "nelze zazálohovat %s kvůli přetečení PATH_MAX\n"
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "nelze odstranit %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "nelze odstranit záznam databáze %s-%s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "nelze odstranit položku '%s' z mezipaměti\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr "Nebyla nalezena veřejná klíčenka; spustili jste '%s'?\n"
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr "Chyba GPGME: %s\n"
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
-msgstr ""
+msgstr "vyhledávání klíče %s pomocí WKD\n"
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
-msgstr ""
+msgstr "chyba gpg: %s\n"
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr "do klíčenky nelze zapisovat\n"
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
-msgstr ""
+msgstr "klíč \"%s\" na serveru\n"
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr "klíč \"%s\" se nepodařilo importovat\n"
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr "klíč \"%s\" nebylo možné vzdáleně vyhledat\n"
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s: chybí vyžadovaný podpis\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr "%s: podpis od \"%s\" má částečnou důvěru\n"
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr "%s: u podpisu od \"%s\" není známá úroveň důvěry\n"
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr "%s: podpis od \"%s\" je nedůvěryhodný\n"
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr "%s: klíč \"%s\" je neznámý\n"
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr "%s: klíč \"%s\" je vypnut\n"
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr "%s: podpis od \"%s\" vypršel\n"
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr "%s: podpis od \"%s\" je neplatný\n"
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr "%s: chyba formátu podpisu\n"
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr "%s: nepodporovaný formát podpisu\n"
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoruje se aktualizace balíčku (%s => %s)\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s: ignoruje se snížení verze balíčku (%s => %s)\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s: snížení z verze %s na verzi %s\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: lokální verze (%s) je novější než v %s (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "ignoruje se náhrada balíčku (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "nelze nahradit soubor %s souborem %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr "'%s' odstraněn ze seznamu cílů, protože je konfliktní s '%s'\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "selhalo získání některých souborů\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
-msgstr ""
+msgstr "načtení souboru %s se nezdařilo: %s\n"
 
 #: lib/libalpm/sync.c:1223
 #, c-format
@@ -950,82 +977,82 @@ msgstr "nelze provést transakci pro odstranění\n"
 msgid "could not commit transaction\n"
 msgstr "nelze provést transakci\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "nelze vytvořit dočasný adresář\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "nelze odstranit %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nelze odstranit dočasný adresář %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "nelze zapisovat do roury (%s)\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "nelze číst z roury (%s)\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "nepodařilo se vytvořit rouru (%s)\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "nelze spustit nový proces (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "nelze změnit kořenový adresář (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "volání execv selhalo (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "volání waitpid selhalo (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "příkaz se nepodařilo spustit správně\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "Neznámý signál"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "příkaz ukončen signálem %d: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "neexistuje mezipaměť %s, vytváří se...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr ""

lib/libalpm/po/da.po

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR "Pacman Development Team <pacman-dev@archlinux.org>"
+# This file is distributed under the same license as the libalpm package.
 #
 # Translators:
 # Chris Darnell <chris@cedeel.com>, 2013
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2019-10-21 17:23+1000\n"
-"PO-Revision-Date: 2019-10-14 00:27+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2021-09-04 16:15+1000\n"
+"PO-Revision-Date: 2021-05-20 02:25+0000\n"
+"Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/"
 "language/da/)\n"
 "Language: da\n"
@@ -25,17 +25,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:91 lib/libalpm/sync.c:290
+#: lib/libalpm/add.c:90 lib/libalpm/sync.c:279
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s er opdateret - springer over\n"
 
-#: lib/libalpm/add.c:95
+#: lib/libalpm/add.c:94
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s er opdateret - springer over\n"
 
-#: lib/libalpm/add.c:100
+#: lib/libalpm/add.c:99
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "nedgraderer pakke %s (%s => %s)\n"
@@ -45,17 +45,17 @@ msgstr "nedgraderer pakke %s (%s => %s)\n"
 msgid "cannot allocate disk archive object"
 msgstr "kan ikke allokere diskarkiv-objekt"
 
-#: lib/libalpm/add.c:143 lib/libalpm/util.c:382
+#: lib/libalpm/add.c:143 lib/libalpm/util.c:384
 #, c-format
 msgid "warning given when extracting %s (%s)\n"
 msgstr "advarsel givet under udpakning %s (%s)\n"
 
-#: lib/libalpm/add.c:146 lib/libalpm/util.c:385
+#: lib/libalpm/add.c:146 lib/libalpm/util.c:387
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "kunne ikke udpakke %s (%s)\n"
 
-#: lib/libalpm/add.c:159 lib/libalpm/dload.c:574 lib/libalpm/remove.c:542
+#: lib/libalpm/add.c:159 lib/libalpm/dload.c:709 lib/libalpm/remove.c:534
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
 msgstr "kunne ikke omdøbe %s til %s (%s)\n"
@@ -99,137 +99,137 @@ msgstr "udtræk: overskriver ikke mappe med fil %s\n"
 msgid "unable to extract %s.pacnew: path too long"
 msgstr "kan ikke pakke %s.pacnew ud: sti for lang"
 
-#: lib/libalpm/add.c:513 lib/libalpm/util.c:334 lib/libalpm/util.c:592
+#: lib/libalpm/add.c:510 lib/libalpm/util.c:335 lib/libalpm/util.c:600
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "kunne ikke hente nuværende arbejdsmappe\n"
 
-#: lib/libalpm/add.c:518 lib/libalpm/util.c:339 lib/libalpm/util.c:597
-#: lib/libalpm/util.c:650
+#: lib/libalpm/add.c:515 lib/libalpm/util.c:340 lib/libalpm/util.c:605
+#: lib/libalpm/util.c:658
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunne ikke ændre mappe til %s (%s)\n"
 
-#: lib/libalpm/add.c:575 lib/libalpm/util.c:403 lib/libalpm/util.c:766
+#: lib/libalpm/add.c:571 lib/libalpm/util.c:405 lib/libalpm/util.c:774
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "kunne ikke genskabe arbejdsmappe (%s)\n"
 
-#: lib/libalpm/add.c:583
+#: lib/libalpm/add.c:579
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "der opstod et problem under opgradering %s\n"
 
-#: lib/libalpm/add.c:589
+#: lib/libalpm/add.c:585
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "der opstod et problem under installation af %s\n"
 
-#: lib/libalpm/add.c:604
+#: lib/libalpm/add.c:600
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "kunne ikke opdatere databasepunkt %s-%s\n"
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:610
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "kunne ikke tilføje punkt »%s« i cache\n"
 
-#: lib/libalpm/be_local.c:267
+#: lib/libalpm/be_local.c:266
 #, c-format
 msgid "error while reading file %s: %s\n"
 msgstr "der opstod en fejl under læsning af fil %s: %s\n"
 
-#: lib/libalpm/be_local.c:364
+#: lib/libalpm/be_local.c:376
 #, c-format
 msgid "removing invalid database: %s\n"
 msgstr "fjerner ugyldig database: %s\n"
 
-#: lib/libalpm/be_local.c:415 lib/libalpm/be_local.c:905
+#: lib/libalpm/be_local.c:427 lib/libalpm/be_local.c:909
 #, c-format
 msgid "could not create directory %s: %s\n"
 msgstr "kunne ikke oprette mappe %s: %s\n"
 
-#: lib/libalpm/be_local.c:590 lib/libalpm/be_sync.c:386
+#: lib/libalpm/be_local.c:602 lib/libalpm/be_sync.c:322
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "ugyldigt navn for databasepunkt '%s'\n"
 
-#: lib/libalpm/be_local.c:598
+#: lib/libalpm/be_local.c:610
 #, c-format
 msgid "duplicated database entry '%s'\n"
 msgstr "duplikeret databasepunkt '%s'\n"
 
-#: lib/libalpm/be_local.c:610
+#: lib/libalpm/be_local.c:622
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "beskadiget databasepunkt '%s'\n"
 
-#: lib/libalpm/be_local.c:713 lib/libalpm/be_local.c:809
-#: lib/libalpm/be_local.c:954 lib/libalpm/be_local.c:1051
-#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:422 lib/libalpm/util.c:253
-#: lib/libalpm/util.c:269
+#: lib/libalpm/be_local.c:722 lib/libalpm/be_local.c:818
+#: lib/libalpm/be_local.c:958 lib/libalpm/be_local.c:1055
+#: lib/libalpm/diskspace.c:131 lib/libalpm/dload.c:823 lib/libalpm/util.c:254
+#: lib/libalpm/util.c:270
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "kunne ikke åbne fil %s: %s\n"
 
-#: lib/libalpm/be_local.c:729 lib/libalpm/be_sync.c:650
+#: lib/libalpm/be_local.c:738 lib/libalpm/be_sync.c:582
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr "%s-database er inkonsistent: forskellige navne på pakke %s\n"
 
-#: lib/libalpm/be_local.c:735 lib/libalpm/be_sync.c:656
+#: lib/libalpm/be_local.c:744 lib/libalpm/be_sync.c:588
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr "%s-database er inkonsistent: forskellige versioner på pakke %s\n"
 
-#: lib/libalpm/be_local.c:776
+#: lib/libalpm/be_local.c:785
 #, c-format
 msgid "unknown validation type for package %s: %s\n"
 msgstr "ukendt valideringstype for pakke %s: %s\n"
 
-#: lib/libalpm/be_package.c:479 lib/libalpm/be_package.c:637
-#: lib/libalpm/be_package.c:650
+#: lib/libalpm/be_package.c:478 lib/libalpm/be_package.c:631
+#: lib/libalpm/be_package.c:643
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "der opstod en fejl under læsning af pakke %s: %s\n"
 
-#: lib/libalpm/be_package.c:493 lib/libalpm/be_package.c:517
+#: lib/libalpm/be_package.c:491 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
 msgstr "fejl ved læsning af mtree af pakke %s: %s\n"
 
-#: lib/libalpm/be_package.c:603
+#: lib/libalpm/be_package.c:597
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "kunne ikke fortolke pakkebeskrivelsesfil i %s\n"
 
-#: lib/libalpm/be_package.c:608
+#: lib/libalpm/be_package.c:602
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "manglende pakkenavn i %s\n"
 
-#: lib/libalpm/be_package.c:612
+#: lib/libalpm/be_package.c:606
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "manglende pakkeversion i %s\n"
 
-#: lib/libalpm/be_package.c:616
+#: lib/libalpm/be_package.c:610
 #, c-format
 msgid "invalid package version in %s\n"
 msgstr "ugyldig pakkeversion i %s\n"
 
-#: lib/libalpm/be_package.c:657
+#: lib/libalpm/be_package.c:649
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "manglende pakkemetadata i %s\n"
 
-#: lib/libalpm/be_package.c:750
+#: lib/libalpm/be_package.c:741
 #, c-format
 msgid "failed to read signature file: %s\n"
 msgstr "kunne ikke læse underskriftfil: %s\n"
 
-#: lib/libalpm/be_package.c:779 lib/libalpm/sync.c:953
+#: lib/libalpm/be_package.c:770 lib/libalpm/sync.c:953
 #, c-format
 msgid "required key missing from keyring\n"
 msgstr "krævede nøgle mangler fra nøglering\n"
@@ -239,32 +239,32 @@ msgstr "krævede nøgle mangler fra nøglering\n"
 msgid "removing invalid file: %s\n"
 msgstr "fjerner ugyldig fil: %s\n"
 
-#: lib/libalpm/be_sync.c:515
+#: lib/libalpm/be_sync.c:449
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
 msgstr "kunne ikke fortolke pakkebeskrivelsesfil '%s' fra db '%s'\n"
 
-#: lib/libalpm/be_sync.c:522
+#: lib/libalpm/be_sync.c:456
 #, c-format
 msgid "could not read db '%s' (%s)\n"
 msgstr "kunne ikke læse db '%s' (%s)\n"
 
-#: lib/libalpm/be_sync.c:556 lib/libalpm/be_sync.c:561
+#: lib/libalpm/be_sync.c:489 lib/libalpm/be_sync.c:494
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
 msgstr "%s-database er inkonsistent: filnavnet på pakken %s er ugyldigt\n"
 
-#: lib/libalpm/be_sync.c:566
+#: lib/libalpm/be_sync.c:499
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
 msgstr "%s-database er inkonsistent: filnavnet på pakken %s er for langt\n"
 
-#: lib/libalpm/be_sync.c:632
+#: lib/libalpm/be_sync.c:564
 #, c-format
 msgid "unknown database file: %s\n"
 msgstr "ukendt databaseful: %s\n"
 
-#: lib/libalpm/db.c:370
+#: lib/libalpm/db.c:344
 #, c-format
 msgid "database path is undefined\n"
 msgstr "databasesti er udefineret\n"
@@ -284,12 +284,12 @@ msgstr "%s vil blive fjernet efter dennes %s-afhængighed\n"
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s vil blive installeret før dennes %s-afhængighed\n"
 
-#: lib/libalpm/deps.c:681 lib/libalpm/deps.c:712
+#: lib/libalpm/deps.c:666 lib/libalpm/deps.c:697
 #, c-format
 msgid "ignoring package %s-%s\n"
 msgstr "ignorerer pakke %s-%s\n"
 
-#: lib/libalpm/deps.c:869
+#: lib/libalpm/deps.c:842
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "kan ikke læse '%s', en afhængighed af '%s'\n"
@@ -344,42 +344,68 @@ msgstr "kunne ikke bestemme rodmonteringspunkt %s\n"
 msgid "Partition %s is mounted read only\n"
 msgstr "Partition %s er monteret som læs-kun\n"
 
-#: lib/libalpm/dload.c:161
+#: lib/libalpm/dload.c:116
+#, c-format
+msgid ""
+"too many errors from %s, skipping for the remainder of this transaction\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:220
 #, c-format
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/dload.c:348
+#: lib/libalpm/dload.c:392
 #, c-format
 msgid "failed to create temporary file for download\n"
 msgstr "kunne ikke oprette midlertidig fil til hentning\n"
 
-#: lib/libalpm/dload.c:393
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "adressen '%s' er ugyldig\n"
-
-#: lib/libalpm/dload.c:464 lib/libalpm/dload.c:485 lib/libalpm/dload.c:496
+#: lib/libalpm/dload.c:509 lib/libalpm/dload.c:547 lib/libalpm/dload.c:561
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "fejlede i indhentning af fil '%s' fra %s: %s\n"
 
-#: lib/libalpm/dload.c:477
+#: lib/libalpm/dload.c:539
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
 msgstr ""
 "kunne ikke indhente fil '%s' fra %s: forventet downloadstørrelse "
 "overskredet\n"
 
-#: lib/libalpm/dload.c:532
+#: lib/libalpm/dload.c:687
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s ser ud til at være afkortet: %jd/%jd byte\n"
 
-#: lib/libalpm/dload.c:677 lib/libalpm/dload.c:706
+#: lib/libalpm/dload.c:787
 #, c-format
-msgid "failed to download %s\n"
-msgstr "kunne ikke hente %s\n"
+msgid "url '%s' is invalid\n"
+msgstr "adressen '%s' er ugyldig\n"
+
+#: lib/libalpm/dload.c:893
+#, c-format
+msgid "failed to setup a download payload for %s\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:905
+#, c-format
+msgid "curl returned error %d from transfer\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:929
+#, c-format
+msgid "curl transfer error: %d\n"
+msgstr ""
+
+#: lib/libalpm/dload.c:1055 lib/libalpm/sync.c:840
+#, c-format
+msgid "failed to retrieve some files\n"
+msgstr "kunne ikke indhente nogle filer\n"
+
+#: lib/libalpm/dload.c:1078
+#, c-format
+msgid "download completed successfully but no file in the cache\n"
+msgstr ""
 
 #: lib/libalpm/error.c:40
 #, c-format
@@ -496,7 +522,7 @@ msgstr "ingen servere konfigureret for arkiv"
 msgid "transaction already initialized"
 msgstr "transaktion allerede initialiseret"
 
-#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:96
 #, c-format
 msgid "transaction not initialized"
 msgstr "transaktion er ikke initialiseret"
@@ -506,86 +532,86 @@ msgstr "transaktion er ikke initialiseret"
 msgid "duplicate target"
 msgstr "dupliker mål"
 
-#: lib/libalpm/error.c:96
+#: lib/libalpm/error.c:94
+#, c-format
+msgid "duplicate filename"
+msgstr ""
+
+#: lib/libalpm/error.c:98
 #, c-format
 msgid "transaction not prepared"
 msgstr "transaktion er ikke forberedt"
 
-#: lib/libalpm/error.c:98
+#: lib/libalpm/error.c:100
 #, c-format
 msgid "transaction aborted"
 msgstr "transaktion afbrudt"
 
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:102
 #, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "handling er ikke kompatibel med transaktionstype"
 
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:104
 #, c-format
 msgid "transaction commit attempt when database is not locked"
 msgstr "forsøg på transaktionsindsendelse (commit) når database ikke er låst"
 
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:106
 #, c-format
 msgid "failed to run transaction hooks"
 msgstr "kunne ikke køre transaktionskroge"
 
-#: lib/libalpm/error.c:107
+#: lib/libalpm/error.c:109
 #, c-format
 msgid "could not find or read package"
 msgstr "kunne ikke finde eller læse pakke"
 
-#: lib/libalpm/error.c:109
+#: lib/libalpm/error.c:111
 #, c-format
 msgid "operation cancelled due to ignorepkg"
 msgstr "handling afbrudt på grund af igonrepkg"
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:113
 #, c-format
 msgid "invalid or corrupted package"
 msgstr "ugyldig eller beskadiget pakke"
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:115
 #, c-format
 msgid "invalid or corrupted package (checksum)"
 msgstr "ugyldig eller beskadiget database (kontrolsum)"
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:117
 #, c-format
 msgid "invalid or corrupted package (PGP signature)"
 msgstr "ugyldig eller beskadiget pakke (PGP-signatur)"
 
-#: lib/libalpm/error.c:117
+#: lib/libalpm/error.c:119
 #, c-format
 msgid "package missing required signature"
 msgstr "pakke mangler krævet signatur"
 
-#: lib/libalpm/error.c:119
+#: lib/libalpm/error.c:121
 #, c-format
 msgid "cannot open package file"
 msgstr "kan ikke åbne pakkefil"
 
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:123
 #, c-format
 msgid "cannot remove all files for package"
 msgstr "kan ikke fjerne alle filer for pakke"
 
-#: lib/libalpm/error.c:123
+#: lib/libalpm/error.c:125
 #, c-format
 msgid "package filename is not valid"
 msgstr "pakkefilnavn er ugyldigt"
 
-#: lib/libalpm/error.c:125
+#: lib/libalpm/error.c:127
 #, c-format
 msgid "package architecture is not valid"
 msgstr "pakkearkitektur er ikke gyldig"
 
-#: lib/libalpm/error.c:127
-#, c-format
-msgid "could not find repository for target"
-msgstr "kunne ikke finde arkiv for mål"
-
 #: lib/libalpm/error.c:130
 #, c-format
 msgid "missing PGP signature"
@@ -651,12 +677,12 @@ msgstr "kompileret uden understøttelse af signatur"
 msgid "unexpected error"
 msgstr "uventet fejl"
 
-#: lib/libalpm/handle.c:153
+#: lib/libalpm/handle.c:142
 #, c-format
 msgid "lock file missing %s\n"
 msgstr "låsefil mangler %s\n"
 
-#: lib/libalpm/handle.c:159
+#: lib/libalpm/handle.c:148
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "kunne ikke fjerne låsningsfil %s\n"
@@ -728,7 +754,7 @@ msgstr "hook %s linje %d: kan ikke sætte tilvalg (%s)\n"
 msgid "unable to run hook %s: %s\n"
 msgstr "kan ikke køre hook %s: %s\n"
 
-#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:386
+#: lib/libalpm/hook.c:547 lib/libalpm/hook.c:559 lib/libalpm/remove.c:378
 #, c-format
 msgid "could not open directory: %s: %s\n"
 msgstr "kunne ikke åbne mappe: %s: %s\n"
@@ -738,7 +764,7 @@ msgstr "kunne ikke åbne mappe: %s: %s\n"
 msgid "could not open file: %s%s: %s\n"
 msgstr "kunne ikke åbne fil: %s%s: %s\n"
 
-#: lib/libalpm/hook.c:595 lib/libalpm/util.c:259
+#: lib/libalpm/hook.c:595 lib/libalpm/util.c:260
 #, c-format
 msgid "could not stat file %s: %s\n"
 msgstr "kunne ikke køre (stat) fil %s: %s\n"
@@ -748,183 +774,183 @@ msgstr "kunne ikke køre (stat) fil %s: %s\n"
 msgid "could not read directory: %s: %s\n"
 msgstr "kunne ikke læse mappe: %s: %s\n"
 
-#: lib/libalpm/package.c:578
+#: lib/libalpm/package.c:598
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
 msgstr "kunne ikke fuldt indlæse metadata for pakke %s-%s\n"
 
-#: lib/libalpm/remove.c:119
+#: lib/libalpm/remove.c:111
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "kunne ikke finde %s i database - springer over\n"
 
-#: lib/libalpm/remove.c:154
+#: lib/libalpm/remove.c:146
 #, c-format
 msgid "removing %s from target list\n"
 msgstr "fjerner %s fra målliste\n"
 
-#: lib/libalpm/remove.c:346
+#: lib/libalpm/remove.c:338
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "kan ikke fjerne fil »%s«:%s\n"
 
-#: lib/libalpm/remove.c:411 lib/libalpm/remove.c:420
+#: lib/libalpm/remove.c:403 lib/libalpm/remove.c:412
 #, c-format
 msgid "could not backup %s due to PATH_MAX overflow\n"
 msgstr "kunne ikke sikkerhedskopiere %s på grund af PATH_MAX-overløb\n"
 
-#: lib/libalpm/remove.c:562
+#: lib/libalpm/remove.c:554
 #, c-format
 msgid "cannot remove %s (%s)\n"
 msgstr "kan ikke fjerne %s (%s)\n"
 
-#: lib/libalpm/remove.c:735
+#: lib/libalpm/remove.c:727
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "kunne ikke fjerne databasepunkt %s-%s\n"
 
-#: lib/libalpm/remove.c:740
+#: lib/libalpm/remove.c:732
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "kunne ikke fjerne punkt '%s' fra cache\n"
 
-#: lib/libalpm/signing.c:171
+#: lib/libalpm/signing.c:163
 #, c-format
 msgid "Public keyring not found; have you run '%s'?\n"
 msgstr "Offentlig nøglering ikke fundet. Har du kørt '%s'?\n"
 
-#: lib/libalpm/signing.c:207 lib/libalpm/signing.c:784
+#: lib/libalpm/signing.c:199 lib/libalpm/signing.c:767
 #, c-format
 msgid "GPGME error: %s\n"
 msgstr "Fejl ved GPGME: %s\n"
 
-#: lib/libalpm/signing.c:284
+#: lib/libalpm/signing.c:274
 #, c-format
 msgid "looking up key %s using WKD\n"
 msgstr "slår nøglen %s op med WKD\n"
 
-#: lib/libalpm/signing.c:293
+#: lib/libalpm/signing.c:283
 #, c-format
 msgid "gpg error: %s\n"
 msgstr "fejl ved gpg: %s\n"
 
-#: lib/libalpm/signing.c:441 lib/libalpm/signing.c:515
+#: lib/libalpm/signing.c:430 lib/libalpm/signing.c:503
 #, c-format
 msgid "keyring is not writable\n"
 msgstr "der kan ikke skrives til nøglering\n"
 
-#: lib/libalpm/signing.c:539
+#: lib/libalpm/signing.c:531
 #, c-format
 msgid "key \"%s\" on keyserver\n"
 msgstr "nøglen\"%s\" på nøgleserver\n"
 
-#: lib/libalpm/signing.c:544
+#: lib/libalpm/signing.c:536
 #, c-format
 msgid "key \"%s\" could not be imported\n"
 msgstr "nøglen \"%s\" kunne ikke importeres\n"
 
-#: lib/libalpm/signing.c:548
+#: lib/libalpm/signing.c:540
 #, c-format
 msgid "key \"%s\" could not be looked up remotely\n"
 msgstr "nøglen \"%s\" kunne ikke opslås eksternt\n"
 
-#: lib/libalpm/signing.c:943 lib/libalpm/sync.c:1022
+#: lib/libalpm/signing.c:926 lib/libalpm/sync.c:1022
 #, c-format
 msgid "%s: missing required signature\n"
 msgstr "%s: mangler krævet signatur\n"
 
-#: lib/libalpm/signing.c:958
+#: lib/libalpm/signing.c:941
 #, c-format
 msgid "%s: signature from \"%s\" is marginal trust\n"
 msgstr "%s: signatur fra \"%s\" er marginelt betroet\n"
 
-#: lib/libalpm/signing.c:966
+#: lib/libalpm/signing.c:949
 #, c-format
 msgid "%s: signature from \"%s\" is unknown trust\n"
 msgstr "%s: signatur fra \"%s\" er ukendt betroet\n"
 
-#: lib/libalpm/signing.c:973
+#: lib/libalpm/signing.c:956
 #, c-format
 msgid "%s: signature from \"%s\" should never be trusted\n"
 msgstr "%s: signatur fra \"%s\" skal aldrig betroes\n"
 
-#: lib/libalpm/signing.c:985
+#: lib/libalpm/signing.c:968
 #, c-format
 msgid "%s: key \"%s\" is unknown\n"
 msgstr "%s: nøgelen \"%s\" er ukendt\n"
 
-#: lib/libalpm/signing.c:994
+#: lib/libalpm/signing.c:977
 #, c-format
 msgid "%s: key \"%s\" is disabled\n"
 msgstr "%s: nøglen \"%s\" er deaktiveret\n"
 
-#: lib/libalpm/signing.c:998
+#: lib/libalpm/signing.c:981
 #, c-format
 msgid "%s: signature from \"%s\" is expired\n"
 msgstr "%s: signatur fra \"%s\" er udløbet\n"
 
-#: lib/libalpm/signing.c:1002
+#: lib/libalpm/signing.c:985
 #, c-format
 msgid "%s: signature from \"%s\" is invalid\n"
 msgstr "%s: signatur fra \"%s\" er ugyldig\n"
 
-#: lib/libalpm/signing.c:1079 lib/libalpm/signing.c:1147
-#: lib/libalpm/signing.c:1226
+#: lib/libalpm/signing.c:1043 lib/libalpm/signing.c:1104
+#: lib/libalpm/signing.c:1183
 #, c-format
 msgid "%s: signature format error\n"
 msgstr "%s: fejl i signaturformat\n"
 
-#: lib/libalpm/signing.c:1179 lib/libalpm/signing.c:1212
-#: lib/libalpm/signing.c:1220
+#: lib/libalpm/signing.c:1136 lib/libalpm/signing.c:1169
+#: lib/libalpm/signing.c:1177
 #, c-format
 msgid "%s: unsupported signature format\n"
 msgstr "%s: signaturformat understøttes ikke\n"
 
-#: lib/libalpm/sync.c:99
+#: lib/libalpm/sync.c:96
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorerer pakkeopgradering (%s => %s)\n"
 
-#: lib/libalpm/sync.c:111
+#: lib/libalpm/sync.c:108
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
 msgstr "%s: ignorerer pakkenedgradering (%s => %s)\n"
 
-#: lib/libalpm/sync.c:114
+#: lib/libalpm/sync.c:111
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
 msgstr "%s: nedgraderer fra version %s til version %s\n"
 
-#: lib/libalpm/sync.c:120
+#: lib/libalpm/sync.c:117
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: lokal (%s) er nyere end %s (%s)\n"
 
-#: lib/libalpm/sync.c:161
+#: lib/libalpm/sync.c:158
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
 msgstr "ignorerer pakkeerstatning (%s-%s => %s-%s)\n"
 
-#: lib/libalpm/sync.c:177
+#: lib/libalpm/sync.c:174
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "kan ikke erstatte %s med %s\n"
 
-#: lib/libalpm/sync.c:535 lib/libalpm/sync.c:605
+#: lib/libalpm/sync.c:476
+#, c-format
+msgid "packages %s and %s have the same filename: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:612
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "pakkekonflikter, der ikke kan løses, er detekteret\n"
 
-#: lib/libalpm/sync.c:555
+#: lib/libalpm/sync.c:562
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr "fjerner »%s« fra målliste da det konflikter med »%s«\n"
 
-#: lib/libalpm/sync.c:849
-#, c-format
-msgid "failed to retrieve some files\n"
-msgstr "kunne ikke indhente nogle filer\n"
-
 #: lib/libalpm/sync.c:1036
 #, c-format
 msgid "failed to read file %s: %s\n"
@@ -945,82 +971,82 @@ msgstr "kunne ikke indsende (commit) fjernelsestransaktion\n"
 msgid "could not commit transaction\n"
 msgstr "kunne ikke indsende (commit) transaktion\n"
 
-#: lib/libalpm/trans.c:364
+#: lib/libalpm/trans.c:365
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "kunne ikke oprette midlertidig mappe\n"
 
-#: lib/libalpm/trans.c:379
+#: lib/libalpm/trans.c:380
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "kunne ikke kopier midlertidig fil til %s (%s)\n"
 
-#: lib/libalpm/trans.c:410
+#: lib/libalpm/trans.c:411
 #, c-format
 msgid "could not remove %s\n"
 msgstr "kunne ikke slette %s\n"
 
-#: lib/libalpm/trans.c:414
+#: lib/libalpm/trans.c:415
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "kunne ikke fjerne tmpdir %s\n"
 
-#: lib/libalpm/util.c:486
+#: lib/libalpm/util.c:488
 #, c-format
 msgid "unable to write to pipe (%s)\n"
 msgstr "kan ikke skrive til pipe (%s)\n"
 
-#: lib/libalpm/util.c:545
+#: lib/libalpm/util.c:547
 #, c-format
 msgid "unable to read from pipe (%s)\n"
 msgstr "kan ikke læse fra pipe (%s)\n"
 
-#: lib/libalpm/util.c:609 lib/libalpm/util.c:615
+#: lib/libalpm/util.c:617 lib/libalpm/util.c:623
 #, c-format
 msgid "could not create pipe (%s)\n"
 msgstr "kunne ikke oprette pipe (%s)\n"
 
-#: lib/libalpm/util.c:623
+#: lib/libalpm/util.c:631
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "kunne ikke forgren en ny proces (%s)\n"
 
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:654
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "kunne ikke ændre rodmappen (%s)\n"
 
-#: lib/libalpm/util.c:658
+#: lib/libalpm/util.c:666
 #, c-format
 msgid "call to execv failed (%s)\n"
 msgstr "kald til execv fejlede (%s)\n"
 
-#: lib/libalpm/util.c:737
+#: lib/libalpm/util.c:745
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "kald til waitpid fejlede (%s)\n"
 
-#: lib/libalpm/util.c:747
+#: lib/libalpm/util.c:755
 #, c-format
 msgid "command failed to execute correctly\n"
 msgstr "kommando kunne ikke udføres korrekt\n"
 
-#: lib/libalpm/util.c:754
+#: lib/libalpm/util.c:762
 #, c-format
 msgid "Unknown signal"
 msgstr "Ukendt signal"
 
-#: lib/libalpm/util.c:756
+#: lib/libalpm/util.c:764
 #, c-format
 msgid "command terminated by signal %d: %s\n"
 msgstr "kommando afbrudt af signal %d: %s\n"
 
-#: lib/libalpm/util.c:853
+#: lib/libalpm/util.c:875
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "ingen %s-cache findes, opretter...\n"
 
-#: lib/libalpm/util.c:884
+#: lib/libalpm/util.c:906
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
 msgstr "kunne ikke finde eller oprette pakke-cache, bruger i stedet %s\n"