diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-01-10 05:59:52 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-01-10 07:45:57 -0500 |
| commit | 8e1bc377225bc8df7a20a4d8a9b25a3fa538e2fd (patch) | |
| tree | c4b2a02a752c9831b6d8c35492f95652af6e7ad6 /libre/pacman/PKGBUILD | |
| parent | 3e2b6810e6cb28bd2983de22c8dfdf2b0c3bbc5b (diff) | |
[pacman]: rebuild for new 'file' package
Diffstat (limited to 'libre/pacman/PKGBUILD')
| -rw-r--r-- | libre/pacman/PKGBUILD | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index a7c4fe56c..5104f8eaf 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/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> @@ -10,31 +9,32 @@ pkgname=pacman pkgver=5.2.1 -pkgrel=1 -pkgrel+=.parabola2 +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=('python' 'fakechroot') optdepends=('perl-locale-gettext: translation support in makepkg-template') -backup=(etc/pacman.conf - etc/makepkg.conf) -provides=('libalpm.so' 'pacman-parabola') +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 @@ -45,9 +45,11 @@ source_armv7h=(0001-Sychronize-filesystem.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312' 'SKIP' - 'aa6f91f18db815c71f947c6e5517cd030736f21308d3eeabeb1d4b771bff2287' - '670c7ae3e7f56b5f04efb942d0418577256e439dd072f9ffaa22d0bab10ff41f' - '3900caad7fffe8ea6581cf477fe2b17274f7fae88a2300a60861451f35350293' + 'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1' + 'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9' + '509a4f253a17670b9def43a0daa3aa17f113961aec65429d1996c93478d6693f' + 'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265' + 'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c' '78be8885fd61999cdd65e61ceb70eed3828fd87f89dec19f4a04d87c8924d451' '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' @@ -59,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 @@ -105,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 } |