diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-09-17 21:16:44 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-09-17 21:16:44 -0400 |
commit | 1aaea6064032560107692f5a2dced71eae458133 (patch) | |
tree | c51bfceaf7026d8b00a44b9a945c4d20ea3c2f9b /libre/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch | |
parent | 3a77e496a160b2767175c8cc208466ba121b621d (diff) | |
download | abslibre-1aaea6064032560107692f5a2dced71eae458133.tar.gz abslibre-1aaea6064032560107692f5a2dced71eae458133.tar.bz2 abslibre-1aaea6064032560107692f5a2dced71eae458133.zip |
libre/pacman: Backport more patches
- Fully remove whirlpoolsums=() support from makepkg, rather than having
weird half-support.
- Pass --stream to `hg clone` when creating the working copy.
Diffstat (limited to 'libre/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch')
-rw-r--r-- | libre/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/libre/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch b/libre/pacman/0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch new file mode 100644 index 000000000..2eb858902 --- /dev/null +++ b/libre/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 |