Commit 0f668126 authored by Chaoting Liu's avatar Chaoting Liu

[build and upload to stable] kwallet-pam: CVE-2018-10380

parent 75977890
...@@ -2,7 +2,7 @@ source ../plasma.conf ...@@ -2,7 +2,7 @@ source ../plasma.conf
pkgname=kwallet-pam pkgname=kwallet-pam
pkgver=${PVersion} pkgver=${PVersion}
pkgrel=1 pkgrel=2
pkgdesc='KWallet PAM integration' pkgdesc='KWallet PAM integration'
arch=(x86_64) arch=(x86_64)
url='https://projects.kde.org/kwallet-pam' url='https://projects.kde.org/kwallet-pam'
...@@ -11,24 +11,31 @@ depends=(pam libgcrypt socat) ...@@ -11,24 +11,31 @@ depends=(pam libgcrypt socat)
makedepends=(extra-cmake-modules qt5-base) makedepends=(extra-cmake-modules qt5-base)
groups=('plasma') groups=('plasma')
options=("debug") options=("debug")
source=("${PServer}/${pkgver}/${pkgname}-${PVersion}.tar.xz"{,.sig}) source=("${PServer}/${pkgver}/${pkgname}-${PVersion}.tar.xz"{,.sig}
CVE-2018-10380-1.patch::"https://cgit.kde.org/kwallet-pam.git/patch/?id=2134dec8"
CVE-2018-10380-2.patch::"https://cgit.kde.org/kwallet-pam.git/patch/?id=01d4143f")
sha256sums=( $(getSum ${pkgname}) sha256sums=( $(getSum ${pkgname})
'SKIP' ) 'SKIP'
'bc509c7d04aa21c35caac263720967dd098af47e6d282e437f1b69de38f42d66'
'b3c8500c7951b4a919875907abcefe817d8d613e31a2eb4ccf63b0038a4f5b62')
validpgpkeys=(${Pvalidpgpkeys[@]}) validpgpkeys=(${Pvalidpgpkeys[@]})
prepare() { prepare() {
mkdir -p build mkdir -p build
mkdir -p build4 mkdir -p build4
cd ${pkgname}-${pkgver} cd ${pkgname}-${pkgver}
# https://www.kde.org/info/security/advisory-20180503-1.txt
patch -p1 -i ../CVE-2018-10380-1.patch
patch -p1 -i ../CVE-2018-10380-2.patch
} }
build() { build() {
cd build cd build
cmake_kf5 ../${pkgname}-${pkgver} -DCMAKE_INSTALL_LIBDIR=lib cmake_kf5 ../${pkgname}-${pkgver}
make make
cd ../build4 cd ../build4
cmake_kf5 ../${pkgname}-${pkgver} -DCMAKE_INSTALL_LIBDIR=lib -DKWALLET4=1 cmake_kf5 ../${pkgname}-${pkgver} -DKWALLET4=1
make make
} }
package() { package() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment