WIP: First pass at adding a pkgdiff script

Signed-off-by: Allan McRae <allan@archlinux.org>

.gitlab-ci.yml

@@ -20,14 +20,14 @@ default:
 arch:
   extends: .arch-test
   script:
-    - meson build
+    - meson setup build
     - ninja -C build
     - fakechroot meson test -C build
 
 arch-debug:
   extends: .arch-test
   script:
-    - meson --buildtype=debug --werror build
+    - meson setup --buildtype=debug --werror build
     - ninja -C build
     - fakechroot meson test -C build
 
@@ -35,50 +35,51 @@ arch-docs:
   extends: .arch-test
   script:
     - pacman -Syu --needed --noconfirm asciidoc
-    - meson -Ddoc=enabled build
+    - meson setup -Ddoc=enabled build
     - ninja -C build
 
 arch-clang:
   extends: .arch-test
   script:
     - pacman -Syu --needed --noconfirm clang
-    - CC=clang meson build
+    - CC=clang meson setup build
     - ninja -C build
     - fakechroot meson test -C build
 
-arch-valgrind:
-  extends: .arch-test
-  script:
-    - pacman -Syu --needed --noconfirm valgrind
-    - meson build
-    - ninja -C build
-    - PACTEST_VALGRIND=1 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 -Dcrypto=nettle --buildtype=debug build
+    - meson setup -Dcrypto=nettle --buildtype=debug build
     - ninja -C build
     - fakechroot meson test -C build
 
 arch-no-gpg:
   extends: .arch-test
   script:
-    - meson -Dgpgme=disabled --buildtype=debug build
+    - meson setup -Dgpgme=disabled --buildtype=debug build
     - ninja -C build
     - fakechroot meson test -C build
 
 arch-no-curl:
   extends: .arch-test
   script:
-    - meson -Dcurl=disabled --buildtype=debug build
+    - meson setup -Dcurl=disabled --buildtype=debug build
     - ninja -C build
     - fakechroot meson test -C build
 
 arch-no-nls:
   extends: .arch-test
   script:
-    - meson -Di18n=false --buildtype=debug build
+    - meson setup -Di18n=false --buildtype=debug build
     - ninja -C build
     - fakechroot meson test -C build
 
@@ -93,7 +94,7 @@ debian:
       gettext python3 python3-setuptools dash gawk ca-certificates
       fakeroot fakechroot
   script:
-    - meson --buildtype=debug build
+    - meson setup --buildtype=debug build
     - ninja -C build
     - fakechroot meson test -C build
 
@@ -109,6 +110,6 @@ fedora:
       fakeroot fakechroot
       perl-Module-Load-Conditional
   script:
-    - meson --buildtype=debug build
+    - meson setup --buildtype=debug build
     - ninja -C build
     - fakechroot meson test -C build

.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

RELEASE

@@ -14,7 +14,7 @@ The following checklist should be used for making a pacman release.
 - 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")
+- 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

build-aux/edit-script.sh.in

@@ -11,6 +11,7 @@ sed \
   -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,6 +21,7 @@ sed \
   -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \
   -e "s|@INODECMD[@]|@INODECMD@|g" \
   -e "s|@FILECMD[@]|@FILECMD@|g" \
+  -e "s|@BSDTAR_NO_READ_SPARSE[@]|@BSDTAR_NO_READ_SPARSE@|g" \
   "$input" >"$output"
 
 if [[ $mode ]]; then

doc/BUILDINFO.5.asciidoc

@@ -18,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 +53,15 @@ BUILDINFO file format.
 *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.20
+# Doxyfile 1.9.3
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -12,7 +12,6 @@ OUTPUT_DIRECTORY       = @OUTPUT_DIRECTORY@
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
-OUTPUT_TEXT_DIRECTION  = None
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = "The $name class" \
@@ -73,6 +72,7 @@ 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
@@ -81,6 +81,7 @@ 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
@@ -110,6 +111,7 @@ 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"
@@ -152,7 +154,6 @@ VERBATIM_HEADERS       = YES
 # 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
@@ -174,6 +175,7 @@ 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
@@ -196,14 +198,16 @@ 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     =
@@ -234,7 +238,6 @@ 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  =
@@ -247,7 +250,6 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
-RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -268,7 +270,9 @@ XML_NS_MEMB_FILE_SCOPE = NO
 #---------------------------------------------------------------------------
 GENERATE_DOCBOOK       = NO
 DOCBOOK_OUTPUT         = docbook
-DOCBOOK_PROGRAMLISTING = NO
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
@@ -304,19 +308,18 @@ EXTERNAL_PAGES         = YES
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
 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
@@ -324,6 +327,7 @@ 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               =
@@ -335,7 +339,6 @@ 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/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*::
@@ -187,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=()'.
 
@@ -245,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=()'.
 
@@ -402,8 +386,8 @@ All options and directives for the split packages default to the global values
 given in the PKGBUILD. Nevertheless, the following ones can be overridden within
 each split package's packaging function:
 `pkgdesc`, `arch`, `url`, `license`, `groups`, `depends`, `optdepends`,
-`provides`, `conflicts`, `replaces`, `backup`, `options`, `install`,
-`changelog` and `alternative`.
+`provides`, `conflicts`, `replaces`, `backup`, `options`, `install`, and
+`changelog`.
 
 Note that makepkg does not consider split package `depends` when checking
 if dependencies are installed before package building and with `--syncdeps`.
@@ -524,8 +508,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/index.asciidoc

@@ -250,7 +250,7 @@ bugs under the Pacman project.
 
 Copyright
 ---------
-pacman is Copyright (C) 2006-2021 Pacman Development Team
+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/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`".
 
@@ -287,6 +287,10 @@ Environment Variables
 **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

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.
@@ -190,8 +195,14 @@ Options
 		package containing the debug symbols when used with `strip'.
 
 	*lto*;;
-		Enable building packages using link time optimization. Adds '-flto'
-		to both CFLAGS and CXXFLAGS.
+		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
@@ -223,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
@@ -274,9 +291,10 @@ 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

doc/meson.build

@@ -5,7 +5,9 @@ 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' },
@@ -28,6 +30,7 @@ asciidoc_opts = [
  '-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),

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

@@ -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,8 +235,13 @@ 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, "%n" for
+	pkgname, "%p" for packager, "%v" for pkgver, "%l" for location, "%r"
+	for repository, "%s" for size, "%C" for checkdepends, "%D" for depends
+	and "%M" for makedepends.
+	Implies '\--print'.
 
 
 Upgrade Options (apply to '-S' and '-U')[[UO]]

doc/pacman.conf.5.asciidoc

@@ -121,7 +121,7 @@ Options
 	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

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[]

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

@@ -41,13 +41,12 @@ 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
@@ -76,7 +75,8 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
+# 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
@@ -88,8 +88,9 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- 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 !lto)
+OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug !lto !autodeps)
 
 #-- File integrity checks to use. Valid: ck, md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(ck)
@@ -107,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

etc/pacman.conf.in

@@ -74,4 +74,4 @@ ParallelDownloads = 5
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#Server = file:///home/packages

lib/libalpm/add.c

@@ -1,7 +1,7 @@
 /*
  *  add.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/add.h

@@ -1,7 +1,7 @@
 /*
  *  add.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/alpm.h

@@ -1,7 +1,7 @@
 /*
  * alpm.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>
@@ -107,12 +107,20 @@ typedef struct _alpm_db_t alpm_db_t;
  * Packages from databases are automatically freed when the database is unregistered. Packages loaded
  * from a file must be freed manually.
  *
- * Packages can then be queried for metadata or added to a \link alpm_trans_t transaction \endlink
+ * Packages can then be queried for metadata or added to a transaction
  * to be added or removed from the system.
  * @ingroup libalpm_packages
  */
 typedef struct _alpm_pkg_t alpm_pkg_t;
 
+/** The extended data type used to store non-standard package data fields
+ * @ingroup libalpm_packages
+ */
+typedef struct _alpm_pkg_xdata_t {
+	char *name;
+	char *value;
+} alpm_pkg_xdata_t;
+
 /** The time type used by libalpm. Represents a unix time stamp
  * @ingroup libalpm_misc */
 typedef int64_t alpm_time_t;
@@ -156,7 +164,7 @@ typedef struct _alpm_backup_t {
  * @param path the path to search for in the package
  * @return a pointer to the matching file or NULL if not found
  */
-alpm_file_t *alpm_filelist_contains(alpm_filelist_t *filelist, const char *path);
+alpm_file_t *alpm_filelist_contains(const alpm_filelist_t *filelist, const char *path);
 
 /* End of libalpm_files */
 /** @} */
@@ -967,7 +975,7 @@ typedef union _alpm_event_t {
  * Called when an event occurs
  * @param ctx user-provided context
  * @param event the event that occurred */
-typedef void (*alpm_cb_event)(void *ctx, alpm_event_t *);
+typedef void (*alpm_cb_event)(void *ctx, alpm_event_t *event);
 
 /**
  * Type of question.
@@ -1114,7 +1122,7 @@ typedef union _alpm_question_t {
  * @param ctx user-provided context
  * @param question the question being asked.
  */
-typedef void (*alpm_cb_question)(void *ctx, alpm_question_t *);
+typedef void (*alpm_cb_question)(void *ctx, alpm_question_t *question);
 
 /** An enum over different kinds of progress alerts. */
 typedef enum _alpm_progress_t {
@@ -1281,6 +1289,12 @@ int alpm_unregister_all_syncdbs(alpm_handle_t *handle);
  */
 int alpm_db_unregister(alpm_db_t *db);
 
+/** Get the handle of a package database.
+ * @param db pointer to the package database
+ * @return the alpm handle that the package database belongs to
+ */
+alpm_handle_t *alpm_db_get_handle(alpm_db_t *db);
+
 /** Get the name of a package database.
  * @param db pointer to the package database
  * @return the name of the package database, NULL on error
@@ -1830,7 +1844,7 @@ const char *alpm_option_get_gpgdir(alpm_handle_t *handle);
  * @param gpgdir the gpgdir to set
  */
 int alpm_option_set_gpgdir(alpm_handle_t *handle, const char *gpgdir);
-/* End of gpdir accessors */
+/* End of gpgdir accessors */
 /** @} */
 
 
@@ -2386,6 +2400,12 @@ int alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg);
  * @{
  */
 
+/** Gets the handle of a package
+ * @param pkg a pointer to package
+ * @return the alpm handle that the package belongs to
+ */
+alpm_handle_t *alpm_pkg_get_handle(alpm_pkg_t *pkg);
+
 /** Gets the name of the file from which the package was loaded.
  * @param pkg a pointer to package
  * @return a reference to an internal string
@@ -2555,12 +2575,6 @@ alpm_filelist_t *alpm_pkg_get_files(alpm_pkg_t *pkg);
  */
 alpm_list_t *alpm_pkg_get_backup(alpm_pkg_t *pkg);
 
-/** Returns the list of alternatives provided by the package
- * @param pkg a pointer to package
- * @return a reference to a list of char* objects
- */
-alpm_list_t *alpm_pkg_get_alternatives(alpm_pkg_t *pkg);
-
 /** Returns the database containing pkg.
  * Returns a pointer to the alpm_db_t structure the package is
  * originating from, or NULL if the package was loaded from a file.
@@ -2592,6 +2606,12 @@ int alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len);
  */
 int alpm_pkg_get_validation(alpm_pkg_t *pkg);
 
+/** Gets the extended data field of a package.
+ * @param pkg a pointer to package
+ * @return a reference to a list of alpm_pkg_xdata_t objects
+ */
+alpm_list_t *alpm_pkg_get_xdata(alpm_pkg_t *pkg);
+
 /** Returns whether the package has an install scriptlet.
  * @return 0 if FALSE, TRUE otherwise
  */

lib/libalpm/alpm_list.c

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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_list.h

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/backup.c

@@ -1,7 +1,7 @@
 /*
  *  backup.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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,10 +195,10 @@ static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg)
 	return pkg->backup;
 }
 
-static alpm_list_t *_cache_get_alternatives(alpm_pkg_t *pkg)
+static alpm_list_t *_cache_get_xdata(alpm_pkg_t *pkg)
 {
 	LAZY_LOAD(INFRQ_DESC);
-	return pkg->alternatives;
+	return pkg->xdata;
 }
 
 /**
@@ -355,7 +355,7 @@ static const struct pkg_operations local_pkg_ops = {
 	.get_replaces = _cache_get_replaces,
 	.get_files = _cache_get_files,
 	.get_backup = _cache_get_backup,
-	.get_alternatives = _cache_get_alternatives,
+	.get_xdata = _cache_get_xdata,
 
 	.changelog_open = _cache_changelog_open,
 	.changelog_read = _cache_changelog_read,
@@ -811,8 +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, "%ALTERNATIVES%") == 0) {
-				READ_AND_STORE_ALL(info->alternatives);
+			} 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);
@@ -1049,11 +1059,11 @@ 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->alternatives) {
-			fputs("%ALTERNATIVES%\n", fp);
-			for(lp = info->alternatives; lp; lp = lp->next) {
-				fputs(lp->data, fp);
-				fputc('\n', fp);
+		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);
 		}

lib/libalpm/be_package.c

@@ -1,7 +1,7 @@
 /*
  *  be_package.c : backend for packages
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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
@@ -244,12 +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, "alternative") == 0) {
-				newpkg->alternatives = alpm_list_add(newpkg->alternatives, strdup(ptr));
-			} 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);
@@ -653,7 +653,6 @@ 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;
@@ -676,6 +675,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
 		newpkg->infolevel |= INFRQ_FILES;
 	}
 
+	close(fd);
 	return newpkg;
 
 pkg_invalid:
@@ -725,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));
@@ -751,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-2021 Pacman Development Team <pacman-dev@lists.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
@@ -666,6 +666,18 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 				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-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/conflict.h

@@ -1,7 +1,7 @@
 /*
  *  conflict.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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>
@@ -212,6 +212,12 @@ int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url)
 	return ret;
 }
 
+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);

lib/libalpm/db.h

@@ -1,7 +1,7 @@
 /*
  *  db.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/deps.c

@@ -1,7 +1,7 @@
 /*
  *  deps.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/deps.h

@@ -1,7 +1,7 @@
 /*
  *  deps.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/diskspace.h

@@ -1,7 +1,7 @@
 /*
  *  diskspace.h
  *
- *  Copyright (c) 2010-2021 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/dload.c

@@ -1,7 +1,7 @@
 /*
  *  dload.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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
@@ -153,8 +153,7 @@ static char *get_fullpath(const char *path, const char *filename,
 }
 
 enum {
-	ABORT_SIGINT = 1,
-	ABORT_OVER_MAXFILESIZE
+	ABORT_OVER_MAXFILESIZE = 1,
 };
 
 static int dload_interrupted;
@@ -295,8 +294,11 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u
 				endptr--;
 			}
 
-			STRNDUP(payload->content_disp_name, fptr, endptr - fptr + 1,
-					RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize));
+			/* avoid information leakage with badly formed headers */
+			if(endptr > fptr) {
+				STRNDUP(payload->content_disp_name, fptr, endptr - fptr + 1,
+						RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize));
+			}
 		}
 	}
 
@@ -471,10 +473,9 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload
  * Returns -1 if an error happened for a required file
  * Returns -2 if an error happened for an optional file
  */
-static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg,
+static int curl_check_finished_download(alpm_handle_t *handle, CURLM *curlm, CURLMsg *msg,
 		const char *localpath, int *active_downloads_num)
 {
-	alpm_handle_t *handle = NULL;
 	struct dload_payload *payload = NULL;
 	CURL *curl = msg->easy_handle;
 	CURLcode curlerr;
@@ -489,7 +490,6 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg,
 
 	curlerr = curl_easy_getinfo(curl, CURLINFO_PRIVATE, &payload);
 	ASSERT(curlerr == CURLE_OK, RET_ERR(handle, ALPM_ERR_LIBCURL, -1));
-	handle = payload->handle;
 
 	curl_gethost(payload->fileurl, hostname, sizeof(hostname));
 	curlerr = msg->data.result;
@@ -917,7 +917,7 @@ static int curl_download_internal(alpm_handle_t *handle,
 				break;
 			}
 			if(msg->msg == CURLMSG_DONE) {
-				int ret = curl_check_finished_download(curlm, msg,
+				int ret = curl_check_finished_download(handle, curlm, msg,
 						localpath, &active_downloads_num);
 				if(ret == -1) {
 					/* if current payload failed to download then stop adding new payloads but wait for the

lib/libalpm/dload.h

@@ -1,7 +1,7 @@
 /*
  *  dload.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/error.c

@@ -1,7 +1,7 @@
 /*
  *  error.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/filelist.c

@@ -1,7 +1,7 @@
 /*
  *  filelist.c
  *
- *  Copyright (c) 2012-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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/group.c

@@ -1,7 +1,7 @@
 /*
  *  group.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/handle.h

@@ -1,7 +1,7 @@
 /*
  *  handle.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/hook.c

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

@@ -4,7 +4,7 @@
 /*
  * libarchive-compat.h
  *
- *  Copyright (c) 2013-2021 Pacman Development Team <pacman-dev@lists.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

lib/libalpm/log.c

@@ -1,7 +1,7 @@
 /*
  *  log.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/log.h

@@ -1,7 +1,7 @@
 /*
  *  log.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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>
@@ -98,7 +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_alternatives(alpm_pkg_t *pkg) { return pkg->alternatives; }
+static alpm_list_t *_pkg_get_xdata(alpm_pkg_t *pkg)      { return pkg->xdata; }
 
 static void *_pkg_changelog_open(alpm_pkg_t UNUSED *pkg)
 {
@@ -163,7 +163,7 @@ const struct pkg_operations default_pkg_ops = {
 	.get_replaces    = _pkg_get_replaces,
 	.get_files       = _pkg_get_files,
 	.get_backup      = _pkg_get_backup,
-	.get_alternatives = _pkg_get_alternatives,
+	.get_xdata       = _pkg_get_xdata,
 
 	.changelog_open  = _pkg_changelog_open,
 	.changelog_read  = _pkg_changelog_read,
@@ -193,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);
@@ -420,13 +426,6 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(alpm_pkg_t *pkg)
 	return pkg->ops->get_backup(pkg);
 }
 
-alpm_list_t SYMEXPORT *alpm_pkg_get_alternatives(alpm_pkg_t *pkg)
-{
-	ASSERT(pkg != NULL, return NULL);
-	pkg->handle->pm_errno = ALPM_ERR_OK;
-	return pkg->ops->get_alternatives(pkg);
-}
-
 alpm_db_t SYMEXPORT *alpm_pkg_get_db(alpm_pkg_t *pkg)
 {
 	/* Sanity checks */
@@ -488,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)
 {
@@ -641,7 +647,6 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr)
 	newpkg->optdepends = list_depdup(pkg->optdepends);
 	newpkg->conflicts  = list_depdup(pkg->conflicts);
 	newpkg->provides   = list_depdup(pkg->provides);
-	newpkg->alternatives = alpm_list_strdup(pkg->alternatives);
 
 	if(pkg->files.count) {
 		size_t filenum;
@@ -681,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) {
@@ -711,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);
@@ -719,7 +750,6 @@ void _alpm_pkg_free(alpm_pkg_t *pkg)
 	free_deplist(pkg->provides);
 	alpm_list_free(pkg->removes);
 	_alpm_pkg_free(pkg->oldpkg);
-	FREELIST(pkg->alternatives);
 
 	if(pkg->origin == ALPM_PKG_FROM_FILE) {
 		FREE(pkg->origin_data.file);

lib/libalpm/package.h

@@ -1,7 +1,7 @@
 /*
  *  package.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>
@@ -66,7 +66,8 @@ struct pkg_operations {
 	alpm_list_t *(*get_replaces) (alpm_pkg_t *);
 	alpm_filelist_t *(*get_files) (alpm_pkg_t *);
 	alpm_list_t *(*get_backup) (alpm_pkg_t *);
-	alpm_list_t *(*get_alternatives) (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 *);
@@ -121,7 +122,6 @@ struct _alpm_pkg_t {
 	alpm_list_t *provides;
 	alpm_list_t *removes; /* in transaction targets only */
 	alpm_pkg_t *oldpkg; /* in transaction targets only */
-	alpm_list_t *alternatives;
 
 	const struct pkg_operations *ops;
 
@@ -138,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 */
@@ -160,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-2021 Pacman Development Team <pacman-dev@lists.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-2021 Pacman Development Team <pacman-dev@lists.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/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/remove.c

@@ -1,7 +1,7 @@
 /*
  *  remove.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/remove.h

@@ -1,7 +1,7 @@
 /*
  *  remove.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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/signing.c

@@ -1,7 +1,7 @@
 /*
  *  signing.c
  *
- *  Copyright (c) 2008-2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+ *  Copyright (c) 2008-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
@@ -253,9 +253,10 @@ error:
  * This requires GPGME to call the gpg binary.
  * @param handle the context handle
  * @param email the email address of the key to import
+ * @param fpr the fingerprint key ID to look up (or NULL)
  * @return 0 on success, -1 on error
  */
-static int key_import_wkd(alpm_handle_t *handle, const char *email)
+static int key_import_wkd(alpm_handle_t *handle, const char *email, const char *fpr)
 {
 	gpgme_error_t gpg_err;
 	gpgme_ctx_t ctx = {0};
@@ -274,7 +275,12 @@ static int key_import_wkd(alpm_handle_t *handle, const char *email)
 	_alpm_log(handle, ALPM_LOG_DEBUG, _("looking up key %s using WKD\n"), email);
 	gpg_err = gpgme_get_key(ctx, email, &key, 0);
 	if(gpg_err_code(gpg_err) == GPG_ERR_NO_ERROR) {
-		ret = 0;
+		/* check if correct key was imported via WKD */
+		if(fpr && _alpm_key_in_keychain(handle, fpr)) {
+			ret = 0;
+		} else {
+			_alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed: WKD imported wrong fingerprint\n");
+		}
 	}
 	gpgme_key_unref(key);
 
@@ -353,14 +359,18 @@ static int key_search_keyserver(alpm_handle_t *handle, const char *fpr,
 	} else {
 		pgpkey->fingerprint = key->subkeys->keyid;
 	}
-	pgpkey->uid = key->uids->uid;
-	pgpkey->name = key->uids->name;
-	pgpkey->email = key->uids->email;
+
+	/* we are probably going to fail importing, but continue anyway... */
+	if(key->uids != NULL) {
+		pgpkey->uid = key->uids->uid;
+		pgpkey->name = key->uids->name;
+		pgpkey->email = key->uids->email;
+	}
+
 	pgpkey->created = key->subkeys->timestamp;
 	pgpkey->expires = key->subkeys->expires;
 	pgpkey->length = key->subkeys->length;
 	pgpkey->revoked = key->subkeys->revoked;
-
 	/* Initialize with '?', this is overwritten unless public key
 	 * algorithm is unknown. */
 	pgpkey->pubkey_algo = '?';
@@ -516,7 +526,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
 	if(question.import) {
 		/* Try to import the key from a WKD first */
 		if(email_from_uid(uid, &email) == 0) {
-			ret = key_import_wkd(handle, email);
+			ret = key_import_wkd(handle, email, fpr);
 			free(email);
 		}
 
@@ -529,7 +539,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
 					ret = 0;
 				} else {
 					_alpm_log(handle, ALPM_LOG_ERROR,
-							_("key \"%s\" could not be imported\n"), fetch_key.uid);
+							_("key \"%s\" could not be imported\n"), fpr);
 				}
 			} else {
 				_alpm_log(handle, ALPM_LOG_ERROR,

lib/libalpm/signing.h

@@ -1,7 +1,7 @@
 /*
  *  signing.h
  *
- *  Copyright (c) 2008-2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+ *  Copyright (c) 2008-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/sync.c

@@ -1,7 +1,7 @@
 /*
  *  sync.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>
@@ -470,7 +470,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 			for(j = i->next; j; j = j->next) {
 				alpm_pkg_t *pkg2 = j->data;
 				if(strcmp(pkg1->filename, pkg2->filename) == 0) {
-					alpm_list_free(resolved);
 					ret = -1;
 					handle->pm_errno = ALPM_ERR_TRANS_DUP_FILENAME;
 					_alpm_log(handle, ALPM_LOG_ERROR, _("packages %s and %s have the same filename: %s\n"),
@@ -480,6 +479,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 		}
 
 		if(ret != 0) {
+			alpm_list_free(resolved);
 			goto cleanup;
 		}
 
@@ -732,7 +732,7 @@ static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files)
 				handle->pm_errno = ALPM_ERR_SERVER_NONE;
 				_alpm_log(handle, ALPM_LOG_ERROR, "%s: %s\n",
 						alpm_strerror(handle->pm_errno), repo->treename);
-				return 1;
+				return -1;
 			}
 
 			ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1));
@@ -1109,6 +1109,7 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,
 			errors++;
 			*data = alpm_list_add(*data, strdup(spkg->filename));
 			free(filepath);
+			_alpm_pkg_free(pkgfile);
 			continue;
 		}
 		free(filepath);

lib/libalpm/sync.h

@@ -1,7 +1,7 @@
 /*
  *  sync.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/trans.c

@@ -1,7 +1,7 @@
 /*
  *  trans.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/trans.h

@@ -1,7 +1,7 @@
 /*
  *  trans.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/util.c

@@ -1,7 +1,7 @@
 /*
  *  util.c
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>
@@ -40,8 +40,7 @@
 #include <archive_entry.h>
 
 #ifdef HAVE_LIBSSL
-#include <openssl/md5.h>
-#include <openssl/sha.h>
+#include <openssl/evp.h>
 #endif
 
 #ifdef HAVE_LIBNETTLE
@@ -349,6 +348,11 @@ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix,
 
 		entryname = archive_entry_pathname(entry);
 
+		if(entryname == NULL) {
+			ret = 1;
+			goto cleanup;
+		}
+
 		/* If specific files were requested, skip entries that don't match. */
 		if(list) {
 			char *entry_prefix = NULL;
@@ -659,6 +663,13 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[],
 					"/", strerror(errno));
 			exit(1);
 		}
+		/* bash assumes it's being run under rsh/ssh if stdin is a socket and
+		 * sources ~/.bashrc if it thinks it's the top-level shell.
+		 * set SHLVL before running to indicate that it's a child shell and
+		 * disable this behavior */
+		setenv("SHLVL", "1", 0);
+		/* bash sources $BASH_ENV when run non-interactively */
+		unsetenv("BASH_ENV");
 		umask(0022);
 		_alpm_reset_signals();
 		execv(cmd, argv);
@@ -916,7 +927,8 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle)
 static int md5_file(const char *path, unsigned char output[16])
 {
 #if HAVE_LIBSSL
-	MD5_CTX ctx;
+	EVP_MD_CTX *ctx;
+	const EVP_MD *md = EVP_get_digestbyname("MD5");
 #else /* HAVE_LIBNETTLE */
 	struct md5_ctx ctx;
 #endif
@@ -933,7 +945,8 @@ static int md5_file(const char *path, unsigned char output[16])
 	}
 
 #if HAVE_LIBSSL
-	MD5_Init(&ctx);
+	ctx = EVP_MD_CTX_create();
+	EVP_DigestInit_ex(ctx, md, NULL);
 #else /* HAVE_LIBNETTLE */
 	md5_init(&ctx);
 #endif
@@ -943,7 +956,7 @@ static int md5_file(const char *path, unsigned char output[16])
 			continue;
 		}
 #if HAVE_LIBSSL
-		MD5_Update(&ctx, buf, n);
+		EVP_DigestUpdate(ctx, buf, n);
 #else /* HAVE_LIBNETTLE */
 		md5_update(&ctx, n, buf);
 #endif
@@ -957,7 +970,8 @@ static int md5_file(const char *path, unsigned char output[16])
 	}
 
 #if HAVE_LIBSSL
-	MD5_Final(output, &ctx);
+	EVP_DigestFinal_ex(ctx, output, NULL);
+	EVP_MD_CTX_destroy(ctx);
 #else /* HAVE_LIBNETTLE */
 	md5_digest(&ctx, MD5_DIGEST_SIZE, output);
 #endif
@@ -972,7 +986,8 @@ static int md5_file(const char *path, unsigned char output[16])
 static int sha256_file(const char *path, unsigned char output[32])
 {
 #if HAVE_LIBSSL
-	SHA256_CTX ctx;
+	EVP_MD_CTX *ctx;
+	const EVP_MD *md = EVP_get_digestbyname("SHA256");
 #else /* HAVE_LIBNETTLE */
 	struct sha256_ctx ctx;
 #endif
@@ -989,7 +1004,8 @@ static int sha256_file(const char *path, unsigned char output[32])
 	}
 
 #if HAVE_LIBSSL
-	SHA256_Init(&ctx);
+	ctx = EVP_MD_CTX_create();
+	EVP_DigestInit_ex(ctx, md, NULL);
 #else /* HAVE_LIBNETTLE */
 	sha256_init(&ctx);
 #endif
@@ -999,7 +1015,7 @@ static int sha256_file(const char *path, unsigned char output[32])
 			continue;
 		}
 #if HAVE_LIBSSL
-		SHA256_Update(&ctx, buf, n);
+		EVP_DigestUpdate(ctx, buf, n);
 #else /* HAVE_LIBNETTLE */
 		sha256_update(&ctx, n, buf);
 #endif
@@ -1013,7 +1029,8 @@ static int sha256_file(const char *path, unsigned char output[32])
 	}
 
 #if HAVE_LIBSSL
-	SHA256_Final(output, &ctx);
+	EVP_DigestFinal_ex(ctx, output, NULL);
+	EVP_MD_CTX_destroy(ctx);
 #else /* HAVE_LIBNETTLE */
 	sha256_digest(&ctx, SHA256_DIGEST_SIZE, output);
 #endif

lib/libalpm/util.h

@@ -1,7 +1,7 @@
 /*
  *  util.h
  *
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.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>

lib/libalpm/version.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2006-2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+ *  Copyright (c) 2006-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

meson.build

@@ -8,7 +8,7 @@ project('pacman',
           'sysconfdir=/etc',
           'localstatedir=/var',
         ],
-        meson_version : '>= 0.51')
+        meson_version : '>= 0.56')
 
 libalpm_version = '13.0.1'
 
@@ -26,14 +26,15 @@ MANDIR = join_paths(PREFIX, get_option('mandir'))
 BUILDSCRIPT = get_option('buildscript')
 LIBMAKEPKGDIR = join_paths(PREFIX, DATAROOTDIR, 'makepkg')
 PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name())
+KEYRINGDIR = join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))
 
 PYTHON = import('python').find_installation('python3')
 LDCONFIG = get_option('ldconfig')
-MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh')
+MESON_MAKE_SYMLINK = join_paths(meson.project_source_root(), 'build-aux/meson-make-symlink.sh')
 
 BASH = find_program('bash4', 'bash')
 if BASH.found()
-  bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"').stdout()
+  bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"', check: true).stdout()
 
   have_bash = bash_version.version_compare('>= 4.4.0')
 endif
@@ -43,7 +44,7 @@ endif
 
 bashcompletion = dependency('bash-completion', required : false)
 if bashcompletion.found()
-  BASHCOMPDIR = bashcompletion.get_pkgconfig_variable('completionsdir')
+  BASHCOMPDIR = bashcompletion.get_variable(pkgconfig: 'completionsdir')
 else
   BASHCOMPDIR = join_paths(DATAROOTDIR, 'bash-completion/completions')
 endif
@@ -53,7 +54,8 @@ if get_option('use-git-version')
       find_program('git'),
       'describe',
       '--abbrev=4',
-      '--dirty').stdout().strip().strip('v')
+      '--dirty',
+      check: true).stdout().strip().strip('v')
 else
   PACKAGE_VERSION = meson.project_version()
 endif
@@ -90,6 +92,11 @@ endif
 libarchive = dependency('libarchive',
                         version : '>=3.0.0',
                         static : get_option('buildstatic'))
+if libarchive.version().version_compare('>=3.6.0')
+  bsdtar_no_read_sparse = '--no-read-sparse'
+else
+  bsdtar_no_read_sparse = ''
+endif
 
 libcurl = dependency('libcurl',
                      version : '>=7.55.0',
@@ -97,7 +104,7 @@ libcurl = dependency('libcurl',
                      static : get_option('buildstatic'))
 conf.set('HAVE_LIBCURL', libcurl.found())
 
-needed_gpgme_version = '>=1.3.0'
+needed_gpgme_version = '>=1.12.0'
 gpgme = dependency('gpgme',
                    version : needed_gpgme_version,
                    required : get_option('gpgme'),
@@ -183,6 +190,7 @@ endif
 
 if get_option('debug')
   extra_cflags = [
+    '-pedantic',
     '-Wcast-align',
     '-Wclobbered',
     '-Wempty-body',
@@ -230,7 +238,7 @@ strip_static = '--strip-debug'
 
 file_seccomp = get_option('file-seccomp')
 # meson-git has find_program('file', required: false, version: '>=5.38')
-filever = run_command('sh', '-c', 'file --version | sed -n "s/^file-\(.*\)/\\1/p"').stdout()
+filever = run_command('sh', '-c', 'file --version | sed -n "s/^file-\(.*\)/\\1/p"', check: true).stdout()
 if file_seccomp.enabled() or ( file_seccomp.auto() and filever.version_compare('>= 5.38') )
   filecmd = 'file -S'
 endif
@@ -245,7 +253,7 @@ elif os.contains('bsd') or os == 'dragonfly'
   inodecmd = 'stat -f \'%i %N\''
 endif
 
-chost = run_command(cc, '-dumpmachine').stdout().strip()
+chost = run_command(cc, '-dumpmachine', check: true).stdout().strip()
 carch = chost.split('-')[0]
 
 # annoyingly, we have to maintain two sets of configuration_data which is
@@ -260,8 +268,9 @@ substs.set('LOCALEDIR', LOCALEDIR)
 substs.set('sysconfdir', SYSCONFDIR)
 substs.set('localstatedir', LOCALSTATEDIR)
 substs.set('PKGDATADIR', PKGDATADIR)
+substs.set('KEYRINGDIR', KEYRINGDIR)
 substs.set('PREFIX', PREFIX)
-substs.set('BASH', BASH.path())
+substs.set('BASH', BASH.full_path())
 substs.set('PACKAGE_VERSION', PACKAGE_VERSION)
 substs.set('PACKAGE_NAME', meson.project_name())
 substs.set('BUILDSCRIPT', BUILDSCRIPT)
@@ -273,6 +282,7 @@ substs.set('LIBMAKEPKGDIR', LIBMAKEPKGDIR)
 substs.set('STRIP_BINARIES', strip_binaries)
 substs.set('STRIP_SHARED', strip_shared)
 substs.set('STRIP_STATIC', strip_static)
+substs.set('BSDTAR_NO_READ_SPARSE', bsdtar_no_read_sparse)
 
 subdir('lib/libalpm')
 subdir('src/common')
@@ -311,7 +321,7 @@ libalpm_a = static_library(
   'alpm_objlib',
   libalpm_sources,
   # https://github.com/mesonbuild/meson/issues/3937
-  objects : libcommon.extract_all_objects(),
+  objects : libcommon.extract_all_objects(recursive: true),
   include_directories : includes,
   gnu_symbol_visibility : 'hidden',
   dependencies : alpm_deps)
@@ -373,7 +383,7 @@ executable(
 
 foreach wrapper : script_wrappers
   cdata = configuration_data()
-  cdata.set_quoted('BASH', BASH.path())
+  cdata.set_quoted('BASH', BASH.full_path())
   cdata.set_quoted('BUILDDIR', wrapper[2])
   cdata.set_quoted('REAL_PROGPATH', wrapper[1].full_path())
 
@@ -381,7 +391,7 @@ foreach wrapper : script_wrappers
   # directory. Use configure_file instead of a custom_target to ensure that
   # permissions on the input script wrapper are preserved.
   configure_file(
-    input : join_paths(meson.source_root(), 'build-aux', 'script-wrapper.sh.in'),
+    input : join_paths(meson.project_source_root(), 'build-aux', 'script-wrapper.sh.in'),
     output : wrapper[0],
     configuration : cdata)
 endforeach
@@ -392,6 +402,12 @@ configure_file(
   configuration : substs,
   install_dir : SYSCONFDIR)
 
+configure_file(
+  input : 'etc/makepkg.conf.d/rust.conf.in',
+  output : 'rust.conf',
+  configuration : substs,
+  install_dir : join_paths(SYSCONFDIR, 'makepkg.conf.d/'))
+
 configure_file(
   input : 'etc/pacman.conf.in',
   output : 'pacman.conf',
@@ -415,10 +431,10 @@ foreach path : [
 endforeach
 
 TEST_ENV = environment()
-TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.source_root(), 'scripts/library/'))
-TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.build_root(), 'scripts/libmakepkg/'))
-TEST_ENV.set('PMTEST_UTIL_DIR', meson.build_root() + '/')
-TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.build_root(), 'scripts/'))
+TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.project_source_root(), 'scripts/library/'))
+TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.project_build_root(), 'scripts/libmakepkg/'))
+TEST_ENV.set('PMTEST_UTIL_DIR', meson.project_build_root() + '/')
+TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.project_build_root(), 'scripts/'))
 
 subdir('test/pacman')
 subdir('test/scripts')
@@ -433,6 +449,7 @@ message('\n    '.join([
   '   localstatedir           : @0@'.format(LOCALSTATEDIR),
   '       database dir        : @0@'.format(join_paths(LOCALSTATEDIR, 'lib/pacman/')),
   '       cache dir           : @0@'.format(join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')),
+  '   keyringdir              : @0@'.format(KEYRINGDIR),
   '   compiler                : @0@ @1@'.format(cc.get_id(), cc.version()),
   '',
   '   Architecture            : @0@'.format(carch),

meson_options.txt

@@ -26,6 +26,9 @@ option('buildscript', type : 'string', value : 'PKGBUILD',
 option('datarootdir', type : 'string', value : 'share',
        description : 'FIXME')
 
+option('keyringdir', type : 'string', value: 'pacman/keyrings',
+	description : 'Where to look for keyring files under datarootdir')
+
 option('makepkg-template-dir', type : 'string', value : '/usr/share/makepkg-template',
        description : 'template dir used by makepkg-template')
 

scripts/completion/zsh_completion.in

@@ -586,38 +586,38 @@ _pacman_conf() {
 	esac
 }
 
-_key_shortopts=(
+_pacman_key_shortopts=(
 	'-h[show help]'
 	'-a[Add the specified keys (empty for stdin)]: :_files'
-	'-d[Remove the Specified keyids]:*: :_keys'
-	'-e[Export the specified or all keyids]:*: :_keys'
-	'-f[List fingerprint for specified or all keyids]:*: :_keys'
-	'-l[List the specified or all keys]:*: :_keys'
-	'-r[Fetch the specified keyids]:*: :_keys'
+	'-d[Remove the Specified keyids]:*: :_pacman_key_list'
+	'-e[Export the specified or all keyids]:*: :_pacman_key_list'
+	'-f[List fingerprint for specified or all keyids]:*: :_pacman_key_list'
+	'-l[List the specified or all keys]:*: :_pacman_key_list'
+	'-r[Fetch the specified keyids]:*: :_pacman_key_list'
 	'-u[Update the trustdb of pacman]'
 	'-v[Verify the file specified by the signature]: :_files -g "*.sig"'
 	'-V[Show program version]'
 )
 
-_key_longopts=(
+_pacman_key_longopts=(
 	'--help[show help]'
 	'--add[Add the specified keys (empty for stdin)]: :_files'
-	'--delete[Remove the Specified keyids]:*: :_keys'
-	'--export[Export the specified or all keyids]:*: :_keys'
-	'--finger[List fingerprint for specified or all keyids]:*: :_keys'
-	'--list-keys[List the specified or all keys]:*: :_keys'
-	'--recv-keys[Fetch the specified keyids]:*: :_keys'
+	'--delete[Remove the Specified keyids]:*: :_pacman_key_list'
+	'--export[Export the specified or all keyids]:*: :_pacman_key_list'
+	'--finger[List fingerprint for specified or all keyids]:*: :_pacman_key_list'
+	'--list-keys[List the specified or all keys]:*: :_pacman_key_list'
+	'--recv-keys[Fetch the specified keyids]:*: :_pacman_key_list'
 	'--updatedb[Update the trustdb of pacman]'
 	'--verify[Verify the file specified by the signature]: :_files -g "*.sig"'
 	'--version[Show program version]'
-	'--edit-key[Present a menu for key management task on keyids]:*: :_keys'
+	'--edit-key[Present a menu for key management task on keyids]:*: :_pacman_key_list'
 	'--import[Imports pubring.gpg from dir(s)]: :_files -g "*.gpg"'
 	'--import-tb[Imports ownertrust values from trustdb.gpg in dir(s)]: :_files -g "*.gpg"'
 	'--init[Ensure the keyring is properly initialized]'
-	'--list-sigs[List keys and their signatures]:*: :_keys'
-	'--lsign-key[Locally sign the specified keyid]:*: :_keys'
-	'--populate[Reload the default keys from the (given) keyrings in '/usr/share/pacman/keyrings']: :_path_files -W /usr/share/pacman/keyrings'
-	'--refresh-keys[Update specified or all keys from a keyserver]:*: :_keys'
+	'--list-sigs[List keys and their signatures]:*: :_pacman_key_list'
+	'--lsign-key[Locally sign the specified keyid]:*: :_pacman_key_list'
+	'--populate[Reload the default keys from the (given) keyrings in '@keyringdir@']: :_path_files -W @keyringdir@'
+	'--refresh-keys[Update specified or all keys from a keyserver]:*: :_pacman_key_list'
 )
 
 _pacman_key_options=(
@@ -631,13 +631,13 @@ _pacman_key() {
 		--*)
 			_arguments -s : \
 				"$_pacman_key_options[@]" \
-				"$_key_longopts[@]"
+				"$_pacman_key_longopts[@]"
 			;;
 		-*)
 			_arguments -s : \
 				"$_pacman_key_options[@]" \
-				"$_key_shortopts[@]" \
-				"$_key_longopts[@]"
+				"$_pacman_key_shortopts[@]" \
+				"$_pacman_key_longopts[@]"
 			;;
 		*)
 			i=$#
@@ -648,13 +648,13 @@ _pacman_key() {
 				--*)
 					_arguments -s : \
 						"$_pacman_key_options[@]" \
-						"$_key_longopts[@]"
+						"$_pacman_key_longopts[@]"
 					;;
 				-*)
 					_arguments -s : \
 						"$_pacman_key_options[@]" \
-						"$_key_shortopts[@]" \
-						"$_key_longopts[@]"
+						"$_pacman_key_shortopts[@]" \
+						"$_pacman_key_longopts[@]"
 					;;
 				*)
 					return 1
@@ -664,7 +664,7 @@ _pacman_key() {
 	esac
 }
 
-_keys() {
+_pacman_key_list() {
 	local keylist keys
 	keylist=$(pacman-key --list-keys 2>/dev/null | awk '
 		$1 == "pub" {
@@ -733,7 +733,7 @@ _makepkg_longopts=(
 	'--check[Run check() function in the PKGBUILD]'
 	'--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files'
 	'--holdver[Do not update VCS sources]'
-	'--key[Specify key to use for gpg signing instead of the default]: :_keys'
+	'--key[Specify key to use for gpg signing instead of the default]: :_pacman_key_list'
 	'--noarchive[Do not create package archive]'
 	'--nocheck[Do not run the check() function in the PKGBUILD]'
 	'--noprepare[Do not run the prepare() function in the PKGBUILD]'

scripts/libmakepkg/autodep.sh.in

@@ -1,9 +1,8 @@
 #!/bin/bash
 #
-#   alternative.sh - Check the files associated with the 'alternative'
-#   array exist.
+#   autodep.sh - functions for automatically adding depends/provides
 #
-#   Copyright (c) 2020 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2021-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
@@ -19,23 +18,21 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_ALTERNATIVE_SH" ]] && return
-LIBMAKEPKG_LINT_PKGBUILD_ALTERNATIVE_SH=1
+[[ -n "$LIBMAKEPKG_AUTODEP_SH" ]] && return
+LIBMAKEPKG_AUTODEP_SH=1
 
 LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$LIBRARY/util/message.sh"
-source "$LIBRARY/util/pkgbuild.sh"
-source "$LIBRARY/lint_pkgbuild/util.sh"
+declare -a autodep_functions
 
+for lib in "$LIBRARY/autodep/"*.sh; do
+	source "$lib"
+done
 
-lint_pkgbuild_functions+=('lint_alternative')
+readonly -a autodep_functions
 
-
-lint_alternative() {
-	local ret=0
-
-	check_files_exist 'alternative' "${alternative[@]/%/.alternative}" || ret=1
-
-	return $ret
+generate_autodeps() {
+	for func in ${autodep_functions[@]}; do
+		$func
+	done
 }

scripts/libmakepkg/autodep/library_depends.sh.in

@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+#   library_depends.sh - Automatically add library requirements to depends
+#
+#   Copyright (c) 2021-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
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[[ -n "$LIBMAKEPKG_AUTODEP_LIBRARY_DEPENDS_SH" ]] && return
+LIBMAKEPKG_AUTODEP_LIBRARY_DEPENDS_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+autodep_functions+=('library_depends')
+
+library_depends() {
+	if check_option "autodeps" "y"; then
+		local dep filename libdeps libdir libpath prefix sofile
+		declare -a libdeps
+
+		while IFS= read -rd '' filename; do
+			for sofile in $(LC_ALL=C readelf -d $filename 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'); do
+				# get the full path of the library
+				libpath=$(ldd $filename | sed -nr "s/.$sofile => (.*) \(.*\)/\1/p")
+
+				# if ldd can not find the library, it is likely part of the package and not in filesystem
+				if [[ -z $libpath ]]; then
+					continue
+				fi
+
+				# skip if the library is part of the package
+				if [[ -e "$pkgdir/$libpath" ]]; then
+					continue
+				fi
+
+				# find the prefix for the dependency
+				libpath=${libpath#/}
+				libpath=${libpath%/*}
+
+				unset prefix
+				for libdir in ${LIB_DIRS[@]}; do
+					if [[ ${libdir/*:} == ${libpath} ]]; then
+						prefix=${libdir/:*}
+					fi
+				done
+
+				if [[ -z ${prefix} ]]; then
+					continue
+				fi
+
+				# only add library dependency if it exists - this helps bootstraping dependencies
+				if [[ $(run_pacman -T "$prefix:$sofile") ]]; then
+					continue
+				fi
+
+				libdeps+=("$prefix:$sofile")
+			done
+
+		done < <(find "$pkgdir" -type f -perm -u+x -print0)
+
+		depends+=($(printf '%s\n' "${libdeps[@]}" | LC_ALL=C sort -u))
+	fi
+}

scripts/libmakepkg/autodep/library_provides.sh.in

@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+#   library_provides.sh - Automatically add a packages libraries to provides
+#
+#   Copyright (c) 2021-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
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[[ -n "$LIBMAKEPKG_AUTODEP_LIBRARY_PROVIDES_SH" ]] && return
+LIBMAKEPKG_AUTODEP_LIBRARY_PROVIDES_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+autodep_functions+=('library_provides')
+
+library_provides() {
+	if check_option "autodeps" "y"; then
+		for lib in ${LIB_DIRS[@]}; do
+			dir=${lib/*:}
+			prefix=${lib/:*}
+
+			if [[ ! -d "$pkgdir/$dir" ]]; then
+				continue;
+			fi
+
+			mapfile -t filenames < <(find "$pkgdir/$dir" -maxdepth 1 -type f | LC_ALL=C sort)
+
+			for fn in "${filenames[@]}"; do
+				# check we have a shared library
+				if LC_ALL=C readelf -h "$fn" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then
+					# extract library soname
+					local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p')
+
+					if [[ -z "$sofile" ]]; then
+						# the library has no soname
+						continue
+					fi
+
+					provides+=("$prefix:$sofile")
+				fi
+			done
+		done
+	fi
+}

scripts/libmakepkg/autodep/meson.build

@@ -0,0 +1,18 @@
+libmakepkg_module = 'autodep'
+
+sources = [
+  'library_depends.sh.in',
+  'library_provides.sh.in',
+]
+
+foreach src : sources
+  output_dir = join_paths(get_option('datadir'), 'makepkg', libmakepkg_module)
+
+  custom_target(
+    libmakepkg_module + '_' + src.underscorify(),
+    command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ],
+    input : src,
+    output : '@BASENAME@',
+    install : true,
+    install_dir : output_dir)
+endforeach

scripts/libmakepkg/buildenv.sh.in

@@ -3,7 +3,7 @@
 #   buildenv.sh - functions for altering the build environment before
 #   compilation
 #
-#   Copyright (c) 2015-2021 Pacman Development Team <pacman-dev@lists.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
@@ -25,18 +25,22 @@ LIBMAKEPKG_BUILDENV_SH=1
 LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 declare -a buildenv_functions build_options
+buildenv_vars=('CPPFLAGS' 'CFLAGS' 'CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST')
 
 for lib in "$LIBRARY/buildenv/"*.sh; do
 	source "$lib"
 done
 
-readonly -a buildenv_functions build_options
+readonly -a buildenv_functions buildenv_vars build_options
 
 prepare_buildenv() {
+	# ensure this function runs first
+	buildenv_buildflags
+
 	for func in ${buildenv_functions[@]}; do
 		$func
 	done
 
 	# ensure all necessary build variables are exported
-	export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS CHOST
+	export ${buildenv_vars[@]}
 }

scripts/libmakepkg/buildenv/buildflags.sh.in

@@ -2,7 +2,7 @@
 #
 #   buildflags.sh - Clear user-specified buildflags if requested
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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
@@ -26,10 +26,9 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 source "$LIBRARY/util/option.sh"
 
 build_options+=('buildflags')
-buildenv_functions+=('buildenv_buildflags')
 
 buildenv_buildflags() {
 	if check_option "buildflags" "n"; then
-		unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
+		unset ${buildenv_vars[@]}
 	fi
 }

scripts/libmakepkg/buildenv/compiler.sh.in

@@ -4,7 +4,7 @@
 #   ccache - Cache compilations and reuse them to save time on repetitions
 #   distcc - Distribute compilation of C and C++ across machines
 #
-#   Copyright (c) 2007-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/buildenv/debugflags.sh.in

@@ -3,7 +3,7 @@
 #   debugflags.sh - Specify flags for building a package with debugging
 #   symbols
 #
-#   Copyright (c) 2012-2021 Pacman Development Team <pacman-dev@lists.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
@@ -29,12 +29,10 @@ source "$LIBRARY/util/option.sh"
 buildenv_functions+=('buildenv_debugflags')
 
 buildenv_debugflags() {
-	if check_option "debug" "y"; then
-		DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"
-		DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"
-		DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}"
+	if check_option "debug" "y" && ! check_option "buildflags" "n"; then
+		DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
+		DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
 		CFLAGS+=" $DEBUG_CFLAGS"
 		CXXFLAGS+=" $DEBUG_CXXFLAGS"
-		RUSTFLAGS+=" $DEBUG_RUSTFLAGS"
 	fi
 }

scripts/libmakepkg/buildenv/lto.sh.in

@@ -3,7 +3,7 @@
 #   lto.sh - Specify flags for building a package with link-time
 #            optimisation
 #
-#   Copyright (c) 2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+#   Copyright (c) 2021-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
@@ -30,8 +30,9 @@ build_options+=('lto')
 buildenv_functions+=('buildenv_lto')
 
 buildenv_lto() {
-	if check_option "lto" "y"; then
-		CFLAGS+=" -flto"
-		CXXFLAGS+=" -flto"
+	if check_option "lto" "y" && ! check_option "buildflags" "n"; then
+		CFLAGS+=" ${LTOFLAGS:--flto}"
+		CXXFLAGS+=" ${LTOFLAGS:--flto}"
+		LDFLAGS+=" ${LTOFLAGS:--flto}"
 	fi
 }

scripts/libmakepkg/buildenv/makeflags.sh.in

@@ -2,7 +2,7 @@
 #
 #   makeflags.sh - Clear user-specified makeflags if requested
 #
-#   Copyright (c) 2007-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/buildenv/meson.build

@@ -6,6 +6,7 @@ sources = [
   'debugflags.sh.in',
   'lto.sh.in',
   'makeflags.sh.in',
+  'rust.sh.in',
 ]
 
 foreach src : sources

scripts/libmakepkg/buildenv/rust.sh.in

@@ -0,0 +1,36 @@
+#!/usr/bin/bash
+#
+#   rust.sh - Specify flags for building a package with rust
+#
+#   Copyright (c) 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
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[[ -n "$LIBMAKEPKG_BUILDENV_RUST_SH" ]] && return
+LIBMAKEPKG_BUILDENV_RUST_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/option.sh"
+
+buildenv_var+=('RUSTFLAGS' 'DEBUG_RUSTFLAGS')
+buildenv_functions+=('buildenv_rust')
+
+buildenv_rust() {
+	if check_option "debug" "y" && ! check_option "buildflags" "n"; then
+		DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
+		RUSTFLAGS+=" $DEBUG_RUSTFLAGS"
+	fi
+}

scripts/libmakepkg/executable.sh.in

@@ -2,7 +2,7 @@
 #
 #   executable.sh - confirm presence of dependent executables
 #
-#   Copyright (c) 2018-2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+#   Copyright (c) 2018-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

scripts/libmakepkg/executable/ccache.sh.in

@@ -2,7 +2,7 @@
 #
 #   ccache.sh - Confirm presence of ccache binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/checksum.sh.in

@@ -2,7 +2,7 @@
 #
 #   checksum.sh - Confirm presence of binaries for checksum operations
 #
-#   Copyright (c) 2016-2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+#   Copyright (c) 2016-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

scripts/libmakepkg/executable/debugedit.sh.in

@@ -0,0 +1,38 @@
+#!/usr/bin/bash
+#
+#   debugedit.sh - Confirm presence of debugedit binary
+#
+#   Copyright (c) 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
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[[ -n "$LIBMAKEPKG_EXECUTABLE_DEBUGEDIT_SH" ]] && return
+LIBMAKEPKG_EXECUTABLE_DEBUGEDIT_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+executable_functions+=('executable_debugedit')
+
+executable_debugedit() {
+	if check_option "debug" "y"; then
+		if ! type -p debugedit >/dev/null; then
+			error "$(gettext "Cannot find the %s binary required for including source files in debug packages.")" "debugedit"
+			return 1
+		fi
+	fi
+}

scripts/libmakepkg/executable/distcc.sh.in

@@ -2,7 +2,7 @@
 #
 #   distcc.sh - Confirm presence of distcc binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/fakeroot.sh.in

@@ -2,7 +2,7 @@
 #
 #   fakeroot.sh - Confirm presence of fakeroot binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/gpg.sh.in

@@ -2,7 +2,7 @@
 #
 #   gpg.sh - Confirm presence of gpg binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/gzip.sh.in

@@ -2,7 +2,7 @@
 #
 #   gzip.sh - Confirm presence of gzip binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/meson.build

@@ -5,6 +5,7 @@ sources = [
   'checksum.sh.in',
   'distcc.sh.in',
   'fakeroot.sh.in',
+  'debugedit.sh.in',
   'gpg.sh.in',
   'gzip.sh.in',
   'pacman.sh.in',

scripts/libmakepkg/executable/pacman.sh.in

@@ -2,7 +2,7 @@
 #
 #   pacman.sh - Confirm presence of pacman binary
 #
-#   Copyright (c) 2012-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/strip.sh.in

@@ -2,7 +2,7 @@
 #
 #   strip.sh - Confirm presence of strip binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/sudo.sh.in

@@ -2,7 +2,7 @@
 #
 #   sudo.sh - Confirm presence of sudo binary
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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

scripts/libmakepkg/executable/vcs.sh.in

@@ -2,7 +2,7 @@
 #
 #   vcs.sh - Confirm presence of binaries for VCS operations
 #
-#   Copyright (c) 2014-2021 Pacman Development Team <pacman-dev@lists.archlinux.org>
+#   Copyright (c) 2014-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

scripts/libmakepkg/integrity.sh.in

@@ -2,7 +2,7 @@
 #
 #   integrity.sh - functions relating to source integrity checking
 #
-#   Copyright (c) 2011-2021 Pacman Development Team <pacman-dev@lists.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