diff options
Diffstat (limited to 'libre-testing')
17 files changed, 1592 insertions, 0 deletions
diff --git a/libre-testing/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch b/libre-testing/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch new file mode 100644 index 000000000..2eb858902 --- /dev/null +++ b/libre-testing/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch @@ -0,0 +1,52 @@ +From patchwork Wed Aug 29 06:49:29 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [pacman-dev] Revert "makepkg: add whirlpool to the list of hashing + algorithms" +X-Patchwork-Submitter: Eli Schwartz <eschwartz@archlinux.org> +X-Patchwork-Id: 751 +Message-Id: <20180829064929.29120-1-eschwartz@archlinux.org> +To: pacman-dev@archlinux.org +Date: Wed, 29 Aug 2018 02:49:29 -0400 +From: Eli Schwartz <eschwartz@archlinux.org> +List-Id: Discussion list for pacman development <pacman-dev.archlinux.org> + +This reverts commit 9cdfd18739cc4b0e2b2efeb9a92a3ea612c8505f. + +We've never documented whirlpoolsums support in the manpage and no one +really seems to have realized we support it, let alone use it -- except +for a few parabola packages, being the contributor's motivation for +adding support. + +The problem is that for two years the code has been broken. In commit +577701250d645d1fc1a505cde34aedbeb3208ea5 we moved to coreutils to +provide checksum commands, rather than openssl, but there is no +whirlpoolsums binary. + +Properly fixing this would require re-adding a dependency on openssl, +independent of the libalpm crypto backend -- which defeats the purpose +of moving to coreutils in the general case. nettle-hash does not provide +a whirlpool algorithm any more than it does base64 (the original reason +for moving to coreutils). + +Therefore, we should just drop support for this again. + +Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> +--- + scripts/makepkg.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in +index cf5fda91..f9c619f2 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -54,7 +54,7 @@ splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' + 'options' 'install' 'changelog') + readonly -a build_options splitpkg_overrides + +-known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512' 'whirlpool') ++known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') + + # Options + ASDEPS=0 diff --git a/libre-testing/pacman/0001-Sychronize-filesystem.patch b/libre-testing/pacman/0001-Sychronize-filesystem.patch new file mode 100644 index 000000000..49ca47cbe --- /dev/null +++ b/libre-testing/pacman/0001-Sychronize-filesystem.patch @@ -0,0 +1,32 @@ +From 60abb58d9db663e6050d8d61d67e0e893306dfb0 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Sat, 13 Sep 2014 18:58:16 -0600 +Subject: [PATCH 1/3] Sychronize filesystem + +Since many problems arise from improper flushing of the filesystem, +particularly package installations followed by a reboot very shorly after, +this will perform a sync() after installations and removals to ensure a +consistent filesystem state after package operations. + +Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> +--- + lib/libalpm/trans.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c +index af964832..b3f9049e 100644 +--- a/lib/libalpm/trans.c ++++ b/lib/libalpm/trans.c +@@ -230,6 +230,9 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) + + trans->state = STATE_COMMITED; + ++ _alpm_log(handle, ALPM_LOG_DEBUG, "synchronizing filesystem\n"); ++ sync(); ++ + return 0; + } + +-- +2.17.0 + diff --git a/libre-testing/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch b/libre-testing/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch new file mode 100644 index 000000000..4afdca595 --- /dev/null +++ b/libre-testing/pacman/0001-makepkg-Better-error-messages-for-versions-in-check-.patch @@ -0,0 +1,358 @@ +From 0b1dacfbd6ed3e8b8af290a108cbcd90e2fbea5c Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Mon, 6 Aug 2018 23:42:48 -0400 +Subject: [PATCH 1/4] makepkg: Better error messages for versions in + (check,make,opt)depends/provides/conflicts + +Given the depends + + depends=('foo>=1.2-1.par2') + +and the error message + + ==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace. + +One would be lead to believe that the problem is that they gave a pkgrel in +depends at all, not that the pkgrel contains letters. + +Each of the (check,make,opt)depends, conflicts, and provides linters use a +glob to trim off properly formed epoch an rel from the full version string, +and pass the remainder to check_pkgver(). This does a good job of +accepting/rejecting full versions, but doesn't do a good job of generating +good error messages when rejecting if it's because of the epoch or rel. + +1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and + lint_pkgrel(), similarly to check_pkgver(). +2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and + splits it in to epoch/ver/rel, and calls the appropriate check_ function + on each. +3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and + provides linters. +--- + scripts/Makefile.am | 1 + + .../lint_pkgbuild/checkdepends.sh.in | 10 ++-- + .../libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++-- + .../libmakepkg/lint_pkgbuild/depends.sh.in | 14 ++--- + scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 10 +++- + .../libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 54 +++++++++++++++++++ + .../lint_pkgbuild/makedepends.sh.in | 10 ++-- + .../libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++-- + scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 20 +++++-- + .../libmakepkg/lint_pkgbuild/provides.sh.in | 10 ++-- + 10 files changed, 106 insertions(+), 43 deletions(-) + create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in + +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index f759e149..7cf8bed0 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -73,6 +73,7 @@ LIBMAKEPKG_IN = \ + libmakepkg/lint_pkgbuild/conflicts.sh \ + libmakepkg/lint_pkgbuild/depends.sh \ + libmakepkg/lint_pkgbuild/epoch.sh \ ++ libmakepkg/lint_pkgbuild/fullpkgver.sh \ + libmakepkg/lint_pkgbuild/install.sh \ + libmakepkg/lint_pkgbuild/makedepends.sh \ + libmakepkg/lint_pkgbuild/optdepends.sh \ +diff --git a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in +index d5648bd4..0a9ddf67 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in +@@ -23,8 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH=1 + + LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + ++source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" + source "$LIBRARY/lint_pkgbuild/pkgname.sh" +-source "$LIBRARY/lint_pkgbuild/pkgver.sh" + source "$LIBRARY/util/message.sh" + source "$LIBRARY/util/pkgbuild.sh" + +@@ -43,12 +43,10 @@ lint_checkdepends() { + + for checkdepend in "${checkdepends_list[@]}"; do + name=${checkdepend%%@(<|>|=|>=|<=)*} +- # remove optional epoch in version specifier +- ver=${checkdepend##$name@(<|>|=|>=|<=)?(+([0-9]):)} + lint_one_pkgname checkdepends "$name" || ret=1 +- if [[ $ver != $checkdepend ]]; then +- # remove optional pkgrel in version specifier +- check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" checkdepends || ret=1 ++ if [[ $name != $checkdepend ]]; then ++ ver=${checkdepend##$name@(<|>|=|>=|<=)} ++ check_fullpkgver "$ver" checkdepends || ret=1 + fi + done + +diff --git a/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in +index a18c25fa..b61459e1 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in +@@ -23,8 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH=1 + + LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + ++source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" + source "$LIBRARY/lint_pkgbuild/pkgname.sh" +-source "$LIBRARY/lint_pkgbuild/pkgver.sh" + source "$LIBRARY/util/message.sh" + source "$LIBRARY/util/pkgbuild.sh" + +@@ -43,12 +43,10 @@ lint_conflicts() { + + for conflict in "${conflicts_list[@]}"; do + name=${conflict%%@(<|>|=|>=|<=)*} +- # remove optional epoch in version specifier +- ver=${conflict##$name@(<|>|=|>=|<=)?(+([0-9]):)} + lint_one_pkgname conflicts "$name" || ret=1 +- if [[ $ver != $conflict ]]; then +- # remove optional pkgrel in version specifier +- check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" conflicts || ret=1 ++ if [[ $name != $conflict ]]; then ++ ver=${conflict##$name@(<|>|=|>=|<=)} ++ check_fullpkgver "$ver" conflicts || ret=1 + fi + done + +diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +index e363a039..aba43825 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +@@ -23,8 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH=1 + + LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + ++source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" + source "$LIBRARY/lint_pkgbuild/pkgname.sh" +-source "$LIBRARY/lint_pkgbuild/pkgver.sh" + source "$LIBRARY/util/message.sh" + source "$LIBRARY/util/pkgbuild.sh" + +@@ -43,13 +43,13 @@ lint_depends() { + + for depend in "${depends_list[@]}"; do + name=${depend%%@(<|>|=|>=|<=)*} +- # remove optional epoch in version specifier +- ver=${depend##$name@(<|>|=|>=|<=)?(+([0-9]):)} + lint_one_pkgname depends "$name" || ret=1 +- # Don't validate empty version because of https://bugs.archlinux.org/task/58776 +- if [[ $ver != $depend && -n $ver ]]; then +- # remove optional pkgrel in version specifier +- check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 ++ if [[ $name != $depend ]]; then ++ ver=${depend##$name@(<|>|=|>=|<=)} ++ # Don't validate empty version because of https://bugs.archlinux.org/task/58776 ++ if [[ -n $ver ]]; then ++ check_fullpkgver "$ver" depends || ret=1 ++ fi + fi + done + +diff --git a/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in b/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in +index 93bd05c1..c98f91b0 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in +@@ -29,9 +29,15 @@ source "$LIBRARY/util/message.sh" + lint_pkgbuild_functions+=('lint_epoch') + + +-lint_epoch() { ++check_epoch() { ++ local epoch=$1 type=$2 ++ + if [[ $epoch != *([[:digit:]]) ]]; then +- error "$(gettext "%s must be an integer, not %s.")" "epoch" "$epoch" ++ error "$(gettext "%s must be an integer, not %s.")" "epoch${type:+ in $type}" "$epoch" + return 1 + fi + } ++ ++lint_epoch() { ++ check_epoch "$epoch" ++} +diff --git a/scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in +new file mode 100644 +index 00000000..1cac7fbc +--- /dev/null ++++ b/scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in +@@ -0,0 +1,54 @@ ++#!/bin/bash ++# ++# fullpkgver.sh - Check whether a full version conforms to requirements. ++# ++# Copyright (c) 2018 Pacman Development Team <pacman-dev@archlinux.org> ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++# ++ ++[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH" ]] && return ++LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/lint_pkgbuild/epoch.sh" ++source "$LIBRARY/lint_pkgbuild/pkgrel.sh" ++source "$LIBRARY/lint_pkgbuild/pkgver.sh" ++ ++ ++check_fullpkgver() { ++ local fullver=$1 type=$2 ++ local ret=0 ++ ++ # If there are multiple colons or multiple hyphens, there's a ++ # question of how we split it--it's invalid either way, but it ++ # will affect error messages. Let's mimic version.c:parseEVR(). ++ ++ if [[ $fullver = *:* ]]; then ++ # split at the *first* colon ++ check_epoch "${fullver%%:*}" "$type" || ret=1 ++ fullver=${fullver#*:} ++ fi ++ ++ if [[ $fullver = *-* ]]; then ++ # split at the *last* hyphen ++ check_pkgrel "${fullver##*-}" "$type" || ret=1 ++ fullver=${fullver%-*} ++ fi ++ ++ check_pkgver "$fullver" "$type" || ret=1 ++ ++ return $ret ++} +diff --git a/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in +index 4cc4ab5d..20c7f7dc 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in +@@ -23,8 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH=1 + + LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + ++source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" + source "$LIBRARY/lint_pkgbuild/pkgname.sh" +-source "$LIBRARY/lint_pkgbuild/pkgver.sh" + source "$LIBRARY/util/message.sh" + source "$LIBRARY/util/pkgbuild.sh" + +@@ -43,12 +43,10 @@ lint_makedepends() { + + for makedepend in "${makedepends_list[@]}"; do + name=${makedepend%%@(<|>|=|>=|<=)*} +- # remove optional epoch in version specifier +- ver=${makedepend##$name@(<|>|=|>=|<=)?(+([0-9]):)} + lint_one_pkgname makedepends "$name" || ret=1 +- if [[ $ver != $makedepend ]]; then +- # remove optional pkgrel in version specifier +- check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" makedepends || ret=1 ++ if [[ $name != $makedepend ]]; then ++ ver=${makedepend##$name@(<|>|=|>=|<=)} ++ check_fullpkgver "$ver" makedepends || ret=1 + fi + done + +diff --git a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +index 9978fe9b..505ee848 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +@@ -23,6 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_OPTDEPENDS_SH=1 + + LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + ++source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" ++source "$LIBRARY/lint_pkgbuild/pkgname.sh" + source "$LIBRARY/util/message.sh" + source "$LIBRARY/util/pkgbuild.sh" + +@@ -41,12 +43,10 @@ lint_optdepends() { + + for optdepend in "${optdepends_list[@]%%:[[:space:]]*}"; do + name=${optdepend%%@(<|>|=|>=|<=)*} +- # remove optional epoch in version specifier +- ver=${optdepend##$name@(<|>|=|>=|<=)?(+([0-9]):)} + lint_one_pkgname optdepends "$name" || ret=1 +- if [[ $ver != $optdepend ]]; then +- # remove optional pkgrel in version specifier +- check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" optdepends || ret=1 ++ if [[ $name != $optdepend ]]; then ++ ver=${optdepend##$name@(<|>|=|>=|<=)} ++ check_fullpkgver "$ver" optdepends || ret=1 + fi + done + +diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +index f294a3bf..762f054a 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +@@ -29,14 +29,24 @@ source "$LIBRARY/util/message.sh" + lint_pkgbuild_functions+=('lint_pkgrel') + + +-lint_pkgrel() { +- if [[ -z $pkgrel ]]; then +- error "$(gettext "%s is not allowed to be empty.")" "pkgrel" ++check_pkgrel() { ++ local rel=$1 type=$2 ++ if [[ -z $rel ]]; then ++ error "$(gettext "%s is not allowed to be empty.")" "pkgrel${type:+ in $type}" + return 1 + fi + +- if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then +- error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" ++ if [[ $rel != +([0-9])?(.+([0-9])) ]]; then ++ error "$(gettext "%s must be a decimal, not %s.")" "pkgrel${type:+ in $type}" "$rel" + return 1 + fi + } ++ ++lint_pkgrel() { ++ if (( PKGVERFUNC )); then ++ # defer check to after getting version from pkgver function ++ return 0 ++ fi ++ ++ check_pkgrel "$pkgrel" ++} +diff --git a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in +index 102be08e..5a529728 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in +@@ -23,8 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_PROVIDES_SH=1 + + LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + ++source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" + source "$LIBRARY/lint_pkgbuild/pkgname.sh" +-source "$LIBRARY/lint_pkgbuild/pkgver.sh" + source "$LIBRARY/util/message.sh" + source "$LIBRARY/util/pkgbuild.sh" + +@@ -48,12 +48,10 @@ lint_provides() { + continue + fi + name=${provide%=*} +- # remove optional epoch in version specifier +- ver=${provide##$name=?(+([0-9]):)} + lint_one_pkgname provides "$name" || ret=1 +- if [[ $ver != $provide ]]; then +- # remove optional pkgrel in version specifier +- check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" provides || ret=1 ++ if [[ $name != $provide ]]; then ++ ver=${provide##$name=} ++ check_fullpkgver "$ver" provides || ret=1 + fi + done + +-- +2.18.0 + diff --git a/libre-testing/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch b/libre-testing/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch new file mode 100644 index 000000000..e666299ff --- /dev/null +++ b/libre-testing/pacman/0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch @@ -0,0 +1,38 @@ +From 59e20edc16b7f13c3d753ac3a28358c467e32965 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Mon, 27 Aug 2018 16:41:29 -0400 +Subject: [PATCH] makepkg: Pass --stream to `hg clone` when creating the + working copy + +Without --stream, `hg clone` reencodes+recompresses the entire repository, +to the storage settings of the host. But download_hg() already did that +on the initial network clone, and it is 100% pointless duplicated work for +the local clone. + +The work that this saves is CPU-bound (not disk-bound), and is restricted +to a single core. + +The --stream flag has only existed since Mercurial 4.4 (2017-11-01). Prior +to that, it was named --uncompressed. --uncompressed still exists as a +compatibility alias for --stream, and marked deprecated, though there is +currently no schedule for its removal. +--- + scripts/libmakepkg/source/hg.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in +index ae9aed3b..7346e1e3 100644 +--- a/scripts/libmakepkg/source/hg.sh.in ++++ b/scripts/libmakepkg/source/hg.sh.in +@@ -94,7 +94,7 @@ extract_hg() { + plain "$(gettext "Aborting...")" + exit 1 + fi +- elif ! hg clone -u "$ref" "$dir" "${dir##*/}"; then ++ elif ! hg clone -u "$ref" --stream "$dir" "${dir##*/}"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" + plain "$(gettext "Aborting...")" + exit 1 +-- +2.18.0 + diff --git a/libre-testing/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch b/libre-testing/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch new file mode 100644 index 000000000..80d9e2c6f --- /dev/null +++ b/libre-testing/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch @@ -0,0 +1,32 @@ +From d892998ecea95c8224b128e1797a0e5a970436a8 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Sat, 30 Jan 2016 17:19:03 -0700 +Subject: [PATCH 2/3] Revert "close stdin before running install scripts" + +This reverts commit e374e6829cea3512f0b4a4069c5a6168f0f8d8a0. + +Arch Linux ARM packages have use cases for this feature, such as +prompting the user to flash a new kernel to a bare partition. Removing +this feature will undoubtedly cause more problems than it intends to +solve. + +Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> +--- + lib/libalpm/util.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c +index 102a879a..c9fdd4af 100644 +--- a/lib/libalpm/util.c ++++ b/lib/libalpm/util.c +@@ -608,7 +608,6 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], + + if(pid == 0) { + /* this code runs for the child only (the actual chroot/exec) */ +- close(0); + close(1); + close(2); + while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); +-- +2.17.0 + diff --git a/libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch b/libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch new file mode 100644 index 000000000..e005e1b4e --- /dev/null +++ b/libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch @@ -0,0 +1,28 @@ +From 38a179d91b79efb44b33c5b5b64d2ee4202921b5 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Mon, 6 Aug 2018 23:50:39 -0400 +Subject: [PATCH 2/4] makepkg: check_pkgrel: Don't say "decimal" in the error + message + +If you have a malformed pkgrel, the error message says that it must be a +"decimal". That isn't quite true, as that would mean that `1.1 == 1.10`. +--- + scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +index 762f054a..30fa6d71 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +@@ -37,7 +37,7 @@ check_pkgrel() { + fi + + if [[ $rel != +([0-9])?(.+([0-9])) ]]; then +- error "$(gettext "%s must be a decimal, not %s.")" "pkgrel${type:+ in $type}" "$rel" ++ error "$(gettext "%s must be of the form 'integer[.integer]', not %s.")" "pkgrel${type:+ in $type}" "$rel" + return 1 + fi + } +-- +2.18.0 + diff --git a/libre-testing/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch b/libre-testing/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch new file mode 100644 index 000000000..302bf0ebc --- /dev/null +++ b/libre-testing/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -0,0 +1,60 @@ +From dd8d526a39c86c300f158c581e028365efe60a64 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Fri, 11 Mar 2016 20:11:24 -0700 +Subject: [PATCH 3/3] Revert "alpm_run_chroot: always connect parent2child + pipe" + +This reverts commit 1d6583a58da0904fb7feafd4a666391087955a7b. +--- + lib/libalpm/util.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c +index c9fdd4af..2d57b256 100644 +--- a/lib/libalpm/util.c ++++ b/lib/libalpm/util.c +@@ -592,7 +592,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], + goto cleanup; + } + +- if(socketpair(AF_UNIX, SOCK_STREAM, 0, parent2child_pipefd) == -1) { ++ if(stdin_cb && socketpair(AF_UNIX, SOCK_STREAM, 0, parent2child_pipefd) == -1) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; +@@ -612,9 +612,11 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], + close(2); + while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); + while(dup2(child2parent_pipefd[HEAD], 2) == -1 && errno == EINTR); +- while(dup2(parent2child_pipefd[TAIL], 0) == -1 && errno == EINTR); +- close(parent2child_pipefd[TAIL]); +- close(parent2child_pipefd[HEAD]); ++ if(stdin_cb) { ++ while(dup2(parent2child_pipefd[TAIL], 0) == -1 && errno == EINTR); ++ close(parent2child_pipefd[TAIL]); ++ close(parent2child_pipefd[HEAD]); ++ } + close(child2parent_pipefd[TAIL]); + close(child2parent_pipefd[HEAD]); + if(cwdfd >= 0) { +@@ -649,16 +651,15 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], + child2parent->events = POLLIN; + fcntl(child2parent->fd, F_SETFL, O_NONBLOCK); + close(child2parent_pipefd[HEAD]); +- close(parent2child_pipefd[TAIL]); + + if(stdin_cb) { + parent2child->fd = parent2child_pipefd[HEAD]; + parent2child->events = POLLOUT; + fcntl(parent2child->fd, F_SETFL, O_NONBLOCK); ++ close(parent2child_pipefd[TAIL]); + } else { + parent2child->fd = -1; + parent2child->events = 0; +- close(parent2child_pipefd[HEAD]); + } + + #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) +-- +2.17.0 + diff --git a/libre-testing/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch b/libre-testing/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch new file mode 100644 index 000000000..987473f85 --- /dev/null +++ b/libre-testing/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch @@ -0,0 +1,31 @@ +From fb1606f4bba3386fd8d1cc710423c6e629060b86 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Mon, 6 Aug 2018 23:51:47 -0400 +Subject: [PATCH 3/4] makepkg: check_pkgver: Report what the bad pkgver is + +For consistency with check_epoch and check_pkgrel. + +I think that this is important because if there are multiple +provides/depends/whatever that include a version, and one of them is +malformed, including the bad version in the error message identified +which one is the problem. +--- + scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +index c105212b..65216b64 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +@@ -38,7 +38,7 @@ check_pkgver() { + fi + + if [[ $ver = *[[:space:]/:-]* ]]; then +- error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver${type:+ in $type}" ++ error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace; got %s.")" "pkgver${type:+ in $type}" "$ver" + return 1 + fi + } +-- +2.18.0 + diff --git a/libre-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch b/libre-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch new file mode 100644 index 000000000..ab0877950 --- /dev/null +++ b/libre-testing/pacman/0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch @@ -0,0 +1,91 @@ +From e72212e314f98a0cf9a082dfa1293baa019fbc90 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Thu, 14 Apr 2016 17:06:07 -0400 +Subject: [PATCH 4/4] makepkg: Treat pkgrel more similarly to pkgver + +This is perfectly fine with libalpm; it was only makepkg that was more +strict with pkgrel than pkgver. + +Further, the former error message about invalid pkgrel formats claimed that +pkgrel was a "decimal", which would mean that `1.1 == 1.10`. This is not +the case; alpm parses pkgrel as a version, not as a decimal. In that +light, enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly. +--- + doc/PKGBUILD.5.asciidoc | 5 ++-- + scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 4 ++-- + test/util/vercmptest.sh | 23 ++++++++++++++++++- + 3 files changed, 26 insertions(+), 6 deletions(-) + +diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc +index f12effde..1ad8de37 100644 +--- a/doc/PKGBUILD.5.asciidoc ++++ b/doc/PKGBUILD.5.asciidoc +@@ -60,9 +60,8 @@ systems (see below). + allows package maintainers to make updates to the package's configure + flags, for example. This is typically set to '1' for each new upstream + software release and incremented for intermediate PKGBUILD updates. The +- variable is a postive integer, with an optional subrelease level +- specified by adding another postive integer separated by a period +- (i.e. in the form x.y). ++ variable is not allowed to contain colons, forward slashes, hyphens or ++ whitespace. + + *epoch*:: + Used to force the package to be seen as newer than any previous versions +diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +index 30fa6d71..0888e0b1 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +@@ -36,8 +36,8 @@ check_pkgrel() { + return 1 + fi + +- if [[ $rel != +([0-9])?(.+([0-9])) ]]; then +- error "$(gettext "%s must be of the form 'integer[.integer]', not %s.")" "pkgrel${type:+ in $type}" "$rel" ++ if [[ $rel = *[[:space:]/:-]* ]]; then ++ error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace; got %s.")" "pkgrel${type:+ in $type}" "$rel" + return 1 + fi + } +diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh +index 1541e7ae..f41a0d1e 100755 +--- a/test/util/vercmptest.sh ++++ b/test/util/vercmptest.sh +@@ -39,7 +39,7 @@ tap_runtest() { + tap_is_str "$($bin "$ver2" "$ver1")" "$exp" "$ver2 $ver1" + } + +-tap_plan 92 ++tap_plan 124 + + # all similar length, no pkgrel + tap_runtest 1.5.0 1.5.0 0 +@@ -113,4 +113,25 @@ tap_runtest 1:1.0 1.0 1 + tap_runtest 1:1.0 1.1 1 + tap_runtest 1:1.1 1.1 1 + ++# complex pkgrel values ++tap_runtest 1-1.5.0 1-1.5.0 0 ++tap_runtest 1-1.5.1 1-1.5.0 1 ++tap_runtest 1-1.5.1 1-1.5 1 ++tap_runtest 1-1.5b 1-1.5 -1 ++tap_runtest 1-1.5b 1-1.5.1 -1 ++# based on "from the manpage" ++tap_runtest 1-1.0a 1-1.0alpha -1 ++tap_runtest 1-1.0alpha 1-1.0b -1 ++tap_runtest 1-1.0b 1-1.0beta -1 ++tap_runtest 1-1.0beta 1-1.0rc -1 ++tap_runtest 1-1.0rc 1-1.0 -1 ++# based on "going crazy? alpha-dotted versions" ++tap_runtest 1-1.5.a 1-1.5 1 ++tap_runtest 1-1.5.b 1-1.5.a 1 ++tap_runtest 1-1.5.1 1-1.5.b 1 ++# based on Parabola usage ++tap_runtest 1-1 1-2.par1 -1 ++tap_runtest 1-2 1-2.par1 -1 ++tap_runtest 1-3 1-2.par1 1 ++ + tap_finish +-- +2.18.0 + diff --git a/libre-testing/pacman/PKGBUILD b/libre-testing/pacman/PKGBUILD new file mode 100644 index 000000000..4e9b31394 --- /dev/null +++ b/libre-testing/pacman/PKGBUILD @@ -0,0 +1,182 @@ +# vim: set ts=2 sw=2 et: +# $Id$ +# Maintainer (Arch): Dan McGee <dan@archlinux.org> +# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> +# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Contributor: Daniel Milewski <niitotantei@riseup.net> + +pkgname=pacman +pkgver=5.1.1 +pkgrel=1 +pkgrel+=.parabola8 +pkgdesc="A library-based package manager with dependency support" +arch=('x86_64') +arch+=('i686' 'armv7h' 'ppc64le') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base' 'base-devel') +groups+=('base-openrc') +depends=('bash' 'glibc' 'libarchive' 'curl' + 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring') +depends+=('parabola-keyring' 'archlinuxarm-keyring' 'archlinux32-keyring') +makedepends=('asciidoc') +checkdepends=('python2' 'fakechroot') +optdepends=('perl-locale-gettext: translation support in makepkg-template') +provides=('pacman-parabola') +conflicts=('pacman-parabola') +replaces=('pacman-parabola') +backup=(etc/pacman.conf etc/makepkg.conf) +options=('strip' 'debug') +validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org> + 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org> +source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} + ltmain-asneeded.patch::"https://git.archlinux.org/pacman.git/plain/build-aux/ltmain-asneeded.patch?id=28cb22e3c20676c42a08593b5553ee896b53e030" + "${arch[@]/#/pacman.conf.}" + makepkg.conf.in + pacman-keyring.service + pacman-keyring.timer + 0001-makepkg-Better-error-messages-for-versions-in-check-.patch + 0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch + 0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch + 0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch + 0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch) +source_armv7h=(0001-Sychronize-filesystem.patch + 0002-Revert-close-stdin-before-running-install-scripts.patch + 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) +sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d' + 'SKIP' + '8e29d09b8ccf78eda393c44acc027b7b6125d89e5a586ad78991752fc9e62a8c' + '53c3d28314fd8fc6f92a0720c41fc5bd4c7b24793f84158d07988b294c5480a2' + '6baddd5a4651f147b9412d86dc8c5b4763e4f34deaf140a7fb986fb4d4a05949' + '435f4e93355048f83697317b35aad7788162bab5f58f1b9268bc83ad03ed41d8' + '88359b6a39c8c1d43b1d1ead05425b0199f8783c330f1b5ec84edcdba5ffb06e' + 'c0cbdc0df96f13a73d241c1eb85a969098bd414f12ecd7c045922b154537e00a' + '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' + '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' + '075ac1f8d782ac9868f5e7f3043f684a00da33915eba9ec7e4a8940992ddc269' + '8065c468706be669bc6718a6634e5e58507cba9b8121bf5cfe1703daacab1c3e' + 'd01100d19b9868da8c689a7a14b6340574ecca0105a8d8ef866b281ad3d7e637' + 'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033' + '1f6a0a8518dc912bc5d9df335b6da220bd3cc51630b6b47c09ec9d4cd47ae432') +sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc' + '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9' + '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb') + +prepare() { + cd "$pkgname-$pkgver" + + # From Arch ARM + if [ "${CARCH}" = "armv7h" ]; then + patch -p1 -i ../0001-Sychronize-filesystem.patch + patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch + patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch + fi + + # From Parabola + patch -p1 -i ../0001-makepkg-Better-error-messages-for-versions-in-check-.patch + patch -p1 -i ../0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch + patch -p1 -i ../0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch + patch -p1 -i ../0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch + + # From pacman-dev mailing list + # Properly drop whirlpoolsums support (instead of mysteriously + # failing). Backported because some Parabola packages actually use + # whirlpoolsums. + patch -p1 -i ../0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch + + # Because a Makefile.am was edited by + # 0001-makepkg-Better-error-messages-for-versions-in-check-.patch + # + # This is based of of the 'autogen.sh' script, which is in + # pacman.it, but not included in the tarball. + autoreconf -i + patch -d build-aux -Np0 -i "$srcdir/ltmain-asneeded.patch" +} + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc \ + --with-scriptlet-shell=/usr/bin/bash \ + --with-ldconfig=/usr/bin/ldconfig + make V=1 + + # Generate the architecture-specific makepkg.conf files + local carch mycarch mychost myflags myldflags + for carch in "${arch[@]}"; do + case $carch in + i686) + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" + ;; + x86_64) + mycarch="x86_64" + mychost="x86_64-pc-linux-gnu" + myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" + ;; + armv7h) + mycarch="armv7h" + mychost="armv7l-unknown-linux-gnueabihf" + myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt" + ;; + ppc64le) + mycarch="ppc64le" + mychost="powerpc64le-unknown-linux-gnu" + myflags="-mcpu=native -O2 -pipe -fstack-protector-strong -fno-plt" + ;; + esac + myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" + + # set things correctly in the default conf file + sed < "$srcdir/makepkg.conf.in" > "$srcdir/makepkg.conf.$carch" \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@LDFLAGS[@]|$myldflags|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + done +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install distro-specific stuff + install -dm755 "$pkgdir"/etc/{makepkg,pacman}.d + install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf" + install -m644 "$srcdir/makepkg.conf.$CARCH" "$pkgdir/etc/makepkg.conf" + echo '# There must be at least 1 file matching /etc/pacman.d/*.conf' > "$pkgdir/etc/pacman.d/empty.conf" + + install -dm755 "$pkgdir/usr/share/pacman/defaults" + local carch + for carch in "${arch[@]}"; do + install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/" + install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/" + done + + # put bash_completion in the right location + install -dm755 "$pkgdir/usr/share/bash-completion/completions" + mv "$pkgdir/etc/bash_completion.d/pacman" "$pkgdir/usr/share/bash-completion/completions" + rmdir "$pkgdir/etc/bash_completion.d" + + for f in makepkg pacman-key; do + ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" + done + + # Parabola's pacman began shipping a weekly job for this back in + # 2014. Why is it nescessary for Parabola installs, but it + # seemingly isn't for Arch installs? + install -Dm644 "$srcdir/pacman-keyring.service" "$pkgdir/usr/lib/systemd/system/pacman-keyring.service" + install -Dm644 "$srcdir/pacman-keyring.timer" "$pkgdir/usr/lib/systemd/system/pacman-keyring.timer" + install -Dm644 /dev/stdin "$pkgdir/usr/lib/systemd/system-preset/90-pacman.preset" <<<"enable pacman-keyring.timer" +} diff --git a/libre-testing/pacman/makepkg.conf.in b/libre-testing/pacman/makepkg.conf.in new file mode 100644 index 000000000..3fc6ed099 --- /dev/null +++ b/libre-testing/pacman/makepkg.conf.in @@ -0,0 +1,155 @@ +#!/hint/bash +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' + 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + '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' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="@CARCH@" +CHOST="@CHOST@" + +#-- Compiler and Linker Flags +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="@CARCHFLAGS@" +CXXFLAGS="@CARCHFLAGS@" +LDFLAGS="@LDFLAGS@" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" +#-- Debugging flags +DEBUG_CFLAGS="-g -fvar-tracking-assignments" +DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# 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 +######################################################################### +# +# 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 +#-- 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 +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug) + +#-- 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. +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 -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) +COMPRESSZ=(compress -c -f) + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' + +######################################################################### +# MODULAR CONFIGURATION +######################################################################### +# +for file in /etc/makepkg.d/*.conf; do + [[ -f "$file" ]] || continue + source "$file" +done +unset file diff --git a/libre-testing/pacman/pacman-keyring.service b/libre-testing/pacman/pacman-keyring.service new file mode 100644 index 000000000..ded0235ad --- /dev/null +++ b/libre-testing/pacman/pacman-keyring.service @@ -0,0 +1,7 @@ +[Unit] +Description=Refresh pacman keyring +Documentation=man:pacman-key + +[Service] +Type=oneshot +ExecStart=/usr/bin/pacman-key --refresh-keys diff --git a/libre-testing/pacman/pacman-keyring.timer b/libre-testing/pacman/pacman-keyring.timer new file mode 100644 index 000000000..1b54d4444 --- /dev/null +++ b/libre-testing/pacman/pacman-keyring.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Refresh pacman keyring once a week +Documentation=man:pacman-key + +[Timer] +OnCalendar=weekly +AccuracySec=1h +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/libre-testing/pacman/pacman.conf.armv7h b/libre-testing/pacman/pacman.conf.armv7h new file mode 100644 index 000000000..72d59e83b --- /dev/null +++ b/libre-testing/pacman/pacman.conf.armv7h @@ -0,0 +1,122 @@ +# +# /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 +#UseDelta = 0.7 +Architecture = armv7h + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +CheckSpace +#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. +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 Arch/Parabola packagers +# with `pacman-key --populate archlinux` and `pacman-key --populate parabola`. + +# +# 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. + +# NOTE: Nonprism is a particular repository that aims to provide software built +# and patched without services under global data surveillance programs like PRISM, +# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism + +#[nonprism-testing] +#Include = /etc/pacman.d/mirrorlist + +#[nonprism] +#Include = /etc/pacman.d/mirrorlist + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +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 + +# The PCR (Parabola Community Repository) contains packages maintained by trusted +# members of the Parabola community. It also contains packages maintained by +# Parabola developers, but that the developer decided didn't belong in core/libre. + +#[pcr-testing] +#Include = /etc/pacman.d/mirrorlist + +[pcr] +Include = /etc/pacman.d/mirrorlist + +# Parabola also supports another community projects and personal repositories, to +# find them check out this wiki page: https://wiki.parabola.nu/Repositories + +# 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 + +Include = /etc/pacman.d/*.conf diff --git a/libre-testing/pacman/pacman.conf.i686 b/libre-testing/pacman/pacman.conf.i686 new file mode 100644 index 000000000..49b8785da --- /dev/null +++ b/libre-testing/pacman/pacman.conf.i686 @@ -0,0 +1,122 @@ +# +# /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 +#UseDelta = 0.7 +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +CheckSpace +#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. +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 Arch/Parabola packagers +# with `pacman-key --populate archlinux` and `pacman-key --populate parabola`. + +# +# 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. + +# NOTE: Nonprism is a particular repository that aims to provide software built +# and patched without services under global data surveillance programs like PRISM, +# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism + +#[nonprism-testing] +#Include = /etc/pacman.d/mirrorlist + +#[nonprism] +#Include = /etc/pacman.d/mirrorlist + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +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 + +# The PCR (Parabola Community Repository) contains packages maintained by trusted +# members of the Parabola community. It also contains packages maintained by +# Parabola developers, but that the developer decided didn't belong in core/libre. + +#[pcr-testing] +#Include = /etc/pacman.d/mirrorlist + +[pcr] +Include = /etc/pacman.d/mirrorlist + +# Parabola also supports another community projects and personal repositories, to +# find them check out this wiki page: https://wiki.parabola.nu/Repositories + +# 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 + +Include = /etc/pacman.d/*.conf diff --git a/libre-testing/pacman/pacman.conf.ppc64le b/libre-testing/pacman/pacman.conf.ppc64le new file mode 100644 index 000000000..df1b8c75e --- /dev/null +++ b/libre-testing/pacman/pacman.conf.ppc64le @@ -0,0 +1,122 @@ +# +# /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 +#UseDelta = 0.7 +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +CheckSpace +#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. +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 Arch/Parabola packagers +# with `pacman-key --populate archlinux` and `pacman-key --populate parabola`. + +# +# 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. + +# NOTE: Nonprism is a particular repository that aims to provide software built +# and patched without services under global data surveillance programs like PRISM, +# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism + +#[nonprism-testing] +#Include = /etc/pacman.d/mirrorlist + +#[nonprism] +#Include = /etc/pacman.d/mirrorlist + +[libre-testing] +Include = /etc/pacman.d/mirrorlist + +[libre] +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 + +# The PCR (Parabola Community Repository) contains packages maintained by trusted +# members of the Parabola community. It also contains packages maintained by +# Parabola developers, but that the developer decided didn't belong in core/libre. + +#[pcr-testing] +#Include = /etc/pacman.d/mirrorlist + +[pcr] +Include = /etc/pacman.d/mirrorlist + +# Parabola also supports another community projects and personal repositories, to +# find them check out this wiki page: https://wiki.parabola.nu/Repositories + +# 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 + +Include = /etc/pacman.d/*.conf diff --git a/libre-testing/pacman/pacman.conf.x86_64 b/libre-testing/pacman/pacman.conf.x86_64 new file mode 100644 index 000000000..b5401acc0 --- /dev/null +++ b/libre-testing/pacman/pacman.conf.x86_64 @@ -0,0 +1,149 @@ +# +# /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 +#UseDelta = 0.7 +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +CheckSpace +#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. +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 Arch/Parabola packagers +# with `pacman-key --populate archlinux` and `pacman-key --populate parabola`. + +# +# 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. + +# NOTE: Nonprism is a particular repository that aims to provide software built +# and patched without services under global data surveillance programs like PRISM, +# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism + +#[nonprism-testing] +#Include = /etc/pacman.d/mirrorlist + +#[nonprism] +#Include = /etc/pacman.d/mirrorlist + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +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 + +# The PCR (Parabola Community Repository) contains packages maintained by trusted +# members of the Parabola community. It also contains packages maintained by +# Parabola developers, but that the developer decided didn't belong in core/libre. + +#[pcr-testing] +#Include = /etc/pacman.d/mirrorlist + +[pcr] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the libre-multilib, multilib and pcr-multilib repositories as required here. + +#[nonprism-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[nonprism-multilib] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib] +#Include = /etc/pacman.d/mirrorlist + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib] +#Include = /etc/pacman.d/mirrorlist + +# Parabola also supports another community projects and personal repositories, to +# find them check out this wiki page: https://wiki.parabola.nu/Repositories + +# 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 + +Include = /etc/pacman.d/*.conf |