[arch-commits] Commit in (77 files)
Antonio Rojas
arojas at archlinux.org
Sat Oct 14 08:57:30 UTC 2017
Date: Saturday, October 14, 2017 @ 08:57:29
Author: arojas
Revision: 307839
KDE Frameworks 5.39
Modified:
attica-qt5/trunk/PKGBUILD
baloo/trunk/PKGBUILD
bluez-qt/trunk/PKGBUILD
breeze-icons/trunk/PKGBUILD
extra-cmake-modules/trunk/PKGBUILD
frameworkintegration/trunk/PKGBUILD
kactivities-stats/trunk/PKGBUILD
kactivities/trunk/PKGBUILD
kapidox/trunk/PKGBUILD
karchive/trunk/PKGBUILD
kauth/trunk/PKGBUILD
kbookmarks/trunk/PKGBUILD
kcmutils/trunk/PKGBUILD
kcodecs/trunk/PKGBUILD
kcompletion/trunk/PKGBUILD
kconfig/trunk/PKGBUILD
kconfigwidgets/trunk/PKGBUILD
kcoreaddons/trunk/PKGBUILD
kcrash/trunk/PKGBUILD
kdbusaddons/trunk/PKGBUILD
kdeclarative/trunk/PKGBUILD
kded/trunk/PKGBUILD
kdelibs4support/trunk/PKGBUILD
kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch
kdesignerplugin/trunk/PKGBUILD
kdesu/trunk/PKGBUILD
kdewebkit/trunk/PKGBUILD
kdnssd/trunk/PKGBUILD
kdoctools/trunk/PKGBUILD
kemoticons/trunk/PKGBUILD
kfilemetadata/trunk/PKGBUILD
kglobalaccel/trunk/PKGBUILD
kguiaddons/trunk/PKGBUILD
khtml/trunk/PKGBUILD
ki18n/trunk/PKGBUILD
kiconthemes/trunk/PKGBUILD
kidletime/trunk/PKGBUILD
kimageformats/trunk/PKGBUILD
kinit/trunk/PKGBUILD
kio/trunk/PKGBUILD
kirigami2/trunk/PKGBUILD
kitemmodels/trunk/PKGBUILD
kitemviews/trunk/PKGBUILD
kjobwidgets/trunk/PKGBUILD
kjs/trunk/PKGBUILD
kjsembed/trunk/PKGBUILD
kmediaplayer/trunk/PKGBUILD
knewstuff/trunk/PKGBUILD
knotifications/trunk/PKGBUILD
knotifyconfig/trunk/PKGBUILD
kpackage/trunk/PKGBUILD
kparts/trunk/PKGBUILD
kpeople/trunk/PKGBUILD
kplotting/trunk/PKGBUILD
kpty/trunk/PKGBUILD
kross/trunk/PKGBUILD
krunner/trunk/PKGBUILD
kservice/trunk/PKGBUILD
ktexteditor/trunk/PKGBUILD
ktextwidgets/trunk/PKGBUILD
kunitconversion/trunk/PKGBUILD
kwallet/trunk/PKGBUILD
kwayland/trunk/PKGBUILD
kwidgetsaddons/trunk/PKGBUILD
kwindowsystem/trunk/PKGBUILD
kxmlgui/trunk/PKGBUILD
kxmlrpcclient/trunk/PKGBUILD
modemmanager-qt/trunk/PKGBUILD
networkmanager-qt/trunk/PKGBUILD
oxygen-icons/trunk/PKGBUILD
plasma-framework/trunk/PKGBUILD
prison/trunk/PKGBUILD
qqc2-desktop-style/trunk/PKGBUILD
solid/trunk/PKGBUILD
sonnet/trunk/PKGBUILD
syntax-highlighting/trunk/PKGBUILD
threadweaver/trunk/PKGBUILD
---------------------------------------------------------+
attica-qt5/trunk/PKGBUILD | 4
baloo/trunk/PKGBUILD | 9
bluez-qt/trunk/PKGBUILD | 5
breeze-icons/trunk/PKGBUILD | 4
extra-cmake-modules/trunk/PKGBUILD | 4
frameworkintegration/trunk/PKGBUILD | 4
kactivities-stats/trunk/PKGBUILD | 4
kactivities/trunk/PKGBUILD | 7
kapidox/trunk/PKGBUILD | 4
karchive/trunk/PKGBUILD | 4
kauth/trunk/PKGBUILD | 4
kbookmarks/trunk/PKGBUILD | 4
kcmutils/trunk/PKGBUILD | 4
kcodecs/trunk/PKGBUILD | 4
kcompletion/trunk/PKGBUILD | 4
kconfig/trunk/PKGBUILD | 4
kconfigwidgets/trunk/PKGBUILD | 4
kcoreaddons/trunk/PKGBUILD | 4
kcrash/trunk/PKGBUILD | 4
kdbusaddons/trunk/PKGBUILD | 4
kdeclarative/trunk/PKGBUILD | 6
kded/trunk/PKGBUILD | 4
kdelibs4support/trunk/PKGBUILD | 11
kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch | 3096 +++-----------
kdesignerplugin/trunk/PKGBUILD | 4
kdesu/trunk/PKGBUILD | 4
kdewebkit/trunk/PKGBUILD | 4
kdnssd/trunk/PKGBUILD | 6
kdoctools/trunk/PKGBUILD | 4
kemoticons/trunk/PKGBUILD | 4
kfilemetadata/trunk/PKGBUILD | 6
kglobalaccel/trunk/PKGBUILD | 4
kguiaddons/trunk/PKGBUILD | 4
khtml/trunk/PKGBUILD | 4
ki18n/trunk/PKGBUILD | 4
kiconthemes/trunk/PKGBUILD | 4
kidletime/trunk/PKGBUILD | 4
kimageformats/trunk/PKGBUILD | 4
kinit/trunk/PKGBUILD | 4
kio/trunk/PKGBUILD | 4
kirigami2/trunk/PKGBUILD | 10
kitemmodels/trunk/PKGBUILD | 4
kitemviews/trunk/PKGBUILD | 4
kjobwidgets/trunk/PKGBUILD | 4
kjs/trunk/PKGBUILD | 4
kjsembed/trunk/PKGBUILD | 4
kmediaplayer/trunk/PKGBUILD | 4
knewstuff/trunk/PKGBUILD | 6
knotifications/trunk/PKGBUILD | 4
knotifyconfig/trunk/PKGBUILD | 4
kpackage/trunk/PKGBUILD | 4
kparts/trunk/PKGBUILD | 4
kpeople/trunk/PKGBUILD | 4
kplotting/trunk/PKGBUILD | 4
kpty/trunk/PKGBUILD | 4
kross/trunk/PKGBUILD | 4
krunner/trunk/PKGBUILD | 4
kservice/trunk/PKGBUILD | 4
ktexteditor/trunk/PKGBUILD | 4
ktextwidgets/trunk/PKGBUILD | 4
kunitconversion/trunk/PKGBUILD | 4
kwallet/trunk/PKGBUILD | 4
kwayland/trunk/PKGBUILD | 6
kwidgetsaddons/trunk/PKGBUILD | 4
kwindowsystem/trunk/PKGBUILD | 6
kxmlgui/trunk/PKGBUILD | 4
kxmlrpcclient/trunk/PKGBUILD | 4
modemmanager-qt/trunk/PKGBUILD | 5
networkmanager-qt/trunk/PKGBUILD | 6
oxygen-icons/trunk/PKGBUILD | 4
plasma-framework/trunk/PKGBUILD | 6
prison/trunk/PKGBUILD | 8
qqc2-desktop-style/trunk/PKGBUILD | 13
solid/trunk/PKGBUILD | 4
sonnet/trunk/PKGBUILD | 4
syntax-highlighting/trunk/PKGBUILD | 4
threadweaver/trunk/PKGBUILD | 4
77 files changed, 963 insertions(+), 2489 deletions(-)
Modified: attica-qt5/trunk/PKGBUILD
===================================================================
--- attica-qt5/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ attica-qt5/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=attica-qt5
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Qt5 library that implements the Open Collaboration Services API'
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/attica-${pkgver}.tar.xz"{,.sig})
-sha256sums=('26f124e686d4a1ff005798958d63ddccd0bc23a763ea0578c4d2337a1a6b558b'
+sha256sums=('4ec1527e54e029c88135b5ed4851874ebb19a566b3c690c62ce6118b42112795'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: baloo/trunk/PKGBUILD
===================================================================
--- baloo/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ baloo/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,20 +3,17 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=baloo
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc="A framework for searching and managing metadata"
arch=('i686' 'x86_64')
url='https://community.kde.org/Frameworks'
license=('LGPL')
-depends=('kfilemetadata' 'kidletime' 'kio' 'lmdb' 'hicolor-icon-theme')
+depends=('kfilemetadata' 'kidletime' 'kio' 'lmdb')
makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'doxygen' 'qt5-tools')
-conflicts=('baloo-frameworks')
-replaces=('baloo-frameworks' 'baloo4')
-provides=('baloo-frameworks')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('31e954b94078c9a6a6ab134adc7c84299614552fe6d2e528a366bceea712a290'
+sha256sums=('ba7a9e4aa88330a7f8cfdd987187fa6622616a63f1834ec0f7faf8b4cfaec81b'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: bluez-qt/trunk/PKGBUILD
===================================================================
--- bluez-qt/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ bluez-qt/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -2,7 +2,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=bluez-qt
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Qt wrapper for Bluez 5 DBus API'
arch=(i686 x86_64)
@@ -10,10 +10,9 @@
license=(GPL2)
depends=(qt5-declarative bluez)
makedepends=(extra-cmake-modules mesa doxygen qt5-tools)
-conflicts=(libbluedevil-frameworks)
groups=(kf5)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('9b532f16b8a226f48dc8e09f00ae1896aef14f4ab211db3fdbab6a729faf5641'
+sha256sums=('a1a992a7d4cc1808f98157664c8e8cedf28bc2c691e1b9e46d30b10fb0380048'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: breeze-icons/trunk/PKGBUILD
===================================================================
--- breeze-icons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ breeze-icons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Antonio Rojas
pkgname=breeze-icons
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Breeze icon themes'
arch=('any')
@@ -13,7 +13,7 @@
groups=('kf5')
makedepends=('extra-cmake-modules' 'qt5-base')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('89291dd396bd0f42e9b90eb92f46895fa461ebc2b420a58c663e0c4898894e25'
+sha256sums=('bd4077f88d106f7dcdefd8f260edbee597e72572e17f443ccd10d3a0eabb4b8c'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: extra-cmake-modules/trunk/PKGBUILD
===================================================================
--- extra-cmake-modules/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ extra-cmake-modules/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=extra-cmake-modules
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Extra modules and scripts for CMake'
arch=('any')
@@ -14,7 +14,7 @@
makedepends=('python-sphinx' 'python-requests' 'qt5-tools')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
fix-python-bindings-generation.patch ECM-no-init.py.patch)
-sha256sums=('6188a8ac8d799439204f69a1eb229431fc9f196790b88d6fb72bb3d57edb2332'
+sha256sums=('b80536d7bed8c12fc492857d3d433b3859462402fe231e463efcd3bf44ffbcd1'
'SKIP'
'af9238c6d1c3b4ebbefab0500c21364805f620a3e408792e2a5eaad3c6dfcc49'
'5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52')
Modified: frameworkintegration/trunk/PKGBUILD
===================================================================
--- frameworkintegration/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ frameworkintegration/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=frameworkintegration
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Framework providing components to allow applications to integrate with a KDE Workspace'
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
optdepends=('appstream-qt: dependency resolving via AppStream' 'packagekit-qt5: dependency resolving via AppStream')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('08cb88ef7c7ceb7cd43cbc7f3040daf7128d22bb75f8eb3956d55afd3e1b3670'
+sha256sums=('50b427b53dfdf667d3e6d8de2b1662a7bea508cbf361163f0383a9e82143da8c'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kactivities/trunk/PKGBUILD
===================================================================
--- kactivities/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kactivities/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kactivities
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="Core components for the KDE's Activities"
@@ -12,12 +12,9 @@
license=('LGPL')
depends=('kcoreaddons' 'kconfig' 'kwindowsystem' 'qt5-declarative')
makedepends=('extra-cmake-modules' 'boost' 'python' 'doxygen' 'qt5-tools')
-provides=('kactivities-frameworks')
-conflicts=('kactivities-frameworks' 'kactivities4')
-replaces=('kactivities-frameworks')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('289d25367515e8d4668f460e3274b68ed6322a7f1c6228602c0f20462303353f'
+sha256sums=('986a0d40de1ae857639c8b2717a4cfc37288c0b7152bb3225b7e7b63cf0d6c5a'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kactivities-stats/trunk/PKGBUILD
===================================================================
--- kactivities-stats/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kactivities-stats/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kactivities-stats
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="A library for accessing the usage data collected by the activities system"
@@ -14,7 +14,7 @@
makedepends=('extra-cmake-modules' 'boost' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('a23955ce584ea0a1be8fe17b0b9cad819279b7518d3a9cf175a40e4bc08fa768'
+sha256sums=('9ee15060e4fc2cc6ca9d02a1a196b92c9cdedf437b4d1a56cd6838fe1e76f0a1'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kapidox/trunk/PKGBUILD
===================================================================
--- kapidox/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kapidox/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kapidox
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Frameworks API Documentation Tools'
arch=('any')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'qt5-base')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('e6c8de70bd2d8fd55c8dd4f01dfb526fe3230c5094aeed5fedda360c693993c8'
+sha256sums=('d6701d35aa45b65dbf442d3325416c3100aa317a94fbeeb8f25595c782d2d58a'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: karchive/trunk/PKGBUILD
===================================================================
--- karchive/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ karchive/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=karchive
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Qt 5 addon providing access to numerous types of archives'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('9354d45219342b888ac0eccbc3ce3a054858fcce9d4c93817352d2b447ebb658'
+sha256sums=('3cc31b2449bf690a3703d339875510f211dfb3d774737d80237da3474dde6865'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kauth/trunk/PKGBUILD
===================================================================
--- kauth/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kauth/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kauth
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Abstraction to system policy and authentication features'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('279af9593b3bf8b2730730877ff865944839e08d21855ea25864934fe372de8a'
+sha256sums=('b184b817d155b272cf42fa748c6d3c9f1713be423551d2a74e297821f6ee7221'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kbookmarks/trunk/PKGBUILD
===================================================================
--- kbookmarks/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kbookmarks/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kbookmarks
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for bookmarks and the XBEL format'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'qt5-tools' 'python' 'doxygen')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('38af8bb592a323b05d05b72d22b9bd5d48932a01e86941fec5e0e5ca59054368'
+sha256sums=('e51b6e9551b649bbfadd95f40b0ae46e197a8bdaa051ccc10db17678985fcaf5'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kcmutils/trunk/PKGBUILD
===================================================================
--- kcmutils/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kcmutils/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kcmutils
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Utilities for interacting with KCModules'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('0b15971ece6003636d012e37760324b005b06050d4d076bbe30eed427717ce58'
+sha256sums=('80375a266286ec20b2c035ad3a79fe7aa4fe0974156413e8d7a9c881a482e4b3'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kcodecs/trunk/PKGBUILD
===================================================================
--- kcodecs/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kcodecs/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kcodecs
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Provide a collection of methods to manipulate strings using various encodings'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('31a22d37da33d86d492b4bf5e439566d8f6a0783f74382931cee4c59a482dd32'
+sha256sums=('eef017d861392296dcc54ff78361f732d9448e66ab977a69f1edf5e52c4214e0'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kcompletion/trunk/PKGBUILD
===================================================================
--- kcompletion/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kcompletion/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kcompletion
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Text completion helpers and widgets'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('5c943799729e7ed8d101eb2e11a09a2616d6c13c33d3575b2e61667e0c2f2539'
+sha256sums=('ba1e6a72e827d2657d518111271cf12eeddb70ec68b0f8943d4bfa632f614d26'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kconfig/trunk/PKGBUILD
===================================================================
--- kconfig/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kconfig/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kconfig
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Configuration system'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('79744af26c90b78f01e065049daea0a6470f0d8b8e71334652179bac1b12243a'
+sha256sums=('3c504d69a38d7fa2e89dbe15b8c02d0803be20f3907c86f18be090031c223104'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kconfigwidgets/trunk/PKGBUILD
===================================================================
--- kconfigwidgets/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kconfigwidgets/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kconfigwidgets
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Widgets for KConfig'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1d70a761eefe60e6f7beb3517ed64edbb6266cfe85bbb65603c9764e524b6170'
+sha256sums=('fc77a295823327aa602d246f2e7da8094f5a97d56c1d69916e3ad9aa71b4ccc4'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kcoreaddons/trunk/PKGBUILD
===================================================================
--- kcoreaddons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kcoreaddons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kcoreaddons
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Addons to QtCore'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('9be3dd86402e173da025c0d326fd9a38ffeecb34828a287f8b8c530a5db275d4'
+sha256sums=('9f6e76c2a15252d2974271e4e3734a64aec157a434251c23b27efaa809d95363'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kcrash/trunk/PKGBUILD
===================================================================
--- kcrash/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kcrash/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kcrash
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for application crash analysis and bug report from apps'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('drkonqi: KDE crash handler application')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('215c90bf6501cb90db01f2a04155bcd8a8e66fcfb4a94649e72204c5a1df10a9'
+sha256sums=('9a0727734745b3050f864f2de1dbdb91e9ac99a49ede9874613427080a1563bb'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdbusaddons/trunk/PKGBUILD
===================================================================
--- kdbusaddons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdbusaddons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdbusaddons
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Addons to QtDBus'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1c1f8955570cd7e0480ec619084c5ea56cbffaca5307d9053d52092f10d589d7'
+sha256sums=('23477be1a3271d599be896477253fbcd9895ca8688ecb6771b290c5b522ae842'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdeclarative/trunk/PKGBUILD
===================================================================
--- kdeclarative/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdeclarative/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,8 +3,8 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdeclarative
-pkgver=5.38.0
-pkgrel=2
+pkgver=5.39.0
+pkgrel=1
pkgdesc='Provides integration of QML and KDE Frameworks'
arch=('i686' 'x86_64')
url='https://community.kde.org/Frameworks'
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('8b38aba552f06596a47d52d364f7a21784e741cfb0c7f23815f1cf067fd7c6a4'
+sha256sums=('f734913d40d94eafabf7d5a090c50a5e8d1caa597aabdf2eab5862f39db71cd1'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kded/trunk/PKGBUILD
===================================================================
--- kded/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kded/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kded
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Extensible deamon for providing system level services'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'kdoctools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('8b96b50313783b5edcf5bb8a0bc4873a844cb1ca662feb0ace9a932e8bfc5277'
+sha256sums=('453d349874b71a500afbb4a7c576be77bf38d3e87bd818269ccdfd27287c644b'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdelibs4support/trunk/PKGBUILD
===================================================================
--- kdelibs4support/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdelibs4support/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdelibs4support
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Porting aid from KDELibs4'
arch=('i686' 'x86_64')
@@ -12,21 +12,18 @@
depends=('kunitconversion' 'kitemmodels' 'kemoticons' 'kded' 'kparts')
makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools' 'networkmanager' 'perl-uri' 'python' 'kdesignerplugin')
groups=('kf5-aids')
-replaces=('kde4support')
-conflicts=('kde4support')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig}
kdelibs4support-openssl-1.1.patch)
-sha256sums=('f72aac163070bd116a112b7918a71d9dc79f945b19e5f449e55704e1e37f741b'
+sha256sums=('d735000260d8565e812b96c81d510acef14f7b66e9fcbbd2d42711bd1bfcb20f'
'SKIP'
- '0ab7d942145fb714d622c9049a060b8451a2e5315c2d8a91528583ebb6f20487')
+ 'e33de96fae2b93c3fa06b4219205ae188b214be8c5e84b8d0426217fd65a5d48')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
prepare() {
mkdir -p build
-# fix build with OpenSSL 1.1 (OpenMandriva)
cd $pkgname-$pkgver
- patch -p1 -i ../kdelibs4support-openssl-1.1.patch
+ patch -p1 -i ../kdelibs4support-openssl-1.1.patch # Fix build with openssl 1.1
}
build() {
Modified: kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch
===================================================================
--- kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch 2017-10-14 08:57:29 UTC (rev 307839)
@@ -1,109 +1,205 @@
---- kdelibs4support-5.32.0/src/CMakeLists.txt.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/CMakeLists.txt 2017-03-24 14:53:43.107091847 +0100
-@@ -304,6 +304,8 @@ target_include_directories(KF5KDELibs4Su
- set(platformLinkLibraries)
- if (APPLE)
- set(platformLinkLibraries "-framework CoreFoundation -framework Carbon -lresolv")
-+else()
-+ set(platformLinkLibraries "-lssl -lcrypto")
- endif()
+diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h
+--- a/src/kssl/kopenssl.h
++++ b/src/kssl/kopenssl.h
+@@ -278,6 +278,16 @@
+ X509 *X509_dup(X509 *x509);
- target_link_libraries(KF5KDELibs4Support
---- kdelibs4support-5.32.0/src/kssl/kopenssl.cpp.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/kopenssl.cpp 2017-03-24 14:56:33.956236271 +0100
-@@ -22,6 +22,7 @@
+ /*
++ * X509_getm_notBefore - get validity start
++ */
++ ASN1_TIME *X509_getm_notBefore(const X509 *x);
++
++ /*
++ * X509_getm_notAfter - get validity end
++ */
++ ASN1_TIME *X509_getm_notAfter(const X509 *x);
++
++ /*
+ * X509_STORE_CTX_new - create an X509 store context
+ */
+ X509_STORE_CTX *X509_STORE_CTX_new(void);
+@@ -297,6 +307,21 @@
+ */
+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
- #if KSSL_HAVE_SSL
- #include <openssl/opensslv.h>
-+#include <openssl/err.h>
++ /**
++ * X509_STORE_CTX_get_current_cert - get the current certificate
++ */
++ X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v);
++
++ /**
++ * X509_STORE_CTX_set_error - set certificate error
++ */
++ void X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error);
++
++ /**
++ * X509_STORE_CTX_get_error - get certificate error
++ */
++ int X509_STORE_CTX_get_error(X509_STORE_CTX *v);
++
+ /*
+ * X509_verify_cert - verify the certificate
+ */
+@@ -313,6 +338,11 @@
+ void X509_STORE_free(X509_STORE *v);
+
+ /*
++ * X509_STORE_set_verify_cb - set verify callback
++ */
++ void X509_STORE_set_verify_cb(X509_STORE *v, int (*verify_cb)(int, X509_STORE_CTX *));
++
++ /*
+ * X509_free - free up an X509
+ */
+ void X509_free(X509 *v);
+@@ -333,6 +363,11 @@
+ X509_NAME *X509_get_issuer_name(X509 *a);
+
+ /*
++ * X509_get0_signature - return X509 signature and signature algorithm
++ */
++ void X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, const X509 *x);
++
++ /*
+ * X509_STORE_add_lookup - add a lookup file/method to an X509 store
+ */
+ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
+@@ -360,7 +395,11 @@
+ /*
+ * CRYPTO_free - free up an internally allocated object
+ */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ void CRYPTO_free(void *x);
++#else
++ void CRYPTO_free(void *x, const char *file, int line);
++#endif
+
+ /*
+ * BIO_new - create new BIO
+@@ -461,58 +500,58 @@
+ /*
+ * Pop off the stack
+ */
+- char *sk_pop(STACK *s);
++ char *OPENSSL_sk_pop(STACK *s);
+
+ /*
+ * Free the stack
+ */
+- void sk_free(STACK *s);
++ void OPENSSL_sk_free(STACK *s);
+
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+- void sk_free(void *s)
++ void OPENSSL_sk_free(void *s)
+ {
+- return sk_free(reinterpret_cast<STACK *>(s));
++ return OPENSSL_sk_free(reinterpret_cast<STACK *>(s));
+ }
#endif
- #include <kconfig.h>
-@@ -31,180 +32,13 @@
- #include <QtCore/QLibrary>
- #include <QtCore/QRegExp>
+ /*
+ * Number of elements in the stack
+ */
+- int sk_num(STACK *s);
++ int OPENSSL_sk_num(STACK *s);
--extern "C" {
--#if KSSL_HAVE_SSL
-- static int (*K_SSL_connect)(SSL *) = nullptr;
-- static int (*K_SSL_accept)(SSL *) = nullptr;
-- static int (*K_SSL_read)(SSL *, void *, int) = nullptr;
-- static int (*K_SSL_write)(SSL *, const void *, int) = nullptr;
-- static SSL *(*K_SSL_new)(SSL_CTX *) = nullptr;
-- static void (*K_SSL_free)(SSL *) = nullptr;
-- static int (*K_SSL_shutdown)(SSL *) = nullptr;
-- static SSL_CTX *(*K_SSL_CTX_new)(SSL_METHOD *) = nullptr;
-- static void (*K_SSL_CTX_free)(SSL_CTX *) = nullptr;
-- static int (*K_SSL_set_fd)(SSL *, int) = nullptr;
-- static int (*K_SSL_pending)(SSL *) = nullptr;
-- static int (*K_SSL_peek)(SSL *, void *, int) = nullptr;
-- static int (*K_SSL_CTX_set_cipher_list)(SSL_CTX *, const char *) = nullptr;
-- static void (*K_SSL_CTX_set_verify)(SSL_CTX *, int,
-- int (*)(int, X509_STORE_CTX *)) = nullptr;
-- static int (*K_SSL_use_certificate)(SSL *, X509 *) = nullptr;
-- static SSL_CIPHER *(*K_SSL_get_current_cipher)(SSL *) = nullptr;
-- static long(*K_SSL_ctrl)(SSL *, int, long, char *) = nullptr;
-- static int (*K_RAND_egd)(const char *) = nullptr;
-- static const char *(*K_RAND_file_name)(char *, size_t) = nullptr;
-- static int (*K_RAND_load_file)(const char *, long) = nullptr;
-- static int (*K_RAND_write_file)(const char *) = nullptr;
-- static SSL_METHOD *(*K_TLSv1_client_method)() = nullptr;
-- static SSL_METHOD *(*K_SSLv23_client_method)() = nullptr;
-- static X509 *(*K_SSL_get_peer_certificate)(SSL *) = nullptr;
-- static int (*K_SSL_CIPHER_get_bits)(SSL_CIPHER *, int *) = nullptr;
-- static char *(*K_SSL_CIPHER_get_version)(SSL_CIPHER *) = nullptr;
-- static const char *(*K_SSL_CIPHER_get_name)(SSL_CIPHER *) = nullptr;
-- static char *(*K_SSL_CIPHER_description)(SSL_CIPHER *, char *, int) = nullptr;
-- static X509 *(*K_d2i_X509)(X509 **, unsigned char **, long) = nullptr;
-- static int (*K_i2d_X509)(X509 *, unsigned char **) = nullptr;
-- static int (*K_X509_cmp)(X509 *, X509 *) = nullptr;
-- static void (*K_X509_STORE_CTX_free)(X509_STORE_CTX *) = nullptr;
-- static int (*K_X509_verify_cert)(X509_STORE_CTX *) = nullptr;
-- static X509_STORE_CTX *(*K_X509_STORE_CTX_new)(void) = nullptr;
-- static void (*K_X509_STORE_free)(X509_STORE *) = nullptr;
-- static X509_STORE *(*K_X509_STORE_new)(void) = nullptr;
-- static void (*K_X509_free)(X509 *) = nullptr;
-- static char *(*K_X509_NAME_oneline)(X509_NAME *, char *, int) = nullptr;
-- static X509_NAME *(*K_X509_get_subject_name)(X509 *) = nullptr;
-- static X509_NAME *(*K_X509_get_issuer_name)(X509 *) = nullptr;
-- static X509_LOOKUP *(*K_X509_STORE_add_lookup)(X509_STORE *, X509_LOOKUP_METHOD *) = nullptr;
-- static X509_LOOKUP_METHOD *(*K_X509_LOOKUP_file)(void) = nullptr;
-- static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr;
-- static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr;
-- static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr;
-- static void (*K_CRYPTO_free)(void *) = nullptr;
-- static X509 *(*K_X509_dup)(X509 *) = nullptr;
-- static BIO_METHOD *(*K_BIO_s_mem)(void) = nullptr;
-- static BIO *(*K_BIO_new)(BIO_METHOD *) = nullptr;
-- static BIO *(*K_BIO_new_fp)(FILE *, int) = nullptr;
-- static BIO *(*K_BIO_new_mem_buf)(void *, int) = nullptr;
-- static int (*K_BIO_free)(BIO *) = nullptr;
-- static long(*K_BIO_ctrl)(BIO *, int, long, void *) = nullptr;
-- static int (*K_BIO_write)(BIO *b, const void *data, int len) = nullptr;
-- static int (*K_PEM_ASN1_write_bio)(int (*)(), const char *, BIO *, char *,
-- const EVP_CIPHER *, unsigned char *, int,
-- pem_password_cb *, void *) = nullptr;
-- static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *, FILE *, unsigned char *) = nullptr;
-- static ASN1_ITEM *K_NETSCAPE_X509_it = nullptr;
-- static int (*K_X509_print_fp)(FILE *, X509 *) = nullptr;
-- static int (*K_i2d_PKCS12)(PKCS12 *, unsigned char **) = nullptr;
-- static int (*K_i2d_PKCS12_fp)(FILE *, PKCS12 *) = nullptr;
-- static int (*K_PKCS12_newpass)(PKCS12 *, char *, char *) = nullptr;
-- static PKCS12 *(*K_d2i_PKCS12_fp)(FILE *, PKCS12 **) = nullptr;
-- static PKCS12 *(*K_PKCS12_new)(void) = nullptr;
-- static void (*K_PKCS12_free)(PKCS12 *) = nullptr;
-- static int (*K_PKCS12_parse)(PKCS12 *, const char *, EVP_PKEY **,
-- X509 **, STACK_OF(X509) **) = nullptr;
-- static void (*K_EVP_PKEY_free)(EVP_PKEY *) = nullptr;
-- static EVP_PKEY *(*K_EVP_PKEY_new)() = nullptr;
-- static void (*K_X509_REQ_free)(X509_REQ *) = nullptr;
-- static X509_REQ *(*K_X509_REQ_new)() = nullptr;
-- static int (*K_SSL_CTX_use_PrivateKey)(SSL_CTX *, EVP_PKEY *) = nullptr;
-- static int (*K_SSL_CTX_use_certificate)(SSL_CTX *, X509 *) = nullptr;
-- static int (*K_SSL_get_error)(SSL *, int) = nullptr;
-- static STACK_OF(X509) *(*K_SSL_get_peer_cert_chain)(SSL *) = nullptr;
-- static void (*K_X509_STORE_CTX_set_chain)(X509_STORE_CTX *, STACK_OF(X509) *) = nullptr;
-- static void (*K_X509_STORE_CTX_set_purpose)(X509_STORE_CTX *, int) = nullptr;
+ /*
+ * Value of element n in the stack
+ */
+- char *sk_value(STACK *s, int n);
++ char *OPENSSL_sk_value(STACK *s, int n);
+
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+- char *sk_value(void *s, int n)
++ char *OPENSSL_sk_value(void *s, int n)
+ {
+- return sk_value(reinterpret_cast<STACK *>(s), n);
++ return OPENSSL_sk_value(reinterpret_cast<STACK *>(s), n);
+ }
+ #endif
+
+ /*
+ * Create a new stack
+ */
+- STACK *sk_new(int (*cmp)());
++ STACK *OPENSSL_sk_new(int (*cmp)());
+
+ /*
+ * Add an element to the stack
+ */
+- int sk_push(STACK *s, char *d);
++ int OPENSSL_sk_push(STACK *s, char *d);
+
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+- int sk_push(void *s, void *d)
++ int OPENSSL_sk_push(void *s, void *d)
+ {
+- return sk_push(reinterpret_cast<STACK *>(s), reinterpret_cast<char *>(d));
++ return OPENSSL_sk_push(reinterpret_cast<STACK *>(s), reinterpret_cast<char *>(d));
+ }
+ #endif
+
+ /*
+ * Duplicate the stack
+ */
+- STACK *sk_dup(STACK *s);
++ STACK *OPENSSL_sk_dup(STACK *s);
+
+ /*
+ * Convert an ASN1_INTEGER to its text form
+@@ -744,6 +783,17 @@
+ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key);
+
+ /*
++ * Get key type
++ */
++ int EVP_PKEY_base_id(EVP_PKEY *pkey);
++
++ RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey);
++ void RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
++ DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey);
++ void DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
++ void DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key);
++
++ /*
+ * Generate a RSA key
+ */
+ RSA *RSA_generate_key(int bits, unsigned long e, void
+diff --git a/src/kssl/kopenssl.cpp b/src/kssl/kopenssl.cpp
+--- a/src/kssl/kopenssl.cpp
++++ b/src/kssl/kopenssl.cpp
+@@ -69,18 +69,26 @@
+ static int (*K_X509_verify_cert)(X509_STORE_CTX *) = nullptr;
+ static X509_STORE_CTX *(*K_X509_STORE_CTX_new)(void) = nullptr;
+ static void (*K_X509_STORE_free)(X509_STORE *) = nullptr;
++ static void (*K_X509_STORE_set_verify_cb)(X509_STORE *, int (*)(int, X509_STORE_CTX *)) = nullptr;
+ static X509_STORE *(*K_X509_STORE_new)(void) = nullptr;
+ static void (*K_X509_free)(X509 *) = nullptr;
+ static char *(*K_X509_NAME_oneline)(X509_NAME *, char *, int) = nullptr;
+ static X509_NAME *(*K_X509_get_subject_name)(X509 *) = nullptr;
+ static X509_NAME *(*K_X509_get_issuer_name)(X509 *) = nullptr;
++ static void (*K_X509_get0_signature)(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, const X509 *x) = nullptr;
+ static X509_LOOKUP *(*K_X509_STORE_add_lookup)(X509_STORE *, X509_LOOKUP_METHOD *) = nullptr;
+ static X509_LOOKUP_METHOD *(*K_X509_LOOKUP_file)(void) = nullptr;
+ static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr;
+ static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr;
+ static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ static void (*K_CRYPTO_free)(void *) = nullptr;
++#else
++ static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr;
++#endif
+ static X509 *(*K_X509_dup)(X509 *) = nullptr;
++ static ASN1_TIME *(*K_X509_getm_notBefore)(const X509 *) = nullptr;
++ static ASN1_TIME *(*K_X509_getm_notAfter)(const X509 *) = nullptr;
+ static BIO_METHOD *(*K_BIO_s_mem)(void) = nullptr;
+ static BIO *(*K_BIO_new)(BIO_METHOD *) = nullptr;
+ static BIO *(*K_BIO_new_fp)(FILE *, int) = nullptr;
+@@ -112,13 +120,16 @@
+ static STACK_OF(X509) *(*K_SSL_get_peer_cert_chain)(SSL *) = nullptr;
+ static void (*K_X509_STORE_CTX_set_chain)(X509_STORE_CTX *, STACK_OF(X509) *) = nullptr;
+ static void (*K_X509_STORE_CTX_set_purpose)(X509_STORE_CTX *, int) = nullptr;
- static void (*K_sk_free)(STACK *) = nullptr;
- static int (*K_sk_num)(STACK *) = nullptr;
- static char *(*K_sk_pop)(STACK *) = nullptr;
@@ -111,313 +207,68 @@
- static STACK *(*K_sk_new)(int (*)()) = nullptr;
- static int (*K_sk_push)(STACK *, char *) = nullptr;
- static STACK *(*K_sk_dup)(STACK *) = nullptr;
-- static char *(*K_i2s_ASN1_INTEGER)(X509V3_EXT_METHOD *, ASN1_INTEGER *) = nullptr;
-- static ASN1_INTEGER *(*K_X509_get_serialNumber)(X509 *) = nullptr;
-- static EVP_PKEY *(*K_X509_get_pubkey)(X509 *) = nullptr;
-- static int (*K_i2d_PublicKey)(EVP_PKEY *, unsigned char **) = nullptr;
-- static int (*K_X509_check_private_key)(X509 *, EVP_PKEY *) = nullptr;
-- static char *(*K_BN_bn2hex)(const BIGNUM *) = nullptr;
-- static int (*K_X509_digest)(const X509 *, const EVP_MD *, unsigned char *, unsigned int *) = nullptr;
-- static EVP_MD *(*K_EVP_md5)() = nullptr;
-- static void (*K_ASN1_INTEGER_free)(ASN1_INTEGER *) = nullptr;
-- static int (*K_OBJ_obj2nid)(ASN1_OBJECT *) = nullptr;
-- static const char *(*K_OBJ_nid2ln)(int) = nullptr;
-- static int (*K_X509_get_ext_count)(X509 *) = nullptr;
-- static int (*K_X509_get_ext_by_NID)(X509 *, int, int) = nullptr;
-- static int (*K_X509_get_ext_by_OBJ)(X509 *, ASN1_OBJECT *, int) = nullptr;
-- static X509_EXTENSION *(*K_X509_get_ext)(X509 *, int loc) = nullptr;
-- static X509_EXTENSION *(*K_X509_delete_ext)(X509 *, int) = nullptr;
-- static int (*K_X509_add_ext)(X509 *, X509_EXTENSION *, int) = nullptr;
-- static void *(*K_X509_get_ext_d2i)(X509 *, int, int *, int *) = nullptr;
-- static char *(*K_i2s_ASN1_OCTET_STRING)(X509V3_EXT_METHOD *, ASN1_OCTET_STRING *) = nullptr;
-- static int (*K_ASN1_BIT_STRING_get_bit)(ASN1_BIT_STRING *, int) = nullptr;
-- static PKCS7 *(*K_PKCS7_new)() = nullptr;
-- static void (*K_PKCS7_free)(PKCS7 *) = nullptr;
-- static void (*K_PKCS7_content_free)(PKCS7 *) = nullptr;
-- static int (*K_i2d_PKCS7)(PKCS7 *, unsigned char **) = nullptr;
-- static PKCS7 *(*K_d2i_PKCS7)(PKCS7 **, unsigned char **, long) = nullptr;
-- static int (*K_i2d_PKCS7_fp)(FILE *, PKCS7 *) = nullptr;
-- static PKCS7 *(*K_d2i_PKCS7_fp)(FILE *, PKCS7 **) = nullptr;
-- static int (*K_i2d_PKCS7_bio)(BIO *bp, PKCS7 *p7) = nullptr;
-- static PKCS7 *(*K_d2i_PKCS7_bio)(BIO *bp, PKCS7 **p7) = nullptr;
-- static PKCS7 *(*K_PKCS7_dup)(PKCS7 *) = nullptr;
-- static STACK_OF(X509_NAME) *(*K_SSL_load_client_CA_file)(const char *) = nullptr;
-- static STACK_OF(X509_INFO) *(*K_PEM_X509_INFO_read)(FILE *, STACK_OF(X509_INFO) *, pem_password_cb *, void *) = nullptr;
-- static char *(*K_ASN1_d2i_fp)(char *(*)(), char *(*)(), FILE *, unsigned char **) = nullptr;
-- static X509 *(*K_X509_new)() = nullptr;
-- static int (*K_X509_PURPOSE_get_count)() = nullptr;
-- static int (*K_X509_PURPOSE_get_id)(X509_PURPOSE *) = nullptr;
-- static int (*K_X509_check_purpose)(X509 *, int, int) = nullptr;
-- static X509_PURPOSE *(*K_X509_PURPOSE_get0)(int) = nullptr;
-- static int (*K_EVP_PKEY_assign)(EVP_PKEY *, int, char *) = nullptr;
-- static int (*K_X509_REQ_set_pubkey)(X509_REQ *, EVP_PKEY *) = nullptr;
-- static RSA *(*K_RSA_generate_key)(int, unsigned long, void (*)(int, int, void *), void *) = nullptr;
-- static int (*K_i2d_X509_REQ_fp)(FILE *, X509_REQ *) = nullptr;
-- static void (*K_ERR_clear_error)() = nullptr;
-- static unsigned long(*K_ERR_get_error)() = nullptr;
-- static void (*K_ERR_print_errors_fp)(FILE *) = nullptr;
-- static PKCS7 *(*K_PKCS7_sign)(X509 *, EVP_PKEY *, STACK_OF(X509) *, BIO *, int) = nullptr;
-- static int (*K_PKCS7_verify)(PKCS7 *, STACK_OF(X509) *, X509_STORE *, BIO *, BIO *, int) = nullptr;
-- static STACK_OF(X509) *(*K_PKCS7_get0_signers)(PKCS7 *, STACK_OF(X509) *, int) = nullptr;
-- static PKCS7 *(*K_PKCS7_encrypt)(STACK_OF(X509) *, BIO *, EVP_CIPHER *, int) = nullptr;
-- static int (*K_PKCS7_decrypt)(PKCS7 *, EVP_PKEY *, X509 *, BIO *, int) = nullptr;
-- static SSL_SESSION *(*K_SSL_get1_session)(SSL *) = nullptr;
-- static void (*K_SSL_SESSION_free)(SSL_SESSION *) = nullptr;
-- static int (*K_SSL_set_session)(SSL *, SSL_SESSION *) = nullptr;
-- static SSL_SESSION *(*K_d2i_SSL_SESSION)(SSL_SESSION **, unsigned char **, long) = nullptr;
-- static int (*K_i2d_SSL_SESSION)(SSL_SESSION *, unsigned char **) = nullptr;
-- static STACK *(*K_X509_get1_email)(X509 *x) = nullptr;
-- static void (*K_X509_email_free)(STACK *sk) = nullptr;
-- static EVP_CIPHER *(*K_EVP_des_ede3_cbc)() = nullptr;
-- static EVP_CIPHER *(*K_EVP_des_cbc)() = nullptr;
-- static EVP_CIPHER *(*K_EVP_rc2_cbc)() = nullptr;
-- static EVP_CIPHER *(*K_EVP_rc2_64_cbc)() = nullptr;
-- static EVP_CIPHER *(*K_EVP_rc2_40_cbc)() = nullptr;
-- static int (*K_i2d_PrivateKey_fp)(FILE *, EVP_PKEY *) = nullptr;
-- static int (*K_i2d_PKCS8PrivateKey_fp)(FILE *, EVP_PKEY *, const EVP_CIPHER *, char *, int, pem_password_cb *, void *) = nullptr;
-- static void (*K_RSA_free)(RSA *) = nullptr;
-- static EVP_CIPHER *(*K_EVP_bf_cbc)() = nullptr;
-- static int (*K_X509_REQ_sign)(X509_REQ *, EVP_PKEY *, const EVP_MD *) = nullptr;
-- static int (*K_X509_NAME_add_entry_by_txt)(X509_NAME *, char *, int, unsigned char *, int, int, int) = nullptr;
-- static X509_NAME *(*K_X509_NAME_new)() = nullptr;
-- static int (*K_X509_REQ_set_subject_name)(X509_REQ *, X509_NAME *) = nullptr;
-- static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING *) = nullptr;
-- static int (*K_ASN1_STRING_length)(ASN1_STRING *) = nullptr;
-- static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = nullptr;
--
--#endif
--}
--
- class KOpenSSLProxyPrivate
- {
- public:
- KOpenSSLProxyPrivate()
-- : sslLib(nullptr), cryptoLib(nullptr), ok(false)
-+ : ok(true)
- {}
-
-- QLibrary *sslLib;
-- QLibrary *cryptoLib;
- bool ok;
-
- static KOpenSSLProxy *sSelf;
-@@ -217,12 +51,12 @@ KOpenSSLProxy *KOpenSSLProxyPrivate::sSe
-
- bool KOpenSSLProxy::hasLibSSL() const
- {
-- return d->sslLib != nullptr;
-+ return true;
- }
-
- bool KOpenSSLProxy::hasLibCrypto() const
- {
-- return d->cryptoLib != nullptr;
-+ return true;
- }
-
- void KOpenSSLProxy::destroy()
-@@ -243,14 +77,14 @@ static QString findMostRecentLib(QString
- QString filter = "lib" + name + ".so.*";
- QDir d(dir, filter);
- if (!d.exists()) {
-- return 0L;
-+ return nullptr;
- }
- QStringList l = d.entryList();
-
- // Find the best one
- int bestmaj = -1;
- int bestmin = -1;
-- QString best = 0L;
-+ QString best = nullptr;
- // where do we start
- uint s = filter.length() - 1;
- for (QStringList::const_iterator it = l.begin(); it != l.end(); ++it) {
-@@ -275,7 +109,7 @@ static QString findMostRecentLib(QString
- }
- }
- if (best.isNull()) {
-- return 0L;
-+ return nullptr;
- } else {
- return dir + '/' + best;
- }
-@@ -285,406 +119,10 @@ static QString findMostRecentLib(QString
- KOpenSSLProxy::KOpenSSLProxy()
- : d(new KOpenSSLProxyPrivate())
- {
-- QStringList libpaths, libnamesc, libnamess;
--
-- d->cryptoLib = nullptr;
-- d->sslLib = nullptr;
--
-- KConfig cfg("cryptodefaults", KConfig::NoGlobals);
-- KConfigGroup cg(&cfg, "OpenSSL");
-- QString upath = cg.readPathEntry("Path", QString());
-- if (!upath.isEmpty()) {
-- libpaths << upath;
-- }
--
--#ifdef Q_OS_WIN
-- d->cryptoLib = new QLibrary("libeay32.dll");
-- if (!d->cryptoLib->load()) {
-- delete d->cryptoLib;
-- d->cryptoLib = 0;
-- }
--#elif defined(__OpenBSD__)
-- {
-- QString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto");
-- if (!libname.isNull()) {
-- d->cryptoLib = new QLibrary(libname);
-- d->cryptoLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-- if (!d->cryptoLib->load()) {
-- delete d->cryptoLib;
-- d->cryptoLib = 0;
-- }
-- }
-- }
--#elif defined(__CYGWIN__)
-- libpaths << "/usr/bin/"
-- << "";
--
-- libnamess << "cygssl-0.9.8.dll"
-- << "cygssl-0.9.7.dll"
-- << "";
--
-- libnamesc << "cygcrypto-0.9.8.dll"
-- << "cygcrypto-0.9.7.dll"
-- << "";
--#else
-- libpaths
--#ifdef _AIX
-- << "/opt/freeware/lib/"
--#endif
-- << "/usr/lib" KDELIBSUFF "/"
-- << "/usr/ssl/lib" KDELIBSUFF "/"
-- << "/usr/local/lib" KDELIBSUFF "/"
-- << "/usr/local/openssl/lib" KDELIBSUFF "/"
-- << "/usr/local/ssl/lib" KDELIBSUFF "/"
-- << "/opt/openssl/lib" KDELIBSUFF "/"
-- << "/lib" KDELIBSUFF "/"
-- << "";
--
--// FIXME: #define here for the various OS types to optimize
-- libnamess
--#ifdef hpux
-- << "libssl.sl"
--#elif defined(_AIX)
-- << "libssl.a(libssl.so.0)"
--#elif defined(__APPLE__)
-- << "libssl.dylib"
-- << "libssl.0.9.dylib"
--#else
--#ifdef SHLIB_VERSION_NUMBER
-- << "libssl.so." SHLIB_VERSION_NUMBER
--#endif
-- << "libssl.so"
-- << "libssl.so.0"
--#endif
-- ;
--
-- libnamesc
--#ifdef hpux
-- << "libcrypto.sl"
--#elif defined(_AIX)
-- << "libcrypto.a(libcrypto.so.0)"
--#elif defined(__APPLE__)
-- << "libcrypto.dylib"
-- << "libcrypto.0.9.dylib"
--#else
--#ifdef SHLIB_VERSION_NUMBER
-- << "libcrypto.so." SHLIB_VERSION_NUMBER
--#endif
-- << "libcrypto.so"
-- << "libcrypto.so.0"
--#endif
-- ;
--#endif
--
-- for (QStringList::const_iterator it = libpaths.constBegin();
-- it != libpaths.constEnd();
-- ++it) {
-- for (QStringList::const_iterator shit = libnamesc.constBegin();
-- shit != libnamesc.constEnd();
-- ++shit) {
-- QString alib = *it;
-- if (!alib.isEmpty() && !alib.endsWith('/')) {
-- alib += '/';
-- }
-- alib += *shit;
-- // someone knows why this is needed?
-- QString tmpStr(alib);
-- tmpStr.remove(QRegExp("\\(.*\\)"));
-- if (QFile(tmpStr).isReadable()) {
-- d->cryptoLib = new QLibrary(alib);
-- d->cryptoLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-- }
-- if (d->cryptoLib && d->cryptoLib->load()) {
-- break;
-- } else {
-- delete d->cryptoLib;
-- d->cryptoLib = nullptr;
-- }
-- }
-- if (d->cryptoLib) {
-- break;
-- }
-- }
--
-- if (d->cryptoLib) {
--#if KSSL_HAVE_SSL
-- K_X509_free = (void (*)(X509 *)) d->cryptoLib->resolve("X509_free");
-- K_RAND_egd = (int (*)(const char *)) d->cryptoLib->resolve("RAND_egd");
-- K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file");
-- K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name");
-- K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file");
-- K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free");
-- K_d2i_X509 = (X509 * (*)(X509 **, unsigned char **, long)) d->cryptoLib->resolve("d2i_X509");
-- K_i2d_X509 = (int (*)(X509 *, unsigned char **)) d->cryptoLib->resolve("i2d_X509");
-- K_X509_cmp = (int (*)(X509 *, X509 *)) d->cryptoLib->resolve("X509_cmp");
-- K_X509_STORE_CTX_new = (X509_STORE_CTX * (*)(void)) d->cryptoLib->resolve("X509_STORE_CTX_new");
-- K_X509_STORE_CTX_free = (void (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_free");
-- K_X509_verify_cert = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_verify_cert");
-- K_X509_STORE_new = (X509_STORE * (*)(void)) d->cryptoLib->resolve("X509_STORE_new");
-- K_X509_STORE_free = (void (*)(X509_STORE *)) d->cryptoLib->resolve("X509_STORE_free");
-- K_X509_NAME_oneline = (char *(*)(X509_NAME *, char *, int)) d->cryptoLib->resolve("X509_NAME_oneline");
-- K_X509_get_subject_name = (X509_NAME * (*)(X509 *)) d->cryptoLib->resolve("X509_get_subject_name");
-- K_X509_get_issuer_name = (X509_NAME * (*)(X509 *)) d->cryptoLib->resolve("X509_get_issuer_name");
-- K_X509_STORE_add_lookup = (X509_LOOKUP * (*)(X509_STORE *, X509_LOOKUP_METHOD *)) d->cryptoLib->resolve("X509_STORE_add_lookup");
-- K_X509_LOOKUP_file = (X509_LOOKUP_METHOD * (*)(void)) d->cryptoLib->resolve("X509_LOOKUP_file");
-- K_X509_LOOKUP_free = (void (*)(X509_LOOKUP *)) d->cryptoLib->resolve("X509_LOOKUP_free");
-- K_X509_LOOKUP_ctrl = (int (*)(X509_LOOKUP *, int, const char *, long, char **)) d->cryptoLib->resolve("X509_LOOKUP_ctrl");
-- K_X509_STORE_CTX_init = (void (*)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *)) d->cryptoLib->resolve("X509_STORE_CTX_init");
-- K_X509_dup = (X509 * (*)(X509 *)) d->cryptoLib->resolve("X509_dup");
-- K_BIO_s_mem = (BIO_METHOD * (*)(void)) d->cryptoLib->resolve("BIO_s_mem");
-- K_BIO_new = (BIO * (*)(BIO_METHOD *)) d->cryptoLib->resolve("BIO_new");
-- K_BIO_new_fp = (BIO * (*)(FILE *, int)) d->cryptoLib->resolve("BIO_new_fp");
-- K_BIO_new_mem_buf = (BIO * (*)(void *, int)) d->cryptoLib->resolve("BIO_new_mem_buf");
-- K_BIO_free = (int (*)(BIO *)) d->cryptoLib->resolve("BIO_free");
-- K_BIO_ctrl = (long(*)(BIO *, int, long, void *)) d->cryptoLib->resolve("BIO_ctrl");
-- K_BIO_write = (int (*)(BIO * b, const void *data, int len)) d->cryptoLib->resolve("BIO_write");
-- K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *, BIO *, char *, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) d->cryptoLib->resolve("PEM_ASN1_write_bio");
-- K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE *, unsigned char *))
-- d->cryptoLib->resolve("ASN1_item_i2d_fp");
-- K_NETSCAPE_X509_it = (ASN1_ITEM *) d->cryptoLib->resolve("NETSCAPE_X509_it");
-- K_X509_print_fp = (int (*)(FILE *, X509 *)) d->cryptoLib->resolve("X509_print_fp");
-- K_i2d_PKCS12 = (int (*)(PKCS12 *, unsigned char **)) d->cryptoLib->resolve("i2d_PKCS12");
-- K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12 *)) d->cryptoLib->resolve("i2d_PKCS12_fp");
-- K_PKCS12_newpass = (int (*)(PKCS12 *, char *, char *)) d->cryptoLib->resolve("PKCS12_newpass");
-- K_d2i_PKCS12_fp = (PKCS12 * (*)(FILE *, PKCS12 **)) d->cryptoLib->resolve("d2i_PKCS12_fp");
-- K_PKCS12_new = (PKCS12 * (*)()) d->cryptoLib->resolve("PKCS12_new");
-- K_PKCS12_free = (void (*)(PKCS12 *)) d->cryptoLib->resolve("PKCS12_free");
-- K_PKCS12_parse = (int (*)(PKCS12 *, const char *, EVP_PKEY **,
-- X509 **, STACK_OF(X509) **)) d->cryptoLib->resolve("PKCS12_parse");
-- K_EVP_PKEY_free = (void (*)(EVP_PKEY *)) d->cryptoLib->resolve("EVP_PKEY_free");
-- K_EVP_PKEY_new = (EVP_PKEY * (*)()) d->cryptoLib->resolve("EVP_PKEY_new");
-- K_X509_REQ_free = (void (*)(X509_REQ *)) d->cryptoLib->resolve("X509_REQ_free");
-- K_X509_REQ_new = (X509_REQ * (*)()) d->cryptoLib->resolve("X509_REQ_new");
-- K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509) *)) d->cryptoLib->resolve("X509_STORE_CTX_set_chain");
-- K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_purpose");
++ static X509 *(*K_X509_STORE_CTX_get_current_cert)(X509_STORE_CTX *) = nullptr;
++ static void (*K_X509_STORE_CTX_set_error)(X509_STORE_CTX *, int) = nullptr;
++ static int (*K_X509_STORE_CTX_get_error)(X509_STORE_CTX *) = nullptr;
++ static void (*K_OPENSSL_sk_free)(STACK *) = nullptr;
++ static int (*K_OPENSSL_sk_num)(STACK *) = nullptr;
++ static char *(*K_OPENSSL_sk_pop)(STACK *) = nullptr;
++ static char *(*K_OPENSSL_sk_value)(STACK *, int) = nullptr;
++ static STACK *(*K_OPENSSL_sk_new)(int (*)()) = nullptr;
++ static int (*K_OPENSSL_sk_push)(STACK *, char *) = nullptr;
++ static STACK *(*K_OPENSSL_sk_dup)(STACK *) = nullptr;
+ static char *(*K_i2s_ASN1_INTEGER)(X509V3_EXT_METHOD *, ASN1_INTEGER *) = nullptr;
+ static ASN1_INTEGER *(*K_X509_get_serialNumber)(X509 *) = nullptr;
+ static EVP_PKEY *(*K_X509_get_pubkey)(X509 *) = nullptr;
+@@ -158,6 +169,12 @@
+ static int (*K_X509_check_purpose)(X509 *, int, int) = nullptr;
+ static X509_PURPOSE *(*K_X509_PURPOSE_get0)(int) = nullptr;
+ static int (*K_EVP_PKEY_assign)(EVP_PKEY *, int, char *) = nullptr;
++ static int (*K_EVP_PKEY_base_id)(EVP_PKEY *) = nullptr;
++ static RSA *(*K_EVP_PKEY_get0_RSA)(EVP_PKEY *) = nullptr;
++ static void (*K_RSA_get0_key)(RSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **) = nullptr;
++ static DSA *(*K_EVP_PKEY_get0_DSA)(EVP_PKEY *) = nullptr;
++ static void (*K_DSA_get0_pqg)(DSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **) = nullptr;
++ static void (*K_DSA_get0_key)(DSA *, const BIGNUM **, const BIGNUM **) = nullptr;
+ static int (*K_X509_REQ_set_pubkey)(X509_REQ *, EVP_PKEY *) = nullptr;
+ static RSA *(*K_RSA_generate_key)(int, unsigned long, void (*)(int, int, void *), void *) = nullptr;
+ static int (*K_i2d_X509_REQ_fp)(FILE *, X509_REQ *) = nullptr;
+@@ -413,7 +430,11 @@
+ K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file");
+ K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name");
+ K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free");
++#else
++ K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free");
++#endif
+ K_d2i_X509 = (X509 * (*)(X509 **, unsigned char **, long)) d->cryptoLib->resolve("d2i_X509");
+ K_i2d_X509 = (int (*)(X509 *, unsigned char **)) d->cryptoLib->resolve("i2d_X509");
+ K_X509_cmp = (int (*)(X509 *, X509 *)) d->cryptoLib->resolve("X509_cmp");
+@@ -422,15 +443,19 @@
+ K_X509_verify_cert = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_verify_cert");
+ K_X509_STORE_new = (X509_STORE * (*)(void)) d->cryptoLib->resolve("X509_STORE_new");
+ K_X509_STORE_free = (void (*)(X509_STORE *)) d->cryptoLib->resolve("X509_STORE_free");
++ K_X509_STORE_set_verify_cb = (void (*)(X509_STORE *, int (*)(int, X509_STORE_CTX *))) d->cryptoLib->resolve("X509_STORE_set_verify_cb");
+ K_X509_NAME_oneline = (char *(*)(X509_NAME *, char *, int)) d->cryptoLib->resolve("X509_NAME_oneline");
+ K_X509_get_subject_name = (X509_NAME * (*)(X509 *)) d->cryptoLib->resolve("X509_get_subject_name");
+ K_X509_get_issuer_name = (X509_NAME * (*)(X509 *)) d->cryptoLib->resolve("X509_get_issuer_name");
++ K_X509_get0_signature = (void (*)(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *)) d->cryptoLib->resolve("X509_get0_signature");
+ K_X509_STORE_add_lookup = (X509_LOOKUP * (*)(X509_STORE *, X509_LOOKUP_METHOD *)) d->cryptoLib->resolve("X509_STORE_add_lookup");
+ K_X509_LOOKUP_file = (X509_LOOKUP_METHOD * (*)(void)) d->cryptoLib->resolve("X509_LOOKUP_file");
+ K_X509_LOOKUP_free = (void (*)(X509_LOOKUP *)) d->cryptoLib->resolve("X509_LOOKUP_free");
+ K_X509_LOOKUP_ctrl = (int (*)(X509_LOOKUP *, int, const char *, long, char **)) d->cryptoLib->resolve("X509_LOOKUP_ctrl");
+ K_X509_STORE_CTX_init = (void (*)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *)) d->cryptoLib->resolve("X509_STORE_CTX_init");
+ K_X509_dup = (X509 * (*)(X509 *)) d->cryptoLib->resolve("X509_dup");
++ K_X509_getm_notBefore = (ASN1_TIME *(*)(const X509 *)) d->cryptoLib->resolve("X509_getm_notBefore");
++ K_X509_getm_notAfter = (ASN1_TIME *(*)(const X509 *)) d->cryptoLib->resolve("X509_getm_notAfter");
+ K_BIO_s_mem = (BIO_METHOD * (*)(void)) d->cryptoLib->resolve("BIO_s_mem");
+ K_BIO_new = (BIO * (*)(BIO_METHOD *)) d->cryptoLib->resolve("BIO_new");
+ K_BIO_new_fp = (BIO * (*)(FILE *, int)) d->cryptoLib->resolve("BIO_new_fp");
+@@ -457,13 +482,26 @@
+ K_X509_REQ_new = (X509_REQ * (*)()) d->cryptoLib->resolve("X509_REQ_new");
+ K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509) *)) d->cryptoLib->resolve("X509_STORE_CTX_set_chain");
+ K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_purpose");
- K_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("sk_free");
- K_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("sk_num");
- K_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("sk_pop");
@@ -425,1854 +276,403 @@
- K_sk_new = (STACK * (*)(int (*)())) d->cryptoLib->resolve("sk_new");
- K_sk_push = (int (*)(STACK *, char *)) d->cryptoLib->resolve("sk_push");
- K_sk_dup = (STACK * (*)(STACK *)) d->cryptoLib->resolve("sk_dup");
-- K_i2s_ASN1_INTEGER = (char *(*)(X509V3_EXT_METHOD *, ASN1_INTEGER *)) d->cryptoLib->resolve("i2s_ASN1_INTEGER");
-- K_X509_get_serialNumber = (ASN1_INTEGER * (*)(X509 *)) d->cryptoLib->resolve("X509_get_serialNumber");
-- K_X509_get_pubkey = (EVP_PKEY * (*)(X509 *)) d->cryptoLib->resolve("X509_get_pubkey");
-- K_i2d_PublicKey = (int (*)(EVP_PKEY *, unsigned char **)) d->cryptoLib->resolve("i2d_PublicKey");
-- K_X509_check_private_key = (int (*)(X509 *, EVP_PKEY *)) d->cryptoLib->resolve("X509_check_private_key");
-- K_BN_bn2hex = (char *(*)(const BIGNUM *)) d->cryptoLib->resolve("BN_bn2hex");
-- K_X509_digest = (int (*)(const X509 *, const EVP_MD *, unsigned char *, unsigned int *)) d->cryptoLib->resolve("X509_digest");
-- K_EVP_md5 = (EVP_MD * (*)()) d->cryptoLib->resolve("EVP_md5");
-- K_ASN1_INTEGER_free = (void (*)(ASN1_INTEGER *)) d->cryptoLib->resolve("ASN1_INTEGER_free");
-- K_OBJ_obj2nid = (int (*)(ASN1_OBJECT *)) d->cryptoLib->resolve("OBJ_obj2nid");
-- K_OBJ_nid2ln = (const char *(*)(int)) d->cryptoLib->resolve("OBJ_nid2ln");
-- K_X509_get_ext_count = (int (*)(X509 *)) d->cryptoLib->resolve("X509_get_ext_count");
-- K_X509_get_ext_by_NID = (int (*)(X509 *, int, int)) d->cryptoLib->resolve("X509_get_ext_by_NID");
-- K_X509_get_ext_by_OBJ = (int (*)(X509 *, ASN1_OBJECT *, int)) d->cryptoLib->resolve("X509_get_ext_by_OBJ");
-- K_X509_get_ext = (X509_EXTENSION * (*)(X509 *, int)) d->cryptoLib->resolve("X509_get_ext");
-- K_X509_delete_ext = (X509_EXTENSION * (*)(X509 *, int)) d->cryptoLib->resolve("X509_delete_ext");
-- K_X509_add_ext = (int (*)(X509 *, X509_EXTENSION *, int)) d->cryptoLib->resolve("X509_add_ext");
-- K_X509_get_ext_d2i = (void *(*)(X509 *, int, int *, int *)) d->cryptoLib->resolve("X509_get_ext_d2i");
-- K_i2s_ASN1_OCTET_STRING = (char *(*)(X509V3_EXT_METHOD *, ASN1_OCTET_STRING *)) d->cryptoLib->resolve("i2s_ASN1_OCTET_STRING");
-- K_ASN1_BIT_STRING_get_bit = (int (*)(ASN1_BIT_STRING *, int)) d->cryptoLib->resolve("ASN1_BIT_STRING_get_bit");
-- K_PKCS7_new = (PKCS7 * (*)()) d->cryptoLib->resolve("PKCS7_new");
-- K_PKCS7_free = (void (*)(PKCS7 *)) d->cryptoLib->resolve("PKCS7_free");
-- K_PKCS7_content_free = (void (*)(PKCS7 *)) d->cryptoLib->resolve("PKCS7_content_free");
-- K_i2d_PKCS7 = (int (*)(PKCS7 *, unsigned char **)) d->cryptoLib->resolve("i2d_PKCS7");
-- K_i2d_PKCS7_fp = (int (*)(FILE *, PKCS7 *)) d->cryptoLib->resolve("i2d_PKCS7_fp");
-- K_i2d_PKCS7_bio = (int (*)(BIO * bp, PKCS7 * p7)) d->cryptoLib->resolve("i2d_PKCS7_bio");
-- K_d2i_PKCS7 = (PKCS7 * (*)(PKCS7 **, unsigned char **, long)) d->cryptoLib->resolve("d2i_PKCS7");
-- K_d2i_PKCS7_fp = (PKCS7 * (*)(FILE *, PKCS7 **)) d->cryptoLib->resolve("d2i_PKCS7_fp");
-- K_d2i_PKCS7_bio = (PKCS7 * (*)(BIO * bp, PKCS7 **p7)) d->cryptoLib->resolve("d2i_PKCS7_bio");
-- K_PKCS7_dup = (PKCS7 * (*)(PKCS7 *)) d->cryptoLib->resolve("PKCS7_dup");
-- K_PKCS7_sign = (PKCS7 * (*)(X509 *, EVP_PKEY *, STACK_OF(X509) *, BIO *, int)) d->cryptoLib->resolve("PKCS7_sign");
-- K_PKCS7_verify = (int (*)(PKCS7 *, STACK_OF(X509) *, X509_STORE *, BIO *, BIO *, int)) d->cryptoLib->resolve("PKCS7_verify");
-- K_PKCS7_get0_signers = (STACK_OF(X509) * (*)(PKCS7 *, STACK_OF(X509) *, int)) d->cryptoLib->resolve("PKCS7_get0_signers");
-- K_PKCS7_encrypt = (PKCS7 * (*)(STACK_OF(X509) *, BIO *, EVP_CIPHER *, int)) d->cryptoLib->resolve("PKCS7_encrypt");
-- K_PKCS7_decrypt = (int (*)(PKCS7 *, EVP_PKEY *, X509 *, BIO *, int)) d->cryptoLib->resolve("PKCS7_decrypt");
-- K_PEM_X509_INFO_read = (STACK_OF(X509_INFO) * (*)(FILE *, STACK_OF(X509_INFO) *, pem_password_cb *, void *)) d->cryptoLib->resolve("PEM_X509_INFO_read");
-- K_ASN1_d2i_fp = (char *(*)(char *(*)(), char *(*)(), FILE *, unsigned char **)) d->cryptoLib->resolve("ASN1_d2i_fp");
-- K_X509_new = (X509 * (*)()) d->cryptoLib->resolve("X509_new");
-- K_X509_PURPOSE_get_count = (int (*)()) d->cryptoLib->resolve("X509_PURPOSE_get_count");
-- K_X509_PURPOSE_get_id = (int (*)(X509_PURPOSE *)) d->cryptoLib->resolve("X509_PURPOSE_get_id");
-- K_X509_check_purpose = (int (*)(X509 *, int, int)) d->cryptoLib->resolve("X509_check_purpose");
-- K_X509_PURPOSE_get0 = (X509_PURPOSE * (*)(int)) d->cryptoLib->resolve("X509_PURPOSE_get0");
-- K_EVP_PKEY_assign = (int (*)(EVP_PKEY *, int, char *)) d->cryptoLib->resolve("EVP_PKEY_assign");
-- K_X509_REQ_set_pubkey = (int (*)(X509_REQ *, EVP_PKEY *)) d->cryptoLib->resolve("X509_REQ_set_pubkey");
-- K_RSA_generate_key = (RSA * (*)(int, unsigned long, void (*)(int, int, void *), void *)) d->cryptoLib->resolve("RSA_generate_key");
-- K_i2d_X509_REQ_fp = (int (*)(FILE *, X509_REQ *)) d->cryptoLib->resolve("i2d_X509_REQ_fp");
-- K_ERR_clear_error = (void (*)()) d->cryptoLib->resolve("ERR_clear_error");
-- K_ERR_get_error = (unsigned long(*)()) d->cryptoLib->resolve("ERR_get_error");
-- K_ERR_print_errors_fp = (void (*)(FILE *)) d->cryptoLib->resolve("ERR_print_errors_fp");
-- K_X509_get1_email = (STACK * (*)(X509 * x)) d->cryptoLib->resolve("X509_get1_email");
-- K_X509_email_free = (void (*)(STACK * sk)) d->cryptoLib->resolve("X509_email_free");
-- K_EVP_des_ede3_cbc = (EVP_CIPHER * (*)()) d->cryptoLib->resolve("EVP_des_ede3_cbc");
-- K_EVP_des_cbc = (EVP_CIPHER * (*)()) d->cryptoLib->resolve("EVP_des_cbc");
-- K_EVP_rc2_cbc = (EVP_CIPHER * (*)()) d->cryptoLib->resolve("EVP_rc2_cbc");
-- K_EVP_rc2_64_cbc = (EVP_CIPHER * (*)()) d->cryptoLib->resolve("EVP_rc2_64_cbc");
-- K_EVP_rc2_40_cbc = (EVP_CIPHER * (*)()) d->cryptoLib->resolve("EVP_rc2_40_cbc");
-- K_i2d_PrivateKey_fp = (int (*)(FILE *, EVP_PKEY *)) d->cryptoLib->resolve("i2d_PrivateKey_fp");
-- K_i2d_PKCS8PrivateKey_fp = (int (*)(FILE *, EVP_PKEY *, const EVP_CIPHER *, char *, int, pem_password_cb *, void *)) d->cryptoLib->resolve("i2d_PKCS8PrivateKey_fp");
-- K_RSA_free = (void (*)(RSA *)) d->cryptoLib->resolve("RSA_free");
-- K_EVP_bf_cbc = (EVP_CIPHER * (*)()) d->cryptoLib->resolve("EVP_bf_cbc");
-- K_X509_REQ_sign = (int (*)(X509_REQ *, EVP_PKEY *, const EVP_MD *)) d->cryptoLib->resolve("X509_REQ_sign");
-- K_X509_NAME_add_entry_by_txt = (int (*)(X509_NAME *, char *, int, unsigned char *, int, int, int)) d->cryptoLib->resolve("X509_NAME_add_entry_by_txt");
-- K_X509_NAME_new = (X509_NAME * (*)()) d->cryptoLib->resolve("X509_NAME_new");
-- K_X509_REQ_set_subject_name = (int (*)(X509_REQ *, X509_NAME *)) d->cryptoLib->resolve("X509_REQ_set_subject_name");
-- K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING *)) d->cryptoLib->resolve("ASN1_STRING_data");
-- K_ASN1_STRING_length = (int (*)(ASN1_STRING *)) d->cryptoLib->resolve("ASN1_STRING_length");
--#endif
-- }
--
--#ifdef Q_OS_WIN
-- d->sslLib = new QLibrary("ssleay32.dll");
-- if (!d->sslLib->load()) {
-- delete d->sslLib;
-- d->sslLib = 0;
-- }
--#elif defined(__OpenBSD__)
-- {
-- QString libname = findMostRecentLib("/usr/lib", "ssl");
-- if (!libname.isNull()) {
-- d->sslLib = new QLibrary(libname);
-- d->sslLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-- if (!d->sslLib->load()) {
-- delete d->sslLib;
-- d->sslLib = 0;
-- }
-- }
-- }
--#else
-- for (QStringList::const_iterator it = libpaths.constBegin();
-- it != libpaths.constEnd();
-- ++it) {
-- for (QStringList::const_iterator shit = libnamess.constBegin();
-- shit != libnamess.constEnd();
-- ++shit) {
-- QString alib = *it;
-- if (!alib.isEmpty() && !alib.endsWith('/')) {
-- alib += '/';
-- }
-- alib += *shit;
-- QString tmpStr(alib);
-- tmpStr.remove(QRegExp("\\(.*\\)"));
-- if (QFile(tmpStr).isReadable()) {
-- d->sslLib = new QLibrary(alib);
-- d->sslLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-- }
-- if (d->sslLib && d->sslLib->load()) {
-- break;
-- } else {
-- delete d->sslLib;
-- d->sslLib = nullptr;
-- }
-- }
-- if (d->sslLib) {
-- break;
-- }
-- }
--#endif
--
-- if (d->sslLib) {
--#if KSSL_HAVE_SSL
-- // stand back from your monitor and look at this. it's fun! :)
-- K_SSL_connect = (int (*)(SSL *)) d->sslLib->resolve("SSL_connect");
-- K_SSL_accept = (int (*)(SSL *)) d->sslLib->resolve("SSL_accept");
-- K_SSL_read = (int (*)(SSL *, void *, int)) d->sslLib->resolve("SSL_read");
-- K_SSL_write = (int (*)(SSL *, const void *, int))
-- d->sslLib->resolve("SSL_write");
-- K_SSL_new = (SSL * (*)(SSL_CTX *)) d->sslLib->resolve("SSL_new");
-- K_SSL_free = (void (*)(SSL *)) d->sslLib->resolve("SSL_free");
-- K_SSL_shutdown = (int (*)(SSL *)) d->sslLib->resolve("SSL_shutdown");
-- K_SSL_CTX_new = (SSL_CTX * (*)(SSL_METHOD *)) d->sslLib->resolve("SSL_CTX_new");
-- K_SSL_CTX_free = (void (*)(SSL_CTX *)) d->sslLib->resolve("SSL_CTX_free");
-- K_SSL_set_fd = (int (*)(SSL *, int)) d->sslLib->resolve("SSL_set_fd");
-- K_SSL_pending = (int (*)(SSL *)) d->sslLib->resolve("SSL_pending");
-- K_SSL_CTX_set_cipher_list = (int (*)(SSL_CTX *, const char *))
-- d->sslLib->resolve("SSL_CTX_set_cipher_list");
-- K_SSL_CTX_set_verify = (void (*)(SSL_CTX *, int, int (*)(int, X509_STORE_CTX *))) d->sslLib->resolve("SSL_CTX_set_verify");
-- K_SSL_use_certificate = (int (*)(SSL *, X509 *))
-- d->sslLib->resolve("SSL_CTX_use_certificate");
-- K_SSL_get_current_cipher = (SSL_CIPHER * (*)(SSL *))
-- d->sslLib->resolve("SSL_get_current_cipher");
-- K_SSL_ctrl = (long(*)(SSL *, int, long, char *))
-- d->sslLib->resolve("SSL_ctrl");
-- K_TLSv1_client_method = (SSL_METHOD * (*)()) d->sslLib->resolve("TLSv1_client_method");
-- K_SSLv23_client_method = (SSL_METHOD * (*)()) d->sslLib->resolve("SSLv23_client_method");
-- K_SSL_get_peer_certificate = (X509 * (*)(SSL *)) d->sslLib->resolve("SSL_get_peer_certificate");
-- K_SSL_CIPHER_get_bits = (int (*)(SSL_CIPHER *, int *)) d->sslLib->resolve("SSL_CIPHER_get_bits");
-- K_SSL_CIPHER_get_version = (char *(*)(SSL_CIPHER *)) d->sslLib->resolve("SSL_CIPHER_get_version");
-- K_SSL_CIPHER_get_name = (const char *(*)(SSL_CIPHER *)) d->sslLib->resolve("SSL_CIPHER_get_name");
-- K_SSL_CIPHER_description = (char *(*)(SSL_CIPHER *, char *, int)) d->sslLib->resolve("SSL_CIPHER_description");
-- K_SSL_CTX_use_PrivateKey = (int (*)(SSL_CTX *, EVP_PKEY *)) d->sslLib->resolve("SSL_CTX_use_PrivateKey");
-- K_SSL_CTX_use_certificate = (int (*)(SSL_CTX *, X509 *)) d->sslLib->resolve("SSL_CTX_use_certificate");
-- K_SSL_get_error = (int (*)(SSL *, int)) d->sslLib->resolve("SSL_get_error");
-- K_SSL_get_peer_cert_chain = (STACK_OF(X509) * (*)(SSL *)) d->sslLib->resolve("SSL_get_peer_cert_chain");
-- K_SSL_load_client_CA_file = (STACK_OF(X509_NAME) * (*)(const char *)) d->sslLib->resolve("SSL_load_client_CA_file");
-- K_SSL_peek = (int (*)(SSL *, void *, int)) d->sslLib->resolve("SSL_peek");
-- K_SSL_get1_session = (SSL_SESSION * (*)(SSL *)) d->sslLib->resolve("SSL_get1_session");
-- K_SSL_SESSION_free = (void (*)(SSL_SESSION *)) d->sslLib->resolve("SSL_SESSION_free");
-- K_SSL_set_session = (int (*)(SSL *, SSL_SESSION *)) d->sslLib->resolve("SSL_set_session");
-- K_d2i_SSL_SESSION = (SSL_SESSION * (*)(SSL_SESSION **, unsigned char **, long)) d->sslLib->resolve("d2i_SSL_SESSION");
-- K_i2d_SSL_SESSION = (int (*)(SSL_SESSION *, unsigned char **)) d->sslLib->resolve("i2d_SSL_SESSION");
-- K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) * (*)(const SSL *)) d->sslLib->resolve("SSL_get_ciphers");
--#endif
--
-- // Initialize the library (once only!)
-- QFunctionPointer x;
-- x = d->sslLib->resolve("SSL_library_init");
-- if (d->cryptoLib) {
-- if (x) {
-- ((int (*)())x)();
-- }
-- x = d->cryptoLib->resolve("OpenSSL_add_all_algorithms");
-- if (!x) {
-- x = d->cryptoLib->resolve("OPENSSL_add_all_algorithms");
-- }
-- if (x) {
-- ((void (*)())x)();
-- } else {
-- x = d->cryptoLib->resolve("OpenSSL_add_all_algorithms_conf");
-- if (!x) {
-- x = d->cryptoLib->resolve("OPENSSL_add_all_algorithms_conf");
-- }
-- if (x) {
-- ((void (*)())x)();
-- } else {
-- x = d->cryptoLib->resolve("OpenSSL_add_all_algorithms_noconf");
-- if (!x) {
-- x = d->cryptoLib->resolve("OPENSSL_add_all_algorithms_noconf");
-- }
-- if (x) {
-- ((void (*)())x)();
-- }
-- }
-- }
-- x = d->cryptoLib->resolve("OpenSSL_add_all_ciphers");
-- if (!x) {
-- x = d->cryptoLib->resolve("OPENSSL_add_all_ciphers");
-- }
-- if (x) {
-- ((void (*)())x)();
-- }
-- x = d->cryptoLib->resolve("OpenSSL_add_all_digests");
-- if (!x) {
-- x = d->cryptoLib->resolve("OPENSSL_add_all_digests");
-- }
-- if (x) {
-- ((void (*)())x)();
-- }
-- }
-- }
--
++ K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert");
++ K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error");
++ K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error");
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free");
++ K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num");
++ K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop");
++ K_OPENSSL_sk_value = (char *(*)(STACK *, int)) d->cryptoLib->resolve("OPENSSL_sk_value");
++ K_OPENSSL_sk_new = (STACK * (*)(int (*)())) d->cryptoLib->resolve("OPENSSL_sk_new");
++ K_OPENSSL_sk_push = (int (*)(STACK *, char *)) d->cryptoLib->resolve("OPENSSL_sk_push");
++ K_OPENSSL_sk_dup = (STACK * (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_dup");
++#else
++ K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("sk_free");
++ K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("sk_num");
++ K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("sk_pop");
++ K_OPENSSL_sk_value = (char *(*)(STACK *, int)) d->cryptoLib->resolve("sk_value");
++ K_OPENSSL_sk_new = (STACK * (*)(int (*)())) d->cryptoLib->resolve("sk_new");
++ K_OPENSSL_sk_push = (int (*)(STACK *, char *)) d->cryptoLib->resolve("sk_push");
++ K_OPENSSL_sk_dup = (STACK * (*)(STACK *)) d->cryptoLib->resolve("sk_dup");
++#endif
+ K_i2s_ASN1_INTEGER = (char *(*)(X509V3_EXT_METHOD *, ASN1_INTEGER *)) d->cryptoLib->resolve("i2s_ASN1_INTEGER");
+ K_X509_get_serialNumber = (ASN1_INTEGER * (*)(X509 *)) d->cryptoLib->resolve("X509_get_serialNumber");
+ K_X509_get_pubkey = (EVP_PKEY * (*)(X509 *)) d->cryptoLib->resolve("X509_get_pubkey");
+@@ -507,6 +545,12 @@
+ K_X509_check_purpose = (int (*)(X509 *, int, int)) d->cryptoLib->resolve("X509_check_purpose");
+ K_X509_PURPOSE_get0 = (X509_PURPOSE * (*)(int)) d->cryptoLib->resolve("X509_PURPOSE_get0");
+ K_EVP_PKEY_assign = (int (*)(EVP_PKEY *, int, char *)) d->cryptoLib->resolve("EVP_PKEY_assign");
++ K_EVP_PKEY_base_id = (int (*)(EVP_PKEY *)) d->cryptoLib->resolve("EVP_PKEY_base_id");
++ K_EVP_PKEY_get0_RSA = (RSA *(*)(EVP_PKEY *)) d->cryptoLib->resolve("EVP_PKEY_get0_RSA");
++ K_RSA_get0_key = (void (*)(RSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **)) d->cryptoLib->resolve("ESA_get0_key");
++ K_EVP_PKEY_get0_DSA = (DSA *(*)(EVP_PKEY *)) d->cryptoLib->resolve("EVP_PKEY_get0_DSA");
++ K_DSA_get0_pqg = (void (*)(DSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **)) d->cryptoLib->resolve("DSA_get0_pqg");
++ K_DSA_get0_key = (void (*)(DSA *, const BIGNUM **, const BIGNUM **)) d->cryptoLib->resolve("DSA_get0_key");
+ K_X509_REQ_set_pubkey = (int (*)(X509_REQ *, EVP_PKEY *)) d->cryptoLib->resolve("X509_REQ_set_pubkey");
+ K_RSA_generate_key = (RSA * (*)(int, unsigned long, void (*)(int, int, void *), void *)) d->cryptoLib->resolve("RSA_generate_key");
+ K_i2d_X509_REQ_fp = (int (*)(FILE *, X509_REQ *)) d->cryptoLib->resolve("i2d_X509_REQ_fp");
+@@ -933,6 +977,17 @@
+ }
}
- KOpenSSLProxy::~KOpenSSLProxy()
- {
-- if (d->sslLib) {
-- d->sslLib->unload();
-- }
-- if (d->cryptoLib) {
-- d->cryptoLib->unload();
-- }
--
- KOpenSSLProxyPrivate::sSelf = nullptr;
- delete d;
- }
-@@ -706,1293 +144,771 @@ KOpenSSLProxy *KOpenSSLProxy::self()
-
- int KOpenSSLProxy::SSL_connect(SSL *ssl)
- {
-- if (K_SSL_connect) {
-- return (K_SSL_connect)(ssl);
-- }
-- return -1;
-+ return ::SSL_connect(ssl);
- }
-
- int KOpenSSLProxy::SSL_accept(SSL *ssl)
- {
-- if (K_SSL_accept) {
-- return (K_SSL_accept)(ssl);
-- }
-- return -1;
-+ return ::SSL_accept(ssl);
- }
-
- int KOpenSSLProxy::SSL_read(SSL *ssl, void *buf, int num)
- {
-- if (K_SSL_read) {
-- return (K_SSL_read)(ssl, buf, num);
-- }
-- return -1;
-+ return ::SSL_read(ssl, buf, num);
- }
-
- int KOpenSSLProxy::SSL_write(SSL *ssl, const void *buf, int num)
- {
-- if (K_SSL_write) {
-- return (K_SSL_write)(ssl, buf, num);
-- }
-- return -1;
-+ return ::SSL_write(ssl, buf, num);
- }
-
- SSL *KOpenSSLProxy::SSL_new(SSL_CTX *ctx)
- {
-- if (K_SSL_new) {
-- return (K_SSL_new)(ctx);
-- }
-- return nullptr;
-+ return ::SSL_new(ctx);
- }
-
- void KOpenSSLProxy::SSL_free(SSL *ssl)
- {
-- if (K_SSL_free) {
-- (K_SSL_free)(ssl);
-- }
-+ return ::SSL_free(ssl);
- }
-
- int KOpenSSLProxy::SSL_shutdown(SSL *ssl)
- {
-- if (K_SSL_shutdown) {
-- return (K_SSL_shutdown)(ssl);
-- }
-- return -1;
-+ return ::SSL_shutdown(ssl);
- }
-
--SSL_CTX *KOpenSSLProxy::SSL_CTX_new(SSL_METHOD *method)
-+SSL_CTX *KOpenSSLProxy::SSL_CTX_new(const SSL_METHOD *method)
- {
-- if (K_SSL_CTX_new) {
-- return (K_SSL_CTX_new)(method);
-- }
-- return nullptr;
-+ return ::SSL_CTX_new(method);
- }
-
- void KOpenSSLProxy::SSL_CTX_free(SSL_CTX *ctx)
- {
-- if (K_SSL_CTX_free) {
-- (K_SSL_CTX_free)(ctx);
-- }
-+ return ::SSL_CTX_free(ctx);
- }
-
- int KOpenSSLProxy::SSL_set_fd(SSL *ssl, int fd)
- {
-- if (K_SSL_set_fd) {
-- return (K_SSL_set_fd)(ssl, fd);
-- }
-- return -1;
-+ return ::SSL_set_fd(ssl, fd);
- }
-
- int KOpenSSLProxy::SSL_pending(SSL *ssl)
- {
-- if (K_SSL_pending) {
-- return (K_SSL_pending)(ssl);
-- }
-- return -1;
-+ return ::SSL_pending(ssl);
- }
-
- int KOpenSSLProxy::SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)
- {
-- if (K_SSL_CTX_set_cipher_list) {
-- return (K_SSL_CTX_set_cipher_list)(ctx, str);
-- }
-- return -1;
-+ return ::SSL_CTX_set_cipher_list(ctx, str);
- }
-
- void KOpenSSLProxy::SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
- int (*verify_callback)(int, X509_STORE_CTX *))
- {
-- if (K_SSL_CTX_set_verify) {
-- (K_SSL_CTX_set_verify)(ctx, mode, verify_callback);
-- }
-+ ::SSL_CTX_set_verify(ctx, mode, verify_callback);
- }
-
- int KOpenSSLProxy::SSL_use_certificate(SSL *ssl, X509 *x)
- {
-- if (K_SSL_use_certificate) {
-- return (K_SSL_use_certificate)(ssl, x);
-- }
-- return -1;
-+ return ::SSL_use_certificate(ssl, x);
- }
-
--SSL_CIPHER *KOpenSSLProxy::SSL_get_current_cipher(SSL *ssl)
-+const SSL_CIPHER *KOpenSSLProxy::SSL_get_current_cipher(SSL *ssl)
- {
-- if (K_SSL_get_current_cipher) {
-- return (K_SSL_get_current_cipher)(ssl);
-- }
-- return nullptr;
-+ return ::SSL_get_current_cipher(ssl);
- }
-
- long KOpenSSLProxy::SSL_ctrl(SSL *ssl, int cmd, long larg, char *parg)
- {
-- if (K_SSL_ctrl) {
-- return (K_SSL_ctrl)(ssl, cmd, larg, parg);
-- }
-- return -1;
-+ return ::SSL_ctrl(ssl, cmd, larg, parg);
- }
-
- int KOpenSSLProxy::RAND_egd(const char *path)
- {
-- if (K_RAND_egd) {
-- return (K_RAND_egd)(path);
-- }
-- return -1;
-+#ifndef OPENSSL_NO_EGD
-+ return ::RAND_egd(path);
++void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *))
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ X509_STORE_set_verify_cb_func(store, verify_cb);
++#else
++ if (K_X509_STORE_set_verify_cb) {
++ (K_X509_STORE_set_verify_cb)(store, verify_cb);
++ }
+#endif
-+ return 0;
- }
-
--SSL_METHOD *KOpenSSLProxy::TLSv1_client_method()
-+const SSL_METHOD *KOpenSSLProxy::TLSv1_client_method()
- {
-- if (K_TLSv1_client_method) {
-- return (K_TLSv1_client_method)();
-- }
-- return nullptr;
-+ return ::TLSv1_client_method();
- }
-
--SSL_METHOD *KOpenSSLProxy::SSLv23_client_method()
-+const SSL_METHOD *KOpenSSLProxy::SSLv23_client_method()
- {
-- if (K_SSLv23_client_method) {
-- return (K_SSLv23_client_method)();
-- }
-- return nullptr;
-+ return ::SSLv23_client_method();
- }
-
- X509 *KOpenSSLProxy::SSL_get_peer_certificate(SSL *s)
- {
-- if (K_SSL_get_peer_certificate) {
-- return (K_SSL_get_peer_certificate)(s);
-- }
-- return nullptr;
-+ return ::SSL_get_peer_certificate(s);
- }
-
- int KOpenSSLProxy::SSL_CIPHER_get_bits(SSL_CIPHER *c, int *alg_bits)
- {
-- if (K_SSL_CIPHER_get_bits) {
-- return (K_SSL_CIPHER_get_bits)(c, alg_bits);
-- }
-- return -1;
-+ return ::SSL_CIPHER_get_bits(c, alg_bits);
- }
-
--char *KOpenSSLProxy::SSL_CIPHER_get_version(SSL_CIPHER *c)
-+const char *KOpenSSLProxy::SSL_CIPHER_get_version(SSL_CIPHER *c)
- {
-- if (K_SSL_CIPHER_get_version) {
-- return (K_SSL_CIPHER_get_version)(c);
-- }
-- return nullptr;
-+ return ::SSL_CIPHER_get_version(c);
- }
-
- const char *KOpenSSLProxy::SSL_CIPHER_get_name(SSL_CIPHER *c)
- {
-- if (K_SSL_CIPHER_get_name) {
-- return (K_SSL_CIPHER_get_name)(c);
-- }
-- return nullptr;
-+ return ::SSL_CIPHER_get_name(c);
- }
-
- char *KOpenSSLProxy::SSL_CIPHER_description(SSL_CIPHER *c, char *buf, int size)
- {
-- if (K_SSL_CIPHER_description) {
-- return (K_SSL_CIPHER_description)(c, buf, size);
-- }
-- return nullptr;
-+ return ::SSL_CIPHER_description(c, buf, size);
- }
-
--X509 *KOpenSSLProxy::d2i_X509(X509 **a, unsigned char **pp, long length)
-+X509 *KOpenSSLProxy::d2i_X509(X509 **a, const unsigned char **pp, long length)
- {
-- if (K_d2i_X509) {
-- return (K_d2i_X509)(a, pp, length);
-- }
-- return nullptr;
-+ return ::d2i_X509(a, pp, length);
- }
-
- int KOpenSSLProxy::i2d_X509(X509 *a, unsigned char **pp)
- {
-- if (K_i2d_X509) {
-- return (K_i2d_X509)(a, pp);
-- }
-- return -1;
-+ return ::i2d_X509(a, pp);
- }
-
- int KOpenSSLProxy::X509_cmp(X509 *a, X509 *b)
- {
-- if (K_X509_cmp) {
-- return (K_X509_cmp)(a, b);
-- }
-- return 0;
-+ return ::X509_cmp(a, b);
- }
-
- X509_STORE *KOpenSSLProxy::X509_STORE_new(void)
- {
-- if (K_X509_STORE_new) {
-- return (K_X509_STORE_new)();
-- }
-- return nullptr;
-+ return ::X509_STORE_new();
- }
-
- void KOpenSSLProxy::X509_STORE_free(X509_STORE *v)
- {
-- if (K_X509_STORE_free) {
-- (K_X509_STORE_free)(v);
-- }
-+ ::X509_STORE_free(v);
- }
-
++}
++
X509_STORE_CTX *KOpenSSLProxy::X509_STORE_CTX_new(void)
{
-- if (K_X509_STORE_CTX_new) {
-- return (K_X509_STORE_CTX_new)();
-- }
-- return nullptr;
-+ return ::X509_STORE_CTX_new();
+ if (K_X509_STORE_CTX_new) {
+@@ -987,6 +1042,22 @@
+ return nullptr;
}
- void KOpenSSLProxy::X509_STORE_CTX_free(X509_STORE_CTX *ctx)
- {
-- if (K_X509_STORE_CTX_free) {
-- (K_X509_STORE_CTX_free)(ctx);
-- }
-+ ::X509_STORE_CTX_free(ctx);
- }
-
- int KOpenSSLProxy::X509_verify_cert(X509_STORE_CTX *ctx)
- {
-- if (K_X509_verify_cert) {
-- return (K_X509_verify_cert)(ctx);
-- }
-- return -1;
-+ return ::X509_verify_cert(ctx);
- }
-
- void KOpenSSLProxy::X509_free(X509 *a)
- {
-- if (K_X509_free) {
-- (K_X509_free)(a);
-- }
-+ ::X509_free(a);
- }
-
- char *KOpenSSLProxy::X509_NAME_oneline(X509_NAME *a, char *buf, int size)
- {
-- if (K_X509_NAME_oneline) {
-- return (K_X509_NAME_oneline)(a, buf, size);
-- }
-- return nullptr;
-+ return ::X509_NAME_oneline(a, buf, size);
- }
-
- X509_NAME *KOpenSSLProxy::X509_get_subject_name(X509 *a)
- {
-- if (K_X509_get_subject_name) {
-- return (K_X509_get_subject_name)(a);
-- }
-- return nullptr;
-+ return ::X509_get_subject_name(a);
- }
-
- X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a)
- {
-- if (K_X509_get_issuer_name) {
-- return (K_X509_get_issuer_name)(a);
-- }
-- return nullptr;
-+ return ::X509_get_issuer_name(a);
- }
-
++void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ if (psig) {
++ *psig = x->signature;
++ }
++ if (algor) {
++ *algor = x->sig_alg;
++ }
++#else
++ if (K_X509_get0_signature) {
++ return (K_X509_get0_signature)(psig, algor, x);
++ }
++#endif
++}
++
X509_LOOKUP *KOpenSSLProxy::X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m)
{
-- if (K_X509_STORE_add_lookup) {
-- return (K_X509_STORE_add_lookup)(v, m);
-- }
-- return nullptr;
-+ return ::X509_STORE_add_lookup(v, m);
+ if (K_X509_STORE_add_lookup) {
+@@ -1025,12 +1096,21 @@
+ }
}
- X509_LOOKUP_METHOD *KOpenSSLProxy::X509_LOOKUP_file(void)
- {
-- if (K_X509_LOOKUP_file) {
-- return (K_X509_LOOKUP_file)();
-- }
-- return nullptr;
-+ return ::X509_LOOKUP_file();
- }
-
- void KOpenSSLProxy::X509_LOOKUP_free(X509_LOOKUP *x)
- {
-- if (K_X509_LOOKUP_free) {
-- (K_X509_LOOKUP_free)(x);
-- }
-+ ::X509_LOOKUP_free(x);
- }
-
- int KOpenSSLProxy::X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret)
- {
-- if (K_X509_LOOKUP_ctrl) {
-- return (K_X509_LOOKUP_ctrl)(ctx, cmd, argc, argl, ret);
-- }
-- return -1;
-+ return ::X509_LOOKUP_ctrl(ctx, cmd, argc, argl, ret);
- }
-
- void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509, STACK_OF(X509) *chain)
- {
-- if (K_X509_STORE_CTX_init) {
-- (K_X509_STORE_CTX_init)(ctx, store, x509, chain);
-- }
-+ ::X509_STORE_CTX_init(ctx, store, x509, chain);
- }
-
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
void KOpenSSLProxy::CRYPTO_free(void *x)
{
-- if (K_CRYPTO_free) {
-- (K_CRYPTO_free)(x);
-- }
-+ ::CRYPTO_free(x, OPENSSL_FILE, OPENSSL_LINE);
+ if (K_CRYPTO_free) {
+ (K_CRYPTO_free)(x);
+ }
}
++#else
++void KOpenSSLProxy::CRYPTO_free(void *x, const char *file, int line)
++{
++ if (K_CRYPTO_free) {
++ K_CRYPTO_free(x, file, line);
++ }
++}
++#endif
X509 *KOpenSSLProxy::X509_dup(X509 *x509)
{
-- if (K_X509_dup) {
-- return (K_X509_dup)(x509);
-- }
-- return nullptr;
-+ return ::X509_dup(x509);
+@@ -1040,6 +1120,32 @@
+ return nullptr;
}
++ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return X509_get_notBefore(x);
++#else
++ if (K_X509_getm_notBefore) {
++ return (K_X509_getm_notBefore)(x);
++ } else {
++ return nullptr;
++ }
++#endif
++}
++
++ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return X509_get_notAfter(x);
++#else
++ if (K_X509_getm_notAfter) {
++ return (K_X509_getm_notAfter)(x);
++ } else {
++ return nullptr;
++ }
++#endif
++}
++
BIO *KOpenSSLProxy::BIO_new(BIO_METHOD *type)
{
-- if (K_BIO_new) {
-- return (K_BIO_new)(type);
-- } else {
-- return nullptr;
-- }
-+ return ::BIO_new(type);
+ if (K_BIO_new) {
+@@ -1257,35 +1363,35 @@
+ }
}
--BIO_METHOD *KOpenSSLProxy::BIO_s_mem(void)
-+const BIO_METHOD *KOpenSSLProxy::BIO_s_mem(void)
+-void KOpenSSLProxy::sk_free(STACK *s)
++void KOpenSSLProxy::OPENSSL_sk_free(STACK *s)
{
-- if (K_BIO_s_mem) {
-- return (K_BIO_s_mem)();
-- } else {
-- return nullptr;
-- }
-+ return ::BIO_s_mem();
- }
-
- BIO *KOpenSSLProxy::BIO_new_fp(FILE *stream, int close_flag)
- {
-- if (K_BIO_new_fp) {
-- return (K_BIO_new_fp)(stream, close_flag);
-- }
-- return nullptr;
-+ return ::BIO_new_fp(stream, close_flag);
- }
-
- BIO *KOpenSSLProxy::BIO_new_mem_buf(void *buf, int len)
- {
-- if (K_BIO_new_mem_buf) {
-- return (K_BIO_new_mem_buf)(buf, len);
-- } else {
-- return nullptr;
-- }
-+ return ::BIO_new_mem_buf(buf, len);
- }
-
- int KOpenSSLProxy::BIO_free(BIO *a)
- {
-- if (K_BIO_free) {
-- return (K_BIO_free)(a);
-- }
-- return -1;
-+ return ::BIO_free(a);
- }
-
- long KOpenSSLProxy::BIO_ctrl(BIO *bp, int cmd, long larg, void *parg)
- {
-- if (K_BIO_ctrl) {
-- return (K_BIO_ctrl)(bp, cmd, larg, parg);
-- } else {
-- return 0; // failure return for BIO_ctrl is quite individual, maybe we should abort() instead
-- }
-+ return ::BIO_ctrl(bp, cmd, larg, parg);
- }
-
- int KOpenSSLProxy::BIO_write(BIO *b, const void *data, int len)
- {
-- if (K_BIO_write) {
-- return (K_BIO_write)(b, data, len);
-- } else {
-- return -1;
-- }
-+ return ::BIO_write(b, data, len);
- }
-
- int KOpenSSLProxy::PEM_write_bio_X509(BIO *bp, X509 *x)
- {
-- if (K_PEM_ASN1_write_bio) {
-- return (K_PEM_ASN1_write_bio)((int (*)())K_i2d_X509, PEM_STRING_X509, bp, (char *)x, nullptr, nullptr, 0, nullptr, nullptr);
-- } else {
-- return -1;
-- }
--}
--
--int KOpenSSLProxy::ASN1_item_i2d_fp(FILE *out, unsigned char *x)
--{
-- if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) {
-- return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-- } else {
-- return -1;
-- }
-+ return ::PEM_ASN1_write_bio(reinterpret_cast<i2d_of_void*>(::i2d_X509), PEM_STRING_X509, bp, (char *)x, nullptr, nullptr, 0, nullptr, nullptr);
- }
-
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x)
- {
-- if (K_X509_print_fp) {
-- return (K_X509_print_fp)(fp, x);
-- }
-- return -1;
-+ return ::X509_print_fp(fp, x);
- }
-
- PKCS12 *KOpenSSLProxy::d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
- {
-- if (K_d2i_PKCS12_fp) {
-- return (K_d2i_PKCS12_fp)(fp, p12);
-- } else {
-- return nullptr;
-- }
-+ return ::d2i_PKCS12_fp(fp, p12);
- }
-
- int KOpenSSLProxy::PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass)
- {
-- if (K_PKCS12_newpass) {
-- return (K_PKCS12_newpass)(p12, oldpass, newpass);
-- } else {
-- return -1;
-- }
-+ return ::PKCS12_newpass(p12, oldpass, newpass);
- }
-
- int KOpenSSLProxy::i2d_PKCS12(PKCS12 *p12, unsigned char **p)
- {
-- if (K_i2d_PKCS12) {
-- return (K_i2d_PKCS12)(p12, p);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PKCS12(p12, p);
- }
-
- int KOpenSSLProxy::i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
- {
-- if (K_i2d_PKCS12_fp) {
-- return (K_i2d_PKCS12_fp)(fp, p12);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PKCS12_fp(fp, p12);
- }
-
- PKCS12 *KOpenSSLProxy::PKCS12_new(void)
- {
-- if (K_PKCS12_new) {
-- return (K_PKCS12_new)();
-- } else {
-- return nullptr;
-- }
-+ return ::PKCS12_new();
- }
-
- void KOpenSSLProxy::PKCS12_free(PKCS12 *a)
- {
-- if (K_PKCS12_free) {
-- (K_PKCS12_free)(a);
-- }
-+ ::PKCS12_free(a);
- }
-
- int KOpenSSLProxy::PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey,
- X509 **cert, STACK_OF(X509) **ca)
- {
-- if (K_PKCS12_parse) {
-- return (K_PKCS12_parse)(p12, pass, pkey, cert, ca);
-- } else {
-- return -1;
-- }
-+ return ::PKCS12_parse(p12, pass, pkey, cert, ca);
- }
-
- void KOpenSSLProxy::EVP_PKEY_free(EVP_PKEY *x)
- {
-- if (K_EVP_PKEY_free) {
-- (K_EVP_PKEY_free)(x);
-- }
-+ ::EVP_PKEY_free(x);
- }
-
- EVP_PKEY *KOpenSSLProxy::EVP_PKEY_new()
- {
-- if (K_EVP_PKEY_new) {
-- return (K_EVP_PKEY_new)();
-- } else {
-- return nullptr;
-- }
-+ return ::EVP_PKEY_new();
- }
-
- void KOpenSSLProxy::X509_REQ_free(X509_REQ *x)
- {
-- if (K_X509_REQ_free) {
-- (K_X509_REQ_free)(x);
-- }
-+ ::X509_REQ_free(x);
- }
-
- X509_REQ *KOpenSSLProxy::X509_REQ_new()
- {
-- if (K_X509_REQ_new) {
-- return (K_X509_REQ_new)();
-- } else {
-- return nullptr;
-- }
-+ return ::X509_REQ_new();
- }
-
- int KOpenSSLProxy::SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey)
- {
-- if (K_SSL_CTX_use_PrivateKey) {
-- return (K_SSL_CTX_use_PrivateKey)(ctx, pkey);
-- } else {
-- return -1;
-- }
-+ return ::SSL_CTX_use_PrivateKey(ctx, pkey);
- }
-
- int KOpenSSLProxy::SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x)
- {
-- if (K_SSL_CTX_use_certificate) {
-- return (K_SSL_CTX_use_certificate)(ctx, x);
-- } else {
-- return -1;
-- }
-+ return ::SSL_CTX_use_certificate(ctx, x);
- }
-
- int KOpenSSLProxy::SSL_get_error(SSL *ssl, int rc)
- {
-- if (K_SSL_get_error) {
-- return (K_SSL_get_error)(ssl, rc);
-- } else {
-- return -1;
-- }
-+ return ::SSL_get_error(ssl, rc);
- }
-
- STACK_OF(X509) *KOpenSSLProxy::SSL_get_peer_cert_chain(SSL *s)
- {
-- if (K_SSL_get_peer_cert_chain) {
-- return (K_SSL_get_peer_cert_chain)(s);
-- } else {
-- return nullptr;
-- }
-+ return ::SSL_get_peer_cert_chain(s);
- }
-
- void KOpenSSLProxy::sk_free(STACK *s)
- {
- if (K_sk_free) {
- (K_sk_free)(s);
-- }
-+ ::OPENSSL_sk_free(s);
++ if (K_OPENSSL_sk_free) {
++ (K_OPENSSL_sk_free)(s);
+ }
}
- int KOpenSSLProxy::sk_num(STACK *s)
+-int KOpenSSLProxy::sk_num(STACK *s)
++int KOpenSSLProxy::OPENSSL_sk_num(STACK *s)
{
- if (K_sk_num) {
- return (K_sk_num)(s);
-- } else {
-- return -1;
-- }
-+ return ::OPENSSL_sk_num(s);
++ if (K_OPENSSL_sk_num) {
++ return (K_OPENSSL_sk_num)(s);
+ } else {
+ return -1;
+ }
}
- char *KOpenSSLProxy::sk_pop(STACK *s)
+-char *KOpenSSLProxy::sk_pop(STACK *s)
++char *KOpenSSLProxy::OPENSSL_sk_pop(STACK *s)
{
- if (K_sk_pop) {
- return (K_sk_pop)(s);
-- } else {
-- return nullptr;
-- }
-+ return static_cast<char*>(::OPENSSL_sk_pop(s));
++ if (K_OPENSSL_sk_pop) {
++ return (K_OPENSSL_sk_pop)(s);
+ } else {
+ return nullptr;
+ }
}
- char *KOpenSSLProxy::sk_value(STACK *s, int n)
+-char *KOpenSSLProxy::sk_value(STACK *s, int n)
++char *KOpenSSLProxy::OPENSSL_sk_value(STACK *s, int n)
{
- if (K_sk_value) {
- return (K_sk_value)(s, n);
-- } else {
-- return nullptr;
-- }
-+ return static_cast<char*>(::sk_value(s, n));
++ if (K_OPENSSL_sk_value) {
++ return (K_OPENSSL_sk_value)(s, n);
+ } else {
+ return nullptr;
+ }
+@@ -1305,28 +1411,65 @@
+ }
}
- void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x)
+-STACK *KOpenSSLProxy::sk_dup(STACK *s)
++X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return v->current_cert;
++#else
++ if (K_X509_STORE_CTX_get_current_cert) {
++ return (K_X509_STORE_CTX_get_current_cert)(v);
++ } else {
++ return nullptr;
++ }
++#endif
++}
++
++void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ v->error = error;
++#else
++ if (K_X509_STORE_CTX_set_error) {
++ (K_X509_STORE_CTX_set_error)(v, error);
++ }
++#endif
++}
++
++int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return v->error;
++#else
++ if (K_X509_STORE_CTX_get_error) {
++ return (K_X509_STORE_CTX_get_error)(v);
++ } else {
++ return 0;
++ }
++#endif
++}
++
++STACK *KOpenSSLProxy::OPENSSL_sk_dup(STACK *s)
{
-- if (K_X509_STORE_CTX_set_chain) {
-- (K_X509_STORE_CTX_set_chain)(v, x);
-- }
-+ ::X509_STORE_CTX_set_chain(v, x);
- }
-
- void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose)
- {
-- if (K_X509_STORE_CTX_set_purpose) {
-- (K_X509_STORE_CTX_set_purpose)(v, purpose);
-- }
-+ ::X509_STORE_CTX_set_purpose(v, purpose);
- }
-
- STACK *KOpenSSLProxy::sk_dup(STACK *s)
- {
- if (K_sk_dup) {
- return (K_sk_dup)(s);
-- } else {
-- return nullptr;
-- }
-+ return ::sk_dup(s);
++ if (K_OPENSSL_sk_dup) {
++ return (K_OPENSSL_sk_dup)(s);
+ } else {
+ return nullptr;
+ }
}
-STACK *KOpenSSLProxy::sk_new(int (*cmp)())
-+STACK *KOpenSSLProxy::sk_new(OPENSSL_sk_compfunc cmp)
++STACK *KOpenSSLProxy::OPENSSL_sk_new(int (*cmp)())
{
- if (K_sk_new) {
- return (K_sk_new)(cmp);
-- } else {
-- return nullptr;
-- }
-+ return ::sk_new(cmp);
++ if (K_OPENSSL_sk_new) {
++ return (K_OPENSSL_sk_new)(cmp);
+ } else {
+ return nullptr;
+ }
}
- int KOpenSSLProxy::sk_push(STACK *s, char *d)
+-int KOpenSSLProxy::sk_push(STACK *s, char *d)
++int KOpenSSLProxy::OPENSSL_sk_push(STACK *s, char *d)
{
- if (K_sk_push) {
- return (K_sk_push)(s, d);
-- } else {
-- return -1;
-- }
-+ return ::sk_push(s, d);
++ if (K_OPENSSL_sk_push) {
++ return (K_OPENSSL_sk_push)(s, d);
+ } else {
+ return -1;
+ }
+@@ -1749,6 +1892,99 @@
+ }
}
- char *KOpenSSLProxy::i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint)
- {
-- if (K_i2s_ASN1_INTEGER) {
-- return (K_i2s_ASN1_INTEGER)(meth, aint);
-- } else {
-- return nullptr;
-- }
-+ return ::i2s_ASN1_INTEGER(meth, aint);
- }
-
- ASN1_INTEGER *KOpenSSLProxy::X509_get_serialNumber(X509 *x)
- {
-- if (K_X509_get_serialNumber) {
-- return (K_X509_get_serialNumber)(x);
-- } else {
-- return nullptr;
-- }
-+ return ::X509_get_serialNumber(x);
- }
-
- EVP_PKEY *KOpenSSLProxy::X509_get_pubkey(X509 *x)
- {
-- if (K_X509_get_pubkey) {
-- return (K_X509_get_pubkey)(x);
-- } else {
-- return nullptr;
-- }
-+ return ::X509_get_pubkey(x);
- }
-
- int KOpenSSLProxy::i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
- {
-- if (K_i2d_PublicKey) {
-- return (K_i2d_PublicKey)(a, pp);
-- } else {
-- return 0;
-- }
-+ return ::i2d_PublicKey(a, pp);
- }
-
- int KOpenSSLProxy::X509_check_private_key(X509 *x, EVP_PKEY *p)
- {
-- if (K_X509_check_private_key) {
-- return (K_X509_check_private_key)(x, p);
-- }
-- return -1;
-+ return ::X509_check_private_key(x, p);
- }
-
- char *KOpenSSLProxy::BN_bn2hex(const BIGNUM *a)
- {
-- if (K_BN_bn2hex) {
-- return (K_BN_bn2hex)(a);
-- } else {
-- return nullptr;
-- }
-+ return ::BN_bn2hex(a);
- }
-
- int KOpenSSLProxy::X509_digest(const X509 *x, const EVP_MD *t, unsigned char *md, unsigned int *len)
- {
-- if (K_X509_digest) {
-- return (K_X509_digest)(x, t, md, len);
-- } else {
-- return -1;
-- }
-+ return ::X509_digest(x, t, md, len);
- }
-
--EVP_MD *KOpenSSLProxy::EVP_md5()
-+const EVP_MD *KOpenSSLProxy::EVP_md5()
- {
-- if (K_EVP_md5) {
-- return (K_EVP_md5)();
-- }
-- return nullptr;
-+ return ::EVP_md5();
- }
-
- void KOpenSSLProxy::ASN1_INTEGER_free(ASN1_INTEGER *a)
- {
-- if (K_ASN1_INTEGER_free) {
-- (K_ASN1_INTEGER_free)(a);
-- }
-+ ::ASN1_INTEGER_free(a);
- }
-
- int KOpenSSLProxy::OBJ_obj2nid(ASN1_OBJECT *o)
- {
-- if (K_OBJ_obj2nid) {
-- return (K_OBJ_obj2nid)(o);
-- } else {
-- return -1;
-- }
-+ return ::OBJ_obj2nid(o);
- }
-
- const char *KOpenSSLProxy::OBJ_nid2ln(int n)
- {
-- if (K_OBJ_nid2ln) {
-- return (K_OBJ_nid2ln)(n);
-- } else {
-- return nullptr;
-- }
-+ return ::OBJ_nid2ln(n);
- }
-
- int KOpenSSLProxy::X509_get_ext_count(X509 *x)
- {
-- if (K_X509_get_ext_count) {
-- return (K_X509_get_ext_count)(x);
-- } else {
-- return -1;
-- }
-+ return ::X509_get_ext_count(x);
- }
-
- int KOpenSSLProxy::X509_get_ext_by_NID(X509 *x, int nid, int lastpos)
- {
-- if (K_X509_get_ext_by_NID) {
-- return (K_X509_get_ext_by_NID)(x, nid, lastpos);
-- } else {
-- return -1;
-- }
-+ return ::X509_get_ext_by_NID(x, nid, lastpos);
- }
-
- int KOpenSSLProxy::X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos)
- {
-- if (K_X509_get_ext_by_OBJ) {
-- return (K_X509_get_ext_by_OBJ)(x, obj, lastpos);
-- } else {
-- return -1;
-- }
-+ return ::X509_get_ext_by_OBJ(x, obj, lastpos);
- }
-
- X509_EXTENSION *KOpenSSLProxy::X509_get_ext(X509 *x, int loc)
- {
-- if (K_X509_get_ext) {
-- return (K_X509_get_ext)(x, loc);
-- } else {
-- return nullptr;
-- }
-+ return ::X509_get_ext(x, loc);
- }
-
- X509_EXTENSION *KOpenSSLProxy::X509_delete_ext(X509 *x, int loc)
- {
-- if (K_X509_delete_ext) {
-- return (K_X509_delete_ext)(x, loc);
-- } else {
-- return nullptr;
-- }
-+ return ::X509_delete_ext(x, loc);
- }
-
- int KOpenSSLProxy::X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
- {
-- if (K_X509_add_ext) {
-- return (K_X509_add_ext)(x, ex, loc);
-- } else {
-- return -1;
-- }
-+ return ::X509_add_ext(x, ex, loc);
- }
-
- void *KOpenSSLProxy::X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)
- {
-- if (K_X509_get_ext_d2i) {
-- return (K_X509_get_ext_d2i)(x, nid, crit, idx);
-- } else {
-- return nullptr;
-- }
-+ return ::X509_get_ext_d2i(x, nid, crit, idx);
- }
-
- char *KOpenSSLProxy::i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5)
- {
-- if (K_i2s_ASN1_OCTET_STRING) {
-- return (K_i2s_ASN1_OCTET_STRING)(method, ia5);
-- } else {
-- return nullptr;
-- }
-+ return ::i2s_ASN1_OCTET_STRING(method, ia5);
- }
-
- int KOpenSSLProxy::ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
- {
-- if (K_ASN1_BIT_STRING_get_bit) {
-- return (K_ASN1_BIT_STRING_get_bit)(a, n);
-- } else {
-- return -1;
-- }
-+ return ::ASN1_BIT_STRING_get_bit(a, n);
- }
-
- PKCS7 *KOpenSSLProxy::PKCS7_new(void)
- {
-- if (K_PKCS7_new) {
-- return (K_PKCS7_new)();
-- } else {
-- return nullptr;
-- }
-+ return ::PKCS7_new();
- }
-
- void KOpenSSLProxy::PKCS7_free(PKCS7 *a)
- {
-- if (K_PKCS7_free) {
-- (K_PKCS7_free)(a);
-- }
-+ ::PKCS7_free(a);
- }
-
- void KOpenSSLProxy::PKCS7_content_free(PKCS7 *a)
- {
-- if (K_PKCS7_content_free) {
-- (K_PKCS7_content_free)(a);
-- }
-+ CRYPTO_free(a);
- }
-
- int KOpenSSLProxy::i2d_PKCS7(PKCS7 *a, unsigned char **pp)
- {
-- if (K_i2d_PKCS7) {
-- return (K_i2d_PKCS7)(a, pp);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PKCS7(a, pp);
- }
-
--PKCS7 *KOpenSSLProxy::d2i_PKCS7(PKCS7 **a, unsigned char **pp, long length)
-+PKCS7 *KOpenSSLProxy::d2i_PKCS7(PKCS7 **a, const unsigned char **pp, long length)
- {
-- if (K_d2i_PKCS7) {
-- return (K_d2i_PKCS7)(a, pp, length);
-- } else {
-- return nullptr;
-- }
-+ return ::d2i_PKCS7(a, pp, length);
- }
-
- int KOpenSSLProxy::i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
- {
-- if (K_i2d_PKCS7_fp) {
-- return (K_i2d_PKCS7_fp)(fp, p7);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PKCS7_fp(fp, p7);
- }
-
- PKCS7 *KOpenSSLProxy::d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
- {
-- if (K_d2i_PKCS7_fp) {
-- return (K_d2i_PKCS7_fp)(fp, p7);
-- } else {
-- return nullptr;
-- }
-+ return ::d2i_PKCS7_fp(fp, p7);
- }
-
- int KOpenSSLProxy::i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
- {
-- if (K_i2d_PKCS7_bio) {
-- return (K_i2d_PKCS7_bio)(bp, p7);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PKCS7_bio(bp, p7);
- }
-
- PKCS7 *KOpenSSLProxy::d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
- {
-- if (K_d2i_PKCS7_bio) {
-- return (K_d2i_PKCS7_bio)(bp, p7);
-- } else {
-- return nullptr;
-- }
-+ return ::d2i_PKCS7_bio(bp, p7);
- }
-
- PKCS7 *KOpenSSLProxy::PKCS7_dup(PKCS7 *p7)
- {
-- if (K_PKCS7_dup) {
-- return (K_PKCS7_dup)(p7);
-- } else {
-- return nullptr;
-- }
-+ return ::PKCS7_dup(p7);
- }
-
- PKCS7 *KOpenSSLProxy::PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
- BIO *data, int flags)
- {
-- if (K_PKCS7_sign) {
-- return (K_PKCS7_sign)(signcert, pkey, certs, data, flags);
-- } else {
-- return nullptr;
-- }
-+ return ::PKCS7_sign(signcert, pkey, certs, data, flags);
- }
-
- int KOpenSSLProxy::PKCS7_verify(PKCS7 *p, STACK_OF(X509)* st, X509_STORE *s, BIO *in, BIO *out, int flags)
- {
-- if (K_PKCS7_verify) {
-- return (K_PKCS7_verify)(p, st, s, in, out, flags);
-- } else {
-- return 0;
-- }
-+ return ::PKCS7_verify(p, st, s, in, out, flags);
- }
-
- STACK_OF(X509) *KOpenSSLProxy::PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags)
- {
-- if (K_PKCS7_get0_signers) {
-- return (K_PKCS7_get0_signers)(p7, certs, flags);
-- } else {
-- return nullptr;
-- }
-+ return ::PKCS7_get0_signers(p7, certs, flags);
- }
-
- PKCS7 *KOpenSSLProxy::PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher,
- int flags)
- {
-- if (K_PKCS7_encrypt) {
-- return (K_PKCS7_encrypt)(certs, in, cipher, flags);
-- } else {
-- return nullptr;
-- }
-+ return ::PKCS7_encrypt(certs, in, cipher, flags);
- }
-
- int KOpenSSLProxy::PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
- {
-- if (K_PKCS7_decrypt) {
-- return (K_PKCS7_decrypt)(p7, pkey, cert, data, flags);
-- } else {
-- return 0;
-- }
-+ return ::PKCS7_decrypt(p7, pkey, cert, data, flags);
- }
-
- STACK_OF(X509_NAME) *KOpenSSLProxy::SSL_load_client_CA_file(const char *file)
- {
-- if (K_SSL_load_client_CA_file) {
-- return (K_SSL_load_client_CA_file)(file);
-- } else {
-- return nullptr;
-- }
-+ return ::SSL_load_client_CA_file(file);
- }
-
- STACK_OF(X509_INFO) *KOpenSSLProxy::PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
- {
-- if (K_PEM_X509_INFO_read) {
-- return (K_PEM_X509_INFO_read)(fp, sk, cb, u);
-- } else {
-- return nullptr;
-- }
-+ return ::PEM_X509_INFO_read(fp, sk, cb, u);
- }
-
- X509 *KOpenSSLProxy::X509_d2i_fp(FILE *out, X509 **buf)
- {
-- if (K_ASN1_d2i_fp) {
-- return reinterpret_cast<X509 *>((K_ASN1_d2i_fp)(reinterpret_cast<char *(*)()>(K_X509_new), reinterpret_cast<char *(*)()>(K_d2i_X509), out, reinterpret_cast<unsigned char **>(buf)));
-- } else {
-- return nullptr;
-- }
-+ return reinterpret_cast<X509 *>(::ASN1_d2i_fp(reinterpret_cast<void *(*)()>(::X509_new), reinterpret_cast<d2i_of_void*>(::d2i_X509), out, reinterpret_cast<void **>(buf)));
- }
-
- int KOpenSSLProxy::SSL_peek(SSL *ssl, void *buf, int num)
- {
-- if (K_SSL_peek) {
-- return (K_SSL_peek)(ssl, buf, num);
-- } else {
-- return -1;
-- }
-+ return ::SSL_peek(ssl, buf, num);
- }
-
- const char *KOpenSSLProxy::RAND_file_name(char *buf, size_t num)
- {
-- if (K_RAND_file_name) {
-- return (K_RAND_file_name)(buf, num);
-- } else {
-- return nullptr;
-- }
-+ return ::RAND_file_name(buf, num);
- }
-
- int KOpenSSLProxy::RAND_load_file(const char *filename, long max_bytes)
- {
-- if (K_RAND_load_file) {
-- return (K_RAND_load_file)(filename, max_bytes);
-- } else {
-- return -1;
-- }
-+ return ::RAND_load_file(filename, max_bytes);
- }
-
- int KOpenSSLProxy::RAND_write_file(const char *filename)
- {
-- if (K_RAND_write_file) {
-- return (K_RAND_write_file)(filename);
-- } else {
-- return -1;
-- }
-+ return ::RAND_write_file(filename);
- }
-
- int KOpenSSLProxy::X509_PURPOSE_get_count()
- {
-- if (K_X509_PURPOSE_get_count) {
-- return (K_X509_PURPOSE_get_count)();
-- } else {
-- return -1;
-- }
-+ return ::X509_PURPOSE_get_count();
- }
-
- int KOpenSSLProxy::X509_PURPOSE_get_id(X509_PURPOSE *p)
- {
-- if (K_X509_PURPOSE_get_id) {
-- return (K_X509_PURPOSE_get_id)(p);
-- } else {
-- return -1;
-- }
-+ return ::X509_PURPOSE_get_id(p);
- }
-
- int KOpenSSLProxy::X509_check_purpose(X509 *x, int id, int ca)
- {
-- if (K_X509_check_purpose) {
-- return (K_X509_check_purpose)(x, id, ca);
-- } else {
-- return -1;
-- }
-+ return ::X509_check_purpose(x, id, ca);
- }
-
- X509_PURPOSE *KOpenSSLProxy::X509_PURPOSE_get0(int idx)
- {
-- if (K_X509_PURPOSE_get0) {
-- return (K_X509_PURPOSE_get0)(idx);
-- } else {
-- return nullptr;
-- }
-+ return ::X509_PURPOSE_get0(idx);
- }
-
- int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
- {
-- if (K_EVP_PKEY_assign) {
-- return (K_EVP_PKEY_assign)(pkey, type, key);
-- } else {
-- return -1;
-- }
-+ return ::EVP_PKEY_assign(pkey, type, key);
- }
-
++int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return pkey->type;
++#else
++ if (K_EVP_PKEY_base_id) {
++ return (K_EVP_PKEY_base_id)(pkey);
++ } else {
++ return 0;
++ }
++#endif
++}
++
++RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return pkey->pkey.rsa;
++#else
++ if (K_EVP_PKEY_get0_RSA) {
++ return (K_EVP_PKEY_get0_RSA)(pkey);
++ } else {
++ return nullptr;
++ }
++#endif
++}
++
++void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ if (n) {
++ *n = rsa->n;
++ }
++ if (e) {
++ *e = rsa->e;
++ }
++ if (d) {
++ *d = rsa->d;
++ }
++#else
++ if (K_RSA_get0_key) {
++ (K_RSA_get0_key)(rsa, n, e, d);
++ }
++#endif
++}
++
++DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ return pkey->pkey.dsa;
++#else
++ if (K_EVP_PKEY_get0_DSA) {
++ return (K_EVP_PKEY_get0_DSA)(pkey);
++ } else {
++ return nullptr;
++ }
++#endif
++}
++
++void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ if (p) {
++ *p = dsa->p;
++ }
++ if (q) {
++ *q = dsa->q;
++ }
++ if (g) {
++ *g = dsa->g;
++ }
++#else
++ if (K_DSA_get0_pqg) {
++ (K_DSA_get0_pqg)(dsa, p, q, g);
++ }
++#endif
++}
++
++void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
++{
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ if (pub_key) {
++ *pub_key = dsa->pub_key;
++ }
++ if (priv_key) {
++ *priv_key = dsa->priv_key;
++ }
++#else
++ if (K_DSA_get0_key) {
++ (K_DSA_get0_key)(dsa, pub_key, priv_key);
++ }
++#endif
++}
++
int KOpenSSLProxy::X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey)
{
-- if (K_X509_REQ_set_pubkey) {
-- return (K_X509_REQ_set_pubkey)(x, pkey);
-- } else {
-- return -1;
-- }
-+ return ::X509_REQ_set_pubkey(x, pkey);
- }
+ if (K_X509_REQ_set_pubkey) {
+diff --git a/src/kssl/kssl.cpp b/src/kssl/kssl.cpp
+--- a/src/kssl/kssl.cpp
++++ b/src/kssl/kssl.cpp
+@@ -46,8 +46,6 @@
+ #warning "kssl.cpp needs to be ported to QSslSocket"
+ #endif
- RSA *KOpenSSLProxy::RSA_generate_key(int bits, unsigned long e, void
- (*callback)(int, int, void *), void *cb_arg)
+-#define sk_dup d->kossl->sk_dup
+-
+ class KSSLPrivate
{
-- if (K_RSA_generate_key) {
-- return (K_RSA_generate_key)(bits, e, callback, cb_arg);
-- } else {
-- return nullptr;
-- }
-+ return ::RSA_generate_key(bits, e, callback, cb_arg);
+ public:
+@@ -210,5 +208,3 @@
+ return m_bSSLWorks;
}
- STACK *KOpenSSLProxy::X509_get1_email(X509 *x)
- {
-- if (K_X509_get1_email) {
-- return (K_X509_get1_email)(x);
-- } else {
-- return nullptr;
-- }
-+ return reinterpret_cast<STACK*>(::X509_get1_email(x));
- }
-
- void KOpenSSLProxy::X509_email_free(STACK *sk)
- {
-- if (K_X509_email_free) {
-- (K_X509_email_free)(sk);
-- }
-+ ::X509_email_free(reinterpret_cast<STACK_OF(OPENSSL_STRING)*>(sk));
- }
-
--EVP_CIPHER *KOpenSSLProxy::EVP_des_ede3_cbc()
-+const EVP_CIPHER *KOpenSSLProxy::EVP_des_ede3_cbc()
- {
-- if (K_EVP_des_ede3_cbc) {
-- return (K_EVP_des_ede3_cbc)();
-- } else {
-- return nullptr;
-- }
-+ return ::EVP_des_ede3_cbc();
- }
-
--EVP_CIPHER *KOpenSSLProxy::EVP_des_cbc()
-+const EVP_CIPHER *KOpenSSLProxy::EVP_des_cbc()
- {
-- if (K_EVP_des_cbc) {
-- return (K_EVP_des_cbc)();
-- } else {
-- return nullptr;
-- }
-+ return ::EVP_des_cbc();
- }
-
--EVP_CIPHER *KOpenSSLProxy::EVP_rc2_cbc()
-+const EVP_CIPHER *KOpenSSLProxy::EVP_rc2_cbc()
- {
-- if (K_EVP_rc2_cbc) {
-- return (K_EVP_rc2_cbc)();
-- } else {
-- return nullptr;
-- }
-+ return ::EVP_rc2_cbc();
- }
-
--EVP_CIPHER *KOpenSSLProxy::EVP_rc2_64_cbc()
-+const EVP_CIPHER *KOpenSSLProxy::EVP_rc2_64_cbc()
- {
-- if (K_EVP_rc2_64_cbc) {
-- return (K_EVP_rc2_64_cbc)();
-- } else {
-- return nullptr;
-- }
-+ return ::EVP_rc2_64_cbc();
- }
-
--EVP_CIPHER *KOpenSSLProxy::EVP_rc2_40_cbc()
-+const EVP_CIPHER *KOpenSSLProxy::EVP_rc2_40_cbc()
- {
-- if (K_EVP_rc2_40_cbc) {
-- return (K_EVP_rc2_40_cbc)();
-- } else {
-- return nullptr;
-- }
-+ return ::EVP_rc2_40_cbc();
- }
-
- int KOpenSSLProxy::i2d_X509_REQ_fp(FILE *fp, X509_REQ *x)
- {
-- if (K_i2d_X509_REQ_fp) {
-- return (K_i2d_X509_REQ_fp)(fp, x);
-- } else {
-- return -1;
-- }
-+ return ::i2d_X509_REQ_fp(fp, x);
- }
-
- void KOpenSSLProxy::ERR_clear_error()
- {
-- if (K_ERR_clear_error) {
-- (K_ERR_clear_error)();
-- }
-+ return ::ERR_clear_error();
- }
-
- unsigned long KOpenSSLProxy::ERR_get_error()
- {
-- if (K_ERR_get_error) {
-- return (K_ERR_get_error)();
-- } else {
-- return 0xffffffff;
-- }
-+ return ::ERR_get_error();
- }
-
- void KOpenSSLProxy::ERR_print_errors_fp(FILE *fp)
- {
-- if (K_ERR_print_errors_fp) {
-- (K_ERR_print_errors_fp)(fp);
-- }
-+ return ::ERR_print_errors_fp(fp);
- }
-
- SSL_SESSION *KOpenSSLProxy::SSL_get1_session(SSL *ssl)
- {
-- if (K_SSL_get1_session) {
-- return (K_SSL_get1_session)(ssl);
-- } else {
-- return nullptr;
-- }
-+ return ::SSL_get1_session(ssl);
- }
-
- void KOpenSSLProxy::SSL_SESSION_free(SSL_SESSION *session)
- {
-- if (K_SSL_SESSION_free) {
-- (K_SSL_SESSION_free)(session);
-- }
-+ return ::SSL_SESSION_free(session);
- }
-
- int KOpenSSLProxy::SSL_set_session(SSL *ssl, SSL_SESSION *session)
- {
-- if (K_SSL_set_session) {
-- return (K_SSL_set_session)(ssl, session);
-- } else {
-- return -1;
-- }
-+ return ::SSL_set_session(ssl, session);
- }
-
--SSL_SESSION *KOpenSSLProxy::d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, long length)
-+SSL_SESSION *KOpenSSLProxy::d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length)
- {
-- if (K_d2i_SSL_SESSION) {
-- return (K_d2i_SSL_SESSION)(a, pp, length);
-- } else {
-- return nullptr;
-- }
-+ return ::d2i_SSL_SESSION(a, pp, length);
- }
-
- int KOpenSSLProxy::i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
- {
-- if (K_i2d_SSL_SESSION) {
-- return (K_i2d_SSL_SESSION)(in, pp);
-- } else {
-- return -1;
-- }
-+ return ::i2d_SSL_SESSION(in, pp);
- }
-
- int KOpenSSLProxy::i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *p)
- {
-- if (K_i2d_PrivateKey_fp) {
-- return (K_i2d_PrivateKey_fp)(fp, p);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PrivateKey_fp(fp, p);
- }
-
- int KOpenSSLProxy::i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *p, const EVP_CIPHER *c, char *k, int klen, pem_password_cb *cb, void *u)
- {
-- if (K_i2d_PKCS8PrivateKey_fp) {
-- return (K_i2d_PKCS8PrivateKey_fp)(fp, p, c, k, klen, cb, u);
-- } else {
-- return -1;
-- }
-+ return ::i2d_PKCS8PrivateKey_fp(fp, p, c, k, klen, cb, u);
- }
-
- void KOpenSSLProxy::RSA_free(RSA *rsa)
- {
-- if (K_RSA_free) {
-- (K_RSA_free)(rsa);
-- }
-+ return ::RSA_free(rsa);
- }
-
--EVP_CIPHER *KOpenSSLProxy::EVP_bf_cbc()
-+const EVP_CIPHER *KOpenSSLProxy::EVP_bf_cbc()
- {
-- if (K_EVP_bf_cbc) {
-- return (K_EVP_bf_cbc)();
-- }
-- return nullptr;
-+ return ::EVP_bf_cbc();
- }
-
- int KOpenSSLProxy::X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
- {
-- if (K_X509_REQ_sign) {
-- return (K_X509_REQ_sign)(x, pkey, md);
-- }
-- return -1;
-+ return ::X509_REQ_sign(x, pkey, md);
- }
-
- int KOpenSSLProxy::X509_NAME_add_entry_by_txt(X509_NAME *name, char *field,
- int type, unsigned char *bytes, int len, int loc, int set)
- {
-- if (K_X509_NAME_add_entry_by_txt) {
-- return (K_X509_NAME_add_entry_by_txt)(name, field, type, bytes, len, loc, set);
-- }
-- return -1;
-+ return ::X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
- }
-
- X509_NAME *KOpenSSLProxy::X509_NAME_new()
- {
-- if (K_X509_NAME_new) {
-- return (K_X509_NAME_new)();
-- }
-- return nullptr;
-+ return ::X509_NAME_new();
- }
-
- int KOpenSSLProxy::X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name)
- {
-- if (K_X509_REQ_set_subject_name) {
-- return (K_X509_REQ_set_subject_name)(req, name);
-- }
-- return -1;
-+ return ::X509_REQ_set_subject_name(req, name);
- }
-
- unsigned char *KOpenSSLProxy::ASN1_STRING_data(ASN1_STRING *x)
- {
-- if (K_ASN1_STRING_data) {
-- return (K_ASN1_STRING_data)(x);
-- }
-- return nullptr;
-+ return ::ASN1_STRING_data(x);
- }
-
- int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x)
- {
-- if (K_ASN1_STRING_length) {
-- return (K_ASN1_STRING_length)(x);
-- }
-- return 0L;
-+ return ::ASN1_STRING_length(x);
- }
-
- STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL *ssl)
- {
-- if (K_SSL_get_ciphers) {
-- return (K_SSL_get_ciphers)(ssl);
-- }
-- return nullptr;
-+ return ::SSL_get_ciphers(ssl);
- }
-
- #endif
+-#undef sk_dup
-
---- kdelibs4support-5.32.0/src/kssl/kopenssl.h.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/kopenssl.h 2017-03-24 14:53:43.108091825 +0100
-@@ -131,7 +131,7 @@ public:
- /*
- * SSL_CTX_new - create a new SSL_CTX object as framework for TLS/SSL enabled functions
- */
-- SSL_CTX *SSL_CTX_new(SSL_METHOD *method);
-+ SSL_CTX *SSL_CTX_new(const SSL_METHOD *method);
-
- /*
- * SSL_CTX_free - free an allocated SSL_CTX object
-@@ -172,7 +172,7 @@ public:
- /*
- * SSL_get_current_cipher - get SSL_CIPHER of a connection
- */
-- SSL_CIPHER *SSL_get_current_cipher(SSL *ssl);
-+ const SSL_CIPHER *SSL_get_current_cipher(SSL *ssl);
-
- /*
- * SSL_set_options - manipulate SSL engine options
-@@ -209,12 +209,12 @@ public:
- /*
- * TLSv1_client_method - return a TLSv1 client method object
- */
-- SSL_METHOD *TLSv1_client_method();
-+ const SSL_METHOD *TLSv1_client_method();
-
- /*
- * SSLv23_client_method - return a SSLv23 client method object
- */
-- SSL_METHOD *SSLv23_client_method();
-+ const SSL_METHOD *SSLv23_client_method();
-
- /*
- * SSL_get_peer_certificate - return the peer's certificate
-@@ -234,7 +234,7 @@ public:
- /*
- * SSL_CIPHER_get_version - get the version of this cipher
- */
-- char *SSL_CIPHER_get_version(SSL_CIPHER *c);
-+ const char *SSL_CIPHER_get_version(SSL_CIPHER *c);
-
- /*
- * SSL_CIPHER_get_name - get the name of this cipher
-@@ -260,7 +260,7 @@ public:
- /*
- * d2i_X509 - Convert a text representation of X509 to an X509 object
- */
-- X509 *d2i_X509(X509 **a, unsigned char **pp, long length);
-+ X509 *d2i_X509(X509 **a, const unsigned char **pp, long length);
-
- /*
- * i2d_X509 - Convert an X509 object into a text representation
-@@ -370,7 +370,7 @@ public:
- /*
- * BIO methods - only one defined here yet
- */
-- BIO_METHOD *BIO_s_mem(void);
-+ const BIO_METHOD *BIO_s_mem(void);
-
- /*
- * BIO_new_fp - nastiness called BIO - used to create BIO* from FILE*
-@@ -403,11 +403,6 @@ public:
- int PEM_write_bio_X509(BIO *bp, X509 *x);
-
- /*
-- * ASN1_item_i2d_fp - used for netscape output
-- */
-- int ASN1_item_i2d_fp(FILE *out, unsigned char *x);
--
-- /*
- * ASN1_d2i_fp - read an X509 from a DER encoded file (buf can be NULL)
- */
- X509 *X509_d2i_fp(FILE *out, X509 **buf);
-@@ -495,7 +490,7 @@ public:
- /*
- * Create a new stack
- */
-- STACK *sk_new(int (*cmp)());
-+ STACK *sk_new(OPENSSL_sk_compfunc cmp);
-
- /*
- * Add an element to the stack
-@@ -552,7 +547,7 @@ public:
- /*
- * EVP_md5
- */
-- EVP_MD *EVP_md5();
-+ const EVP_MD *EVP_md5();
-
- /*
- * ASN1_INTEGER free
-@@ -647,7 +642,7 @@ public:
- /*
- *
- */
-- PKCS7 *d2i_PKCS7(PKCS7 **a, unsigned char **pp, long length);
-+ PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **pp, long length);
-
- /*
- *
-@@ -768,11 +763,11 @@ public:
- void X509_email_free(STACK *sk);
-
- /* Ciphers needed for SMime */
-- EVP_CIPHER *EVP_des_ede3_cbc();
-- EVP_CIPHER *EVP_des_cbc();
-- EVP_CIPHER *EVP_rc2_cbc();
-- EVP_CIPHER *EVP_rc2_64_cbc();
-- EVP_CIPHER *EVP_rc2_40_cbc();
-+ const EVP_CIPHER *EVP_des_ede3_cbc();
-+ const EVP_CIPHER *EVP_des_cbc();
-+ const EVP_CIPHER *EVP_rc2_cbc();
-+ const EVP_CIPHER *EVP_rc2_64_cbc();
-+ const EVP_CIPHER *EVP_rc2_40_cbc();
-
- /* clear the current error - use this often*/
- void ERR_clear_error();
-@@ -793,7 +788,7 @@ public:
- int SSL_set_session(SSL *ssl, SSL_SESSION *session);
-
- /* Decode ASN.1 to SSL_SESSION */
-- SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, long length);
-+ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length);
- /* Encode SSL_SESSION to ASN.1 */
- int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
-
-@@ -807,7 +802,7 @@ public:
- void RSA_free(RSA *);
-
- /* Get a blowfish CBC pointer */
-- EVP_CIPHER *EVP_bf_cbc();
-+ const EVP_CIPHER *EVP_bf_cbc();
-
- /* Sign a CSR */
- int X509_REQ_sign(X509_REQ *, EVP_PKEY *, const EVP_MD *);
---- kdelibs4support-5.32.0/src/kssl/ksslcallback.c.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/ksslcallback.c 2017-03-24 14:53:43.108091825 +0100
-@@ -39,7 +39,7 @@ extern "C" {
+diff --git a/src/kssl/ksslcallback.c b/src/kssl/ksslcallback.c
+--- a/src/kssl/ksslcallback.c
++++ b/src/kssl/ksslcallback.c
+@@ -39,7 +39,7 @@
// back will not be threadsafe ofcourse.
if (KSSL_X509CallBack_ca) {
- if (KOSSL::self()->X509_cmp(ctx->current_cert, KSSL_X509CallBack_ca) != 0) {
-+ if (KOSSL::self()->X509_cmp(X509_STORE_CTX_get0_cert(ctx), KSSL_X509CallBack_ca) != 0) {
++ if (KOSSL::self()->X509_cmp(KOSSL::self()->X509_STORE_CTX_get_current_cert(ctx), KSSL_X509CallBack_ca) != 0) {
return 1; // Ignore errors for this certificate
}
-@@ -47,7 +47,7 @@ extern "C" {
+@@ -47,7 +47,7 @@
}
if (!ok) {
- switch (ctx->error) {
-+ switch (X509_STORE_CTX_get_error(ctx)) {
++ switch (KOSSL::self()->X509_STORE_CTX_get_error(ctx)) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
case X509_V_ERR_UNABLE_TO_GET_CRL:
case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
---- kdelibs4support-5.32.0/src/kssl/ksslcertchain.cpp.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/ksslcertchain.cpp 2017-03-24 14:53:43.108091825 +0100
+diff --git a/src/kssl/ksslcertchain.cpp b/src/kssl/ksslcertchain.cpp
+--- a/src/kssl/ksslcertchain.cpp
++++ b/src/kssl/ksslcertchain.cpp
@@ -41,16 +41,6 @@
#include <kopenssl.h>
#include <QtCore/QStringList>
@@ -2290,122 +690,210 @@
class KSSLCertChainPrivate
{
public:
---- kdelibs4support-5.32.0/src/kssl/ksslcertificate.cpp.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/ksslcertificate.cpp 2017-03-24 14:59:42.598253378 +0100
-@@ -146,7 +146,7 @@ KSSLCertificate *KSSLCertificate::fromSt
+@@ -79,13 +69,13 @@
+ STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
+
+ for (;;) {
+- X509 *x5 = sk_X509_pop(x);
++ X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_pop(reinterpret_cast<STACK *>(x)));
+ if (!x5) {
+ break;
+ }
+ d->kossl->X509_free(x5);
+ }
+- sk_X509_free(x);
++ d->kossl->OPENSSL_sk_free(reinterpret_cast<STACK *>(x));
}
+ #endif
+ delete d;
+@@ -108,7 +98,7 @@
+ int KSSLCertChain::depth()
+ {
+ #if KSSL_HAVE_SSL
+- return sk_X509_num((STACK_OF(X509) *)_chain);
++ return d->kossl->OPENSSL_sk_num(static_cast<STACK *>(_chain));
+ #endif
+ return 0;
+ }
+@@ -127,8 +117,8 @@
+ #if KSSL_HAVE_SSL
+ STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
- QByteArray qba = QByteArray::fromBase64(cert);
-- unsigned char *qbap = reinterpret_cast<unsigned char *>(qba.data());
-+ const unsigned char *qbap = reinterpret_cast<unsigned char *>(qba.data());
- X509 *x5c = KOSSL::self()->d2i_X509(nullptr, &qbap, qba.size());
- if (!x5c) {
- return nullptr;
-@@ -168,7 +168,7 @@ QString KSSLCertificate::getSubject() co
- return rc;
+- for (int i = 0; i < sk_X509_num(x); i++) {
+- X509 *x5 = sk_X509_value(x, i);
++ for (int i = 0; i < d->kossl->OPENSSL_sk_num(reinterpret_cast<STACK *>(x)); i++) {
++ X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_value(reinterpret_cast<STACK *>(x), i));
+ if (!x5) {
+ continue;
+ }
+@@ -148,22 +138,22 @@
+ STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
+
+ for (;;) {
+- X509 *x5 = sk_X509_pop(x);
++ X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_pop(reinterpret_cast<STACK*>(x)));
+ if (!x5) {
+ break;
+ }
+ d->kossl->X509_free(x5);
+ }
+- sk_X509_free(x);
++ d->kossl->OPENSSL_sk_free(reinterpret_cast<STACK*>(x));
+ _chain = nullptr;
}
- rc = t;
-- d->kossl->OPENSSL_free(t);
-+ OPENSSL_free(t);
+
+ if (chain.isEmpty()) {
+ return;
+ }
+- _chain = (void *)sk_new(nullptr);
++ _chain = (void *)d->kossl->OPENSSL_sk_new(nullptr);
+ foreach (KSSLCertificate *x, chain) {
+- sk_X509_push((STACK_OF(X509) *)_chain, d->kossl->X509_dup(x->getCert()));
++ d->kossl->OPENSSL_sk_push(static_cast<STACK*>(_chain), d->kossl->X509_dup(x->getCert()));
+ }
+
#endif
- return rc;
+@@ -176,13 +166,13 @@
+ STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
+
+ for (;;) {
+- X509 *x5 = sk_X509_pop(x);
++ X509 *x5 = reinterpret_cast<X509 *>(d->kossl->OPENSSL_sk_pop(reinterpret_cast<STACK *>(x)));
+ if (!x5) {
+ break;
+ }
+ d->kossl->X509_free(x5);
+ }
+- sk_X509_free(x);
++ d->kossl->OPENSSL_sk_free(reinterpret_cast<STACK *>(x));
+ _chain = nullptr;
+ }
+
+@@ -190,15 +180,15 @@
+ return;
+ }
+
+- _chain = (void *)sk_new(nullptr);
++ _chain = (void *)d->kossl->OPENSSL_sk_new(nullptr);
+ STACK_OF(X509) *x = (STACK_OF(X509) *)stack_of_x509;
+
+- for (int i = 0; i < sk_X509_num(x); i++) {
+- X509 *x5 = sk_X509_value(x, i);
++ for (int i = 0; i < d->kossl->OPENSSL_sk_num(reinterpret_cast<STACK *>(x)); i++) {
++ X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_value(reinterpret_cast<STACK *>(x), i));
+ if (!x5) {
+ continue;
+ }
+- sk_X509_push((STACK_OF(X509) *)_chain, d->kossl->X509_dup(x5));
++ d->kossl->OPENSSL_sk_push(reinterpret_cast<STACK *>(_chain), d->kossl->X509_dup(x5));
+ }
+
+ #else
+@@ -217,14 +207,3 @@
+ }
+ setChain(cl);
}
-@@ -195,14 +195,26 @@ QString KSSLCertificate::getSignatureTex
+-
+-#if KSSL_HAVE_SSL
+-#undef sk_new
+-#undef sk_push
+-#undef sk_free
+-#undef sk_value
+-#undef sk_num
+-#undef sk_dup
+-#undef sk_pop
+-#endif
+-
+diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp
+--- a/src/kssl/ksslcertificate.cpp
++++ b/src/kssl/ksslcertificate.cpp
+@@ -195,14 +195,17 @@
char *s;
int n, i;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- i = d->kossl->OBJ_obj2nid(d->m_cert->sig_alg->algorithm);
-+#else
-+ i = X509_get_signature_nid(d->m_cert);
-+#endif
+- i = d->kossl->OBJ_obj2nid(d->m_cert->sig_alg->algorithm);
++ const X509_ALGOR *algor;
++ const ASN1_BIT_STRING *sig;
++ d->kossl->X509_get0_signature(&sig, &algor, d->m_cert);
++ i = d->kossl->OBJ_obj2nid(algor->algorithm);
rc = i18n("Signature Algorithm: ");
rc += (i == NID_undef) ? i18n("Unknown") : QString(d->kossl->OBJ_nid2ln(i));
--
+
rc += '\n';
-+
rc += i18n("Signature Contents:");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- n = d->m_cert->signature->length;
- s = (char *)d->m_cert->signature->data;
-+#else
-+ const ASN1_BIT_STRING *sig;
-+ const X509_ALGOR *alg;
-+ X509_get0_signature(&sig, &alg, d->m_cert);
+- n = d->m_cert->signature->length;
+- s = (char *)d->m_cert->signature->data;
+ n = sig->length;
-+ s = (char*)sig->data;
-+#endif
++ s = (char *)sig->data;
for (i = 0; i < n; ++i) {
if (i % 20 != 0) {
rc += ':';
-@@ -228,7 +240,7 @@ void KSSLCertificate::getEmails(QStringL
+@@ -227,9 +230,10 @@
+ }
STACK *s = d->kossl->X509_get1_email(d->m_cert);
++ const int size = d->kossl->OPENSSL_sk_num(s);
if (s) {
- for (int n = 0; n < s->num; n++) {
-+ for (int n = 0; n < OPENSSL_sk_num(s); n++) {
- to.append(d->kossl->sk_value(s, n));
+- to.append(d->kossl->sk_value(s, n));
++ for (int n = 0; n < size; n++) {
++ to.append(d->kossl->OPENSSL_sk_value(s, n));
}
d->kossl->X509_email_free(s);
-@@ -309,12 +321,12 @@ QString KSSLCertificate::getKeyType() co
+ }
+@@ -309,12 +313,12 @@
EVP_PKEY *pkey = d->kossl->X509_get_pubkey(d->m_cert);
if (pkey) {
#ifndef NO_RSA
- if (pkey->type == EVP_PKEY_RSA) {
-+ if (EVP_PKEY_id(pkey) == EVP_PKEY_RSA) {
++ if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA) {
rc = "RSA";
} else
#endif
#ifndef NO_DSA
- if (pkey->type == EVP_PKEY_DSA) {
-+ if (EVP_PKEY_id(pkey) == EVP_PKEY_DSA) {
++ if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_DSA) {
rc = "DSA";
} else
#endif
-@@ -336,8 +348,10 @@ QString KSSLCertificate::getPublicKeyTex
+@@ -336,8 +340,10 @@
if (pkey) {
rc = i18nc("Unknown", "Unknown key algorithm");
#ifndef NO_RSA
- if (pkey->type == EVP_PKEY_RSA) {
- x = d->kossl->BN_bn2hex(pkey->pkey.rsa->n);
-+ if (EVP_PKEY_id(pkey) == EVP_PKEY_RSA) {
-+ const BIGNUM *n, *e, *dd;
-+ RSA_get0_key(EVP_PKEY_get1_RSA(pkey), &n, &e, &dd);
++ if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA) {
++ const BIGNUM *n, *e;
++ d->kossl->RSA_get0_key(d->kossl->EVP_PKEY_get0_RSA(pkey), &n, &e, nullptr);
+ x = d->kossl->BN_bn2hex(n);
rc = i18n("Key type: RSA (%1 bit)", strlen(x) * 4) + '\n';
rc += i18n("Modulus: ");
-@@ -350,17 +364,19 @@ QString KSSLCertificate::getPublicKeyTex
- rc += x[i];
- }
+@@ -352,15 +358,18 @@
rc += '\n';
-- d->kossl->OPENSSL_free(x);
-+ OPENSSL_free(x);
+ d->kossl->OPENSSL_free(x);
- x = d->kossl->BN_bn2hex(pkey->pkey.rsa->e);
+ x = d->kossl->BN_bn2hex(e);
rc += i18n("Exponent: 0x") + QLatin1String(x) +
QLatin1String("\n");
-- d->kossl->OPENSSL_free(x);
-+ OPENSSL_free(x);
+ d->kossl->OPENSSL_free(x);
}
#endif
#ifndef NO_DSA
- if (pkey->type == EVP_PKEY_DSA) {
- x = d->kossl->BN_bn2hex(pkey->pkey.dsa->p);
-+ if (EVP_PKEY_id(pkey) == EVP_PKEY_DSA) {
++ if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_DSA) {
++ auto dsa = d->kossl->EVP_PKEY_get0_DSA(pkey);
+ const BIGNUM *p, *q, *g;
-+ DSA_get0_pqg(EVP_PKEY_get1_DSA(pkey), &p, &q, &g);
++ d->kossl->DSA_get0_pqg(dsa, &p, &q, &g);
+ x = d->kossl->BN_bn2hex(p);
// hack - this may not be always accurate
rc = i18n("Key type: DSA (%1 bit)", strlen(x) * 4) + '\n';
-@@ -374,9 +390,9 @@ QString KSSLCertificate::getPublicKeyTex
- rc += x[i];
- }
+@@ -376,7 +385,7 @@
rc += '\n';
-- d->kossl->OPENSSL_free(x);
-+ OPENSSL_free(x);
+ d->kossl->OPENSSL_free(x);
- x = d->kossl->BN_bn2hex(pkey->pkey.dsa->q);
+ x = d->kossl->BN_bn2hex(q);
@@ -2412,12 +900,9 @@
rc += i18n("160 bit prime factor: ");
for (unsigned int i = 0; i < strlen(x); i++) {
if (i % 40 != 0 && i % 2 == 0) {
-@@ -387,9 +403,9 @@ QString KSSLCertificate::getPublicKeyTex
- rc += x[i];
- }
+@@ -389,7 +398,7 @@
rc += '\n';
-- d->kossl->OPENSSL_free(x);
-+ OPENSSL_free(x);
+ d->kossl->OPENSSL_free(x);
- x = d->kossl->BN_bn2hex(pkey->pkey.dsa->g);
+ x = d->kossl->BN_bn2hex(g);
@@ -2424,111 +909,116 @@
rc += QString("g: ");
for (unsigned int i = 0; i < strlen(x); i++) {
if (i % 40 != 0 && i % 2 == 0) {
-@@ -400,9 +416,11 @@ QString KSSLCertificate::getPublicKeyTex
- rc += x[i];
- }
+@@ -402,7 +411,9 @@
rc += '\n';
-- d->kossl->OPENSSL_free(x);
-+ OPENSSL_free(x);
+ d->kossl->OPENSSL_free(x);
- x = d->kossl->BN_bn2hex(pkey->pkey.dsa->pub_key);
-+ const BIGNUM *pub, *priv;
-+ DSA_get0_key(EVP_PKEY_get1_DSA(pkey), &pub, &priv);
-+ x = d->kossl->BN_bn2hex(pub);
++ const BIGNUM *pub_key;
++ d->kossl->DSA_get0_key(dsa, &pub_key, nullptr);
++ x = d->kossl->BN_bn2hex(pub_key);
rc += i18n("Public key: ");
for (unsigned int i = 0; i < strlen(x); i++) {
if (i % 40 != 0 && i % 2 == 0) {
-@@ -413,7 +431,7 @@ QString KSSLCertificate::getPublicKeyTex
- rc += x[i];
- }
- rc += '\n';
-- d->kossl->OPENSSL_free(x);
-+ OPENSSL_free(x);
+@@ -692,7 +703,7 @@
+ return errors;
}
- #endif
- d->kossl->EVP_PKEY_free(pkey);
-@@ -435,7 +453,7 @@ QString KSSLCertificate::getIssuer() con
- }
- rc = t;
-- d->kossl->OPENSSL_free(t);
-+ OPENSSL_free(t);
- #endif
+- X509_STORE_set_verify_cb_func(certStore, X509Callback);
++ d->kossl->X509_STORE_set_verify_cb(certStore, X509Callback);
- return rc;
-@@ -733,9 +751,9 @@ KSSLCertificate::KSSLValidationList KSSL
+ certLookup = d->kossl->X509_STORE_add_lookup(certStore, d->kossl->X509_LOOKUP_file());
+ if (!certLookup) {
+@@ -733,9 +744,9 @@
KSSL_X509CallBack_ca = ca ? ca->d->m_cert : nullptr;
KSSL_X509CallBack_ca_found = false;
- certStoreCTX->error = X509_V_OK;
-+ X509_STORE_CTX_set_error(certStoreCTX, X509_V_OK);
++ d->kossl->X509_STORE_CTX_set_error(certStoreCTX, X509_V_OK);
rc = d->kossl->X509_verify_cert(certStoreCTX);
- int errcode = certStoreCTX->error;
-+ int errcode = X509_STORE_CTX_get_error(certStoreCTX);
++ int errcode = d->kossl->X509_STORE_CTX_get_error(certStoreCTX);
if (ca && !KSSL_X509CallBack_ca_found) {
ksslv = KSSLCertificate::Irrelevant;
} else {
-@@ -748,9 +766,9 @@ KSSLCertificate::KSSLValidationList KSSL
+@@ -748,9 +759,9 @@
d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX,
X509_PURPOSE_NS_SSL_SERVER);
- certStoreCTX->error = X509_V_OK;
-+ X509_STORE_CTX_set_error(certStoreCTX, X509_V_OK);
++ d->kossl->X509_STORE_CTX_set_error(certStoreCTX, X509_V_OK);
rc = d->kossl->X509_verify_cert(certStoreCTX);
- errcode = certStoreCTX->error;
-+ errcode = X509_STORE_CTX_get_error(certStoreCTX);
++ errcode = d->kossl->X509_STORE_CTX_get_error(certStoreCTX);
ksslv = processError(errcode);
}
d->kossl->X509_STORE_CTX_free(certStoreCTX);
-@@ -1210,7 +1228,7 @@ typedef struct NETSCAPE_X509_st {
+@@ -982,7 +993,7 @@
+ QString KSSLCertificate::getNotBefore() const
+ {
+ #if KSSL_HAVE_SSL
+- return ASN1_UTCTIME_QString(X509_get_notBefore(d->m_cert));
++ return ASN1_UTCTIME_QString(d->kossl->X509_getm_notBefore(d->m_cert));
+ #else
+ return QString();
+ #endif
+@@ -991,7 +1002,7 @@
+ QString KSSLCertificate::getNotAfter() const
+ {
+ #if KSSL_HAVE_SSL
+- return ASN1_UTCTIME_QString(X509_get_notAfter(d->m_cert));
++ return ASN1_UTCTIME_QString(d->kossl->X509_getm_notAfter(d->m_cert));
+ #else
+ return QString();
+ #endif
+@@ -1000,7 +1011,7 @@
+ QDateTime KSSLCertificate::getQDTNotBefore() const
+ {
+ #if KSSL_HAVE_SSL
+- return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), nullptr);
++ return ASN1_UTCTIME_QDateTime(d->kossl->X509_getm_notBefore(d->m_cert), nullptr);
+ #else
+ return QDateTime::currentDateTime();
+ #endif
+@@ -1009,7 +1020,7 @@
+ QDateTime KSSLCertificate::getQDTNotAfter() const
+ {
+ #if KSSL_HAVE_SSL
+- return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), nullptr);
++ return ASN1_UTCTIME_QDateTime(d->kossl->X509_getm_notAfter(d->m_cert), nullptr);
+ #else
+ return QDateTime::currentDateTime();
+ #endif
+@@ -1210,7 +1221,8 @@
QByteArray KSSLCertificate::toNetscape()
{
QByteArray qba;
-#if KSSL_HAVE_SSL
-+#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x1010000L
++ // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all
++#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L
NETSCAPE_X509 nx;
ASN1_OCTET_STRING hdr;
QTemporaryFile ktf;
-@@ -1263,7 +1281,7 @@ bool KSSLCertificate::setCert(const QStr
- #if KSSL_HAVE_SSL
- QByteArray qba, qbb = cert.toLocal8Bit();
- qba = QByteArray::fromBase64(qbb);
-- unsigned char *qbap = reinterpret_cast<unsigned char *>(qba.data());
-+ const unsigned char *qbap = reinterpret_cast<unsigned char *>(qba.data());
- X509 *x5c = KOSSL::self()->d2i_X509(nullptr, &qbap, qba.size());
- if (x5c) {
- setCert(x5c);
-@@ -1294,7 +1312,7 @@ QStringList KSSLCertificate::subjAltName
+@@ -1294,10 +1306,10 @@
return rc;
}
- int cnt = d->kossl->sk_GENERAL_NAME_num(names);
-+ int cnt = sk_GENERAL_NAME_num(names);
++ int cnt = d->kossl->OPENSSL_sk_num((STACK *)names);
for (int i = 0; i < cnt; i++) {
- const GENERAL_NAME *val = (const GENERAL_NAME *)d->kossl->sk_value(names, i);
---- kdelibs4support-5.32.0/src/kssl/kssl.cpp.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/kssl.cpp 2017-03-24 14:53:43.109091802 +0100
-@@ -61,7 +61,7 @@ public:
- #if KSSL_HAVE_SSL
- SSL *m_ssl;
- SSL_CTX *m_ctx;
-- SSL_METHOD *m_meth;
-+ const SSL_METHOD *m_meth;
+- const GENERAL_NAME *val = (const GENERAL_NAME *)d->kossl->sk_value(names, i);
++ const GENERAL_NAME *val = (const GENERAL_NAME *)d->kossl->OPENSSL_sk_value(names, i);
+ if (val->type != GEN_DNS) {
+ continue;
+ }
+@@ -1309,7 +1321,7 @@
+ rc += s;
+ }
+ }
+- d->kossl->sk_free(names);
++ d->kossl->OPENSSL_sk_free(names);
#endif
- KOSSL *kossl;
- };
---- kdelibs4support-5.32.0/src/kssl/ksslutils.cpp.0000~ 2017-03-04 17:10:46.000000000 +0100
-+++ kdelibs4support-5.32.0/src/kssl/ksslutils.cpp 2017-03-24 14:53:43.109091802 +0100
-@@ -94,9 +94,9 @@ QString ASN1_UTCTIME_QString(ASN1_UTCTIM
-
- QString ASN1_INTEGER_QString(ASN1_INTEGER *aint)
- {
-- char *rep = KOSSL::self()->i2s_ASN1_INTEGER(nullptr, aint);
-+ char *rep = KOSSL::self()->i2s_ASN1_INTEGER(NULL, aint);
- QString yy = rep;
-- KOSSL::self()->OPENSSL_free(rep);
-+ OPENSSL_free(rep);
- return yy;
+ return rc;
}
-
+
Modified: kdesignerplugin/trunk/PKGBUILD
===================================================================
--- kdesignerplugin/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdesignerplugin/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdesignerplugin
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Integration of Frameworks widgets in Qt Designer/Creator'
arch=(i686 x86_64)
@@ -13,7 +13,7 @@
makedepends=(extra-cmake-modules qt5-tools kdoctools python)
groups=(kf5)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('c6038ac44f05083e6d1e7e2d8b950b31d493f1bf587f4b89984fefae5f973b66'
+sha256sums=('ee9c33c583caa1209b112119b2ba6c1f3c14f015b6bafd6e54c97acd8db1f9ac'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdesu/trunk/PKGBUILD
===================================================================
--- kdesu/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdesu/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdesu
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Integration with su for elevated privileges'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('25b35914fa9cab6f70d09970324385d7ea14f3edb6ff1908bc12e403e31732b1'
+sha256sums=('9d9b1d202ad09993dd6c0bfe3bf4738e1867dc563bcd49b664e3026534fc5b0d'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdewebkit/trunk/PKGBUILD
===================================================================
--- kdewebkit/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdewebkit/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdewebkit
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='KDE Integration for QtWebKit'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('ee8375464179fbdc167209608595792bf188618258fe383adf36affca65cccb2'
+sha256sums=('dd38c6d50681967cecb5debcbd1acc5135d465f15c46ceb7f2db32c4ffa0c015'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdnssd/trunk/PKGBUILD
===================================================================
--- kdnssd/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdnssd/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdnssd
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Abstraction to system DNSSD features'
arch=('i686' 'x86_64')
@@ -12,10 +12,8 @@
depends=('qt5-base' 'avahi')
makedepends=('extra-cmake-modules' 'doxygen' 'qt5-tools')
groups=('kf5')
-replaces=('kdnssd-framework')
-conflicts=('kdnssd-framework')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1d70cc194e45fe12e09005948fb794a3deb1e2d58d0269bef3a30a9cfbf32f80'
+sha256sums=('e550cf9af93f9b22b49a812610cd31f286caf17cf44c82ed9b6d4290390f0db1'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kdoctools/trunk/PKGBUILD
===================================================================
--- kdoctools/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kdoctools/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kdoctools
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Documentation generation from docbook'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
groups=('kf5')
options=('staticlibs')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('c95f7e604bd16c3ef97b3fc0320a5656ef1ea3b3c75b7d4d22348391423c7b39'
+sha256sums=('57a12705b87754d8bbc76e3400691d02072d61bd0e2e4b62845dca558f9be49d'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kemoticons/trunk/PKGBUILD
===================================================================
--- kemoticons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kemoticons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kemoticons
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for emoticons and emoticons themes'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'mesa' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('a5b54d48822055e409f04fe4a85bb057798c0b0c815a5f7c6ca24bd47c4809b0'
+sha256sums=('f05d4812ae8472fc455be7bb6b8e5f45ffef17b415b7154f08ba0eb293d14f8c'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kfilemetadata/trunk/PKGBUILD
===================================================================
--- kfilemetadata/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kfilemetadata/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,8 +3,8 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kfilemetadata
-pkgver=5.38.0
-pkgrel=2
+pkgver=5.39.0
+pkgrel=1
pkgdesc="A library for extracting file metadata"
arch=('i686' 'x86_64')
url='https://community.kde.org/Frameworks'
@@ -14,7 +14,7 @@
makedepends=('extra-cmake-modules' 'catdoc' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha1sums=('a58cf32830d49db270852b45ee6055dd3ef6a54f'
+sha1sums=('d7f48e2e018d75b03daca02a96947e3c16afad22'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kglobalaccel/trunk/PKGBUILD
===================================================================
--- kglobalaccel/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kglobalaccel/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kglobalaccel
-pkgver=5.38.1
+pkgver=5.39.0
pkgrel=1
pkgdesc='Add support for global workspace shortcuts'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('36ceeb585598c088c80fdde30b3ea9b12e6d250dcae46c24024072a37a5f236a'
+sha256sums=('21ab590c0288193d914ebbbb1be1f8efd5f3a6f8ac0a9592439da1141db78b71'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB # David Faure <faure at kde.org>
2D1D5B0588357787DE9EE225EC94D18F7F05997E) # Jonathan Riddell
Modified: kguiaddons/trunk/PKGBUILD
===================================================================
--- kguiaddons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kguiaddons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kguiaddons
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Addons to QtGui'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('01a6350be86f86fb11625393fdc2cb1fe70b7289d06140afa7b0186339047aca'
+sha256sums=('6ee0f5a2b1d66d5266cd2045ff06329efeb394441261a9ce9ea7f5f35689e9ab'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: khtml/trunk/PKGBUILD
===================================================================
--- khtml/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ khtml/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=khtml
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='KHTML APIs'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'gperf')
groups=('kf5-aids')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('fe35153e0d89ca984fe6609ce2365a94eb21849e9d69e201a195af36d40e4639'
+sha256sums=('a284c7c60bf0df22c4b92e9c341ca080cd49730c5218f572ed88a885365ff624'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: ki18n/trunk/PKGBUILD
===================================================================
--- ki18n/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ ki18n/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=ki18n
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Advanced internationalization framework'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('240ccf22a65cf85da900c88afceac8bedc40b71a4d19bad526c03aa285cc2a7d'
+sha256sums=('5e31cac2735db66de620d28a5d561f15aaafd6181c1ff7ca3a03b20ce3c305a5'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kiconthemes/trunk/PKGBUILD
===================================================================
--- kiconthemes/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kiconthemes/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kiconthemes
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for icon themes'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'mesa' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('2a7dc525c1e9eea8c8952ca4eeccc22c28bb37ea83895fd7166174263218aa07'
+sha256sums=('2edd03b3424fcc02d203ac8e3238c17436ccc951892bfcda498494ff871199cc'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kidletime/trunk/PKGBUILD
===================================================================
--- kidletime/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kidletime/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kidletime
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Monitoring user activity'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'mesa' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('5bd30a316ea72a44ed4e4f7f11533e5aa74fc817f360f471b2658ac560e221c5'
+sha256sums=('a8ada849a4c740a4346bc3c073e38761b8cfe38be6eb0ffc9221d85932bb0506'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kimageformats/trunk/PKGBUILD
===================================================================
--- kimageformats/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kimageformats/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kimageformats
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Image format plugins for Qt5'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('karchive: plugin for Krita and OpenRaster images')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('97ca8eaa52f296e7fddde25abfe6c7707070b075e92e487da9edb3c719d4e860'
+sha256sums=('a59082e8abbd141849e49762aac952f5f6d6820bf61cad0687bf618bbb6eced6'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kinit/trunk/PKGBUILD
===================================================================
--- kinit/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kinit/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kinit
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Process launcher to speed up launching KDE applications'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'kdoctools' 'python')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('ae49e0a3cf8a86868afb57bfd820c65be60939e4a79d39e54608fcc9f307914c'
+sha256sums=('c26a88e6c3e0607bdfa1b51ae6fa0d7fa6bb863c9f8f2659e8622d0d77a05c28'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kio/trunk/PKGBUILD
===================================================================
--- kio/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kio/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kio
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Resource and network access abstraction'
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
'knetattach: to add new kio-remote entries')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('f43ab29c0ab51c78bd323e57fa6bba4aedf2d26d70df973b7ef7c80c9fc81597'
+sha256sums=('96cbea5aba34b4e1b0df5ecfb4aaf65ff324341fb00f99796146536557232f24'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kirigami2/trunk/PKGBUILD
===================================================================
--- kirigami2/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kirigami2/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -2,17 +2,17 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=kirigami2
-pkgver=5.38.0
-pkgrel=2
+pkgver=5.39.0
+pkgrel=1
pkgdesc='A QtQuick based components set'
arch=(i686 x86_64)
url='https://community.kde.org/Frameworks'
license=(LGPL)
groups=(kf5)
-depends=(qt5-quickcontrols2)
+depends=(qt5-quickcontrols2 qt5-graphicaleffects)
makedepends=(extra-cmake-modules qt5-tools plasma-framework)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('6c84eca0fdb7cd852aae36c45f40195dd16e17608aec2ce8fbf555198b0c64a2'
+sha256sums=('2714ee82dbcc2cd1b799d5f12193cae5637136466295567426c74b4f26f5ef6a'
'SKIP')
validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure at kde.org>
@@ -22,7 +22,7 @@
build() {
cd build
- cmake ../${pkgname}-${pkgver} \
+ cmake ../$pkgname-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKDE_INSTALL_LIBDIR=lib \
Modified: kitemmodels/trunk/PKGBUILD
===================================================================
--- kitemmodels/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kitemmodels/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kitemmodels
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Models for Qt Model/View system'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('4cfa7661b6d3c1e242b92c9200383400398af1db341dbbd2de573429898d4068'
+sha256sums=('699a1e7e1c78159efb501afc197f9b9959a800405da1ed9de9115ea13c98c0ae'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kitemviews/trunk/PKGBUILD
===================================================================
--- kitemviews/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kitemviews/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kitemviews
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Widget addons for Qt Model/View'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('46df0b2a0fe436cac2e1984d9038ac894ac86d9650db5328fa7069a13f46b151'
+sha256sums=('d069da87a28b373676b7bda1a1474c5f8c815441041cbc5af52d7c1a5a4a885e'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kjobwidgets/trunk/PKGBUILD
===================================================================
--- kjobwidgets/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kjobwidgets/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kjobwidgets
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Widgets for tracking KJob instances'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('a5340df37ba44f6b5b82f8c6732aaaa42ffc6d9a829c15b345e824360eb3e66e'
+sha256sums=('ccfd26c54e15a854d4d86028e7339dcbe33b0c52412686b89b2dc7794b2946fc'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kjs/trunk/PKGBUILD
===================================================================
--- kjs/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kjs/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kjs
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for JS scripting in applications'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'kdoctools')
groups=('kf5-aids')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('c173775230d93ef9da043e2664c71d0bd84c6dc4b05b881730dbcf32012a3c36'
+sha256sums=('36b365c9f3f41b8ca60d9816d58e6a67e32b2c83385a92d43d3237431118763a'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kjsembed/trunk/PKGBUILD
===================================================================
--- kjsembed/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kjsembed/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kjsembed
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Embedded JS'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools' 'python')
groups=('kf5-aids')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('0afdf41564f2f00e98c13cb160e9405ac40c11836dc0f354b50f01418a3d6059'
+sha256sums=('ebcd97eaa6a5e36f6af7201e10f716aaab3a8cda984ce6b115a8274072f778c4'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kmediaplayer/trunk/PKGBUILD
===================================================================
--- kmediaplayer/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kmediaplayer/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kmediaplayer
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Plugin interface for media player features'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python')
groups=('kf5-aids')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('669c07be42c2412212a183ca86e7500e11a49f4a52cc26221aee8583247a62e1'
+sha256sums=('e11e51541d4f70c4ba237fca37ae19a398f284e6ecef6cf0326292bc42e0da27'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: knewstuff/trunk/PKGBUILD
===================================================================
--- knewstuff/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ knewstuff/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -1,9 +1,10 @@
# $Id$
# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=knewstuff
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for downloading application assets from the network'
arch=('i686' 'x86_64')
@@ -11,9 +12,10 @@
license=('LGPL')
depends=('kio')
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
+optdepends=('kirigami2: QML components')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('4052f0ac27bc32de02493494816809261e762eeb2e906168d9e749aa99ab8cd0'
+sha256sums=('3925f2417e35f5dfa9d2dc1d8059233467569af915b2c0266ea62d6fd2a6aeaa'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: knotifications/trunk/PKGBUILD
===================================================================
--- knotifications/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ knotifications/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=knotifications
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Abstraction for system notifications'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
makedepends=('extra-cmake-modules' 'qt5-tools' 'python' 'doxygen')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('ed7d33414840c8b25ce0f7fc446516bd85458b4e349825da026eb511a1d875cb'
+sha256sums=('b21daed46b95f7d109c5c0e8d3d43e9f435ac497e33912420b495c9080626838'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: knotifyconfig/trunk/PKGBUILD
===================================================================
--- knotifyconfig/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ knotifyconfig/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=knotifyconfig
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Configuration system for KNotify'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('d333e83fb372b93493092084418af9fa5557e017c30c923bbd6a5d6f2a7d0f16'
+sha256sums=('2bf7d5c455a49e56d23a2295811060aa689223602a752269412a5d6db236d326'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kpackage/trunk/PKGBUILD
===================================================================
--- kpackage/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kpackage/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,7 +4,7 @@
# Contributor: Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
pkgname=kpackage
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Framework that lets applications manage user installable packages of non-binary assets'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
makedepends=('extra-cmake-modules' 'qt5-tools' 'python' 'kdoctools' 'doxygen')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('b6eb027aa8fbb0a45d87b026ae7117f14c08385628b5da5ba55994f7f01c926c'
+sha256sums=('713eff23f61d9766f02b40cc6cfa73acd31d126a0c6a775903f79c9adebc77c5'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kparts/trunk/PKGBUILD
===================================================================
--- kparts/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kparts/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kparts
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Document centric plugin system'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('f7a701a02d89c5555d92047760314c64fd51beb13ed393ebee67597e13396aa5'
+sha256sums=('26ebb165f82e8caacaadc70c7c996d2c68d3a40296389760940dc385859362e4'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kpeople/trunk/PKGBUILD
===================================================================
--- kpeople/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kpeople/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=kpeople
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='A library that provides access to all contacts and the people who hold them'
arch=(i686 x86_64)
@@ -13,7 +13,7 @@
makedepends=(extra-cmake-modules python mesa doxygen qt5-tools)
groups=(kf5)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1d78459d0c7da5674d64d6ef421fcd3598823a44c3a62ca534dcbd650649a279'
+sha256sums=('59399598cc4f8324963a71fd1de12b3344fec9d8086863e6858dd23f1a6de8e8'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kplotting/trunk/PKGBUILD
===================================================================
--- kplotting/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kplotting/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kplotting
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Lightweight plotting framework'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'mesa' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('e2d8ef624735a56f3998c88af6f06209221af5f27ef05096d65ebb124dc56ec3'
+sha256sums=('6ad90a3c774cec102dee21d63ba8b4d75b5bc95d61cf903480f11a3b840b3eb6'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kpty/trunk/PKGBUILD
===================================================================
--- kpty/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kpty/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kpty
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Pty abstraction'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('de98c5e8c13135aee4038b53b7656d8dad88e6a652140390608fdedc2344f031'
+sha256sums=('16d26608a7bb5feb085aba7162e6d0ed151f1aace6fbdf7c68a8ccc1c76b060a'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kross/trunk/PKGBUILD
===================================================================
--- kross/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kross/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kross
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Multi-language application scripting'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools' 'python')
groups=('kf5-aids')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('670dc18d258e8f821fcd64ba30c587ac3afaecbc54d968edb0fe624682788cb5'
+sha256sums=('d06ddc6157e150ea91be0f790df35a2e14239de0179f0cd8f048ad93597c09be'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: krunner/trunk/PKGBUILD
===================================================================
--- krunner/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ krunner/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=krunner
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Framework for providing different actions given a string query'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
depends=('plasma-framework' 'threadweaver')
makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'doxygen' 'qt5-tools')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('95bd2ed35f25d369bc2c613cbad87f78083bffde6ade3ad0ec9e69547fa1d099'
+sha256sums=('d43d3821b64a49fec7f06a3ad410f15412cebbe7f365c64a307a2c5ad14fba3f'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kservice/trunk/PKGBUILD
===================================================================
--- kservice/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kservice/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kservice
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Advanced plugin and service introspection'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('2d31c96d8fad235aa2bfc96258ac03d7ec064184fe6a54856f9d7407fbae4a7d'
+sha256sums=('149e0320e05abe67140f88a50cbf95d48a075a2996e9b2e3c9d123e6d1417f29'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: ktexteditor/trunk/PKGBUILD
===================================================================
--- ktexteditor/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ ktexteditor/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=ktexteditor
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Advanced embeddable text editor'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('31e7b3118a2cb56176d85538ef43f41842add3ef5c881786a7db7122c37ebea4'
+sha256sums=('c5d9c67532ab6f3abee8ae2623ff21e6ca5280d5ea9ca5d23bdb55f937e565ae'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: ktextwidgets/trunk/PKGBUILD
===================================================================
--- ktextwidgets/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ ktextwidgets/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=ktextwidgets
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Advanced text editing widgets'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('eef0847aa98489437784361a281a16cbd52b3ac8a1a83619c370078e96ea1288'
+sha256sums=('5849d104e99be94d554bff229646df8fde84e3396c82e21a3e390ee08b09d05c'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kunitconversion/trunk/PKGBUILD
===================================================================
--- kunitconversion/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kunitconversion/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kunitconversion
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Support for unit conversion'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('6c538b35e727f75e90178b6b5b17d299a3ce797bd82a6adb0af4e41096eb6082'
+sha256sums=('fb53e8d3c8997fbda4cf2b2a2e6ce71eecd44683903e039d35256ec3ac582113'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kwallet/trunk/PKGBUILD
===================================================================
--- kwallet/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kwallet/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kwallet
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Secure and unified container for user passwords'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('kwalletmanager: Configuration GUI')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('dc06fe8917cf5ea61251e42e9c7e9e5662eb223aace1bf8ee4becf6a896cdae3'
+sha256sums=('5f83a5ca245773abfe5b31c536996ca1aee312d512181d133edcd890874f9fee'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kwayland/trunk/PKGBUILD
===================================================================
--- kwayland/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kwayland/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,17 +4,17 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kwayland
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Qt-style Client and Server library wrapper for the Wayland libraries'
arch=('i686' 'x86_64')
url='https://www.kde.org'
license=('LGPL')
-depends=('qt5-base' 'wayland') # namcap note: wayland is needed for nvidia-libgl users
+depends=('qt5-base')
makedepends=('extra-cmake-modules' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('404aaf11e144a42b2422a5a47aaf04fb629c4a468689bd8f543c0de6b745a53d'
+sha256sums=('dd74c8edef9f28dd8f2df9e52a7f32f844d16c342e3184a69a57eb6c0f893029'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kwidgetsaddons/trunk/PKGBUILD
===================================================================
--- kwidgetsaddons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kwidgetsaddons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kwidgetsaddons
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Addons to QtWidgets'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('python-pykf5: to use the Python 3 bindings' 'python2-pykf5: to use the Python 2 bindings')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('45ee4f81cd91e61e82306f757a06849644fde73e09650e0498797cdc3a4604fa'
+sha256sums=('abb9556d3716beff74460bfea9a33e6470386cb1a68601263b7997a09f1a0db4'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kwindowsystem/trunk/PKGBUILD
===================================================================
--- kwindowsystem/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kwindowsystem/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,17 +3,17 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kwindowsystem
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Access to the windowing system'
arch=('i686' 'x86_64')
url='https://community.kde.org/Frameworks'
license=('LGPL')
-depends=('qt5-x11extras' 'libxfixes')
+depends=('qt5-x11extras')
makedepends=('extra-cmake-modules' 'qt5-tools' 'doxygen')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('2c16eb635714ff122b9348c0cc880be60d08c817c98026029f78434d918db90b'
+sha256sums=('17771aa0acf93b32329633aac9b07e72448edee2a2ecfe7a8f0040a23638dab7'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kxmlgui/trunk/PKGBUILD
===================================================================
--- kxmlgui/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kxmlgui/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=kxmlgui
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='User configurable main windows'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'mesa' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('64f73ada0b1e08c97db00cfe2967b0d8354b338cd85e76644f79da022af49589'
+sha256sums=('2584cf5b39414b4bf76817d5f09dcdf5cd2e1554ac424386a0f0fa0173089e7f'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: kxmlrpcclient/trunk/PKGBUILD
===================================================================
--- kxmlrpcclient/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ kxmlrpcclient/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=kxmlrpcclient
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc="XML-RPC client library for KDE"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'python' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('4a79382406f247bd9ace01859cb92948e74e48c7abb94b9e47066f0453812a3d'
+sha256sums=('faa3e3af7b85c3bf679fc991d5ff2ef3c4f068a7e516885215c6d2e6870d8ac8'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: modemmanager-qt/trunk/PKGBUILD
===================================================================
--- modemmanager-qt/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ modemmanager-qt/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Mainrainer: Antonio Rojas <arojas at archlinux.org>
pkgname=modemmanager-qt
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Qt wrapper for ModemManager DBus API'
arch=(i686 x86_64)
@@ -12,9 +12,8 @@
depends=(modemmanager qt5-base)
makedepends=(extra-cmake-modules doxygen qt5-tools)
groups=(kf5)
-conflicts=(libmm-qt5)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('3c214a46b257fd8798ccbf38f9b099c5172dcf108958320ce39eae9e29aa0aa2'
+sha256sums=('67fe53c0069dfafacfdbee167db762c49f9dcb97c75b29f0724cfa1340b8ba3d'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: networkmanager-qt/trunk/PKGBUILD
===================================================================
--- networkmanager-qt/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ networkmanager-qt/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=networkmanager-qt
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Qt wrapper for NetworkManager API'
arch=('i686' 'x86_64')
@@ -12,10 +12,8 @@
depends=('networkmanager' 'qt5-base')
makedepends=('extra-cmake-modules' 'doxygen' 'qt5-tools')
groups=('kf5')
-replaces=('libnm-qt5')
-conflicts=('libnm-qt5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('c8adcd1bb9f50c4a1455bfc99684632a1812779e50607e1375b5de3bb345a281'
+sha256sums=('01651f491a5540a4f22f7b10ae24cbccd037787722d5e0448b79d6a63fd87aca'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: oxygen-icons/trunk/PKGBUILD
===================================================================
--- oxygen-icons/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ oxygen-icons/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -6,7 +6,7 @@
pkgbase=oxygen-icons
pkgname=('oxygen-icons'
'oxygen-icons-svg')
-pkgver=5.38.0
+pkgver=5.39.0
epoch=1
pkgrel=1
pkgdesc="The Oxygen Icon Theme"
@@ -15,7 +15,7 @@
license=('LGPL')
makedepends=('extra-cmake-modules' 'qt5-base')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}5-${pkgver}.tar.xz"{,.sig})
-sha256sums=('2dc6c1a481b1877739328aebc27661bdaa090b3de653e5ecc5be96bc463e693a'
+sha256sums=('28e9243820e380b965a2f85b1290ad98158438cb1498c79d75fb95ef80b639cc'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: plasma-framework/trunk/PKGBUILD
===================================================================
--- plasma-framework/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ plasma-framework/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,8 +3,8 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=plasma-framework
-pkgver=5.38.0
-pkgrel=2
+pkgver=5.39.0
+pkgrel=1
pkgdesc='Plasma library and runtime components based upon KF5 and Qt5'
arch=('i686' 'x86_64')
url='https://community.kde.org/Frameworks'
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools' 'python' 'doxygen')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('4f23f37de0c404dc07809538fd531fa557780e99c854203980846c32a2c370b7'
+sha256sums=('a38f92df010d063a934a04d181c30bcac40df5f0494cfc1268d453fe6b9a5dbd'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: prison/trunk/PKGBUILD
===================================================================
--- prison/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ prison/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -4,8 +4,8 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=prison
-pkgver=5.38.0
-pkgrel=2
+pkgver=5.39.0
+pkgrel=1
pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
arch=(i686 x86_64)
url='https://community.kde.org/Frameworks'
@@ -12,11 +12,9 @@
license=(GPL)
depends=(qt5-base libdmtx qrencode)
makedepends=(extra-cmake-modules doxygen qt5-tools)
-conflicts=(prison-frameworks)
-replaces=(prison-frameworks)
groups=(kf5)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('95bc65c9164b8ed8cace08be7dfdf12cc9a398a42e2b4c66852faaa1cd1f325f'
+sha256sums=('db06431d8b8679643faedd7787495ef43154a71599949f42cb55b11ec88812ac'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: qqc2-desktop-style/trunk/PKGBUILD
===================================================================
--- qqc2-desktop-style/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ qqc2-desktop-style/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -1,20 +1,19 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qqc2-desktop-style
-pkgver=5.10.95
+pkgver=5.39.0
pkgrel=1
pkgdesc='A style for Qt Quick Controls 2 to make it follow your desktop theme'
arch=(i686 x86_64)
url='https://community.kde.org/Frameworks'
license=(LGPL)
-#groups=(kf5)
-depends=(qt5-quickcontrols2)
+groups=(kf5)
+depends=(kirigami2 kiconthemes)
makedepends=(extra-cmake-modules)
-source=("https://download.kde.org/unstable/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('bafa0600f096826ba371a1e1366e04b6c9a47c7de81cb403df1caec5d809d82f'
+source=("https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('fb8818b22dbc1f47c38bef488543f025ec5da810e84f5ed732b08969338411e1'
'SKIP')
-# validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure at kde.org>
-validpgpkeys=(2D1D5B0588357787DE9EE225EC94D18F7F05997E) # Jonathan Riddell <jr at jriddell.org>
+validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure at kde.org>
prepare() {
mkdir -p build
Modified: solid/trunk/PKGBUILD
===================================================================
--- solid/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ solid/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=solid
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Hardware integration and detection'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'qt5-tools' 'doxygen')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('1052830aaed16391563dc35fe0e01bba2813acf2e0c70fa2223d54d2732b6cac'
+sha256sums=('d98c1bc67a8483d42d76d0369bab3255b30420a5bd41bc4730cabbf03e3c74a5'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: sonnet/trunk/PKGBUILD
===================================================================
--- sonnet/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ sonnet/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=sonnet
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Spelling framework for Qt5'
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
'hspell: spell checking for Hebrew' 'libvoikko: Finnish support via Voikko')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('aa73bb8a599f7b2ed14c043726ffe2d6399f1fd9a3daa51f12685aae11baa58c'
+sha256sums=('819f2bf8c95758106deaf800f3c4ec18d3f42d845a90996462839a759774abac'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: syntax-highlighting/trunk/PKGBUILD
===================================================================
--- syntax-highlighting/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ syntax-highlighting/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=syntax-highlighting
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='Syntax highlighting engine for structured text and code'
arch=(i686 x86_64)
@@ -14,7 +14,7 @@
groups=(kf5)
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
pkgbuild-syntax-highlight.patch)
-sha256sums=('d4b887e2b4c0bb0d0c723325b11897d1ab38a644e3276d57eae8393928783680'
+sha256sums=('acfd79f8d53269bae1d4876c737605f0e20c31d9453444fa98b8e296e06c1a2d'
'SKIP'
'4321ee61f2465966f87dde89cf60e39b30de14e82b492d9a11a5c7e725b1ad8f')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
Modified: threadweaver/trunk/PKGBUILD
===================================================================
--- threadweaver/trunk/PKGBUILD 2017-10-14 08:54:34 UTC (rev 307838)
+++ threadweaver/trunk/PKGBUILD 2017-10-14 08:57:29 UTC (rev 307839)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=threadweaver
-pkgver=5.38.0
+pkgver=5.39.0
pkgrel=1
pkgdesc='High-level multithreading framework'
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
makedepends=('extra-cmake-modules' 'mesa' 'doxygen' 'qt5-tools')
groups=('kf5')
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('db6dca72315a376fa8852f0059113a5880a002e311e5f4591138303b69a209b5'
+sha256sums=('5c116d93f2ca7bdc75db8d59a4b4852d2c7db48073ad3de21e4bfbf6339a2b80'
'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
More information about the arch-commits
mailing list