diff options
Diffstat (limited to 'libre-testing/pacman/PKGBUILD')
| -rw-r--r-- | libre-testing/pacman/PKGBUILD | 72 |
1 files changed, 25 insertions, 47 deletions
diff --git a/libre-testing/pacman/PKGBUILD b/libre-testing/pacman/PKGBUILD index 8ad959088..5104f8eaf 100644 --- a/libre-testing/pacman/PKGBUILD +++ b/libre-testing/pacman/PKGBUILD @@ -1,4 +1,3 @@ -# vim: set ts=2 sw=2 et: # Maintainer (Arch): Dan McGee <dan@archlinux.org> # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> @@ -9,58 +8,52 @@ # Contributor: Daniel Milewski <niitotantei@riseup.net> pkgname=pacman -pkgver=5.1.3 -pkgrel=1 +pkgver=5.2.1 +pkgrel=4 pkgrel+=.parabola1 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') arch+=('i686' 'armv7h') url="https://www.archlinux.org/pacman/" license=('GPL') -groups=('base' 'base-devel') -groups+=('base-openrc') +groups=('base-devel') 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' - 'xdelta3: delta support in repo-add') -backup=(etc/pacman.conf - etc/makepkg.conf) -provides=('pacman-parabola') +checkdepends=('python' 'fakechroot') +optdepends=('perl-locale-gettext: translation support in makepkg-template') +provides=('libalpm.so') +provides+=('pacman-parabola') conflicts=('pacman-parabola') replaces=('pacman-parabola') -backup=(etc/pacman.conf etc/makepkg.conf) +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} + pacman-5.2.1-fix-pactest-package-tar-format.patch::https://git.archlinux.org/pacman.git/patch/?id=b9faf652735c603d1bdf849a570185eb721f11c1 + makepkg-fix-one-more-file-seccomp-issue.patch "${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) + 0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.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=('10db61a0928d619871340c3f93a677d1541d6c52353c516aec4f8d96e830d4eb' +sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312' 'SKIP' - '418a2c7675f3b350beebf8fbfd267744724e8437f1ad61c86a2f5fcdca44409b' - 'fa4c0d2db22583c962f34e3e2fb7666dd30c68bfd5b298c76da1a09227bc6cf8' - 'ae034a05c4373aa30419c541e121e5d6dac33dd6fa8d4cc494d3c98cedd95a2e' - 'c0cbdc0df96f13a73d241c1eb85a969098bd414f12ecd7c045922b154537e00a' + 'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1' + 'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9' + '509a4f253a17670b9def43a0daa3aa17f113961aec65429d1996c93478d6693f' + 'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265' + 'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c' + '78be8885fd61999cdd65e61ceb70eed3828fd87f89dec19f4a04d87c8924d451' '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' - '075ac1f8d782ac9868f5e7f3043f684a00da33915eba9ec7e4a8940992ddc269' - '8065c468706be669bc6718a6634e5e58507cba9b8121bf5cfe1703daacab1c3e' - 'd01100d19b9868da8c689a7a14b6340574ecca0105a8d8ef866b281ad3d7e637' - 'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033' - '1f6a0a8518dc912bc5d9df335b6da220bd3cc51630b6b47c09ec9d4cd47ae432') + '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8') sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc' '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9' '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb') @@ -68,6 +61,9 @@ sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041c prepare() { cd "$pkgname-$pkgver" + patch -Np1 < ../pacman-5.2.1-fix-pactest-package-tar-format.patch + patch -Np1 < ../makepkg-fix-one-more-file-seccomp-issue.patch + # From Arch ARM if [ "${CARCH}" = "armv7h" ]; then patch -p1 -i ../0001-Sychronize-filesystem.patch @@ -76,16 +72,7 @@ prepare() { 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 } build() { @@ -123,8 +110,8 @@ build() { 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" + -e "s|@CARCHFLAGS[@]|$myflags|g" \ + -e "s|@LDFLAGS[@]|$myldflags|g" done } @@ -150,15 +137,6 @@ package() { 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? |