From f40e3ae342b01df3644a9ed3a9e64b8a31f27516 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 23 Feb 2020 14:25:23 +0100 Subject: core/libseccomp: make sure, we only path the old version --- core/libseccomp/PKGBUILD | 82 +++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/core/libseccomp/PKGBUILD b/core/libseccomp/PKGBUILD index 36c698ba..99ccab09 100644 --- a/core/libseccomp/PKGBUILD +++ b/core/libseccomp/PKGBUILD @@ -19,42 +19,46 @@ if [ "${CARCH}" = "i486" ]; then )" fi -# force 2.4.2 version as 2.4.1-4 version to make glibc 2.31 work and -# make it possible to do proper upgrades afterwards to 2.4.2-1 -source=(https://github.com/seccomp/${pkgname}/releases/download/v2.4.2/${pkgname}-2.4.2.tar.gz) -pkgrel=4 -sha256sums=(b54f27b53884caacc932e75e6b44304ac83586e2abe7a83eca6daecc5440585b) - -eval "$( - declare -f build | \ - sed ' - s/cd ${pkgname}-${pkgver}/cd libseccomp-2.4.2/ - ' -)" - -eval "$( - declare -f check | \ - sed ' - s/cd ${pkgname}-${pkgver}/cd libseccomp-2.4.2/ - ' -)" - -eval "$( - declare -f package | \ - sed ' - s/cd ${pkgname}-${pkgver}/cd libseccomp-2.4.2/ - ' -)" - -source+=('libseccomp-2.4.2-ppoll.patch') -sha256sums+=('2d6f638428bc7f9931d4e0a59b80f13327d6c3748e7049eba54b0be08f6620a9') -prepare() { - cd ${pkgbase}-2.4.2 - patch -Np1 -i "$srcdir/libseccomp-2.4.2-ppoll.patch" -} - -# XXX: do NOT trust this key as its not yet in the strong set, see linked issue -# XXX: https://github.com/seccomp/libseccomp/issues/187 -# XXX: 47A68FCE37C7D7024FD65E11356CE62C2B524099 Tom Hromatka -# XXX: do NOT trust ^^ this key as its not yet in the strong set ^^ see linked issue -validpgpkeys=('7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A') # Paul Moore +if [ "${pkgver}" = '2.4.1' ]; then + + # force 2.4.2 version as 2.4.1-4 version to make glibc 2.31 work and + # make it possible to do proper upgrades afterwards to 2.4.2-1 + source=(https://github.com/seccomp/${pkgname}/releases/download/v2.4.2/${pkgname}-2.4.2.tar.gz) + pkgrel=4 + sha256sums=(b54f27b53884caacc932e75e6b44304ac83586e2abe7a83eca6daecc5440585b) + + eval "$( + declare -f build | \ + sed ' + s/cd ${pkgname}-${pkgver}/cd libseccomp-2.4.2/ + ' + )" + + eval "$( + declare -f check | \ + sed ' + s/cd ${pkgname}-${pkgver}/cd libseccomp-2.4.2/ + ' + )" + + eval "$( + declare -f package | \ + sed ' + s/cd ${pkgname}-${pkgver}/cd libseccomp-2.4.2/ + ' + )" + + source+=('libseccomp-2.4.2-ppoll.patch') + sha256sums+=('2d6f638428bc7f9931d4e0a59b80f13327d6c3748e7049eba54b0be08f6620a9') + prepare() { + cd ${pkgbase}-2.4.2 + patch -Np1 -i "$srcdir/libseccomp-2.4.2-ppoll.patch" + } + + # XXX: do NOT trust this key as its not yet in the strong set, see linked issue + # XXX: https://github.com/seccomp/libseccomp/issues/187 + + # XXX: 47A68FCE37C7D7024FD65E11356CE62C2B524099 Tom Hromatka + # XXX: do NOT trust ^^ this key as its not yet in the strong set ^^ see linked issue + validpgpkeys=('7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A') # Paul Moore +fi -- cgit v1.2.3-70-g09d2