[arch-commits] Commit in libktnef/repos (4 files)

[Antonio Rojas]

    Date: Monday, February 27, 2017 @ 18:20:50
  Author: arojas
Revision: 289648

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libktnef/repos/extra-i686/PKGBUILD
    (from rev 289647, libktnef/trunk/PKGBUILD)
  libktnef/repos/extra-x86_64/PKGBUILD
    (from rev 289647, libktnef/trunk/PKGBUILD)
Deleted:
  libktnef/repos/extra-i686/PKGBUILD
  libktnef/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   82 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   35 --------------------
 extra-x86_64/PKGBUILD |   35 --------------------
 3 files changed, 82 insertions(+), 70 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-27 18:20:21 UTC (rev 289647)
+++ extra-i686/PKGBUILD	2017-02-27 18:20:50 UTC (rev 289648)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-_pkgname=ktnef
-pkgname=lib$_pkgname
-pkgver=16.12.2
-pkgrel=1
-pkgdesc="API for handling TNEF data"
-arch=(i686 x86_64)
-url="https://community.kde.org/KDE_PIM"
-license=(LGPL)
-depends=(kcalutils kcontacts)
-makedepends=(extra-cmake-modules python kdoctools kdesignerplugin)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig})
-md5sums=('a2e7c55dbe19efd90bc3e2dffe40216e'
-         'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$_pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: libktnef/repos/extra-i686/PKGBUILD (from rev 289647, libktnef/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-27 18:20:50 UTC (rev 289648)
@@ -0,0 +1,41 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+_pkgname=ktnef
+pkgname=lib$_pkgname
+pkgver=16.12.2
+pkgrel=2
+pkgdesc="API for handling TNEF data"
+arch=(i686 x86_64)
+url="https://community.kde.org/KDE_PIM"
+license=(LGPL)
+depends=(kcalutils kcontacts)
+makedepends=(extra-cmake-modules python kdoctools kdesignerplugin)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig}
+        ktnef-directory-traversal.patch::"https://cgit.kde.org/ktnef.git/patch/?id=4ff38aa1")
+md5sums=('a2e7c55dbe19efd90bc3e2dffe40216e'
+         'SKIP'
+         '6273402e57d311d8163faa69d3a8d371')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  # https://www.kde.org/info/security/advisory-20170227-1.txt
+  cd $_pkgname-$pkgver
+  patch -p1 -i ../ktnef-directory-traversal.patch
+}
+
+build() {
+  cd build
+  cmake ../$_pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-27 18:20:21 UTC (rev 289647)
+++ extra-x86_64/PKGBUILD	2017-02-27 18:20:50 UTC (rev 289648)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-_pkgname=ktnef
-pkgname=lib$_pkgname
-pkgver=16.12.2
-pkgrel=1
-pkgdesc="API for handling TNEF data"
-arch=(i686 x86_64)
-url="https://community.kde.org/KDE_PIM"
-license=(LGPL)
-depends=(kcalutils kcontacts)
-makedepends=(extra-cmake-modules python kdoctools kdesignerplugin)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig})
-md5sums=('a2e7c55dbe19efd90bc3e2dffe40216e'
-         'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$_pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: libktnef/repos/extra-x86_64/PKGBUILD (from rev 289647, libktnef/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-27 18:20:50 UTC (rev 289648)
@@ -0,0 +1,41 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+_pkgname=ktnef
+pkgname=lib$_pkgname
+pkgver=16.12.2
+pkgrel=2
+pkgdesc="API for handling TNEF data"
+arch=(i686 x86_64)
+url="https://community.kde.org/KDE_PIM"
+license=(LGPL)
+depends=(kcalutils kcontacts)
+makedepends=(extra-cmake-modules python kdoctools kdesignerplugin)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig}
+        ktnef-directory-traversal.patch::"https://cgit.kde.org/ktnef.git/patch/?id=4ff38aa1")
+md5sums=('a2e7c55dbe19efd90bc3e2dffe40216e'
+         'SKIP'
+         '6273402e57d311d8163faa69d3a8d371')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  # https://www.kde.org/info/security/advisory-20170227-1.txt
+  cd $_pkgname-$pkgver
+  patch -p1 -i ../ktnef-directory-traversal.patch
+}
+
+build() {
+  cd build
+  cmake ../$_pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}