60 changed files with 405 additions and 2416 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,22 @@
 *~
 devtools-*.tar.gz*
-build/
+archbuild
+archco
+archrelease
+bash_completion
+checkpkg
+commitpkg
+finddeps
+lddd
+makechrootpkg
+makerepropkg
+mkarchroot
+offload-build
+rebuildpkgs
+zsh_completion
+find-libdeps
+crossrepomove
+arch-nspawn
+sogrep
+doc/*.1
+doc/*.7
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,21 +0,0 @@
-image: "archlinux:latest"
-
-stages:
-  - build
-  - test
-
-build:
-  stage: build
-  needs: []
-  script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoc
-    - make PREFIX=/usr
-    - make PREFIX=/usr DESTDIR=build install
-
-check:
-  stage: test
-  needs: []
-  script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoc shellcheck
-    - make check || true
-    - SHELLCHECK_OPTS="-S error" make check
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,28 @@
+language: shell
+sudo: required
+
+services:
+- docker
+
+archlinux:
+  packages:
+    - openssh
+    - subversion
+    - rsync
+    - arch-install-scripts
+    - git
+    - bzr
+    - mercurial
+    - diffutils
+    - asciidoc
+    - shellcheck
+  script:
+    - sudo pacman -Syu --noconfirm --needed "${CONFIG_PACKAGES[@]}"
+    - make PREFIX=/usr
+    - make PREFIX=/usr DESTDIR="$(mktemp -d)" install
+    - make check || true
+    - SHELLCHECK_OPTS="-S error" make check
+
+script: 'curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash'
+
+# vim: ft=yaml ts=2 sw=2 et:
--- a/674
+++ b/674
@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 3 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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/138
+++ b/138
@ -1,16 +1,39 @@
-V=20230307
-BUILDTOOLVER ?= $(V)
+V=20210202

 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
-BUILDDIR = build

-BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
-LIBUTILS = $(wildcard lib/*)
-MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
-PACMAN_CONFIGS=$(wildcard config/pacman/*)
-SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
-MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
+IN_PROGS = \
+	archco \
+	arch-nspawn \
+	archrelease \
+	archbuild \
+	checkpkg \
+	commitpkg \
+	crossrepomove\
+	finddeps \
+	find-libdeps \
+	lddd \
+	makerepropkg \
+	mkarchroot \
+	makechrootpkg \
+	offload-build \
+	rebuildpkgs \
+	sogrep
+
+BINPROGS = \
+	$(IN_PROGS)
+
+CONFIGFILES = \
+	makepkg-x86_64.conf \
+	pacman-extra.conf \
+	pacman-testing.conf \
+	pacman-staging.conf \
+	pacman-multilib.conf \
+	pacman-multilib-testing.conf \
+	pacman-multilib-staging.conf \
+	pacman-kde-unstable.conf \
+	pacman-gnome-unstable.conf

 COMMITPKG_LINKS = \
 	extrapkg \
@ -27,11 +50,8 @@ COMMITPKG_LINKS = \

 ARCHBUILD_LINKS = \
 	extra-x86_64-build \
-	extra-x86_64_v3-build \
 	testing-x86_64-build \
-	testing-x86_64_v3-build \
 	staging-x86_64-build \
-	staging-x86_64_v3-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
@ -42,90 +62,74 @@ CROSSREPOMOVE_LINKS = \
 	extra2community \
 	community2extra

-COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*)))
 BASHCOMPLETION_LINKS = \
 	archco \
 	communityco


-all: binprogs completion man
-binprogs: $(BINPROGS)
-completion: $(COMPLETIONS)
+MANS = \
+	doc/lddd.1 \
+	doc/checkpkg.1 \
+	doc/offload-build.1 \
+	doc/sogrep.1 \
+	doc/makerepropkg.1 \
+	doc/mkarchroot.1 \
+	doc/find-libdeps.1 \
+	doc/find-libprovides.1 \
+	doc/devtools.7
+
+
+all: $(BINPROGS) bash_completion zsh_completion man
 man: $(MANS)

-
-ifneq ($(wildcard *.in),)
-	$(error Legacy in prog file found: $(wildcard *.in) - please migrate to src/*)
-endif
-ifneq ($(wildcard pacman-*.conf),)
-	$(error Legacy pacman config file found: $(wildcard pacman-*.conf) - please migrate to config/pacman/*)
-endif
-ifneq ($(wildcard makepkg-*.conf),)
-	$(error Legacy makepkg config files found: $(wildcard makepkg-*.conf) -  please migrate to config/makepkg/*)
-endif
-ifneq ($(wildcard setarch-aliases.d/*),)
-	$(error Legacy setarch aliase found: $(wildcard setarch-aliases.d/*) - please migrate to config/setarch-aliases.d/*)
-endif
-
-
 edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
-GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"

-define buildInScript
-$(1)/%: $(2)%.in $(LIBUTILS)
-	$$(GEN_MSG)
-	@mkdir -p $$(dir $$@)
-	@$(RM) "$$@"
-	@{ echo -n 'm4_changequote([[[,]]])'; cat $$<; } | m4 -P --define=m4_devtools_version=$$(BUILDTOOLVER) | $(edit) >$$@
-	@chmod $(3) "$$@"
-	@bash -O extglob -n "$$@"
-endef
+%: %.in Makefile lib/common.sh
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | m4 -P | $(edit) >$@
+	@chmod a-w "$@"
+	@chmod +x "$@"
+	@bash -O extglob -n "$@"

-$(eval $(call buildInScript,build/bin,src/,555))
-$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444)))
+$(MANS): doc/asciidoc.conf doc/footer.asciidoc

-$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/asciidoc.conf doc/man/include/footer.asciidoc
-	$(GEN_MSG)
-	@mkdir -p $(BUILDDIR)/doc/man
-	@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(PREFIX)/share/devtools $<
+doc/%: doc/%.asciidoc
+	a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc $<

 clean:
-	rm -rf $(BUILDDIR)
+	rm -f $(IN_PROGS) bash_completion zsh_completion $(MANS)

-install: all
+install:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools
 	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
-	for conf in ${MAKEPKG_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
-	for conf in ${PACMAN_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
-	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
+	install -m0644 ${CONFIGFILES} $(DESTDIR)$(PREFIX)/share/devtools
 	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${CROSSREPOMOVE_LINKS}; do ln -sf crossrepomove $(DESTDIR)$(PREFIX)/bin/$$l; done
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	install -Dm0644 $(BUILDDIR)/contrib/completion/bash/devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
-	for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
-	install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_devtools $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	install -Dm0644 bash_completion $(DESTDIR)/usr/share/bash-completion/completions/devtools
+	for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)/usr/share/bash-completion/completions/$$l; done
+	install -Dm0644 zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
 	for manfile in $(MANS); do \
 		install -Dm644 $$manfile -t $(DESTDIR)$(MANDIR)/man$${manfile##*.}; \
 	done;

 uninstall:
-	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for conf in ${MAKEPKG_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
-	for conf in ${PACMAN_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
-	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d/$$f; done
+	for f in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+	for f in ${CONFIGFILES}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/$$f; done
 	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${CROSSREPOMOVE_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
-	for l in ${BASHCOMPLETION_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
-	rm $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
+	rm $(DESTDIR)/usr/share/bash-completion/completions/devtools
 	rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	rm -f $(DESTDIR)$(PREFIX)/bin/communityco
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d $(DESTDIR)$(PREFIX)/share/devtools
+	for manfile in $(MANS); do \
+		rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile#doc/}; \
+	done;

 TODAY=$(shell date +"%Y%m%d")
 tag:
@ -134,14 +138,14 @@ tag:
 	@git tag --sign --message "Version $(TODAY)" $(TODAY)

 dist:
-	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip > devtools-$(V).tar.gz
+	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz

 upload:
 	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/

-check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
+check: $(BINPROGS) bash_completion makepkg-x86_64.conf PKGBUILD.proto
 	shellcheck $^

-.PHONY: all completion man clean install uninstall dist upload check tag
+.PHONY: all clean install uninstall dist upload check tag
 .DELETE_ON_ERROR:
--- a/contrib/makepkg/PKGBUILD.proto
+++ b/contrib/makepkg/PKGBUILD.proto
--- a/README.md
+++ b/README.md
@ -3,15 +3,15 @@
 This repository contains tools for the Arch Linux distribution for building
 and maintaining official repository packages.

-## Building
+## Patches

-When building official distro packages the `BUILDTOOLVER` needs to be set to the
-exact label of the release package in order to allow to detect the exactly used
-devtools version. This is required for reproducible builds to fetch the according
-files like `makepkg.conf`.
+Patches can be send to arch-projects@archlinux.org or via a pull request on
+Github. When sending patches to the mailing list make sure to set a valid
+subjectprefix otherwise the email is denied by mailman. Git can be configured
+as following.

-```sh
-BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" make all
+```
+git config format.subjectprefix 'devtools] [PATCH'
 ```

 ## Releasing
@ -22,7 +22,3 @@ BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" make all
 4. Push changes
 5. Upload the source tarball with ```make dist upload```
 6. Update the package
-
-## License
-
-Devtools is licensed under the terms of the **GPL-3.0-or-later** (see [LICENSE](LICENSE)).
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@ -1,6 +1,14 @@
 #!/bin/bash
+# License: GNU GPLv2
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# 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; version 2 of the License.
+#
+# 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.

 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
@ -49,12 +57,14 @@ shift 1

 [[ -z $working_dir ]] && die 'Please specify a working directory.'

+pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
+
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+	mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi

 # shellcheck disable=2016
-host_mirrors=($(pacman-conf --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
+host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))

 for host_mirror in "${host_mirrors[@]}"; do
 	if [[ $host_mirror == *file://* ]]; then
@ -66,7 +76,7 @@ for host_mirror in "${host_mirrors[@]}"; do
 done

 while read -r line; do
-	mapfile -t lines < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
+	mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
 		--repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
 	for line in "${lines[@]}"; do
 		if [[ $line = file://* ]]; then
@ -74,7 +84,7 @@ while read -r line; do
 			in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
 		fi
 	done
-done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
+done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)

 mount_args+=("--bind=${cache_dirs[0]//:/\\:}")

@ -87,7 +97,7 @@ copy_hostconf () {
 	unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
 	pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1

-	#printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
+	printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"

 	[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
 	[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
@ -116,21 +126,10 @@ copy_hostconf
 eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"

 [[ -z $nosetarch ]] || unset CARCH
-if [[ -f "@pkgdatadir@/setarch-aliases.d/${CARCH}" ]]; then
-	read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${CARCH}"
-else
-	set_arch="${CARCH}"
-fi

-for p in  echo exec; do
-[[ $p == echo ]] && msg "Entering chroot \"$working_dir\" via:"
-"$p" systemd-nspawn -q \
+exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
 	-D "$working_dir" \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
-	--register=no \
-	--as-pid2 \
-	--rlimit=NOFILE=10000 \
-	--resolv-conf=copy-host \
+	--register=no --keep-unit --as-pid2 \
 	"${mount_args[@]}" \
 	"$@"
-done
--- a/src/archbuild.in
+++ b/src/archbuild.in
@ -1,6 +1,5 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
@ -18,27 +17,6 @@ else
 	repo=${tag%-*}
 	arch=${tag##*-}
 fi
-if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then
-	read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${arch}"
-else
-	set_arch="${arch}"
-fi
-
-# Architecture-specific Mount
-arch_mounts=()
-if [[ -f "@pkgdatadir@/mount.d/${arch}" ]]; then
-	mapfile -t arch_mounts < "@pkgdatadir@/mount.d/${arch}"
-fi
-for arch_mount in "${arch_mounts[@]}"; do
-	if [[ $arch_mount = rw* ]]; then
-		arch_mount=${arch_mount#rw }
-		in_array "$arch_mount" "${makechrootpkg_args[@]}" || makechrootpkg_args+=("-d" "$arch_mount")
-	elif [[ $arch_mount = ro* ]]; then
-		arch_mount=${arch_mount#ro }
-		in_array "$arch_mount" "${makechrootpkg_args[@]}" || makechrootpkg_args+=("-D" "$arch_mount")
-	fi
-done
-
 chroots='/var/lib/archbuild'
 clean_first=false

@ -91,7 +69,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then

 	rm -rf --one-file-system "${chroots}/${repo}-${arch}"
 	(umask 0022; mkdir -p "${chroots}/${repo}-${arch}")
-	mkarchroot \
+	setarch "${arch}" mkarchroot \
 		-C "${pacman_config}" \
 		-M "${makepkg_config}" \
 		"${chroots}/${repo}-${arch}/root" \
--- a/src/archco.in
+++ b/src/archco.in
@ -1,6 +1,5 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)

--- a/src/archrelease.in
+++ b/src/archrelease.in
@ -1,6 +1,5 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)
 m4_include(lib/valid-tags.sh)
@ -51,6 +50,11 @@ fi
 pushd .. >/dev/null
 mapfile -t known_files < <(svn ls -r HEAD "$trunk")
 wait $! || die "failed to discover committed files"
+for file in "${known_files[@]}"; do
+	if [[ ${file:(-1)} = '/' ]]; then
+		die "archrelease: subdirectories are not supported in package directories!"
+	fi
+done

 # gracefully handle files containing an "@" character
 known_files=("${known_files[@]/%/@}")
@ -62,7 +66,7 @@ for tag in "$@"; do
 	stat_busy "Copying %s to %s" "${trunk}" "${tag}"

 	if [[ -d repos/$tag ]]; then
-		mapfile -t trash < <(svn ls --recursive "repos/$tag")
+		mapfile -t trash < <(svn ls "repos/$tag")
 		wait $! || die "failed to discover existing files"
 		if (( ${#trash[@]} )); then
 			trash=("${trash[@]/#/repos/$tag/}")
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@ -1,6 +1,5 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 _devtools_compgen() {
  local i r
--- a/src/checkpkg.in
+++ b/src/checkpkg.in
@ -1,9 +1,27 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified
+
+shopt -s extglob

 m4_include(lib/common.sh)

+# Source makepkg.conf; fail if it is not found
+if [[ -r '/etc/makepkg.conf' ]]; then
+	# shellcheck source=makepkg-x86_64.conf
+	source '/etc/makepkg.conf'
+else
+	die '/etc/makepkg.conf not found!'
+fi
+
+# Source user-specific makepkg.conf overrides
+if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
+	# shellcheck source=/dev/null
+	source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
+elif [[ -r "$HOME/.makepkg.conf" ]]; then
+	# shellcheck source=/dev/null
+	source "$HOME/.makepkg.conf"
+fi
+
 usage() {
    cat <<- _EOF_
 		Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]
@ -16,71 +34,46 @@ usage() {
 		list for both packages and a library list for both packages.

 		OPTIONS
-		    -r, --rmdir          Remove the temporary directory
-		    -w, --warn           Print a warning in case of differences
-		    -M, --makepkg-config Set an alternate makepkg configuration file
-		    -h, --help           Show this help text
+		    -r, --rmdir     Remove the temporary directory
+		    -w, --warn      Print a warning in case of differences
+		    -h, --help      Show this help text
 _EOF_
 }

 RMDIR=0
 WARN=0
-MAKEPKG_CONF=/etc/makepkg.conf

-# option checking
-while (( $# )); do
-	case $1 in
-		-h|--help)
-			usage
-			exit 0
-			;;
-		-r|--rmdir)
-			RMDIR=1
-			shift
-			;;
-		-w|--warn)
-			WARN=1
-			shift
-			;;
-		-M|--makepkg-config)
-			MAKEPKG_CONF="$2"
-			shift 2
-			;;
-		--)
-			shift
-			break
-			;;
-		-*|--*)
-			die "invalid argument: %s" "$1"
-			;;
-		*)
-			break
-			;;
-	esac
+OPT_SHORT='rwh'
+OPT_LONG=('rmdir' 'warn' 'help')
+if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
+    exit 1
+fi
+set  -- "${OPTRET[@]}"
+
+while :; do
+    case $1 in
+        -r|--rmdir)
+            RMDIR=1
+            ;;
+        -w|--warn)
+            WARN=1
+            ;;
+        -h|--help)
+            usage
+            exit 0
+            ;;
+        --)
+            shift; break
+            ;;
+    esac
+    shift
 done

-# Source makepkg.conf; fail if it is not found
-if [[ -r "${MAKEPKG_CONF}" ]]; then
-	# shellcheck source=config/makepkg/x86_64.conf
-	source "${MAKEPKG_CONF}"
-else
-	die "${MAKEPKG_CONF} not found!"
-fi
-
-# Source user-specific makepkg.conf overrides
-if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
-	# shellcheck source=/dev/null
-	source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
-elif [[ -r "$HOME/.makepkg.conf" ]]; then
-	# shellcheck source=/dev/null
-	source "$HOME/.makepkg.conf"
-fi
-
 if [[ ! -f PKGBUILD ]]; then
 	die 'This must be run in the directory of a built package.'
 fi

-# shellcheck source=contrib/makepkg/PKGBUILD.proto
+# shellcheck source=PKGBUILD.proto
 . ./PKGBUILD
 if [[ ${arch[0]} == 'any' ]]; then
 	CARCH='any'
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@ -1,12 +1,11 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)

 # Source makepkg.conf; fail if it is not found
 if [[ -r '/etc/makepkg.conf' ]]; then
-	# shellcheck source=config/makepkg/x86_64.conf
+	# shellcheck source=makepkg-x86_64.conf
 	source '/etc/makepkg.conf'
 else
 	die '/etc/makepkg.conf not found!'
@ -28,7 +27,7 @@ if [[ ! -f PKGBUILD ]]; then
 fi

 source=()
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
+# shellcheck source=PKGBUILD.proto
 . ./PKGBUILD
 pkgbase=${pkgbase:-$pkgname}

@ -48,21 +47,6 @@ case "$cmd" in
 		;;
 esac

-
-if (( ${#validpgpkeys[@]} != 0 )); then
-	if [[ -d keys ]]; then
-		for key in "${validpgpkeys[@]}"; do
-			if [[ ! -f keys/pgp/$key.asc ]]; then
-				export-pkgbuild-keys || die 'Failed to export valid PGP keys for source files'
-			fi
-		done
-	else
-		export-pkgbuild-keys || die 'Failed to export valid PGP keys for source files'
-	fi
-
-	svn add --parents --force keys/pgp/*
-fi
-
 # find files which should be under source control
 needsversioning=()
 for s in "${source[@]}"; do
@ -75,9 +59,6 @@ for i in 'changelog' 'install'; do
 		needsversioning+=("$file")
 	done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
 done
-for key in "${validpgpkeys[@]}"; do
-	needsversioning+=("keys/pgp/$key.asc")
-done

 # assert that they really are controlled by SVN
 if (( ${#needsversioning[*]} )); then
@ -111,14 +92,16 @@ for _arch in "${arch[@]}"; do
 		fullver=$(get_full_version "$_pkgname")

 		if pkgfile=$(find_cached_package "$_pkgname" "$fullver" "$_arch"); then
-			check_package_validity "$pkgfile"
+			if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
+				die "PACKAGER was not set when building package"
+			fi
+			hashsum=sha256sum
+			pkgbuild_hash=$(awk -v"hashsum=$hashsum" -F' = ' '$1 == "pkgbuild_"hashsum {print $2}' <(bsdtar -xOqf "$pkgfile" .BUILDINFO))
+			if [[ "$pkgbuild_hash" != "$($hashsum PKGBUILD|cut -d' ' -f1)" ]]; then
+				die "PKGBUILD $hashsum mismatch: expected $pkgbuild_hash"
+			fi
 		fi
 	done
-
-	fullver=$(get_full_version "$pkgbase")
-	if pkgfile=$(find_cached_package "$pkgbase-debug" "$fullver" "$_arch"); then
-		check_package_validity "$pkgfile"
-	fi
 done

 if [[ -z $server ]]; then
@ -132,17 +115,16 @@ if [[ -n $(svn status -q) ]]; then
 		svn commit -q -m "${msgtemplate}: ${1}" || die
 		stat_done
 	else
-		[[ -z ${WORKDIR:-} ]] && setup_workdir
-		msgfile=$(mktemp --tmpdir="${WORKDIR}" commitpkg.XXXXXXXXXX)
+		msgfile="$(mktemp)"
 		echo "$msgtemplate" > "$msgfile"
 		if [[ -n $SVN_EDITOR ]]; then
-			$SVN_EDITOR "$msgfile" || die
+			$SVN_EDITOR "$msgfile"
 		elif [[ -n $VISUAL ]]; then
-			$VISUAL "$msgfile" || die
+			$VISUAL "$msgfile"
 		elif [[ -n $EDITOR ]]; then
-			$EDITOR "$msgfile" || die
+			$EDITOR "$msgfile"
 		else
-			vi "$msgfile" || die
+			vi "$msgfile"
 		fi
 		[[ -s $msgfile ]] || die
 		stat_busy 'Committing changes to trunk'
@ -164,37 +146,27 @@ for _arch in "${arch[@]}"; do

 	for _pkgname in "${pkgname[@]}"; do
 		fullver=$(get_full_version "$_pkgname")
+
 		if ! pkgfile=$(find_cached_package "$_pkgname" "$fullver" "${_arch}"); then
 			warning "Skipping %s: failed to locate package file" "$_pkgname-$fullver-$_arch"
 			skip_arches+=("$_arch")
 			continue 2
 		fi
 		uploads+=("$pkgfile")
-	done

-	fullver=$(get_full_version "$pkgbase")
-	if ! pkgfile=$(find_cached_package "$pkgbase-debug" "$fullver" "$_arch"); then
-		continue
-	fi
-	if ! is_debug_package "$pkgfile"; then
-		continue
-	fi
-	uploads+=("$pkgfile")
-done
-
-for pkgfile in "${uploads[@]}"; do
-	sigfile="${pkgfile}.sig"
-	if [[ ! -f $sigfile ]]; then
-		msg "Signing package %s..." "${pkgfile}"
-		if [[ -n $GPGKEY ]]; then
-			SIGNWITHKEY=(-u "${GPGKEY}")
+		sigfile="${pkgfile}.sig"
+		if [[ ! -f $sigfile ]]; then
+			msg "Signing package %s..." "${pkgfile}"
+			if [[ -n $GPGKEY ]]; then
+				SIGNWITHKEY=(-u "${GPGKEY}")
+			fi
+			gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "${pkgfile}" || die
 		fi
-		gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "${pkgfile}" || die
-	fi
-	if ! gpg --verify "$sigfile" "$pkgfile" >/dev/null 2>&1; then
-		die "Signature %s is incorrect!" "$sigfile"
-	fi
-	uploads+=("$sigfile")
+		if ! gpg --verify "$sigfile" "$pkgfile" >/dev/null 2>&1; then
+			die "Signature %s is incorrect!" "$sigfile"
+		fi
+		uploads+=("$sigfile")
+	done
 done

 for _arch in "${arch[@]}"; do
--- a/config/makepkg/x86_64_v3.conf
+++ b/config/makepkg/x86_64_v3.conf
@ -1,162 +0,0 @@
-#!/hint/bash
-# shellcheck disable=2034
-
-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
-          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#-- The package required by makepkg to download VCS sources
-#  Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
-            'fossil::fossil'
-            'git::git'
-            'hg::mercurial'
-            'svn::subversion')
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="x86_64_v3"
-CHOST="x86_64-pc-linux-gnu"
-
-#-- Compiler and Linker Flags
-#CPPFLAGS=""
-CFLAGS="-march=x86-64-v3 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection"
-CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-LTOFLAGS="-flto=auto"
-RUSTFLAGS=""
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-#-- Debugging flags
-DEBUG_CFLAGS="-g"
-DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-DEBUG_RUSTFLAGS="-C debuginfo=2"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
-#  A negated environment option will do the opposite of the comments below.
-#
-#-- distcc:   Use the Distributed C/C++/ObjC compiler
-#-- color:    Colorize output messages
-#-- ccache:   Use ccache to cache compilation
-#-- check:    Run the check() function if present in the PKGBUILD
-#-- sign:     Generate PGP signature file
-#
-BUILDENV=(!distcc color !ccache check !sign)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-#
-#-- Specify a directory for package building.
-#BUILDDIR=/tmp/makepkg
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#   These are default values for the options=() settings
-#########################################################################
-#
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
-#  A negated option will do the opposite of the comments below.
-#
-#-- strip:      Strip symbols from binaries/libraries
-#-- docs:       Save doc directories specified by DOC_DIRS
-#-- libtool:    Leave libtool (.la) files in packages
-#-- staticlibs: Leave static library (.a) files in packages
-#-- emptydirs:  Leave empty directories in packages
-#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:      Remove files specified by PURGE_TARGETS
-#-- debug:      Add debugging flags as specified in DEBUG_* variables
-#-- lto:        Add compile flags for building with link time optimization
-#
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
-INTEGRITY_CHECK=(sha256)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-#-- Directory to store source code in for debug packages
-DBGSRCDIR="/usr/src/debug"
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Log files: specify a fixed directory where all log files will be placed
-#LOGDEST=/home/makepkglogs
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
-#-- Specify a key to use for package signing
-#GPGKEY=""
-
-#########################################################################
-# COMPRESSION DEFAULTS
-#########################################################################
-#
-COMPRESSGZ=(gzip -c -f -n)
-COMPRESSBZ2=(bzip2 -c -f)
-COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -T0 --ultra -20 -)
-COMPRESSLRZ=(lrzip -q)
-COMPRESSLZO=(lzop -q)
-COMPRESSZ=(compress -c -f)
-COMPRESSLZ4=(lz4 -q)
-COMPRESSLZ=(lzip -c -f)
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-PKGEXT='.pkg.tar.zst'
-SRCEXT='.src.tar.gz'
-
-#########################################################################
-# OTHER
-#########################################################################
-#
-#-- Command used to run pacman as root, instead of trying sudo and su
-#PACMAN_AUTH=()
-# vim: set ft=sh ts=2 sw=2 et:
--- a/config/pacman/extra-x86_64_v3.conf
+++ b/config/pacman/extra-x86_64_v3.conf
@ -1,92 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
--- a/config/pacman/gnome-unstable.conf
+++ b/config/pacman/gnome-unstable.conf
@ -1,95 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
--- a/config/pacman/testing-x86_64_v3.conf
+++ b/config/pacman/testing-x86_64_v3.conf
@ -1,92 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
--- a/config/setarch-aliases.d/x86_64_v3
+++ b/config/setarch-aliases.d/x86_64_v3
@ -1 +0,0 @@
-x86_64
--- a/src/crossrepomove.in
+++ b/src/crossrepomove.in
@ -1,6 +1,5 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)

@ -45,7 +44,7 @@ msg "Downloading sources for %s" "${pkgbase}"
 svn -q checkout -N "${target_svn}" target_checkout
 mkdir -p "target_checkout/${pkgbase}/repos"
 svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
+# shellcheck source=PKGBUILD.proto
 . "target_checkout/${pkgbase}/trunk/PKGBUILD"

 msg "Downloading packages for %s" "${pkgbase}"
@ -57,14 +56,9 @@ for _arch in "${arch[@]}"; do
 	fi
 	for _pkgname in "${pkgname[@]}"; do
 		fullver=$(get_full_version "$_pkgname")
-		pkgpath="/srv/ftp/${source_repo}/os/${repo_arch}/${_pkgname}-${fullver}-${_arch}.pkg.tar.*"
-		debugpath="/srv/ftp/${source_repo}-debug/os/${repo_arch}/${_pkgname}-debug-${fullver}-${_arch}.pkg.tar.*"
-		# Fail if $pkgpath doesn't match but keep $debugpath optional
+		pkgpath="/srv/ftp/$source_repo/os/$repo_arch/$_pkgname-$fullver-${_arch}.pkg.tar.*"
 		# shellcheck disable=2029
-		ssh "${server}" "bash -c '
-			install ${pkgpath} -Dt staging/${target_repo} &&
-			(install ${debugpath} -Dt staging/${target_repo} 2>/dev/null || true)
-		'" || die
+		ssh "$server" "cp $pkgpath staging/$target_repo" || die
 	done
 done

--- a/doc/man/checkpkg.1.asciidoc
+++ b/doc/man/checkpkg.1.asciidoc
@ -29,9 +29,6 @@ Options
 *-w, --warn*::
 	Print a warning instead of a regular message in case of soname differences.

-*-M, --makepkg-config*::
-	Set an alternate makepkg configuration file.
-
 *-h, --help*::
 	Show a help text

@ -40,4 +37,4 @@ See Also

 linkman:find-libprovides[1]

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/devtools.7.asciidoc
+++ b/doc/man/devtools.7.asciidoc
@ -18,14 +18,8 @@ Programs
 The list below gives a short overview; see the respective documentation
 for details.

-linkman:archbuild[1]
-	Build an Arch Linux package inside a clean chroot
-
-linkman:arch-nspawn[1]
-	Run a command or OS in a light-weight namespace container
-
 linkman:checkpkg[1]
-	Compare the current build package with the repository version
+	Compare the current build pakcage with the repository version

 linkman:find-libdeps[1]
 	Find soname dependencies for a package
@ -36,20 +30,17 @@ linkman:find-libprovides[1]
 linkman:lddd[1]
 	Find broken library links on your system

+linkman:makerepropkg[1]
+	Rebuild a package to see if it is reproducible
+
 linkman:mkarchroot[1]
 	Creates an arch chroot in a specified location with a specified set of
 	packages

-linkman:makechrootpkg[1]
-	Build a PKGBUILD in a given chroot environment
-
-linkman:makerepropkg[1]
-	Rebuild a package to see if it is reproducible
-
 linkman:offload-build[1]
 	Build a PKGBUILD on a remote server using makechrootpkg

 linkman:sogrep[1]
 	Find packages using a linked to a given shared library

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/find-libdeps.1.asciidoc
+++ b/doc/man/find-libdeps.1.asciidoc
@ -21,4 +21,4 @@ Options
 	Ignore internal libraries.


-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/find-libprovides.1.asciidoc
+++ b/doc/man/find-libprovides.1.asciidoc
@ -21,4 +21,4 @@ Options
 *--ignore-internal*::
 	Ignore internal libraries.

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/include/footer.asciidoc
+++ b/doc/man/include/footer.asciidoc
@ -1,7 +1,9 @@

 Bugs
 ----
-Bugs can be reported on the project's GitLab bug tracker 'https://gitlab.archlinux.org/archlinux/devtools'
+Bugs can be reported on the bug tracker 'https://bugs.archlinux.org' in the Arch
+Linux category and title prefixed with [devtools] or via
+mailto:arch-projects@archlinux.org[].


 Authors
--- a/doc/man/lddd.1.asciidoc
+++ b/doc/man/lddd.1.asciidoc
@ -22,4 +22,4 @@ See Also

 linkman:ldd[1]

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/makerepropkg.1.asciidoc
+++ b/doc/man/makerepropkg.1.asciidoc
@ -48,12 +48,7 @@ Options
 *-M* <file>::
 	Location of a makepkg config file.

-*-l* <chroot>::
-	The directory name to use as the chroot namespace
-	Useful for maintaining multiple copies
-	Default: $USER
-
 *-h*::
 	Show this usage message

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/arch-nspawn.1.asciidoc
+++ b/doc/man/arch-nspawn.1.asciidoc
@ -1,40 +0,0 @@
-arch-nspawn(1)
-==============
-
-Name
----
-arch-nspawn - Run a command or OS in a light-weight namespace container
-
-Synopsis
--------
-arch-nspawn [options] working-dir [systemd-nspawn arguments]
-
-Description
-----------
-
-'arch-nspawn' is a wrapper around systemd-nspawn to run command or OS in a
-namespace container such as a directory including base utilities of a OS.
-It is used to build package(s) in given clean and defined environment.
-
-Options
-------
-
-*-C* <file>::
-	Location of a pacman config file
-
-*-M* <file>::
-	Location of a makepkg config file
-
-*-c* <dir>::
-	Set pacman cache, if no directory is specified the passed pacman.conf's cachedir is used with a fallback to '/etc/pacman.conf'
-
-*-f* <file>::
-	Copy file from the host to the chroot
-
-*-s*::
-	Do not run setarch
-
-*-h*::
-	Show this usage message
-
-include::include/footer.asciidoc[]
--- a/doc/man/archbuild.1.asciidoc
+++ b/doc/man/archbuild.1.asciidoc
@ -1,48 +0,0 @@
-archbuild(1)
-============
-
-Name
----
-archbuild - a script to build an Arch Linux package inside a clean chroot.
-
-Synopsis
--------
-archbuild [options] -- [makechrootpkg args]
-
-Description
-----------
-
-'archbuild' is a script to build an Arch Linux package. archbuild is part of devtools but should only be used via one of the included symlinks:
-
-* extra-x86_64-build
-* gnome-unstable-x86_64-build
-* kde-unstable-x86_64-build
-* multilib-build
-* multilib-staging-build
-* multilib-testing-build
-* staging-x86_64-build
-* testing-x86_64-build
-
-The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'pacman-reponame-arch.conf' with a fallback to 'pacman-reponame.conf' from {pkgdatadir}. The makepkg configuration is loaded from 'makepkg-repo-arch.conf' with a fallback to 'makepkg-reponame.conf' from {pkgdatadir}.
-
-It will also load the bind mount configuration from 'mount.d/arch' in {pkgdatadir}. The file format is that each line starting with ro and rw will be used, other lines will be ignored, and the rest of the used line is out/path:in/path preceded by a space as a separator. ro means it is a read-only mount, rw means a read-write mount.
-
-Options
-------
-
-*-h*::
-	Output command line options.
-
-*-c*::
-	Recreate the chroot before building.
-
-*-r* <dir>::
-	Create chroots in this directory.
-
-
-See Also
--------
-
-linkman:devtools[7]
-
-include::include/footer.asciidoc[]
--- a/doc/man/diffpkg.1.asciidoc
+++ b/doc/man/diffpkg.1.asciidoc
@ -1,77 +0,0 @@
-diffpkg(1)
-===========
-
-Name
----
-diffpkg - Compare package files using different modes.
-
-Synopsis
--------
-diffpkg [OPTIONS] [MODES] [FILE|PKGNAME...]
-
-Description
-----------
-
-Searches for a locally built package corresponding to the PKGBUILD, and
-downloads the last version of that package from the Pacman repositories.
-It then compares the package archives using different modes while using
-simple tar content list by default.
-
-When given one package, use it to diff against the locally built one.
-When given two packages, diff both packages against each other.
-
-In either case, a package name will be converted to a filename from the
-cache or pool, and diffpkg will proceed as though this filename was initially
-specified.
-
-Options
-------
-
-*-M, --makepkg-config*::
-	Set an alternate makepkg configuration file
-
-
-*-P, --pool*='DIR'::
-	Search diff target in pool dir (default `'/srv/ftp/pool'`)
-
-*-v, --verbose*::
-	Provide more detailed/unfiltered output
-
-*-h, --help*::
-	Show a help text
-
-Output Options
--------------
-
-*--color*[='WHEN']::
-	Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
-
-*-u, -U, --unified*::
-	Output 3 lines of unified context
-
-*-y, --side-by-side*::
-	Output in two columns
-
-*-W, --width*[='NUM']::
-	Output at most 'NUM' (default `'auto'`) print columns; 'NUM' can be `'auto'`, `'columns'` or a number.
-	`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
-
-Modes
-----
-
-*-l, --list*::
-	Activate tar content list diff mode (default)
-
-*-d, --diffoscope*::
-	Activate diffoscope diff mode
-
-*-p, --pkginfo*::
-	Activate .PKGINFO diff mode
-
-*-b, --buildinfo*::
-	Activate .BUILDINFO diff mode
-
-See Also
--------
-
-include::include/footer.asciidoc[]
--- a/doc/man/export-pkgbuild-keys.1.asciidoc
+++ b/doc/man/export-pkgbuild-keys.1.asciidoc
@ -1,25 +0,0 @@
-export-pkgbuild-keys(1)
-=======================
-
-Name
----
-export-pkgbuild-keys - Export valid source signing keys from a PKGBUILD
-
-Synopsis
--------
-export-pkgbuild-keys
-
-Description
-----------
-
-Export the PGP keys from a PKGBUILDs validpgpkeys array into the keys/pgp/
-subdirectory. Useful for distributing packager validated source signing
-keys alongside PKGBUILDs.
-
-Options
-------
-
-*-h, --help*::
-	Show a help text.
-
-include::include/footer.asciidoc[]
--- a/doc/man/makechrootpkg.1.asciidoc
+++ b/doc/man/makechrootpkg.1.asciidoc
@ -1,76 +0,0 @@
-makechrootpkg(1)
-================
-
-Name
----
-makechrootpkg - Build a PKGBUILD in a given chroot environment
-
-Synopsis
--------
-makechrootpkg [OPTIONS] -r <chrootdir> [--] [makepkg args]
-
-Description
-----------
-
-Run this script in a directory containing a PKGBUILD to build a package
-inside a clean chroot. Arguments passed to this script after the
-end-of-options marker (--) will be passed to makepkg.
-
-The chroot dir consists of the following directories:
-<chrootdir>/{root, copy} but only "root" is required
-by default. The working copy will be created as needed
-
-The chroot "root" directory must be created via the following
-command:
-	mkarchroot <chrootdir>/root base-devel
-
-This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER
-from makepkg.conf(5), if those variables are not part of the
-environment.
-
-Default makepkg args: --syncdeps --noconfirm --log --holdver --skipinteg
-
-Options
-------
-
-*-h*::
-	Show this usage message
-
-*-c*::
-	Clean the chroot before building
-
-*-d* <dir>::
-	Bind directory into build chroot as read-write
-
-*-D* <dir>::
-	Bind directory into build chroot as read-only
-
-*-u*::
-	Update the working copy of the chroot before building
-	This is useful for rebuilds without dirtying the pristine
-	chroot
-
-*-r* <dir>::
-	The chroot dir to use
-
-*-I* <pkg>::
-	Install a package into the working copy of the chroot
-
-*-l* <copy>::
-	The directory to use as the working copy of the chroot
-	Useful for maintaining multiple copies
-	Default: $USER
-
-*-n*::
-	Run namcap on the build package
-
-*-C*::
-	Run checkpkg on the build package
-
-*-T*::
-	Build in a temporary directory
-
-*-U*::
-	Run makepkg as a specified user
-
-include::include/footer.asciidoc[]
--- a/doc/man/mkarchroot.1.asciidoc
+++ b/doc/man/mkarchroot.1.asciidoc
@ -46,4 +46,4 @@ See Also

 linkman:pacman[1]

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/offload-build.1.asciidoc
+++ b/doc/man/offload-build.1.asciidoc
@ -49,4 +49,4 @@ Example: To use a second `testing-x86_64-build` instance with another copydir:

 	`offload-build -r testing -- -- -l <chroot_copy>`

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/doc/man/sogrep.1.asciidoc
+++ b/doc/man/sogrep.1.asciidoc
@ -45,4 +45,4 @@ Environment Variables
 	directory set by the **XDG_CACHE_HOME** environment variable or the
 	**HOME** environment variable if **XDG_CACHE_HOME** is not set.

-include::include/footer.asciidoc[]
+include::footer.asciidoc[]
--- a/src/find-libdeps.in
+++ b/src/find-libdeps.in
@ -1,10 +1,10 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)

 set -e
+shopt -s extglob

 IGNORE_INTERNAL=0

@ -40,12 +40,9 @@ else
 	pushd "$WORKDIR" >/dev/null
 fi

-shopt -s extglob
 process_sofile() {
 	# extract the library name: libfoo.so
-	shopt -s extglob nullglob
 	soname="${sofile%.so?(+(.+([0-9])))}".so
-	shopt -u extglob nullglob
 	# extract the major version: 1
 	soversion="${sofile##*\.so\.}"
 	if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then
@ -57,7 +54,6 @@ process_sofile() {
 		soobjects+=("${soname}=${soversion}-${soarch}")
 	fi
 }
-shopt -u extglob

 case $script_mode in
 	deps) find_args=(-perm -u+x);;
--- a/src/finddeps.in
+++ b/src/finddeps.in
@ -2,7 +2,7 @@
 #
 # finddeps - find packages that depend on a given depname
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)

@ -20,7 +20,7 @@ fi
 find . -type d -print0 2>/dev/null| while read -r -d '' d; do
 	if [[ -f "$d/PKGBUILD" ]]; then
 		pkgname=() depends=() makedepends=() optdepends=()
-		# shellcheck source=contrib/makepkg/PKGBUILD.proto
+		# shellcheck source=PKGBUILD.proto
 		. "$d/PKGBUILD"
 		for dep in "${depends[@]}"; do
 			# lose the version comparator, if any
--- a/src/lddd.in
+++ b/src/lddd.in
@ -2,7 +2,7 @@
 #
 # lddd - find broken library links on your machine
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified

 m4_include(lib/common.sh)

--- a/lib/archroot.sh
+++ b/lib/archroot.sh
@ -1,6 +1,5 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified
 :

 # shellcheck disable=2034
--- a/lib/common.sh
+++ b/lib/common.sh
@ -1,8 +1,7 @@
 #!/hint/bash
-#
 # This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+
+# License: Unspecified

 [[ -z ${_INCLUDE_COMMON_SH:-} ]] || return 0
 _INCLUDE_COMMON_SH="$(set +o|grep nounset)"
@ -15,9 +14,7 @@ $_INCLUDE_COMMON_SH
 # Avoid any encoding problems
 export LANG=C

-# Set buildtool properties
-export BUILDTOOL=devtools
-export BUILDTOOLVER=m4_devtools_version
+shopt -s extglob

 # check if messages are to be printed using color
 if [[ -t 2 && "$TERM" != dumb ]]; then
@ -137,20 +134,15 @@ pkgver_equal() {
 #    $pkgver can be supplied with or without a pkgrel appended.
 #    If not supplied, any pkgrel will be matched.
 ##
-shopt -s extglob
 find_cached_package() {
 	local searchdirs=("$PWD" "$PKGDEST") results=()
 	local targetname=$1 targetver=$2 targetarch=$3
-	local dir pkg packages pkgbasename name ver rel arch r results
+	local dir pkg pkgbasename name ver rel arch r results

 	for dir in "${searchdirs[@]}"; do
 		[[ -d $dir ]] || continue

-		shopt -s extglob nullglob
-		mapfile -t packages < <(printf "%s\n" "$dir"/"${targetname}"-"${targetver}"-*"${targetarch}".pkg.tar?(.!(sig|*.*)))
-		shopt -u extglob nullglob
-
-		for pkg in "${packages[@]}"; do
+		for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
 			[[ -f $pkg ]] || continue

 			# avoid adding duplicates of the same inode
@ -192,73 +184,3 @@ find_cached_package() {
 			return 1
 	esac
 }
-shopt -u extglob
-
-check_package_validity(){
-	local pkgfile=$1
-	if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
-		die "PACKAGER was not set when building package"
-	fi
-	hashsum=sha256sum
-	pkgbuild_hash=$(awk -v"hashsum=$hashsum" -F' = ' '$1 == "pkgbuild_"hashsum {print $2}' <(bsdtar -xOqf "$pkgfile" .BUILDINFO))
-	if [[ "$pkgbuild_hash" != "$($hashsum PKGBUILD|cut -d' ' -f1)" ]]; then
-		die "PKGBUILD $hashsum mismatch: expected $pkgbuild_hash"
-	fi
-}
-
-
-# usage: grep_pkginfo pkgfile pattern
-grep_pkginfo() {
-	local _ret=()
-	mapfile -t _ret < <(bsdtar -xOqf "$1" ".PKGINFO" | grep "^${2} = ")
-	printf '%s\n' "${_ret[@]#${2} = }"
-}
-
-
-# Get the package name
-getpkgname() {
-	local _name
-
-	_name="$(grep_pkginfo "$1" "pkgname")"
-	if [[ -z $_name ]]; then
-		error "Package '%s' has no pkgname in the PKGINFO. Fail!" "$1"
-		exit 1
-	fi
-
-	echo "$_name"
-}
-
-
-# Get the package base or name as fallback
-getpkgbase() {
-	local _base
-
-	_base="$(grep_pkginfo "$1" "pkgbase")"
-	if [[ -z $_base ]]; then
-		getpkgname "$1"
-	else
-		echo "$_base"
-	fi
-}
-
-
-getpkgdesc() {
-	local _desc
-
-	_desc="$(grep_pkginfo "$1" "pkgdesc")"
-	if [[ -z $_desc ]]; then
-		error "Package '%s' has no pkgdesc in the PKGINFO. Fail!" "$1"
-		exit 1
-	fi
-
-	echo "$_desc"
-}
-
-
-is_debug_package() {
-	local pkgfile=${1} pkgbase pkgname pkgdesc
-	pkgbase="$(getpkgbase "${pkgfile}")"
-	pkgname="$(getpkgname "${pkgfile}")"
-	pkgdesc="$(getpkgdesc "${pkgfile}")"
-	[[ ${pkgdesc} == "Detached debugging symbols for "* && ${pkgbase}-debug = "${pkgname}" ]]
-}
--- a/lib/valid-repos.sh
+++ b/lib/valid-repos.sh
@ -1,6 +1,5 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified
 :

 # shellcheck disable=2034
--- a/lib/valid-tags.sh
+++ b/lib/valid-tags.sh
@ -1,6 +1,5 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified
 :

 # shellcheck disable=2034
--- a/src/makechrootpkg.in
+++ b/src/makechrootpkg.in
@ -1,6 +1,14 @@
 #!/bin/bash
+# License: GNU GPLv2
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# 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; version 2 of the License.
+#
+# 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.

 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
@ -9,7 +17,7 @@ source /usr/share/makepkg/util/config.sh

 shopt -s nullglob

-default_makepkg_args=(--syncdeps --noconfirm --holdver --skipinteg)
+default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
 makepkg_args=("${default_makepkg_args[@]}")
 verifysource_args=()
 chrootdir=
@ -24,7 +32,6 @@ clean_first=0
 run_namcap=0
 run_checkpkg=0
 temp_chroot=0
-tmp_opts="nosuid,nodev,size=50%,nr_inodes=2m"

 bindmounts_ro=()
 bindmounts_rw=()
@ -57,7 +64,6 @@ usage() {
 	echo 'Flags:'
 	echo '-h         This help'
 	echo '-c         Clean the chroot before building'
-	echo '-C <dir>   Set pacman cache to pass to arch-nspawn'
 	echo '-d <dir>   Bind directory into build chroot as read-write'
 	echo '-D <dir>   Bind directory into build chroot as read-only'
 	echo '-u         Update the working copy of the chroot before building'
@ -152,7 +158,6 @@ prepare_chroot() {
 	local builduser_uid builduser_gid
 	builduser_uid="$(id -u "$makepkg_user")"
 	builduser_gid="$(id -g "$makepkg_user")"
-	builduser_gids="$(id -G "$makepkg_user")"
 	local install="install -o $builduser_uid -g $builduser_gid"
 	local x

@ -161,18 +166,14 @@ prepare_chroot() {
 	# an x86_64 host).
 	sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,shadow,group}
 	printf >>"$copydir/etc/group"  'builduser:x:%d:\n' "$builduser_gid"
-	for gid in $builduser_gids; do
-		if [[ $gid != $builduser_gid ]]; then
-			group_name=$(getent group "$gid" | cut -d: -f1)
-			printf >>"$copydir/etc/group"  "$group_name:x:%d:builduser\n" "$gid"
-		fi
-	done
 	printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' "$builduser_uid" "$builduser_gid"
 	printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))"

 	$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}

-	for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest
+	sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
+	for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
+		"MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
 	do
 		grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
 		echo "$x" >>"$copydir/etc/makepkg.conf"
@ -189,8 +190,6 @@ EOF
 		printf '#!/bin/bash\n'
 		declare -f _chrootbuild
 		declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
-		declare -p BUILDTOOL 2>/dev/null
-		declare -p BUILDTOOLVER 2>/dev/null
 		printf '_chrootbuild "$@" || exit\n'

 		if (( run_namcap )); then
@ -214,12 +213,7 @@ _chrootbuild() {
 	# use "$" in arguments to commands with "sudo -i".  ${foo} or
 	# ${1} is OK, but $foo or $1 isn't.
 	# https://bugzilla.sudo.ws/show_bug.cgi?id=765
-	mkdir /build/.distcc
-	chown builduser /build/.distcc
-	sudo --preserve-env=SOURCE_DATE_EPOCH \
-		--preserve-env=BUILDTOOL \
-		--preserve-env=BUILDTOOLVER \
-		-iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+	sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 	ret=$?
 	case $ret in
 		0|14)
@ -242,9 +236,9 @@ download_sources() {
 	chown "$makepkg_user:" "$WORKDIR"

 	# Ensure sources are downloaded
-	sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
+	sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
 		env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
-		makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+		makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
 		die "Could not download sources."
 }

@ -283,13 +277,12 @@ move_products() {
 }
 # }}}

-while getopts 'hcuC:r:I:l:nCTD:d:U:' arg; do
+while getopts 'hcur:I:l:nCTD:d:U:' arg; do
 	case "$arg" in
 		c) clean_first=1 ;;
 		D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
 		d) bindmounts_rw+=("--bind=$OPTARG") ;;
 		u) update_first=1 ;;
-		C) cache_dir="-c $OPTARG" ;;
 		r) passeddir="$OPTARG" ;;
 		I) install_pkgs+=("$OPTARG") ;;
 		l) copy="$OPTARG" ;;
@ -305,7 +298,7 @@ done
 [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
 makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}

-check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER

 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$passeddir")
@ -321,14 +314,13 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")

-# See if -R, -e or -A was passed to makepkg
+# See if -R or -e was passed to makepkg
 for arg in "${@:$OPTIND}"; do
 	case ${arg%%=*} in
-		--skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
+		--skip*|--holdver) verifysource_args+=("$arg") ;;
 		--repackage|--noextract) keepbuilddir=1 ;;
 		--*) ;;
-		-*A*) verifysource_args+=(-A) ;;&
-		-*R*|-*e*) keepbuilddir=1 ;;&
+		-*R*|-*e*) keepbuilddir=1 ;;
 	esac
 done

@ -372,11 +364,9 @@ download_sources

 prepare_chroot

-if arch-nspawn $cache_dir "$copydir" \
-	--setenv=TERM=xterm \
+if arch-nspawn "$copydir" \
 	--bind="${PWD//:/\\:}:/startdir" \
 	--bind="${SRCDEST//:/\\:}:/srcdest" \
-	--tmpfs="/tmp:${tmp_opts}" \
 	"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
 	/chrootbuild "${makepkg_args[@]}"
 then
@ -421,7 +411,7 @@ else
 		done

 		msg2 "Checking packages"
-		sudo -u "$makepkg_user" checkpkg --rmdir --warn --makepkg-config "$copydir/etc/makepkg.conf" "${remotepkgs[@]/#file:\/\//}"
+		sudo -u "$makepkg_user" checkpkg --rmdir --warn "${remotepkgs[@]/#file:\/\//}"
 	fi
 	true
 fi
--- a/config/makepkg/x86_64.conf
+++ b/config/makepkg/x86_64.conf
@ -11,11 +11,11 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
-          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
+DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
+          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'rsync::/usr/bin/rsync --no-motd -zz %u %o'
          'scp::/usr/bin/scp -C %u %o')

 # Other common tools:
@ -26,7 +26,6 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
 VCSCLIENTS=('bzr::bzr'
-            'fossil::fossil'
            'git::git'
            'hg::mercurial'
            'svn::subversion')
@ -39,26 +38,21 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"

 #-- Compiler and Linker Flags
-#CPPFLAGS=""
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection"
-CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-LTOFLAGS="-flto=auto"
-RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
-DEBUG_CFLAGS="-g"
-DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"

 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@ -81,7 +75,7 @@ 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)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@ -92,12 +86,11 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
-#-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)

-#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
-INTEGRITY_CHECK=(sha256)
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
 #-- Options to be used when stripping shared libraries. See `man strip' for details.
@ -153,10 +146,4 @@ COMPRESSLZ=(lzip -c -f)
 PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'

-#########################################################################
-# OTHER
-#########################################################################
-#
-#-- Command used to run pacman as root, instead of trying sudo and su
-#PACMAN_AUTH=()
 # vim: set ft=sh ts=2 sw=2 et:
--- a/src/makerepropkg.in
+++ b/src/makerepropkg.in
@ -1,10 +1,21 @@
 #!/bin/bash
+#   makerepropkg - rebuild a package to see if it is reproducible
 #
-# makerepropkg - rebuild a package to see if it is reproducible
+#   Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
 #
-# Copyright (c) 2019 by Eli Schwartz <eschwartz@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 <https://www.gnu.org/licenses/>.
 #
-# SPDX-License-Identifier: GPL-3.0-or-later

 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
@ -17,12 +28,9 @@ declare -a buildenv buildopts installed installpkgs

 archiveurl='https://archive.archlinux.org/packages'
 buildroot=/var/lib/archbuild/reproducible
+chroot=testenv
 diffoscope=0

-chroot=$USER
-[[ -n ${SUDO_USER:-} ]] && chroot=$SUDO_USER
-[[ -z "$chroot" || $chroot = root ]] && chroot=copy
-
 parse_buildinfo() {
    local line var val

@ -84,19 +92,6 @@ get_pkgfile() {
    return 1
 }

-get_makepkg_conf() {
-    local fname=${1}
-    local arch="${2}"
-    local makepkg_conf="${3}"
-    if ! buildtool_file=$(get_pkgfile "${fname}"); then
-        error "failed to retrieve ${fname}"
-        return 1
-    fi
-    msg2 "using makepkg.conf from ${fname}"
-    bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
-    return 0
-}
-
 usage() {
    cat << __EOF__
 usage: ${BASH_SOURCE[0]##*/} [options] <package_file>
@ -112,19 +107,15 @@ OPTIONS
    -d            Run diffoscope if the package is unreproducible
    -c <dir>      Set pacman cache
    -M <file>     Location of a makepkg config file
-    -l <chroot>   The directory name to use as the chroot namespace
-                  Useful for maintaining multiple copies
-                  Default: $chroot
    -h            Show this usage message
 __EOF__
 }

-while getopts 'dM:c:l:h' arg; do
+while getopts 'dM:c:h' arg; do
    case "$arg" in
        d) diffoscope=1 ;;
        M) archroot_args+=(-M "$OPTARG") ;;
        c) cache_dirs+=("$OPTARG") ;;
-        l) chroot="$OPTARG" ;;
        h) usage; exit 0 ;;
        *|?) usage; exit 1 ;;
    esac
@ -187,19 +178,15 @@ parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO)
 export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
 PACKAGER="${buildinfo[packager]}"
 BUILDDIR="${buildinfo[builddir]}"
-BUILDTOOL="${buildinfo[buildtool]}"
-BUILDTOOLVER="${buildinfo[buildtoolver]}"
 PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}}

 # nuke and restore reproducible testenv
-namespace="$buildroot/$chroot"
-lock 9 "${namespace}.lock" "Locking chroot namespace '%s'" "${namespace}"
-for copy in "${namespace}"/*/; do
+for copy in "${buildroot}"/*/; do
    [[ -d ${copy} ]] || continue
    subvolume_delete_recursive "${copy}"
 done
-rm -rf --one-file-system "${namespace}"
-(umask 0022; mkdir -p "${namespace}")
+rm -rf --one-file-system "${buildroot}"
+(umask 0022; mkdir -p "${buildroot}")

 for fname in "${installed[@]}"; do
    if ! allpkgfiles+=("$(get_pkgfile "${fname}")"); then
@ -207,53 +194,34 @@ for fname in "${installed[@]}"; do
        exit 1
    fi
 done
-
-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
-
-makepkg_conf="${TEMPDIR}/makepkg.conf"
-# anything before buildtool support is pinned to the last none buildtool aware release
-if [[ -z "${BUILDTOOL}" ]]; then
-    get_makepkg_conf "devtools-20210202-3-any" "${CARCH}" "${makepkg_conf}" || exit 1
-# prefere to assume devtools up until matching makepkg version so repository packages remain reproducible
-elif [[ "${BUILDTOOL}" = makepkg ]] && (( $(vercmp "${BUILDTOOLVER}" 6.0.1) <= 0 )); then
-    get_makepkg_conf "devtools-20210202-3-any" "${CARCH}" "${makepkg_conf}" || exit 1
-# all devtools builds
-elif [[ "${BUILDTOOL}" = devtools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${CARCH}" "${makepkg_conf}"; then
-    true
-# fallback to current makepkg.conf
-else
-    warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback"
-    makepkg_conf=@pkgdatadir@/makepkg-${CARCH}.conf
-fi
-printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M "${makepkg_conf}" -U "${archroot_args[@]}" "${namespace}/root" - || exit 1
+printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M @pkgdatadir@/makepkg-x86_64.conf -U "${archroot_args[@]}" "${buildroot}"/root - || exit 1

 # use makechrootpkg to prep the build directory
-makechrootpkg -r "${namespace}" -l build -- --packagelist || exit 1
+makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1

 # set detected makepkg.conf options
 {
-    for var in PACKAGER BUILDDIR BUILDTOOL BUILDTOOLVER PKGEXT; do
+    for var in PACKAGER BUILDDIR PKGEXT; do
        printf '%s=%s\n' "${var}" "${!var@Q}"
    done
    printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
    printf 'BUILDENV=(%s)\n' "${buildenv[*]@Q}"
-} >> "${namespace}/build"/etc/makepkg.conf
-install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${namespace}/build/${BUILDDIR}"
+} >> "${buildroot}/${chroot}"/etc/makepkg.conf >> "${buildroot}/${chroot}"/etc/makepkg.conf
+install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${buildroot}/${chroot}/${BUILDDIR}"

 # kick off the build
-arch-nspawn "${namespace}/build" \
+arch-nspawn "${buildroot}/${chroot}" \
    --bind="${PWD}:/startdir" \
    --bind="${SRCDEST}:/srcdest" \
    /chrootbuild -C --noconfirm --log --holdver --skipinteg
 ret=$?

 if (( ${ret} == 0 )); then
-    msg2 "built succeeded! built packages can be found in ${namespace}/build/pkgdest"
+    msg2 "built succeeded! built packages can be found in ${buildroot}/${chroot}/pkgdest"
    msg "comparing artifacts..."

    for pkgfile in "${splitpkgs[@]}"; do
-        comparefiles=("${pkgfile}" "${namespace}/build/pkgdest/${pkgfile##*/}")
+        comparefiles=("${pkgfile}" "${buildroot}/${chroot}/pkgdest/${pkgfile##*/}")
        if cmp -s "${comparefiles[@]}"; then
            msg2 "Package '%s' successfully reproduced!" "${pkgfile}"
        else
--- a/src/mkarchroot.in
+++ b/src/mkarchroot.in
@ -1,6 +1,14 @@
 #!/bin/bash
+# License: GNU GPLv2
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# 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; version 2 of the License.
+#
+# 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.

 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
@ -55,9 +63,10 @@ shift 1

 [[ -z $working_dir ]] && die 'Please specify a working directory.'

+pacconf_cmd=$(command -v pacman-conf || command -v pacconf)

 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+	mapfile -t cache_dirs < <($pacconf_cmd CacheDir)
 fi

 umask 0022
@ -81,11 +90,11 @@ for file in "${files[@]}"; do
 	cp "$file" "$working_dir$file"
 done

-unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \
+pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
 	"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'

 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
-echo 'LANG=C.UTF-8' > "$working_dir/etc/locale.conf"
+echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
 echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"

 systemd-machine-id-setup --root="$working_dir"
--- a/src/offload-build.in
+++ b/src/offload-build.in
@ -1,10 +1,22 @@
 #!/bin/bash
 #
-# offload-build - build a PKGBUILD on a remote server using makechrootpkg.
+#   offload-build - build a PKGBUILD on a remote server using makechrootpkg.
 #
-# Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
+#   Copyright (c) 2019 by Eli Schwartz <eschwartz@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 <https://www.gnu.org/licenses/>.
 #
-# SPDX-License-Identifier: GPL-3.0-or-later

 source /usr/share/makepkg/util/config.sh

--- a/config/pacman/extra.conf
+++ b/config/pacman/extra.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/config/pacman/staging-x86_64_v3.conf
+++ b/config/pacman/staging-x86_64_v3.conf
@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
+Architecture = auto

 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
@ -31,11 +31,10 @@ Architecture = x86_64_v3 x86_64
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@ -70,6 +69,9 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

+[gnome-unstable]
+Include = /etc/pacman.d/mirrorlist
+
 [staging]
 Include = /etc/pacman.d/mirrorlist

--- a/config/pacman/kde-unstable.conf
+++ b/config/pacman/kde-unstable.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/config/pacman/multilib-staging.conf
+++ b/config/pacman/multilib-staging.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/config/pacman/multilib-testing.conf
+++ b/config/pacman/multilib-testing.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/config/pacman/multilib.conf
+++ b/config/pacman/multilib.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/config/pacman/staging.conf
+++ b/config/pacman/staging.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/config/pacman/testing.conf
+++ b/config/pacman/testing.conf
@ -31,11 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-NoProgressBar
+#TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
+#VerbosePkgLists

 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
--- a/src/rebuildpkgs.in
+++ b/src/rebuildpkgs.in
@ -1,6 +1,5 @@
 #!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# License: Unspecified
 #
 # This script rebuilds a list of packages in order
 # and reports anything that fails
@ -22,7 +21,7 @@ fi

 # Source makepkg.conf; fail if it is not found
 if [[ -r '/etc/makepkg.conf' ]]; then
-	# shellcheck source=config/makepkg/x86_64.conf
+	# shellcheck source=makepkg-x86_64.conf
 	source '/etc/makepkg.conf'
 else
 	die '/etc/makepkg.conf not found!'
@ -54,7 +53,7 @@ bump_pkgrel() {
 pkg_from_pkgbuild() {
 	# we want the sourcing to be done in a subshell so we don't pollute our current namespace
 	export CARCH PKGEXT
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
+	# shellcheck source=PKGBUILD.proto
 	(source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
 }

--- a/src/sogrep.in
+++ b/src/sogrep.in
@ -1,12 +1,22 @@
 #!/bin/bash
 #
-# sogrep - find shared library links in an Arch Linux repository.
+#   sogrep - find shared library links in an Arch Linux repository.
 #
-# Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
+#   Copyright (c) 2019 by Eli Schwartz <eschwartz@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 <https://www.gnu.org/licenses/>.
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-m4_include(lib/common.sh)

 # globals
 : ${SOLINKS_MIRROR:="https://mirror.pkgbuild.com"}
@ -29,40 +39,13 @@ recache() {

    for repo in "${_repos[@]}"; do
        for arch in "${arches[@]}"; do
-            # delete extracted tarballs from previous sogrep versions
            rm -rf "${SOCACHE_DIR}/${arch}/${repo}"
-
-            # fetch repo links database if newer than our cached copy
-            local dbpath=${SOCACHE_DIR}/${arch}/${repo}.links.tar.gz
-            mkdir -p "${dbpath%/*}"
-            (( VERBOSE )) && echo "Fetching ${repo}.links.tar.gz..."
-            if ! curl -fLR "${verbosity}" -o "${dbpath}" -z "${dbpath}" \
-                    "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz"; then
-                echo "error: failed to download links database for repo ${repo}"
-                exit 1
-            fi
+            mkdir -p "${SOCACHE_DIR}/${arch}/${repo}"
+            curl -L "$verbosity" "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}"
        done
    done
 }

-is_outdated_cache() {
-    local repo arch
-
-    # links databases are generated at about the same time every day; we should
-    # attempt to check for new database files if any of them are over a day old
-
-    for repo in "${_repos[@]}"; do
-        for arch in "${arches[@]}"; do
-            local dbpath=${SOCACHE_DIR}/${arch}/${repo}.links.tar.gz
-            if [[ ! -f ${dbpath} ]] || [[ $(find "${dbpath}" -mtime +0) ]]; then
-                return 0
-            fi
-        done
-    done
-
-    return 1
-}
-
 search() {
    local repo=$1 arch lib=$2 srepos=("${_repos[@]}")

@ -75,20 +58,15 @@ search() {
        srepos=("${repo}")
    fi

-    setup_workdir
-
    for arch in "${arches[@]}"; do
        for repo in "${srepos[@]}"; do
            local prefix=
            (( VERBOSE && ${#srepos[@]} > 1 )) && prefix=${repo}/
-            local db=${SOCACHE_DIR}/${arch}/${repo}.links.tar.gz
-            if [[ -f ${db} ]]; then
-                local extracted=${WORKDIR}/${arch}/${repo}
-                mkdir -p "${extracted}"
-                bsdtar -C "${extracted}" -xf "${db}"
+            db=${SOCACHE_DIR}/${arch}/${repo}/
+            if [[ -d ${db} ]]; then
                while read -rd '' pkg; do
                    read -r match
-                    pkg=${pkg#${extracted}/}
+                    pkg=${pkg#${db}}
                    pkg="${prefix}${pkg%-*-*/links}"

                    if (( VERBOSE )); then
@ -96,7 +74,7 @@ search() {
                    else
                        printf '%s\n' "${pkg}"
                    fi
-                done < <(grep -rZ "${lib}" "${extracted}") | sort -u
+                done < <(grep -rZ "${lib}" "${db}") | sort -u
            fi
        done
    done | resort
@ -161,8 +139,7 @@ if ! (( ( REFRESH && $# == 0 ) || $# == 2 )); then
    exit 1
 fi

-# trigger a refresh if requested explicitly or the cached dbs might be outdated
-if (( REFRESH )) || [[ ! -d ${SOCACHE_DIR} ]] || is_outdated_cache; then
+if (( REFRESH )) || [[ ! -d ${SOCACHE_DIR} ]]; then
    recache
    (( $# == 2 )) || exit 0
 fi
--- a/src/diffpkg.in
+++ b/src/diffpkg.in
@ -1,335 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-m4_include(lib/common.sh)
-
-usage() {
-    cat <<- _EOF_
-		Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] [MODES] [FILE|PKGNAME...]
-
-		Searches for a locally built package corresponding to the PKGBUILD, and
-		downloads the last version of that package from the Pacman repositories.
-		It then compares the package archives using different modes while using
-		simple tar content list by default.
-
-		When given one package, use it to diff against the locally built one.
-		When given two packages, diff both packages against each other.
-
-		In either case, a package name will be converted to a filename from the
-		cache, and diffpkg will proceed as though this filename was initially
-		specified.
-
-		OPTIONS
-		    -M, --makepkg-config Set an alternate makepkg configuration file
-		    -P, --pool=DIR       Search diff target in pool dir (default '/srv/ftp/pool')
-		    -v, --verbose        Provide more detailed/unfiltered output
-		    -h, --help           Show this help text
-
-		OUTPUT OPTIONS
-		    --color[=WHEN]       Color output; WHEN is 'never', 'always', or 'auto';
-		                         Plain --color means --color='auto'
-		    -u, -U, --unified    Output 3 lines of unified context
-		    -y, --side-by-side   Output in two columns
-		    -W, --width=NUM      Output at most NUM (default 'auto') print columns
-		                         NUM can be 'auto', 'columns' or a number
-
-		MODES
-		    -l, --list           Activate content list diff mode (default)
-		    -d, --diffoscope     Activate diffoscope diff mode
-		    -p, --pkginfo        Activate .PKGINFO diff mode
-		    -b, --buildinfo      Activate .BUILDINFO diff mode
-_EOF_
-}
-
-MAKEPKG_CONF=/etc/makepkg.conf
-POOLDIR=/srv/ftp/pool
-
-VERBOSE=0
-TARLIST=0
-DIFFOSCOPE=0
-PKGINFO=0
-BUILDINFO=0
-
-DIFFMODE=--side-by-side
-DIFFCOLOR=--color=auto
-DIFFWIDTH=--width=auto
-DIFFOPTIONS=(--expand-tabs)
-
-# option checking
-while (( $# )); do
-	case $1 in
-		-h|--help)
-			usage
-			exit 0
-			;;
-		-M|--makepkg-config)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			MAKEPKG_CONF="$2"
-			shift 2
-			;;
-		-l|--list)
-			TARLIST=1
-			shift
-			;;
-		-d|--diffoscope)
-			DIFFOSCOPE=1
-			shift
-			;;
-		-p|--pkginfo)
-			PKGINFO=1
-			shift
-			;;
-		-b|--buildinfo)
-			BUILDINFO=1
-			shift
-			;;
-		-v|--verbose)
-			VERBOSE=1
-			shift
-			;;
-		-u|-U|--unified)
-			DIFFMODE=--unified
-			shift
-			;;
-		-y|--side-by-side)
-			DIFFMODE=--side-by-side
-			shift
-			;;
-		--color|--color=*)
-			if [[ $2 == never || $2 == always || $2 == auto ]]; then
-				DIFFCOLOR="--color=$2"
-				shift 2
-				continue
-			fi
-			if [[ $1 == --color ]]; then
-				DIFFCOLOR="--color=auto"
-			else
-				DIFFCOLOR="$1"
-			fi
-			shift
-			;;
-		-W|--width)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			DIFFWIDTH="--width=$2"
-			shift 2
-			;;
-		--width=*)
-			DIFFWIDTH="$1"
-			shift
-			;;
-		-P|--pool)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			POOLDIR="$2"
-			shift 2
-			;;
-		--pool=*)
-			POOLDIR="${1#*=}"
-			shift
-			;;
-		--)
-			shift
-			break
-			;;
-		-*|--*)
-			die "invalid argument: %s" "$1"
-			;;
-		*)
-			break
-			;;
-	esac
-done
-
-# Set options based on flags or magic values
-if (( VERBOSE )); then
-	if [[ $DIFFMODE == --unified ]]; then
-		DIFFMODE="--unified=99999"
-	fi
-else
-	DIFFOPTIONS+=(--suppress-common-lines)
-fi
-if [[ $DIFFWIDTH == --width=columns ]]; then
-	DIFFWIDTH="--width=${COLUMNS:-130}"
-fi
-if [[ $DIFFWIDTH != --width=auto ]]; then
-	DIFFOPTIONS+=("${DIFFWIDTH}")
-fi
-DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
-
-if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
-	TARLIST=1
-fi
-
-# Source makepkg.conf; fail if it is not found
-if [[ -r "${MAKEPKG_CONF}" ]]; then
-	# shellcheck source=config/makepkg/x86_64.conf
-	source "${MAKEPKG_CONF}"
-else
-	die "${MAKEPKG_CONF} not found!"
-fi
-
-# Source user-specific makepkg.conf overrides
-if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
-	# shellcheck source=/dev/null
-	source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
-elif [[ -r "$HOME/.makepkg.conf" ]]; then
-	# shellcheck source=/dev/null
-	source "$HOME/.makepkg.conf"
-fi
-
-STARTDIR=$(pwd)
-trap 'rm -rf $TMPDIR' EXIT INT TERM QUIT
-TMPDIR=$(mktemp -d --tmpdir diffpkg-script.XXXXXXXX)
-export TMPDIR
-
-tar_list() {
-	bsdtar tf "$*" | if (( VERBOSE )); then
-		cat
-	else
-		sed -E 's|^usr/lib/modules/[0-9][^/]+|usr/lib/modules/[…]|g'
-	fi | sort
-}
-
-file_line_length() {
-	path="$1"
-	wc -L "${path}" | tail -n1 | sed -E 's/^ +//g' | cut -d' ' -f1
-}
-
-file_diff_columns() {
-	file1="$1"
-	file2="$2"
-	file1_length=$(file_line_length "$file1")
-	file2_length=$(file_line_length "$file2")
-	echo $(( file1_length + file2_length + 3 ))
-}
-
-diff_pkgs() {
-	local oldpkg newpkg
-	oldpkg=$(readlink -m "$1")
-	newpkg=$(readlink -m "$2")
-
-	[[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
-	[[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
-
-	DIFFOPTIONS+=(--label "${oldpkg}" --label "${newpkg}")
-
-	if (( TARLIST )); then
-		tar_list "$oldpkg" > "$TMPDIR/old"
-		tar_list "$newpkg" > "$TMPDIR/new"
-	fi
-
-	if (( PKGINFO )); then
-		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
-	fi
-
-	if (( BUILDINFO )); then
-		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
-	fi
-
-	if (( TARLIST || PKGINFO || BUILDINFO )); then
-		# Resolve dynamic auto width one we know the content to diff
-		if [[ $DIFFWIDTH == --width=auto ]]; then
-			AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
-			DIFFOPTIONS+=("--width=${AUTOLENGTH}")
-		fi
-
-		# Print a header for side-by-side view as it lacks labels
-		if [[ $DIFFMODE == --side-by-side ]]; then
-			printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
-		fi
-
-		diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"
-	fi
-
-	if (( DIFFOSCOPE )); then
-		diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
-	fi
-}
-
-shopt -s extglob
-fetch_pkg() {
-	local pkg pkgdest pkgurl
-	case $1 in
-		*://*)
-			pkgurl=$1 ;;
-		/*|*/*)
-			pkgurl=$(readlink -m "$1") ;;
-		*.pkg.tar*)
-			pkgurl=$1 ;;
-		'')
-			;;
-		*)
-			pkg=$1 ;;
-	esac
-
-	if [[ -z ${pkgurl} ]]; then
-		# Try to find latest package in pool dir
-		if [[ -d ${POOLDIR} ]]; then
-			shopt -s extglob nullglob
-			pkgurl=$(printf "%s\n" "${POOLDIR}"/*/"${_pkgname}"-!(*-*)-!(*-*)-!(*-*).pkg.tar!(*.sig)|sort -Vr|head -1)
-			shopt -u extglob nullglob
-		fi
-		# Search via pacman database if no pool file exists
-		if [[ ! -f ${pkgurl} ]]; then
-			pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
-				die "Couldn't download previous package for %s." "$pkg"
-		fi
-	fi
-
-	pkg=${pkgurl##*/}
-	pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
-
-	if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
-		ln -sf "${pkgurl#file://}" "$pkgdest"
-	elif [[ -f "$PKGDEST/$pkg" ]]; then
-		ln -sf "$PKGDEST/$pkg" "$pkgdest"
-	elif [[ -f "$STARTDIR/$pkg" ]]; then
-		ln -sf "$STARTDIR/$pkg" "$pkgdest"
-	elif [[ $pkgurl = *://* ]]; then
-		curl -fsLC - --retry 3 --retry-delay 3 -o "$pkgdest" "$pkgurl" || \
-			die "Couldn't download %s" "$pkgurl"
-	else
-		die "File not found: %s" "$pkgurl"
-	fi
-
-	echo "$pkgdest"
-}
-shopt -u extglob
-
-if (( $# < 2 )); then
-	if [[ ! -f PKGBUILD ]]; then
-		die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
-	fi
-
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
-	. ./PKGBUILD
-	if [[ ${arch[0]} == 'any' ]]; then
-		CARCH='any'
-	fi
-
-	for _pkgname in "${pkgname[@]}"; do
-		comparepkg=$_pkgname
-		pkgurl=
-		target_pkgver=$(get_full_version "$_pkgname")
-		if ! pkgfile=$(find_cached_package "$_pkgname" "$target_pkgver" "$CARCH"); then
-			die 'tarball not found for package: %s' "${_pkgname}-$target_pkgver"
-		fi
-
-		ln -s "$pkgfile" "$TMPDIR"
-
-		if (( $# )); then
-			comparepkg="$1"
-		fi
-
-		oldpkg=$(fetch_pkg "$comparepkg") || exit 1
-
-		diff_pkgs "$oldpkg" "$pkgfile"
-	done
-else
-	file1=$(fetch_pkg "$1") || exit 1
-	file2=$(fetch_pkg "$2") || exit 1
-
-	diff_pkgs "$file1" "$file2"
-fi
--- a/src/export-pkgbuild-keys.in
+++ b/src/export-pkgbuild-keys.in
@ -1,75 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-m4_include(lib/common.sh)
-
-usage() {
-	cat <<- _EOF_
-		Usage: ${BASH_SOURCE[0]##*/}
-
-		Export the PGP keys from a PKGBUILDs validpgpkeys array into the keys/pgp/
-		subdirectory. Useful for distributing packager validated source signing
-		keys alongside PKGBUILDs.
-
-		OPTIONS
-		    -h, --help      Show this help text
-_EOF_
-}
-
-# option checking
-while (( $# )); do
-	case $1 in
-		-h|--help)
-			usage
-			exit 0
-			;;
-		*)
-			die "invalid argument: %s" "$1"
-			;;
-	esac
-done
-
-if [[ ! -f PKGBUILD ]]; then
-	die "This must be run a directory containing a PKGBUILD."
-fi
-
-mapfile -t validpgpkeys < <(
-	# shellcheck source=PKGBUILD.proto
-	. ./PKGBUILD
-	if (( ${#validpgpkeys[@]} )); then
-		printf "%s\n" "${validpgpkeys[@]}"
-	fi
-)
-
-msg "Exporting ${#validpgpkeys[@]} PGP keys..."
-if (( ${#validpgpkeys[@]} == 0 )); then
-	exit 0
-fi
-
-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
-
-mkdir -p keys/pgp
-error=0
-
-for key in "${validpgpkeys[@]}"; do
-	gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-minimal "$key" 2>/dev/null
-
-	# gpg does not give a non-zero return value if it fails to export...
-	if [[ -f $TEMPDIR/$key.asc ]]; then
-		msg2 "Exported $key"
-		mv "$TEMPDIR/$key.asc" "keys/pgp/$key.asc"
-	else
-		if [[ -f keys/pgp/$key.asc ]]; then
-			warning "Failed to update key: $key"
-		else
-			error "Key unavailable: $key"
-			error=1
-		fi
-	fi
-done
-
-if (( error )); then
-	die "Failed to export all \'validpgpkeys\' entries."
-fi
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@ -1,18 +1,15 @@
-#compdef archbuild archco arch-nspawn archrelease commitpkg diffpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
+#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
+# License: Unspecified

 m4_include(lib/valid-tags.sh)
 m4_include(lib/valid-repos.sh)

 _binary_arch=${_arch[*]:0:-1}
-_colors=(never always auto)

 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
 	'-r[Create chroots in this directory]:base_dir:_files -/'
 	'-h[Display usage]'
-	'--[Introduce makechrootpkg options]:*::makechrootpkg options:=  _dispatch makechrootpkg makechrootpkg'
 )

 _archco_args=(
@ -42,22 +39,6 @@ _commitpkg_args=(
 	'1:commit_msg'
 )

-_diffpkg_args=(
-	'(-l --list)'{-l,--list}'[Tar content list diff mode]'
-	'(-d --diffoscope)'{-d,--diffoscope}'[Diffoscope diff mode]'
-	'(-p --pkginfo)'{-p,--pkginfo}'[.PKGINFO diff mode]'
-	'(-b --buildinfo)'{-b,--buildinfo}'[.BUILDINFO diff mode]'
-	'(-m --makepkg-config)'{-m,--makepkg-config}'[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
-	'(-u -U --unified)'{-u,-U,--unified}'[Output 3 lines of unified context]'
-	'(-y --side-by-side)'{-y,--side-by-side}'[Output in two columns]'
-	'--color=[Color output]:when:($_colors[*])'
-	'(-W --width=)'{-W,--width=}'[Output at most NUM print columns]:num:(auto columns)'
-	'(-P --pool=)'{-P,--pool=}'[pool directory]:dir:_files -/'
-	'(-v --verbose)'{-v,--verbose}'[Provide more detailed/unfiltered output]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:packages:_devtools_completions_all_packages'
-)
-
 _finddeps_args=(
 	'1:packages:_devtools_completions_all_packages'
 )
@ -94,7 +75,6 @@ _rebuildpkgs_args=(
 _checkpkg_args=(
 	'(-r --rmdir)'{-r,--rmdir}'[Remove the temporary directory]'
 	'(-w --warn)'{-w,--warn}'[Print a warning in case of differences]'
-	'(-M --makepkg-config)'{-M,--makepkg-config}'[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
 	'(-h --help)'{-h,--help}'[Display usage]'
 )