Date: Wednesday, September 15, 2021 @ 14:48:46 Author: foutrelis Revision: 424035
archrelease: copy trunk to extra-any Added: devtools/repos/extra-any/PKGBUILD (from rev 424034, devtools/trunk/PKGBUILD) devtools/repos/extra-any/fix-curlrc-disabling.patch (from rev 424034, devtools/trunk/fix-curlrc-disabling.patch) Deleted: devtools/repos/extra-any/PKGBUILD ----------------------------+ PKGBUILD | 88 +++++++++++++++++++++++-------------------- fix-curlrc-disabling.patch | 36 +++++++++++++++++ 2 files changed, 84 insertions(+), 40 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-09-15 14:48:41 UTC (rev 424034) +++ PKGBUILD 2021-09-15 14:48:46 UTC (rev 424035) @@ -1,40 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=devtools -pkgver=20210202 -pkgrel=2 -pkgdesc='Tools for Arch Linux package maintainers' -arch=('any') -license=('GPL') -url='https://github.com/archlinux/devtools' -depends=('bash' 'openssh' 'subversion' 'rsync' 'arch-install-scripts' - 'git' 'bzr' 'mercurial' 'diffutils' 'util-linux' 'awk') -makedepends=('asciidoc') -optdepends=('btrfs-progs: btrfs support') -source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' - '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' - '86CFFCA918CF3AF47147588051E8B148A9999C34' - '8FC15A064950A99DD1BD14DD39E4B877E62EB915' - '8218F88849AAC522E94CF470A5E9288C4FA415FA' - 'B81B051F2D7FC867AAFF35A58DBD63B82072D77A' - 'F3691687D867B81B51CE07D9BBE43771487328A9' - '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' - 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8') -sha256sums=('ad1a65f0f349093b557bd6f45fd5f84ba2be246702908193ae7351457a218d6e' - 'SKIP') -b2sums=('b3f388b928f91a230e0fbc406cdeccd81d3688d5f5a6e9c7928994c680f22b4162e0cce07bb7d84e0c5bb2850cd92b35a531ca5bc8ca9b7d97a278e9f3787f45' - 'SKIP') - -build() { - cd ${pkgname}-${pkgver} - make PREFIX=/usr -} - -package() { - cd ${pkgname}-${pkgver} - make PREFIX=/usr DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: Copied: devtools/repos/extra-any/PKGBUILD (from rev 424034, devtools/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-09-15 14:48:46 UTC (rev 424035) @@ -0,0 +1,48 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=devtools +pkgver=20210202 +pkgrel=3 +pkgdesc='Tools for Arch Linux package maintainers' +arch=('any') +license=('GPL') +url='https://github.com/archlinux/devtools' +depends=('bash' 'openssh' 'subversion' 'rsync' 'arch-install-scripts' + 'git' 'bzr' 'mercurial' 'diffutils' 'util-linux' 'awk') +makedepends=('asciidoc') +optdepends=('btrfs-progs: btrfs support') +source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + fix-curlrc-disabling.patch) +validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' + '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' + '86CFFCA918CF3AF47147588051E8B148A9999C34' + '8FC15A064950A99DD1BD14DD39E4B877E62EB915' + '8218F88849AAC522E94CF470A5E9288C4FA415FA' + 'B81B051F2D7FC867AAFF35A58DBD63B82072D77A' + 'F3691687D867B81B51CE07D9BBE43771487328A9' + '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' + 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8') +sha256sums=('ad1a65f0f349093b557bd6f45fd5f84ba2be246702908193ae7351457a218d6e' + 'SKIP' + 'cfb48e2aec7b4b811e878bf918ca719b7e956556ba20cf71295617a67ed31338') +b2sums=('b3f388b928f91a230e0fbc406cdeccd81d3688d5f5a6e9c7928994c680f22b4162e0cce07bb7d84e0c5bb2850cd92b35a531ca5bc8ca9b7d97a278e9f3787f45' + 'SKIP' + 'f2c771da57ae9f4ddada031c881345a6aced684bab7435a074b96be5000cdae0ed042740ab845aa612d17860e6c1ebd9d351979f62061f62477588446c302ae8') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../fix-curlrc-disabling.patch +} + +build() { + cd ${pkgname}-${pkgver} + make PREFIX=/usr +} + +package() { + cd ${pkgname}-${pkgver} + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: Copied: devtools/repos/extra-any/fix-curlrc-disabling.patch (from rev 424034, devtools/trunk/fix-curlrc-disabling.patch) =================================================================== --- fix-curlrc-disabling.patch (rev 0) +++ fix-curlrc-disabling.patch 2021-09-15 14:48:46 UTC (rev 424035) @@ -0,0 +1,36 @@ +From a1033644f24cf58789ca283164895908158aeeb5 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@foutrelis.com> +Date: Wed, 15 Sep 2021 16:52:54 +0300 +Subject: [PATCH] Sync makepkg.conf with pacman 6.0.1-2 + +Includes the following hotfix: + +> upgpkg: pacman 6.0.1-2: makepkg.conf: Pass -q as the first option to curl +> +> This is needed to disable reading the curlrc config file (if it exists). +> +> Same change submitted to upstream pacman: +> https://lists.archlinux.org/pipermail/pacman-dev/2021-September/025348.html +--- + makepkg-x86_64.conf | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf +index 4854c32..3aa7470 100644 +--- a/makepkg-x86_64.conf ++++ b/makepkg-x86_64.conf +@@ -11,10 +11,10 @@ + # + #-- The download utilities that makepkg should use to acquire sources + # Format: 'protocol::agent' +-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' +- 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' +- 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +- 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' ++DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' ++ 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' ++ 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' ++ 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'rsync::/usr/bin/rsync --no-motd -zz %u %o' + 'scp::/usr/bin/scp -C %u %o') +