[arch-commits] Commit in kwallet-pam/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Thursday, May 3, 2018 @ 10:30:55
  Author: arojas
Revision: 323353

archrelease: copy trunk to extra-x86_64

Added:
  kwallet-pam/repos/extra-x86_64/PKGBUILD
    (from rev 323352, kwallet-pam/trunk/PKGBUILD)
Deleted:
  kwallet-pam/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  105 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 57 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-03 10:30:28 UTC (rev 323352)
+++ PKGBUILD	2018-05-03 10:30:55 UTC (rev 323353)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer:Antonio Rojas <arojas at archlinux.org>
-
-pkgname=kwallet-pam
-pkgver=5.12.5
-pkgrel=1
-pkgdesc='KWallet PAM integration'
-arch=(x86_64)
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license=(LGPL)
-depends=(pam libgcrypt socat)
-makedepends=(extra-cmake-modules qt5-base)
-groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('6374132fe2d142c9eb999e90c636b973fe9715335de3cfa86f0b5f4258d5eba2'
-            'SKIP')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
-              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson
-              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
-
-prepare() {
-  mkdir -p build{,4}
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib
-  make
-
-  cd ../build4
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib \
-    -DKWALLET4=1
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  cd ../build4
-  make DESTDIR="$pkgdir" install
-}

Copied: kwallet-pam/repos/extra-x86_64/PKGBUILD (from rev 323352, kwallet-pam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-03 10:30:55 UTC (rev 323353)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer:Antonio Rojas <arojas at archlinux.org>
+
+pkgname=kwallet-pam
+pkgver=5.12.5
+pkgrel=2
+pkgdesc='KWallet PAM integration'
+arch=(x86_64)
+url='https://www.kde.org/workspaces/plasmadesktop/'
+license=(LGPL)
+depends=(pam libgcrypt socat)
+makedepends=(extra-cmake-modules qt5-base)
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.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=('6374132fe2d142c9eb999e90c636b973fe9715335de3cfa86f0b5f4258d5eba2'
+            'SKIP'
+            'bc509c7d04aa21c35caac263720967dd098af47e6d282e437f1b69de38f42d66'
+            'b3c8500c7951b4a919875907abcefe817d8d613e31a2eb4ccf63b0038a4f5b62')
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
+              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
+
+prepare() {
+  mkdir -p build{,4}
+
+  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() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib
+  make
+
+  cd ../build4
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DKWALLET4=1
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+  cd ../build4
+  make DESTDIR="$pkgdir" install
+}