Mon Dec 7 21:49:58 UTC 202020201207214958

Goodbye vtown... we hardly knew you. It is indeed the day of the Big Merge(tm) leaving nothing left in /testing (but I'll try to work on that soon). In addition to merging packages from /testing, Qt4 and related packages have gone away, along with some other libraries that were only used by KDE4. Perhaps someone will want to take up maintenance of Qt4 (but I'm also pretty sure that SBo wouldn't touch that build script with a ten foot pole). ConsoleKit2 is gone, replaced by elogind (which also takes over for cgmanager and pm-utils). Huge thanks to Eric Hameleers, Heinz Wiesinger, and Robby Workman for all the help making this possible. There's still more cleanup to do here, but that'll be easier with everything in the main tree instead of maintaining side installs running the /testing packages. I'll look into what can be done about extra/pure-alsa-system/ soon. Enjoy! :-) a/aaa_elflibs-15.0-x86_64-28.txz: Rebuilt. Upgraded: libcap.so.2.45, libelf-0.182.so, libglib-2.0.so.0.6600.3, libgmodule-2.0.so.0.6600.3, libgmp.so.10.4.1, libgmpxx.so.4.6.1, libgobject-2.0.so.0.6600.3, libgthread-2.0.so.0.6600.3, libhistory.so.8.1, libisl.so.23.0.0, liblber-2.4.so.2.11.4, libldap-2.4.so.2.11.4, libpcre2-8.so.0.10.1, libreadline.so.8.1. Removed: libHalf.so.12.0.0, libIex-2_2.so.12.0.0, libIexMath-2_2.so.12.0.0, libIlmImf-2_2.so.22.0.0, libIlmImfUtil-2_2.so.22.0.0, libIlmThread-2_2.so.12.0.0, libImath-2_2.so.12.0.0, libexiv2.so.26.0.0, libpoppler-qt4.so.4.11.0, libpoppler.so.79.0.0, libraw.so.16.0.0, libraw_r.so.16.0.0. a/bash-5.1.000-x86_64-1.txz: Upgraded. a/dbus-1.12.20-x86_64-2.txz: Rebuilt. a/elogind-243.7-x86_64-1.txz: Added. a/eudev-3.2.9-x86_64-2.txz: Rebuilt. Applied Pavilion 13 x360 keys patch from upstream git. Thanks to Robby Workman. a/procps-ng-3.3.16-x86_64-3.txz: Rebuilt. Recompiled using --with-elogind. ap/cgmanager-0.42-x86_64-1.txz: Removed. ap/pm-utils-1.4.1-x86_64-6.txz: Removed. ap/vim-8.2.2105-x86_64-1.txz: Upgraded. d/python-setuptools-51.0.0-x86_64-1.txz: Upgraded. kde/akonadi-20.08.3-x86_64-1.txz: Upgraded. kde/akonadi-calendar-20.08.3-x86_64-1.txz: Added. kde/akonadi-calendar-tools-20.08.3-x86_64-1.txz: Added. kde/akonadi-contacts-20.08.3-x86_64-1.txz: Added. kde/akonadi-import-wizard-20.08.3-x86_64-1.txz: Added. kde/akonadi-mime-20.08.3-x86_64-1.txz: Added. kde/akonadi-notes-20.08.3-x86_64-1.txz: Added. kde/akonadi-search-20.08.3-x86_64-1.txz: Added. kde/akonadiconsole-20.08.3-x86_64-1.txz: Added. kde/akregator-20.08.3-x86_64-1.txz: Added. kde/alkimia-8.0.4-x86_64-1.txz: Added. kde/amarok-2.9.0-x86_64-3.txz: Removed. kde/amor-4.14.3-x86_64-3.txz: Removed. kde/analitza-20.08.3-x86_64-1.txz: Upgraded. kde/ark-20.08.3-x86_64-1.txz: Upgraded. kde/artikulate-20.08.3-x86_64-1.txz: Upgraded. kde/attica-5.76.0-x86_64-1.txz: Upgraded. kde/audiocd-kio-20.08.3-x86_64-1.txz: Upgraded. kde/baloo-5.76.0-x86_64-1.txz: Upgraded. kde/baloo-widgets-20.08.3-x86_64-1.txz: Upgraded. kde/blinken-20.08.3-x86_64-1.txz: Upgraded. kde/bluedevil-5.20.4-x86_64-1.txz: Upgraded. kde/bluez-qt-5.76.0-x86_64-1.txz: Added. kde/bomber-20.08.3-x86_64-1.txz: Upgraded. kde/bovo-20.08.3-x86_64-1.txz: Upgraded. kde/breeze-5.20.4-x86_64-1.txz: Added. kde/breeze-grub-5.20.4-x86_64-1.txz: Added. kde/breeze-gtk-5.20.4-x86_64-1.txz: Added. kde/breeze-icons-5.76.0-noarch-1.txz: Added. kde/calendarsupport-20.08.3-x86_64-1.txz: Added. kde/calligra-3.2.1-x86_64-1.txz: Upgraded. kde/calligraplan-3.2.2-x86_64-1.txz: Added. kde/cantor-20.08.3-x86_64-1.txz: Upgraded. kde/cervisia-20.08.3-x86_64-1.txz: Upgraded. kde/digikam-7.1.0-x86_64-1.txz: Added. kde/dolphin-20.08.3-x86_64-1.txz: Added. kde/dolphin-plugins-20.08.3-x86_64-1.txz: Upgraded. kde/dragon-20.08.3-x86_64-1.txz: Upgraded. kde/drkonqi-5.20.4-x86_64-1.txz: Added. kde/elisa-20.08.3-x86_64-1.txz: Added. kde/eventviews-20.08.3-x86_64-1.txz: Added. kde/extra-cmake-modules-5.76.0-x86_64-1.txz: Added. kde/falkon-3.1.0-x86_64-1.txz: Added. kde/ffmpegthumbs-20.08.3-x86_64-1.txz: Added. kde/filelight-20.08.3-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.76.0-x86_64-1.txz: Added. kde/granatier-20.08.3-x86_64-1.txz: Upgraded. kde/grantlee-editor-20.08.3-x86_64-1.txz: Added. kde/grantleetheme-20.08.3-x86_64-1.txz: Added. kde/gwenview-20.08.3-x86_64-1.txz: Upgraded. kde/incidenceeditor-20.08.3-x86_64-1.txz: Added. kde/juk-20.08.3-x86_64-1.txz: Upgraded. kde/k3b-20.08.3-x86_64-1.txz: Upgraded. kde/kaccessible-4.14.3-x86_64-3.txz: Removed. kde/kactivities-5.76.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.76.0-x86_64-1.txz: Added. kde/kactivitymanagerd-5.20.4-x86_64-1.txz: Added. kde/kaddressbook-20.08.3-x86_64-1.txz: Added. kde/kajongg-4.14.3-x86_64-3.txz: Removed. kde/kalarm-20.08.3-x86_64-1.txz: Added. kde/kalarmcal-20.08.3-x86_64-1.txz: Added. kde/kalgebra-20.08.3-x86_64-1.txz: Upgraded. kde/kalzium-20.08.3-x86_64-1.txz: Upgraded. kde/kamera-20.08.3-x86_64-1.txz: Upgraded. kde/kamoso-20.08.3-x86_64-1.txz: Added. kde/kanagram-20.08.3-x86_64-1.txz: Upgraded. kde/kapidox-5.76.0-x86_64-1.txz: Added. kde/kapman-20.08.3-x86_64-1.txz: Upgraded. kde/kapptemplate-20.08.3-x86_64-1.txz: Upgraded. kde/karchive-5.76.0-x86_64-1.txz: Added. kde/kate-20.08.3-x86_64-1.txz: Upgraded. kde/katomic-20.08.3-x86_64-1.txz: Upgraded. kde/kaudiocreator-1.3-x86_64-3.txz: Removed. kde/kauth-5.76.0-x86_64-1.txz: Added. kde/kbackup-20.08.3-x86_64-1.txz: Added. kde/kblackbox-20.08.3-x86_64-1.txz: Upgraded. kde/kblocks-20.08.3-x86_64-1.txz: Upgraded. kde/kbookmarks-5.76.0-x86_64-1.txz: Added. kde/kbounce-20.08.3-x86_64-1.txz: Upgraded. kde/kbreakout-20.08.3-x86_64-1.txz: Upgraded. kde/kbruch-20.08.3-x86_64-1.txz: Upgraded. kde/kcachegrind-20.08.3-x86_64-1.txz: Upgraded. kde/kcalc-20.08.3-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.76.0-x86_64-1.txz: Added. kde/kcalutils-20.08.3-x86_64-1.txz: Added. kde/kcharselect-20.08.3-x86_64-1.txz: Upgraded. kde/kcm-fcitx-0.5.6-x86_64-1.txz: Added. kde/kcmutils-5.76.0-x86_64-1.txz: Added. kde/kcodecs-5.76.0-x86_64-1.txz: Added. kde/kcolorchooser-20.08.3-x86_64-1.txz: Upgraded. kde/kcompletion-5.76.0-x86_64-1.txz: Added. kde/kconfig-5.76.0-x86_64-1.txz: Added. kde/kconfigwidgets-5.76.0-x86_64-1.txz: Added. kde/kcontacts-5.76.0-x86_64-1.txz: Added. kde/kcoreaddons-5.76.0-x86_64-1.txz: Added. kde/kcrash-5.76.0-x86_64-1.txz: Added. kde/kcron-20.08.3-x86_64-1.txz: Upgraded. kde/kdav-5.76.0-x86_64-1.txz: Added. kde/kdbusaddons-5.76.0-x86_64-1.txz: Added. kde/kde-base-artwork-4.14.3-x86_64-3.txz: Removed. kde/kde-baseapps-4.14.3-x86_64-3.txz: Removed. kde/kde-cli-tools-5.20.4-x86_64-1.txz: Added. kde/kde-dev-scripts-20.08.3-x86_64-1.txz: Upgraded. kde/kde-dev-utils-20.08.3-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.20.4-x86_64-1.txz: Added. kde/kde-runtime-4.14.3-x86_64-8.txz: Removed. kde/kde-wallpapers-4.14.3-noarch-2.txz: Removed. kde/kde-workspace-4.11.22-x86_64-9.txz: Removed. kde/kdeartwork-4.14.3-x86_64-3.txz: Removed. kde/kdebugsettings-20.08.3-x86_64-1.txz: Added. kde/kdeclarative-5.76.0-x86_64-1.txz: Added. kde/kdeconnect-kde-20.08.3-x86_64-1.txz: Upgraded. kde/kdecoration-5.20.4-x86_64-1.txz: Added. kde/kded-5.76.0-x86_64-1.txz: Added. kde/kdeedu-data-20.08.3-x86_64-1.txz: Added. kde/kdegraphics-mobipocket-20.08.3-x86_64-1.txz: Upgraded. kde/kdegraphics-strigi-analyzer-4.14.3-x86_64-3.txz: Removed. kde/kdegraphics-thumbnailers-20.08.3-x86_64-1.txz: Upgraded. kde/kdelibs-4.14.38-x86_64-8.txz: Removed. kde/kdelibs4support-5.76.0-x86_64-1.txz: Added. kde/kdenetwork-filesharing-20.08.3-x86_64-1.txz: Upgraded. kde/kdenetwork-strigi-analyzers-4.14.3-x86_64-3.txz: Removed. kde/kdenlive-20.08.3-x86_64-1.txz: Added. kde/kdepim-4.14.10-x86_64-5.txz: Removed. kde/kdepim-addons-20.08.3-x86_64-1.txz: Added. kde/kdepim-apps-libs-20.08.3-x86_64-1.txz: Added. kde/kdepim-runtime-20.08.3-x86_64-1.txz: Upgraded. kde/kdepimlibs-4.14.10-x86_64-9.txz: Removed. kde/kdeplasma-addons-5.20.4-x86_64-1.txz: Upgraded. kde/kdesdk-kioslaves-20.08.3-x86_64-1.txz: Upgraded. kde/kdesdk-strigi-analyzers-4.14.3-x86_64-3.txz: Removed. kde/kdesdk-thumbnailers-20.08.3-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.76.0-x86_64-1.txz: Added. kde/kdesu-5.76.0-x86_64-1.txz: Added. kde/kdev-php-5.6.0-x86_64-1.txz: Added. kde/kdev-python-5.6.0-x86_64-1.txz: Upgraded. kde/kdevelop-5.6.0-x86_64-1.txz: Upgraded. kde/kdevelop-pg-qt-2.2.1-x86_64-1.txz: Upgraded. kde/kdevelop-php-1.7.4-x86_64-2.txz: Removed. kde/kdevelop-php-docs-1.7.4-x86_64-2.txz: Removed. kde/kdevplatform-1.7.4-x86_64-2.txz: Removed. kde/kdewebdev-4.14.3-x86_64-3.txz: Removed. kde/kdewebkit-5.76.0-x86_64-1.txz: Added. kde/kdf-20.08.3-x86_64-1.txz: Upgraded. kde/kdiagram-2.7.0-x86_64-1.txz: Added. kde/kdialog-20.08.3-x86_64-1.txz: Added. kde/kdiamond-20.08.3-x86_64-1.txz: Upgraded. kde/kdnssd-5.76.0-x86_64-1.txz: Added. kde/kdoctools-5.76.0-x86_64-1.txz: Added. kde/keditbookmarks-20.08.3-x86_64-1.txz: Added. kde/kemoticons-5.76.0-x86_64-1.txz: Added. kde/kfilemetadata-5.76.0-x86_64-1.txz: Upgraded. kde/kfind-20.08.3-x86_64-1.txz: Added. kde/kfloppy-20.08.3-x86_64-1.txz: Upgraded. kde/kfourinline-20.08.3-x86_64-1.txz: Upgraded. kde/kgamma-4.14.3-x86_64-3.txz: Removed. kde/kgamma5-5.20.4-x86_64-1.txz: Added. kde/kgeography-20.08.3-x86_64-1.txz: Upgraded. kde/kget-20.08.3-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.76.0-x86_64-1.txz: Added. kde/kgoldrunner-20.08.3-x86_64-1.txz: Upgraded. kde/kgpg-20.08.3-x86_64-1.txz: Upgraded. kde/kguiaddons-5.76.0-x86_64-1.txz: Added. kde/khangman-20.08.3-x86_64-1.txz: Upgraded. kde/khelpcenter-20.08.3-x86_64-1.txz: Added. kde/kholidays-5.76.0-x86_64-1.txz: Added. kde/khotkeys-5.20.4-x86_64-1.txz: Added. kde/khtml-5.76.0-x86_64-1.txz: Added. kde/ki18n-5.76.0-x86_64-1.txz: Added. kde/kiconthemes-5.76.0-x86_64-1.txz: Added. kde/kid3-3.8.4-x86_64-1.txz: Added. kde/kidentitymanagement-20.08.3-x86_64-1.txz: Added. kde/kidletime-5.76.0-x86_64-1.txz: Added. kde/kig-20.08.3-x86_64-1.txz: Upgraded. kde/kigo-20.08.3-x86_64-1.txz: Upgraded. kde/kile-2.9.93-x86_64-1.txz: Added. kde/killbots-20.08.3-x86_64-1.txz: Upgraded. kde/kimageformats-5.76.0-x86_64-1.txz: Added. kde/kimagemapeditor-20.08.3-x86_64-1.txz: Added. kde/kimap-20.08.3-x86_64-1.txz: Added. kde/kinfocenter-5.20.4-x86_64-1.txz: Added. kde/kinit-5.76.0-x86_64-1.txz: Added. kde/kio-5.76.0-x86_64-1.txz: Added. kde/kio-extras-20.08.3-x86_64-1.txz: Added. kde/kio-gdrive-20.08.3-x86_64-1.txz: Added. kde/kio-mtp-2063e75_20131020git-x86_64-4.txz: Removed. kde/kipi-plugins-20.08.3-x86_64-1.txz: Added. kde/kirigami-gallery-20.08.3-x86_64-1.txz: Added. kde/kirigami2-5.76.0-x86_64-1.txz: Added. kde/kiriki-20.08.3-x86_64-1.txz: Upgraded. kde/kitemmodels-5.76.0-x86_64-1.txz: Added. kde/kitemviews-5.76.0-x86_64-1.txz: Added. kde/kiten-20.08.3-x86_64-1.txz: Upgraded. kde/kitinerary-20.08.3-x86_64-1.txz: Added. kde/kjobwidgets-5.76.0-x86_64-1.txz: Added. kde/kjots-20200924_355b642-x86_64-1.txz: Added. kde/kjs-5.76.0-x86_64-1.txz: Added. kde/kjsembed-5.76.0-x86_64-1.txz: Added. kde/kjumpingcube-20.08.3-x86_64-1.txz: Upgraded. kde/kldap-20.08.3-x86_64-1.txz: Added. kde/kleopatra-20.08.3-x86_64-1.txz: Added. kde/klettres-4.14.3-x86_64-3.txz: Removed. kde/klickety-20.08.3-x86_64-1.txz: Upgraded. kde/klines-20.08.3-x86_64-1.txz: Upgraded. kde/kmag-20.08.3-x86_64-1.txz: Upgraded. kde/kmahjongg-20.08.3-x86_64-1.txz: Upgraded. kde/kmail-20.08.3-x86_64-1.txz: Added. kde/kmail-account-wizard-20.08.3-x86_64-1.txz: Added. kde/kmailtransport-20.08.3-x86_64-1.txz: Added. kde/kmbox-20.08.3-x86_64-1.txz: Added. kde/kmediaplayer-5.76.0-x86_64-1.txz: Added. kde/kmenuedit-5.20.4-x86_64-1.txz: Added. kde/kmime-20.08.3-x86_64-1.txz: Added. kde/kmines-20.08.3-x86_64-1.txz: Upgraded. kde/kmix-20.08.3-x86_64-1.txz: Upgraded. kde/kmousetool-20.08.3-x86_64-1.txz: Upgraded. kde/kmouth-20.08.3-x86_64-1.txz: Upgraded. kde/kmplot-20.08.3-x86_64-1.txz: Upgraded. kde/kmymoney-5.1.0-x86_64-1.txz: Added. kde/knavalbattle-20.08.3-x86_64-1.txz: Upgraded. kde/knetwalk-20.08.3-x86_64-1.txz: Upgraded. kde/knewstuff-5.76.0-x86_64-1.txz: Added. kde/knights-20.08.3-x86_64-1.txz: Added. kde/knotes-20.08.3-x86_64-1.txz: Added. kde/knotifications-5.76.0-x86_64-1.txz: Added. kde/knotifyconfig-5.76.0-x86_64-1.txz: Added. kde/kolf-20.08.3-x86_64-1.txz: Upgraded. kde/kollision-20.08.3-x86_64-1.txz: Upgraded. kde/kolourpaint-20.08.3-x86_64-1.txz: Upgraded. kde/kompare-20.08.3-x86_64-1.txz: Upgraded. kde/konqueror-20.08.3-x86_64-1.txz: Added. kde/konquest-20.08.3-x86_64-1.txz: Upgraded. kde/konsole-20.08.3-x86_64-1.txz: Upgraded. kde/kontact-20.08.3-x86_64-1.txz: Added. kde/kontactinterface-20.08.3-x86_64-1.txz: Added. kde/kopete-20.08.3-x86_64-1.txz: Upgraded. kde/korganizer-20.08.3-x86_64-1.txz: Added. kde/korundum-4.14.3-x86_64-8.txz: Removed. kde/kpackage-5.76.0-x86_64-1.txz: Added. kde/kparts-5.76.0-x86_64-1.txz: Added. kde/kpat-20.08.3-x86_64-1.txz: Upgraded. kde/kpeople-5.76.0-x86_64-1.txz: Added. kde/kpeoplevcard-0.1-x86_64-1.txz: Added. kde/kpimtextedit-20.08.3-x86_64-1.txz: Added. kde/kpkpass-20.08.3-x86_64-1.txz: Added. kde/kplayer-0.7.2-x86_64-3.txz: Removed. kde/kplotting-5.76.0-x86_64-1.txz: Added. kde/kpmcore-4.2.0-x86_64-1.txz: Added. kde/kppp-4.14.3-x86_64-3.txz: Removed. kde/kpty-5.76.0-x86_64-1.txz: Added. kde/kqtquickcharts-20.08.3-x86_64-1.txz: Upgraded. kde/kquickcharts-5.76.0-x86_64-1.txz: Added. kde/krdc-20.08.3-x86_64-1.txz: Upgraded. kde/kremotecontrol-4.14.3-x86_64-3.txz: Removed. kde/krename-5.0.1-x86_64-1.txz: Added. kde/kreversi-20.08.3-x86_64-1.txz: Upgraded. kde/krfb-20.08.3-x86_64-1.txz: Upgraded. kde/krita-4.4.1-x86_64-1.txz: Added. kde/kross-5.76.0-x86_64-1.txz: Added. kde/kross-interpreters-20.08.3-x86_64-1.txz: Upgraded. kde/kruler-20.08.3-x86_64-1.txz: Upgraded. kde/krunner-5.76.0-x86_64-1.txz: Added. kde/krusader-2.7.2-x86_64-1.txz: Added. kde/ksaneplugin-4.14.3-x86_64-3.txz: Removed. kde/kscreen-5.20.4-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.20.4-x86_64-1.txz: Added. kde/kservice-5.76.0-x86_64-1.txz: Added. kde/kshisen-20.08.3-x86_64-1.txz: Upgraded. kde/ksirk-20.08.3-x86_64-1.txz: Upgraded. kde/ksmtp-20.08.3-x86_64-1.txz: Added. kde/ksnakeduel-20.08.3-x86_64-1.txz: Upgraded. kde/ksnapshot-4.14.3-x86_64-3.txz: Removed. kde/kspaceduel-20.08.3-x86_64-1.txz: Upgraded. kde/ksquares-20.08.3-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.20.4-x86_64-1.txz: Added. kde/kstars-3.5.0-x86_64-1.txz: Upgraded. kde/ksudoku-20.08.3-x86_64-1.txz: Upgraded. kde/ksysguard-5.20.4-x86_64-1.txz: Added. kde/ksystemlog-20.08.3-x86_64-1.txz: Upgraded. kde/kteatime-20.08.3-x86_64-1.txz: Upgraded. kde/ktexteditor-5.76.0-x86_64-1.txz: Added. kde/ktextwidgets-5.76.0-x86_64-1.txz: Added. kde/ktimer-20.08.3-x86_64-1.txz: Upgraded. kde/ktimetracker-5.0.1-x86_64-1.txz: Added. kde/ktnef-20.08.3-x86_64-1.txz: Added. kde/ktorrent-5.2.0-x86_64-1.txz: Upgraded. kde/ktouch-20.08.3-x86_64-1.txz: Upgraded. kde/ktuberling-4.14.3-x86_64-3.txz: Removed. kde/kturtle-20.08.3-x86_64-1.txz: Upgraded. kde/ktux-4.14.3-x86_64-3.txz: Removed. kde/kubrick-20.08.3-x86_64-1.txz: Upgraded. kde/kunitconversion-5.76.0-x86_64-1.txz: Added. kde/kuser-4.14.3-x86_64-3.txz: Removed. kde/kwallet-5.76.0-x86_64-1.txz: Added. kde/kwallet-pam-5.20.4-x86_64-1.txz: Added. kde/kwalletmanager-20.08.3-x86_64-1.txz: Upgraded. kde/kwave-20.08.3-x86_64-1.txz: Added. kde/kwayland-5.76.0-x86_64-1.txz: Added. kde/kwayland-integration-5.20.4-x86_64-1.txz: Added. kde/kwayland-server-5.20.4-x86_64-1.txz: Added. kde/kwebkitpart-1.3.4-x86_64-3.txz: Removed. kde/kwidgetsaddons-5.76.0-x86_64-1.txz: Added. kde/kwin-5.20.4-x86_64-1.txz: Added. kde/kwindowsystem-5.76.0-x86_64-1.txz: Added. kde/kwordquiz-20.08.3-x86_64-1.txz: Upgraded. kde/kwrited-5.20.4-x86_64-1.txz: Added. kde/kxmlgui-5.76.0-x86_64-1.txz: Added. kde/kxmlrpcclient-5.76.0-x86_64-1.txz: Added. kde/latte-dock-0.9.11-x86_64-1.txz: Added. kde/libgravatar-20.08.3-x86_64-1.txz: Added. kde/libkcddb-20.08.3-x86_64-1.txz: Upgraded. kde/libkcompactdisc-20.08.3-x86_64-1.txz: Upgraded. kde/libkdcraw-20.08.3-x86_64-1.txz: Upgraded. kde/libkdeedu-4.14.3-x86_64-3.txz: Removed. kde/libkdegames-20.08.3-x86_64-1.txz: Upgraded. kde/libkdepim-20.08.3-x86_64-1.txz: Added. kde/libkeduvocdocument-20.08.3-x86_64-1.txz: Added. kde/libkexiv2-20.08.3-x86_64-1.txz: Upgraded. kde/libkgapi-20.08.3-x86_64-1.txz: Added. kde/libkgeomap-20.08.3-x86_64-1.txz: Added. kde/libkipi-20.08.3-x86_64-1.txz: Upgraded. kde/libkleo-20.08.3-x86_64-1.txz: Added. kde/libkmahjongg-20.08.3-x86_64-1.txz: Upgraded. kde/libkomparediff2-20.08.3-x86_64-1.txz: Upgraded. kde/libksane-20.08.3-x86_64-1.txz: Upgraded. kde/libkscreen-5.20.4-x86_64-1.txz: Upgraded. kde/libksieve-20.08.3-x86_64-1.txz: Added. kde/libksysguard-5.20.4-x86_64-1.txz: Added. kde/libktorrent-2.2.0-x86_64-1.txz: Upgraded. kde/libmm-qt-1.0.1-x86_64-3.txz: Removed. kde/libnm-qt-0.9.8.4-x86_64-1.txz: Removed. kde/lokalize-20.08.3-x86_64-1.txz: Upgraded. kde/lskat-20.08.3-x86_64-1.txz: Upgraded. kde/mailcommon-20.08.3-x86_64-1.txz: Added. kde/mailimporter-20.08.3-x86_64-1.txz: Added. kde/marble-20.08.3-x86_64-1.txz: Upgraded. kde/mbox-importer-20.08.3-x86_64-1.txz: Added. kde/messagelib-20.08.3-x86_64-1.txz: Added. kde/milou-5.20.4-x86_64-1.txz: Added. kde/minuet-20.08.3-x86_64-1.txz: Added. kde/modemmanager-qt-5.76.0-x86_64-1.txz: Added. kde/mplayerthumbs-4.14.3-x86_64-3.txz: Removed. kde/nepomuk-core-4.14.3-x86_64-5.txz: Removed. kde/nepomuk-widgets-4.14.3-x86_64-3.txz: Removed. kde/networkmanager-qt-5.76.0-x86_64-1.txz: Added. kde/okteta-0.26.4-x86_64-1.txz: Upgraded. kde/okular-20.08.3-x86_64-1.txz: Upgraded. kde/oxygen-5.20.4-x86_64-1.txz: Added. kde/oxygen-fonts-5.4.3-noarch-1.txz: Added. kde/oxygen-gtk2-1.4.6-x86_64-1.txz: Upgraded. kde/oxygen-icons-4.14.3-x86_64-3.txz: Removed. kde/oxygen-icons5-5.76.0-noarch-1.txz: Added. kde/pairs-4.14.3-x86_64-3.txz: Removed. kde/palapeli-20.08.3-x86_64-1.txz: Upgraded. kde/parley-20.08.3-x86_64-1.txz: Upgraded. kde/partitionmanager-4.2.0-x86_64-1.txz: Upgraded. kde/perlkde-4.14.3-x86_64-10.txz: Removed. kde/perlqt-4.14.3-x86_64-11.txz: Removed. kde/picmi-20.08.3-x86_64-1.txz: Upgraded. kde/pim-data-exporter-20.08.3-x86_64-1.txz: Added. kde/pim-sieve-editor-20.08.3-x86_64-1.txz: Added. kde/pimcommon-20.08.3-x86_64-1.txz: Added. kde/plasma-browser-integration-5.20.4-x86_64-1.txz: Added. kde/plasma-desktop-5.20.4-x86_64-1.txz: Added. kde/plasma-disks-5.20.4-x86_64-1.txz: Added. kde/plasma-framework-5.76.0-x86_64-1.txz: Added. kde/plasma-integration-5.20.4-x86_64-1.txz: Added. kde/plasma-nm-5.20.4-x86_64-1.txz: Upgraded. kde/plasma-pa-5.20.4-x86_64-1.txz: Added. kde/plasma-sdk-5.20.4-x86_64-1.txz: Added. kde/plasma-vault-5.20.4-x86_64-1.txz: Added. kde/plasma-wayland-protocols-1.1.1-x86_64-1.txz: Added. kde/plasma-workspace-5.20.4-x86_64-1.txz: Added. kde/plasma-workspace-wallpapers-5.20.4-x86_64-1.txz: Added. kde/polkit-kde-agent-1-5.20.4-x86_64-1.txz: Upgraded. kde/polkit-kde-kcmodules-1-001bdf7_20120111git-x86_64-3.txz: Removed. kde/powerdevil-5.20.4-x86_64-1.txz: Added. kde/poxml-20.08.3-x86_64-1.txz: Upgraded. kde/print-manager-20.08.3-x86_64-1.txz: Upgraded. kde/prison-5.76.0-x86_64-1.txz: Added. kde/pulseaudio-qt-1.2-x86_64-1.txz: Added. kde/purpose-5.76.0-x86_64-1.txz: Added. kde/pykde4-4.14.3-x86_64-11.txz: Removed. kde/qqc2-desktop-style-5.76.0-x86_64-1.txz: Added. kde/qtruby-4.14.3-x86_64-11.txz: Removed. kde/rocs-20.08.3-x86_64-1.txz: Upgraded. kde/sddm-0.19.0-x86_64-1.txz: Added. kde/sddm-kcm-5.20.4-x86_64-1.txz: Added. kde/skanlite-2.2.0-x86_64-1.txz: Upgraded. kde/smokegen-4.14.3-x86_64-3.txz: Removed. kde/smokekde-4.14.3-x86_64-3.txz: Removed. kde/smokeqt-4.14.3-x86_64-6.txz: Removed. kde/solid-5.76.0-x86_64-1.txz: Added. kde/sonnet-5.76.0-x86_64-1.txz: Added. kde/spectacle-20.08.3-x86_64-1.txz: Added. kde/step-20.08.3-x86_64-1.txz: Upgraded. kde/superkaramba-4.14.3-x86_64-4.txz: Removed. kde/svgpart-20.08.3-x86_64-1.txz: Upgraded. kde/sweeper-20.08.3-x86_64-1.txz: Upgraded. kde/syndication-5.76.0-x86_64-1.txz: Added. kde/syntax-highlighting-5.76.0-x86_64-1.txz: Added. kde/systemsettings-5.20.4-x86_64-1.txz: Added. kde/threadweaver-5.76.0-x86_64-1.txz: Added. kde/umbrello-20.08.3-x86_64-1.txz: Upgraded. kde/wacomtablet-20201030_417d9d9-x86_64-1.txz: Added. kde/wicd-kde-0.3.0_bcf27d8-x86_64-3.txz: Removed. kde/xdg-desktop-portal-kde-5.20.4-x86_64-1.txz: Added. kde/yakuake-20.08.3-x86_64-1.txz: Added. kde/zeroconf-ioslave-20.08.3-x86_64-1.txz: Upgraded. kdei/calligra-l10n-bs-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-ca-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-ca@valencia-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-cs-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-da-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-de-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-el-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-en_GB-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-es-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-et-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-fi-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-fr-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-gl-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-hu-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-it-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-ja-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-kk-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-nb-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-nl-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-pl-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-pt-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-pt_BR-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-ru-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-sk-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-sv-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-tr-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-uk-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-zh_CN-2.9.11-noarch-1.txz: Removed. kdei/calligra-l10n-zh_TW-2.9.11-noarch-1.txz: Removed. kdei/kde-l10n-ar-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-bg-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-bs-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ca-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ca@valencia-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-cs-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-da-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-de-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-el-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-en_GB-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-es-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-et-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-eu-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-fa-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-fi-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-fr-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ga-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-gl-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-he-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-hi-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-hr-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-hu-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ia-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-id-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-is-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-it-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ja-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-kk-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-km-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ko-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-lt-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-lv-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-mr-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-nb-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-nds-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-nl-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-nn-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-pa-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-pl-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-pt-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-pt_BR-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ro-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ru-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-sk-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-sl-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-sr-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-sv-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-tr-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-ug-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-uk-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-wa-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-zh_CN-4.14.3-noarch-1.txz: Removed. kdei/kde-l10n-zh_TW-4.14.3-noarch-1.txz: Removed. l/ConsoleKit2-1.2.1-x86_64-4.txz: Removed. l/PyQt-4.12.3-x86_64-3.txz: Removed. l/QScintilla-2.11.6-x86_64-1.txz: Upgraded. Drop Qt4 support. l/QtAV-20200910_2a470d2a-x86_64-1.txz: Added. l/SDL2-2.0.12-x86_64-2.txz: Rebuilt. l/accountsservice-0.6.55-x86_64-1.txz: Added. l/automoc4-0.9.88-x86_64-2.txz: Removed. l/cfitsio-3.49-x86_64-1.txz: Added. l/cryfs-0.10.2-x86_64-1.txz: Added. l/cryptopp-8.2.0-x86_64-1.txz: Added. l/dotconf-1.3-x86_64-1.txz: Added. l/dvdauthor-0.7.2-x86_64-1.txz: Added. l/eigen3-3.3.9-x86_64-1.txz: Upgraded. l/frei0r-plugins-1.7.0-x86_64-1.txz: Added. l/fuse3-3.10.1-x86_64-1.txz: Upgraded. l/grantlee-5.2.0-x86_64-1.txz: Upgraded. l/gst-plugins-base-1.18.2-x86_64-1.txz: Upgraded. l/gst-plugins-good-1.18.2-x86_64-1.txz: Upgraded. l/gst-plugins-libav-1.18.2-x86_64-1.txz: Upgraded. l/gstreamer-1.18.2-x86_64-1.txz: Upgraded. l/gtk+3-3.24.24-x86_64-1.txz: Upgraded. l/gvfs-1.46.1-x86_64-2.txz: Rebuilt. Recompiled using -Dlogind=true. l/kdsoap-1.9.1-x86_64-1.txz: Added. l/lensfun-0.3.95-x86_64-1.txz: Added. l/libappindicator-12.10.0-x86_64-1.txz: Added. l/libbluedevil-2.1-x86_64-2.txz: Removed. l/libburn-1.5.2.pl01-x86_64-1.txz: Added. l/libdbusmenu-16.04.0-x86_64-1.txz: Added. l/libdbusmenu-qt-0.9.3+16.04.20160218-x86_64-1.txz: Upgraded. l/libdmtx-0.7.5-x86_64-1.txz: Added. l/libindicator-12.10.1-x86_64-1.txz: Added. l/liblastfm-1.1.0-x86_64-1.txz: Removed. l/libqalculate-3.14.0-x86_64-1.txz: Added. l/mlt-6.22.1-x86_64-1.txz: Added. l/opencv-4.5.0-x86_64-1.txz: Added. l/phonon-4.11.1-x86_64-1.txz: Upgraded. l/phonon-backend-gstreamer-4.10.0-x86_64-1.txz: Added. l/phonon-gstreamer-4.8.2-x86_64-2.txz: Removed. l/pipewire-0.3.13-x86_64-1.txz: Added. l/polkit-0.118-x86_64-2.txz: Rebuilt. l/polkit-qt-1-0.113.0-x86_64-1.txz: Upgraded. l/poppler-20.12.1-x86_64-1.txz: Upgraded. l/python-certifi-2020.12.5-x86_64-1.txz: Upgraded. l/python-pygments-2.7.3-x86_64-1.txz: Upgraded. l/qca-2.3.1-x86_64-1.txz: Upgraded. l/qca-qt5-2.3.1-x86_64-1.txz: Removed. l/qimageblitz-0.0.6-x86_64-2.txz: Removed. l/qjson-0.9.0-x86_64-1.txz: Removed. l/qrencode-4.1.1-x86_64-1.txz: Added. l/qt-4.8.7-x86_64-17.txz: Removed. l/qt-gstreamer-1.2.0-x86_64-2.txz: Removed. l/qt5-5.15.2-x86_64-2.txz: Rebuilt. l/qtkeychain-0.11.1-x86_64-1.txz: Added. l/qtscriptgenerator-0.2.0-x86_64-3.txz: Removed. l/quazip-1.1-x86_64-1.txz: Added. l/raptor2-2.0.15-x86_64-10.txz: Removed. l/rasqal-0.9.33-x86_64-3.txz: Removed. l/readline-8.1.000-x86_64-1.txz: Upgraded. l/redland-1.0.17-x86_64-6.txz: Removed. l/rttr-0.9.6-x86_64-1.txz: Added. l/soprano-2.9.4-x86_64-3.txz: Removed. l/speech-dispatcher-0.10.2-x86_64-1.txz: Added. l/strigi-0.7.8-x86_64-4.txz: Removed. l/vid.stab-20200916_e851e7b-x86_64-1.txz: Added. l/xapian-core-1.4.17-x86_64-2.txz: Rebuilt. n/NetworkManager-1.28.0-x86_64-1.txz: Upgraded. Drop ConsoleKit2 support and add elogind support. Thanks to Robby Workman. x/OpenCC-1.1.1-x86_64-1.txz: Added. x/cldr-emoji-annotation-37.0_13.0_0_2-noarch-1.txz: Added. x/fcitx-4.2.9.8-x86_64-1.txz: Added. Don't build Qt4 components. x/fcitx-anthy-0.2.3-x86_64-1.txz: Added. x/fcitx-configtool-0.4.9-x86_64-1.txz: Added. x/fcitx-hangul-0.3.1-x86_64-1.txz: Added. x/fcitx-kkc-0.1.4-x86_64-1.txz: Added. x/fcitx-libpinyin-0.5.3-x86_64-1.txz: Added. x/fcitx-m17n-0.2.4-x86_64-1.txz: Added. x/fcitx-qt5-1.2.5-x86_64-1.txz: Added. x/fcitx-sayura-0.1.2-x86_64-1.txz: Added. x/fcitx-table-extra-0.3.8-x86_64-1.txz: Added. x/fcitx-table-other-0.2.4-x86_64-1.txz: Added. x/fcitx-unikey-0.2.7-x86_64-1.txz: Added. x/ibus-1.5.23-x86_64-1.txz: Added. x/ibus-anthy-1.5.11-x86_64-1.txz: Added. x/ibus-hangul-1.5.4-x86_64-1.txz: Added. x/ibus-kkc-1.5.22-x86_64-1.txz: Added. x/ibus-libpinyin-1.11.1-x86_64-1.txz: Added. x/ibus-m17n-1.4.3-x86_64-1.txz: Added. x/ibus-table-1.12.1-x86_64-1.txz: Added. x/ibus-unikey-0.6.1-x86_64-1.txz: Added. x/libgee-0.20.1-x86_64-1.txz: Added. x/libkkc-0.3.5-x86_64-1.txz: Added. x/libkkc-data-0.2.7-x86_64-1.txz: Added. x/libpinyin-2.3.0-x86_64-1.txz: Added. x/marisa-0.2.4-x86_64-1.txz: Added. x/motif-2.3.8-x86_64-3.txz: Rebuilt. Added xinitrc.mwm. Thanks to ziprun. x/scim-1.4.18-x86_64-1.txz: Removed. x/scim-anthy-1.2.7-x86_64-2.txz: Removed. x/scim-hangul-0.4.0-x86_64-2.txz: Removed. x/scim-input-pad-0.1.3.1-x86_64-2.txz: Removed. x/scim-m17n-0.2.3-x86_64-2.txz: Removed. x/scim-pinyin-0.5.92-x86_64-2.txz: Removed. x/scim-tables-0.5.14.1-x86_64-2.txz: Removed. x/skkdic-20200128-noarch-1.txz: Added. x/xdm-1.1.11-x86_64-11.txz: Rebuilt. Drop ConsoleKit2 patch, fix pam.d/xdm file. Thanks to Robby Workman. xap/seamonkey-2.53.5.1-x86_64-1.txz: Upgraded. This update contains security fixes and improvements. For more information, see: https://www.seamonkey-project.org/releases/seamonkey2.53.5.1 (* Security fix *) xap/vim-gvim-8.2.2105-x86_64-1.txz: Upgraded. xap/xine-lib-1.2.11-x86_64-1.txz: Upgraded. xfce/Greybird-3.22.12-noarch-1.txz: Added. xfce/elementary-xfce-0.15.1-x86_64-1.txz: Added. xfce/exo-0.12.11-x86_64-2.txz: Rebuilt. xfce/garcon-0.6.4-x86_64-2.txz: Rebuilt. xfce/gtk-xfce-engine-2.10.1-x86_64-3.txz: Removed. xfce/libxfce4ui-4.14.1-x86_64-1.txz: Upgraded. xfce/libxfce4util-4.14.0-x86_64-1.txz: Upgraded. xfce/mousepad-0.4.2-x86_64-1.txz: Added. xfce/orage-4.12.1-x86_64-5.txz: Removed. xfce/thunar-1.8.16-x86_64-2.txz: Rebuilt. xfce/thunar-volman-0.9.5-x86_64-2.txz: Rebuilt. xfce/tumbler-0.2.9-x86_64-2.txz: Rebuilt. xfce/xfce4-appfinder-4.14.0-x86_64-1.txz: Upgraded. xfce/xfce4-clipman-plugin-1.6.1-x86_64-1.txz: Upgraded. xfce/xfce4-dev-tools-4.14.0-x86_64-1.txz: Upgraded. xfce/xfce4-notifyd-0.6.2-x86_64-1.txz: Upgraded. xfce/xfce4-panel-4.14.4-x86_64-1.txz: Upgraded. xfce/xfce4-panel-profiles-1.0.10-x86_64-1.txz: Added. xfce/xfce4-power-manager-1.6.6-x86_64-1.txz: Upgraded. xfce/xfce4-pulseaudio-plugin-0.4.3-x86_64-1.txz: Upgraded. xfce/xfce4-screensaver-0.1.11-x86_64-1.txz: Added. xfce/xfce4-screenshooter-1.9.7-x86_64-1.txz: Upgraded. xfce/xfce4-session-4.14.2-x86_64-1.txz: Upgraded. xfce/xfce4-settings-4.14.3-x86_64-1.txz: Upgraded. xfce/xfce4-systemload-plugin-1.2.3-x86_64-2.txz: Rebuilt. xfce/xfce4-taskmanager-1.2.3-x86_64-1.txz: Upgraded. xfce/xfce4-terminal-0.8.9.2-x86_64-1.txz: Upgraded. xfce/xfce4-weather-plugin-0.10.2-x86_64-1.txz: Upgraded. xfce/xfce4-whiskermenu-plugin-2.4.6-x86_64-1.txz: Added. xfce/xfconf-4.14.4-x86_64-1.txz: Upgraded. xfce/xfdesktop-4.14.3-x86_64-1.txz: Upgraded. xfce/xfwm4-4.14.6-x86_64-1.txz: Upgraded.
author: Patrick J Volkerding <volkerdi@slackware.com> 2020-12-07 21:49:58 +0000
committer: Eric Hameleers <alien@slackware.com> 2020-12-08 08:59:51 +0100
commit: 5584dad3850d8f1aa3459ed8b85b3f8b571df3d4 (patch)
tree: 42cbbe668c936cf1bc0d35e57cf68afec5657776 /source/kde/kde/patch
parent: 9dce810dc522c70eeca9a928b95df923a70e4f2c (diff)
download: current-5584dad3850d8f1aa3459ed8b85b3f8b571df3d4.tar.gz
current-5584dad3850d8f1aa3459ed8b85b3f8b571df3d4.tar.xz
55 files changed, 6077 insertions, 0 deletions
diff --git a/source/kde/kde/patch/README b/source/kde/kde/patch/README
new file mode 100644
index 000000000..2478e45f9
--- /dev/null
+++ b/source/kde/kde/patch/README
@@ -0,0 +1,18 @@
+
+IMPORTANT!
+
+To fail/exit a script, use this:
+
+[command that fails] || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+DO NOT USE THIS:
+
+[command that fails] || exit 1
+
+as it will cause the parent script to exit in the wrong location and possibly
+silently skip building some packages.
+
+Thanks,
+
+The Management
+
diff --git a/source/kde/kde/patch/baloo.patch b/source/kde/kde/patch/baloo.patch
new file mode 100644
index 000000000..bcca5d5bb
--- /dev/null
+++ b/source/kde/kde/patch/baloo.patch
@@ -0,0 +1,2 @@
+# Disable file indexing by default in Baloo:
+cat $CWD/patch/baloo/baloo_def_indexing_disabled.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch b/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch
new file mode 100644
index 000000000..8a12e45f2
--- /dev/null
+++ b/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch
@@ -0,0 +1,12 @@
+diff -uar baloo-5.72.0.orig/src/lib/baloosettings.kcfg baloo-5.72.0/src/lib/baloosettings.kcfg
+--- baloo-5.72.0.orig/src/lib/baloosettings.kcfg	2020-07-04 15:03:02.000000000 +0200
++++ baloo-5.72.0/src/lib/baloosettings.kcfg	2020-07-29 19:51:58.891567902 +0200
+@@ -9,7 +9,7 @@
+   <group name="Basic Settings">
+     <entry name="indexingEnabled" key="Indexing-Enabled" type="Bool">
+       <label>Indexing-Enabled</label>
+-      <default>true</default>
++      <default>false</default>
+     </entry>
+   </group>
+   <group name="General">
diff --git a/source/kde/kde/patch/calendarsupport.patch b/source/kde/kde/patch/calendarsupport.patch
new file mode 100644
index 000000000..d856e5f53
--- /dev/null
+++ b/source/kde/kde/patch/calendarsupport.patch
@@ -0,0 +1,2 @@
+# Fix for API change in qt-5.15.2:
+cat $CWD/patch/calendarsupport/calendarsupport.qt-5.15.2.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff b/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
new file mode 100644
index 000000000..7dc0b8689
--- /dev/null
+++ b/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
@@ -0,0 +1,507 @@
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/calprintdefaultplugins.cpp calendarsupport-20.08.3/src/printing/calprintdefaultplugins.cpp
+--- calendarsupport-20.08.3.orig/src/printing/calprintdefaultplugins.cpp	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/calprintdefaultplugins.cpp	2020-11-21 13:57:32.443012469 -0600
+@@ -1,28 +1,12 @@
+ /*
+-  Copyright (c) 1998 Preston Brown <pbrown@kde.org>
+-  Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
+-  Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
+-  Copyright (c) 2008 Ron Goodheart <rong.dev@gmail.com>
+-  Copyright (C) 2010-2020 Laurent Montel <montel@kde.org>
+-  Copyright (c) 2012-2013 Allen Winter <winter@kde.org>
+-
+-  This program is free software; you can redistribute it and/or modify
+-  it under the terms of the GNU General Public License as published by
+-  the Free Software Foundation; either version 2 of the License, or
+-  (at your option) any later version.
+-
+-  This program is distributed in the hope that it will be useful,
+-  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-  GNU General Public License for more details.
+-
+-  You should have received a copy of the GNU General Public License along
+-  with this program; if not, write to the Free Software Foundation, Inc.,
+-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-
+-  As a special exception, permission is given to link this program
+-  with any edition of Qt, and distribute the resulting executable,
+-  without including the source code for Qt in the source distribution.
++  SPDX-FileCopyrightText: 1998 Preston Brown <pbrown@kde.org>
++  SPDX-FileCopyrightText: 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
++  SPDX-FileCopyrightText: 2003 Cornelius Schumacher <schumacher@kde.org>
++  SPDX-FileCopyrightText: 2008 Ron Goodheart <rong.dev@gmail.com>
++  SPDX-FileCopyrightText: 2010-2020 Laurent Montel <montel@kde.org>
++  SPDX-FileCopyrightText: 2012-2013 Allen Winter <winter@kde.org>
++
++  SPDX-License-Identifier: GPL-2.0-or-later WITH Qt-Commercial-exception-1.0
+ */
+ 
+ #include "calprintdefaultplugins.h"
+@@ -40,7 +24,6 @@
+ 
+ #include <QPainter>
+ #include <QPrinter>
+-#include <KLocalizedString>
+ 
+ using namespace CalendarSupport;
+ 
+@@ -69,7 +52,7 @@
+ 
+ void CalPrintIncidence::readSettingsWidget()
+ {
+-    CalPrintIncidenceConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintIncidenceConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         mUseColors = cfg->mColors->isChecked();
+@@ -84,7 +67,7 @@
+ 
+ void CalPrintIncidence::setSettingsWidget()
+ {
+-    CalPrintIncidenceConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintIncidenceConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mColors->setChecked(mUseColors);
+@@ -205,7 +188,7 @@
+ 
+     bool visit(const KCalendarCore::FreeBusy::Ptr &fb) override
+     {
+-        Q_UNUSED(fb);
++        Q_UNUSED(fb)
+         return true;
+     }
+ };
+@@ -688,7 +671,7 @@
+ 
+ void CalPrintDay::readSettingsWidget()
+ {
+-    CalPrintDayConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintDayConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         mFromDate = cfg->mFromDate->date();
+@@ -720,7 +703,7 @@
+ 
+ void CalPrintDay::setSettingsWidget()
+ {
+-    CalPrintDayConfig *cfg = dynamic_cast<CalPrintDayConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintDayConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mFromDate->setDate(mFromDate);
+         cfg->mToDate->setDate(mToDate);
+@@ -793,7 +776,7 @@
+ void CalPrintDay::setDateRange(const QDate &from, const QDate &to)
+ {
+     CalPrintPluginBase::setDateRange(from, to);
+-    CalPrintDayConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintDayConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mFromDate->setDate(from);
+@@ -821,7 +804,7 @@
+         QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
+         QString line2 = local.toString(mToDate, QLocale::ShortFormat);
+         QString title;
+-        if (orientation() == QPrinter::Landscape) {
++        if (orientation() == QPageLayout::Landscape) {
+             title = i18nc("date from-to", "%1 - %2", line1, line2);
+         } else {
+             title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
+@@ -967,7 +950,7 @@
+ 
+ void CalPrintWeek::readSettingsWidget()
+ {
+-    CalPrintWeekConfig *cfg = dynamic_cast<CalPrintWeekConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintWeekConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         mFromDate = cfg->mFromDate->date();
+         mToDate = cfg->mToDate->date();
+@@ -999,7 +982,7 @@
+ 
+ void CalPrintWeek::setSettingsWidget()
+ {
+-    CalPrintWeekConfig *cfg = dynamic_cast<CalPrintWeekConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintWeekConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mFromDate->setDate(mFromDate);
+         cfg->mToDate->setDate(mToDate);
+@@ -1066,21 +1049,21 @@
+     }
+ }
+ 
+-QPrinter::Orientation CalPrintWeek::defaultOrientation() const
++QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
+ {
+     if (mWeekPrintType == Filofax) {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     } else if (mWeekPrintType == SplitWeek) {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     } else {
+-        return QPrinter::Landscape;
++        return QPageLayout::Landscape;
+     }
+ }
+ 
+ void CalPrintWeek::setDateRange(const QDate &from, const QDate &to)
+ {
+     CalPrintPluginBase::setDateRange(from, to);
+-    CalPrintWeekConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintWeekConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mFromDate->setDate(from);
+@@ -1115,7 +1098,7 @@
+         do {
+             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
+             line2 = local.toString(curWeek, QLocale::ShortFormat);
+-            if (orientation() == QPrinter::Landscape) {
++            if (orientation() == QPageLayout::Landscape) {
+                 title = i18nc("date from-to", "%1 - %2", line1, line2);
+             } else {
+                 title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
+@@ -1142,7 +1125,7 @@
+         do {
+             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
+             line2 = local.toString(curWeek, QLocale::ShortFormat);
+-            if (orientation() == QPrinter::Landscape) {
++            if (orientation() == QPageLayout::Landscape) {
+                 title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
+                               line1, line2, curWeek.weekNumber());
+             } else {
+@@ -1228,7 +1211,7 @@
+ 
+ void CalPrintMonth::readSettingsWidget()
+ {
+-    CalPrintMonthConfig *cfg = dynamic_cast<CalPrintMonthConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintMonthConfig *>((QWidget *)mConfigWidget);
+ 
+     if (cfg) {
+         mFromDate = QDate(cfg->mFromYear->value(), cfg->mFromMonth->currentIndex() + 1, 1);
+@@ -1250,7 +1233,7 @@
+ 
+ void CalPrintMonth::setSettingsWidget()
+ {
+-    CalPrintMonthConfig *cfg = dynamic_cast<CalPrintMonthConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintMonthConfig *>((QWidget *)mConfigWidget);
+ 
+     if (cfg) {
+         setDateRange(mFromDate, mToDate);
+@@ -1306,7 +1289,7 @@
+ void CalPrintMonth::setDateRange(const QDate &from, const QDate &to)
+ {
+     CalPrintPluginBase::setDateRange(from, to);
+-    CalPrintMonthConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintMonthConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mFromMonth->clear();
+@@ -1389,7 +1372,7 @@
+ 
+ void CalPrintTodos::readSettingsWidget()
+ {
+-    CalPrintTodoConfig *cfg = dynamic_cast<CalPrintTodoConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintTodoConfig *>((QWidget *)mConfigWidget);
+ 
+     if (cfg) {
+         mPageTitle = cfg->mTitle->text();
+@@ -1425,7 +1408,7 @@
+ 
+ void CalPrintTodos::setSettingsWidget()
+ {
+-    CalPrintTodoConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintTodoConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mTitle->setText(mPageTitle);
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/calprintdefaultplugins.h calendarsupport-20.08.3/src/printing/calprintdefaultplugins.h
+--- calendarsupport-20.08.3.orig/src/printing/calprintdefaultplugins.h	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/calprintdefaultplugins.h	2020-11-21 16:02:29.289180174 -0600
+@@ -69,9 +69,9 @@
+     }
+ 
+     QWidget *createConfigWidget(QWidget *) override;
+-    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
++    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
+     {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     }
+ 
+ public:
+@@ -182,7 +182,7 @@
+     /**
+       Returns the default orientation for the eWeekPrintType.
+     */
+-    QPrinter::Orientation defaultOrientation() const override;
++    QPageLayout::Orientation defaultOrientation() const override;
+ 
+ public:
+     void print(QPainter &p, int width, int height) override;
+@@ -238,9 +238,9 @@
+     }
+ 
+     QWidget *createConfigWidget(QWidget *) override;
+-    QPrinter::Orientation defaultOrientation() const override
++    QPageLayout::Orientation defaultOrientation() const override
+     {
+-        return QPrinter::Landscape;
++        return QPageLayout::Landscape;
+     }
+ 
+ public:
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/calprinter.cpp calendarsupport-20.08.3/src/printing/calprinter.cpp
+--- calendarsupport-20.08.3.orig/src/printing/calprinter.cpp	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/calprinter.cpp	2020-11-21 16:02:29.290180174 -0600
+@@ -39,7 +39,6 @@
+ #include <QStackedWidget>
+ #include <KConfigGroup>
+ #include <QDialogButtonBox>
+-#include <QPushButton>
+ 
+ #include <PimCommon/KPimPrintPreviewDialog>
+ 
+@@ -142,13 +141,13 @@
+     QPrinter printer;
+     switch (dlgorientation) {
+     case eOrientPlugin:
+-        printer.setOrientation(selectedStyle->defaultOrientation());
++        printer.setPageOrientation(selectedStyle->defaultOrientation());
+         break;
+     case eOrientPortrait:
+-        printer.setOrientation(QPrinter::Portrait);
++        printer.setPageOrientation(QPageLayout::Portrait);
+         break;
+     case eOrientLandscape:
+-        printer.setOrientation(QPrinter::Landscape);
++        printer.setPageOrientation(QPageLayout::Landscape);
+         break;
+     case eOrientPrinter:
+         break;
+@@ -182,7 +181,7 @@
+     setWindowTitle(i18nc("@title:window", "Print"));
+     QDialogButtonBox *buttonBox = new QDialogButtonBox(
+         QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
++    auto *mainLayout = new QVBoxLayout(this);
+     mOkButton = buttonBox->button(QDialogButtonBox::Ok);
+     mOkButton->setDefault(true);
+     mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+@@ -190,12 +189,12 @@
+     connect(buttonBox, &QDialogButtonBox::rejected, this, &CalPrintDialog::reject);
+     setModal(true);
+     QWidget *page = new QWidget(this);
+-    QVBoxLayout *pageVBoxLayout = new QVBoxLayout(page);
++    auto *pageVBoxLayout = new QVBoxLayout(page);
+     pageVBoxLayout->setContentsMargins(0, 0, 0, 0);
+     mainLayout->addWidget(page);
+     mainLayout->addWidget(buttonBox);
+ 
+-    QSplitter *splitter = new QSplitter(page);
++    auto *splitter = new QSplitter(page);
+     pageVBoxLayout->addWidget(splitter);
+     splitter->setOrientation(Qt::Horizontal);
+     splitter->setChildrenCollapsible(false);
+@@ -204,7 +203,7 @@
+     mTypeGroup = new QButtonGroup(typeBox);
+ 
+     QWidget *splitterRight = new QWidget(splitter);
+-    QGridLayout *splitterRightLayout = new QGridLayout(splitterRight);
++    auto *splitterRightLayout = new QGridLayout(splitterRight);
+     splitterRightLayout->setContentsMargins(0, 0, 0, 0);
+     //splitterRightLayout->setMargin( marginHint() );
+     //splitterRightLayout->setSpacing( spacingHint() );
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/calprintpluginbase.cpp calendarsupport-20.08.3/src/printing/calprintpluginbase.cpp
+--- calendarsupport-20.08.3.orig/src/printing/calprintpluginbase.cpp	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/calprintpluginbase.cpp	2020-11-21 16:02:29.290180174 -0600
+@@ -38,7 +38,6 @@
+ #include <QAbstractTextDocumentLayout>
+ #include <QFrame>
+ #include <QLabel>
+-#include <QPainter>
+ #include <QTextCursor>
+ #include <QTextDocument>
+ #include <QTextDocumentFragment>
+@@ -112,7 +111,7 @@
+         happens on the given day */
+     bool overlaps(CellItem *o) const override
+     {
+-        PrintCellItem *other = static_cast<PrintCellItem *>(o);
++        auto *other = static_cast<PrintCellItem *>(o);
+         return !(other->start() >= end() || other->end() <= start());
+     }
+ 
+@@ -144,7 +143,7 @@
+ QWidget *CalPrintPluginBase::createConfigWidget(QWidget *w)
+ {
+     QFrame *wdg = new QFrame(w);
+-    QVBoxLayout *layout = new QVBoxLayout(wdg);
++    auto *layout = new QVBoxLayout(wdg);
+ 
+     QLabel *title = new QLabel(description(), wdg);
+     QFont titleFont(title->font());
+@@ -248,9 +247,9 @@
+     mPrintFooter = printFooter;
+ }
+ 
+-QPrinter::Orientation CalPrintPluginBase::orientation() const
++QPageLayout::Orientation CalPrintPluginBase::orientation() const
+ {
+-    return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
++    return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
+ }
+ 
+ QColor CalPrintPluginBase::getTextColor(const QColor &c) const
+@@ -342,7 +341,7 @@
+ {
+     if (mHeaderHeight >= 0) {
+         return mHeaderHeight;
+-    } else if (orientation() == QPrinter::Portrait) {
++    } else if (orientation() == QPageLayout::Portrait) {
+         return PORTRAIT_HEADER_HEIGHT;
+     } else {
+         return LANDSCAPE_HEADER_HEIGHT;
+@@ -372,7 +371,7 @@
+ 
+     if (mFooterHeight >= 0) {
+         return mFooterHeight;
+-    } else if (orientation() == QPrinter::Portrait) {
++    } else if (orientation() == QPageLayout::Portrait) {
+         return PORTRAIT_FOOTER_HEIGHT;
+     } else {
+         return LANDSCAPE_FOOTER_HEIGHT;
+@@ -961,7 +960,7 @@
+ 
+     QListIterator<CellItem *> it2(cells);
+     while (it2.hasNext()) {
+-        PrintCellItem *placeItem = static_cast<PrintCellItem *>(it2.next());
++        auto *placeItem = static_cast<PrintCellItem *>(it2.next());
+         drawAgendaItem(placeItem, p, startPrintDate, endPrintDate, minlen, box,
+                        includeDescription, excludeTime);
+     }
+@@ -1673,7 +1672,7 @@
+     QFont oldfont(p.font());
+     p.setFont(QFont(QStringLiteral("sans-serif"), 7));
+     while (it1.hasNext()) {
+-        PrintCellItem *placeItem = static_cast<PrintCellItem *>(it1.next());
++        auto *placeItem = static_cast<PrintCellItem *>(it1.next());
+         int minsToStart = starttime.secsTo(placeItem->start()) / 60;
+         int minsToEnd = starttime.secsTo(placeItem->end()) / 60;
+ 
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/calprintpluginbase.h calendarsupport-20.08.3/src/printing/calprintpluginbase.h
+--- calendarsupport-20.08.3.orig/src/printing/calprintpluginbase.h	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/calprintpluginbase.h	2020-11-21 16:02:29.290180174 -0600
+@@ -123,7 +123,7 @@
+     */
+     static int weekdayColumn(int weekday);
+ 
+-    QPrinter::Orientation orientation() const;
++    QPageLayout::Orientation orientation() const;
+ 
+     /** Returns the height of the page header. If the height was explicitly
+         set using setHeaderHeight, that value is returned, otherwise a
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/printplugin.h calendarsupport-20.08.3/src/printing/printplugin.h
+--- calendarsupport-20.08.3.orig/src/printing/printplugin.h	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/printplugin.h	2020-11-21 16:02:29.290180174 -0600
+@@ -153,9 +153,9 @@
+       config settings), implement this function in your subclass and
+       return the desired orientation.
+     */
+-    virtual QPrinter::Orientation defaultOrientation() const
++    virtual QPageLayout::Orientation defaultOrientation() const
+     {
+-        return QPrinter::Portrait;
++        return QPageLayout::Portrait;
+     }
+ 
+     /**
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/yearprint.cpp calendarsupport-20.08.3/src/printing/yearprint.cpp
+--- calendarsupport-20.08.3.orig/src/printing/yearprint.cpp	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/yearprint.cpp	2020-11-21 13:57:32.444012470 -0600
+@@ -1,23 +1,7 @@
+ /*
+-  Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
++  SPDX-FileCopyrightText: 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
+ 
+-  This program is free software; you can redistribute it and/or modify
+-  it under the terms of the GNU General Public License as published by
+-  the Free Software Foundation; either version 2 of the License, or
+-  (at your option) any later version.
+-
+-  This program is distributed in the hope that it will be useful,
+-  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-  GNU General Public License for more details.
+-
+-  You should have received a copy of the GNU General Public License along
+-  with this program; if not, write to the Free Software Foundation, Inc.,
+-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-
+-  As a special exception, permission is given to link this program
+-  with any edition of Qt, and distribute the resulting executable,
+-  without including the source code for Qt in the source distribution.
++  SPDX-License-Identifier: GPL-2.0-or-later WITH Qt-Commercial-exception-1.0
+ */
+ 
+ #include "yearprint.h"
+@@ -38,7 +22,7 @@
+ 
+ void CalPrintYear::readSettingsWidget()
+ {
+-    CalPrintYearConfig *cfg = dynamic_cast<CalPrintYearConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintYearConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         mYear = cfg->mYear->value();
+         mPages = cfg->mPages->currentText().toInt();
+@@ -49,7 +33,7 @@
+ 
+ void CalPrintYear::setSettingsWidget()
+ {
+-    CalPrintYearConfig *cfg
++    auto *cfg
+         = dynamic_cast<CalPrintYearConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         QDate start(mYear, 1, 1);
+@@ -98,15 +82,15 @@
+     }
+ }
+ 
+-QPrinter::Orientation CalPrintYear::defaultOrientation() const
++QPageLayout::Orientation CalPrintYear::defaultOrientation() const
+ {
+-    return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
++    return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
+ }
+ 
+ void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
+ {
+     CalPrintPluginBase::setDateRange(from, to);
+-    CalPrintYearConfig *cfg = dynamic_cast<CalPrintYearConfig *>((QWidget *)mConfigWidget);
++    auto *cfg = dynamic_cast<CalPrintYearConfig *>((QWidget *)mConfigWidget);
+     if (cfg) {
+         cfg->mYear->setValue(from.year());
+     }
+@@ -147,7 +131,7 @@
+         QString stdate = locale.toString(start, QLocale::ShortFormat);
+         QString endate = locale.toString(end, QLocale::ShortFormat);
+         QString title;
+-        if (orientation() == QPrinter::Landscape) {
++        if (orientation() == QPageLayout::Landscape) {
+             title = i18nc("date from - to", "%1 - %2", stdate, endate);
+         } else {
+             title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);
+diff -u -r --new-file calendarsupport-20.08.3.orig/src/printing/yearprint.h calendarsupport-20.08.3/src/printing/yearprint.h
+--- calendarsupport-20.08.3.orig/src/printing/yearprint.h	2020-10-10 14:56:21.000000000 -0500
++++ calendarsupport-20.08.3/src/printing/yearprint.h	2020-11-21 16:02:29.291180174 -0600
+@@ -64,7 +64,7 @@
+     }
+ 
+     QWidget *createConfigWidget(QWidget *) override;
+-    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
++    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
+ 
+ public:
+     void print(QPainter &p, int width, int height) override;
diff --git a/source/kde/kde/patch/calligraplan.patch b/source/kde/kde/patch/calligraplan.patch
new file mode 100644
index 000000000..5895d0cea
--- /dev/null
+++ b/source/kde/kde/patch/calligraplan.patch
@@ -0,0 +1,2 @@
+# Fix build against Qt 5.15:
+cat $CWD/patch/calligraplan/calligraplan.qt-5.15.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
new file mode 100644
index 000000000..c8962a1b5
--- /dev/null
+++ b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
@@ -0,0 +1,10 @@
+--- ./src/libs/ui/kptganttitemdelegate.cpp.orig	2019-12-12 05:48:13.000000000 -0600
++++ ./src/libs/ui/kptganttitemdelegate.cpp	2020-07-18 14:48:48.058351438 -0500
+@@ -28,6 +28,7 @@
+ #include <QModelIndex>
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLocale>
+ 
+ #include <KLocalizedString>
diff --git a/source/kde/kde/patch/dolphin.patch b/source/kde/kde/patch/dolphin.patch
new file mode 100644
index 000000000..02a7950c8
--- /dev/null
+++ b/source/kde/kde/patch/dolphin.patch
@@ -0,0 +1,2 @@
+# Let the user decide whether she wants to run Dolphin as root:
+cat $CWD/patch/dolphin/dolphin_revert_noroot.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch
new file mode 100644
index 000000000..423e17074
--- /dev/null
+++ b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch
@@ -0,0 +1,23 @@
+# Let the user decide whether she wants to run Dolphin as root:
+
+diff -uar dolphin-18.08.0.orig/src/main.cpp dolphin-18.08.0/src/main.cpp
+--- dolphin-18.08.0.orig/src/main.cpp	2018-08-06 22:41:40.000000000 +0200
++++ dolphin-18.08.0/src/main.cpp	2018-08-11 00:32:48.073913157 +0200
+@@ -43,14 +43,12 @@
+ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    // Prohibit using sudo or kdesu (but allow using the root user directly)
++    // Warn using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
+-            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
++            std::cout << "Executing Dolphin with sudo is UNSAFE due to unfixable security vulnerabilities." << std::endl;
+         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+-            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
++            std::cout << "Executing Dolphin with kdesu is UNSAFE due to unfixable security vulnerabilities." << std::endl;
+         }
+     }
+ #endif
diff --git a/source/kde/kde/patch/falkon.patch b/source/kde/kde/patch/falkon.patch
new file mode 100644
index 000000000..27a466836
--- /dev/null
+++ b/source/kde/kde/patch/falkon.patch
@@ -0,0 +1,2 @@
+# Fix build against Qt 5.15:
+cat $CWD/patch/falkon/falkon.qt-5.15.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/falkon/falkon.qt-5.15.diff b/source/kde/kde/patch/falkon/falkon.qt-5.15.diff
new file mode 100644
index 000000000..60f1699e8
--- /dev/null
+++ b/source/kde/kde/patch/falkon/falkon.qt-5.15.diff
@@ -0,0 +1,20 @@
+--- ./src/lib/tools/qztools.cpp.orig	2019-03-19 13:06:45.000000000 -0500
++++ ./src/lib/tools/qztools.cpp	2020-07-18 15:00:08.881313780 -0500
+@@ -25,6 +25,7 @@
+ #include <QByteArray>
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QBuffer>
+ #include <QFile>
+ #include <QDir>
+--- ./src/plugins/VerticalTabs/verticaltabsplugin.cpp.orig	2019-03-19 13:06:45.000000000 -0500
++++ ./src/plugins/VerticalTabs/verticaltabsplugin.cpp	2020-07-18 15:03:16.468303404 -0500
+@@ -31,6 +31,7 @@
+ #include "desktopfile.h"
+ 
+ #include <QSettings>
++#include <QFile>
+ 
+ VerticalTabsPlugin::VerticalTabsPlugin()
+     : QObject()
diff --git a/source/kde/kde/patch/kaddressbook.patch b/source/kde/kde/patch/kaddressbook.patch
new file mode 100644
index 000000000..f5479069d
--- /dev/null
+++ b/source/kde/kde/patch/kaddressbook.patch
@@ -0,0 +1,2 @@
+# Fix for API change in qt-5.15.2:
+cat $CWD/patch/kaddressbook/kaddressbook.qt-5.15.2.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff b/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
new file mode 100644
index 000000000..6460b30d4
--- /dev/null
+++ b/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
@@ -0,0 +1,48 @@
+diff -u -r kaddressbook-20.08.3.orig/src/printing/compact/compactstyle.cpp kaddressbook-20.08.3/src/printing/compact/compactstyle.cpp
+--- kaddressbook-20.08.3.orig/src/printing/compact/compactstyle.cpp	2020-10-31 12:34:25.000000000 -0500
++++ kaddressbook-20.08.3/src/printing/compact/compactstyle.cpp	2020-11-21 18:57:47.894415475 -0600
+@@ -184,7 +184,7 @@
+ 
+     // print
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff -u -r kaddressbook-20.08.3.orig/src/printing/grantlee/grantleeprintstyle.cpp kaddressbook-20.08.3/src/printing/grantlee/grantleeprintstyle.cpp
+--- kaddressbook-20.08.3.orig/src/printing/grantlee/grantleeprintstyle.cpp	2020-10-31 12:34:25.000000000 -0500
++++ kaddressbook-20.08.3/src/printing/grantlee/grantleeprintstyle.cpp	2020-11-21 18:58:45.776416770 -0600
+@@ -52,7 +52,7 @@
+ void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
+ {
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff -u -r kaddressbook-20.08.3.orig/src/printing/mike/mikesstyle.cpp kaddressbook-20.08.3/src/printing/mike/mikesstyle.cpp
+--- kaddressbook-20.08.3.orig/src/printing/mike/mikesstyle.cpp	2020-10-31 12:34:25.000000000 -0500
++++ kaddressbook-20.08.3/src/printing/mike/mikesstyle.cpp	2020-11-21 18:59:05.607417213 -0600
+@@ -123,7 +123,7 @@
+ void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
+ {
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff -u -r kaddressbook-20.08.3.orig/src/printing/ringbinder/ringbinderstyle.cpp kaddressbook-20.08.3/src/printing/ringbinder/ringbinderstyle.cpp
+--- kaddressbook-20.08.3.orig/src/printing/ringbinder/ringbinderstyle.cpp	2020-10-31 12:34:25.000000000 -0500
++++ kaddressbook-20.08.3/src/printing/ringbinder/ringbinderstyle.cpp	2020-11-21 18:59:38.963417959 -0600
+@@ -175,7 +175,7 @@
+     config.sync();
+ 
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
diff --git a/source/kde/kde/patch/kalgebra.patch b/source/kde/kde/patch/kalgebra.patch
new file mode 100644
index 000000000..d17f4822d
--- /dev/null
+++ b/source/kde/kde/patch/kalgebra.patch
@@ -0,0 +1,4 @@
+# On some systems, libreadline is linked to Curses implementation directly;
+# on other, it's not, requiring you to link both Curses and Readline libraries
+# manually.
+cat $CWD/patch/kalgebra/kalgebra_ncurses_linking.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
new file mode 100644
index 000000000..3d78fa30b
--- /dev/null
+++ b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
@@ -0,0 +1,11 @@
+--- kalgebra-14.12.1.orig/calgebra/CMakeLists.txt	2014-11-13 02:59:40.000000000 +0100
++++ kalgebra-14.12.1/calgebra/CMakeLists.txt	2015-01-14 14:35:54.702166188 +0100
+@@ -13,7 +13,7 @@
+ endif()
+ 
+ add_executable(calgebra main.cpp)
+-target_link_libraries(calgebra Qt5::Core ${READLINE_LIBRARY} KF5::Analitza)
++target_link_libraries(calgebra Qt5::Core ${READLINE_LIBRARY} ${CURSES_LIBRARIES} KF5::Analitza)
+ 
+ install(TARGETS calgebra ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
diff --git a/source/kde/kde/patch/kate.patch b/source/kde/kde/patch/kate.patch
new file mode 100644
index 000000000..59df062a0
--- /dev/null
+++ b/source/kde/kde/patch/kate.patch
@@ -0,0 +1,3 @@
+# Allow Kate to be started by the root user; disallowing this is not
+# a decision that a developer should make for the user, it is patronizing:
+cat $CWD/patch/kate/kate_runasroot.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kate/kate_runasroot.patch b/source/kde/kde/patch/kate/kate_runasroot.patch
new file mode 100644
index 000000000..f549fc342
--- /dev/null
+++ b/source/kde/kde/patch/kate/kate_runasroot.patch
@@ -0,0 +1,45 @@
+The user gets to decide whether she wants to run kate as root.
+Please developers, do not presume that a Slackware user is dumb.
+
+diff -uar kate-19.04.1.orig/kate/main.cpp kate-19.04.1/kate/main.cpp
+--- kate-19.04.1.orig/kate/main.cpp	2019-05-02 12:44:53.000000000 +0200
++++ kate-19.04.1/kate/main.cpp	2019-05-08 21:26:07.196338144 +0200
+@@ -59,14 +59,12 @@
+ int main(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    // Prohibit using sudo or kdesu (but allow using the root user directly)
++    // Warn using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
+-            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
++            std::cout << "Executing Kate with sudo is UNSAFE due to unfixable security vulnerabilities." << std::endl;
+         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+-            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
++            std::cout << "Executing Kate with kdesu is UNSAFE due to unfixable security vulnerabilities." << std::endl;
+         }
+     }
+ #endif
+diff -uar kate-19.04.1.orig/kwrite/main.cpp kate-19.04.1/kwrite/main.cpp
+--- kate-19.04.1.orig/kwrite/main.cpp	2019-05-02 12:44:53.000000000 +0200
++++ kate-19.04.1/kwrite/main.cpp	2019-05-08 21:27:52.034134472 +0200
+@@ -51,14 +51,12 @@
+ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    // Prohibit using sudo or kdesu (but allow using the root user directly)
++    // Warn using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
+-            std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
++            std::cout << "Executing KWrite with sudo is UNSAFE due to unfixable security vulnerabilities." << std::endl;
+         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+-            std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
++            std::cout << "Executing KWrite with kdesu is UNSAFE due to unfixable security vulnerabilities." << std::endl;
+         }
+     }
+ #endif
diff --git a/source/kde/kde/patch/kdeconnect-kde.patch b/source/kde/kde/patch/kdeconnect-kde.patch
new file mode 100644
index 000000000..122440d2a
--- /dev/null
+++ b/source/kde/kde/patch/kdeconnect-kde.patch
@@ -0,0 +1,2 @@
+# Fix remote device browsing with openssh 8.2:
+cat $CWD/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff b/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
new file mode 100644
index 000000000..ff067aa8e
--- /dev/null
+++ b/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
@@ -0,0 +1,12 @@
+diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
+index fca9907c..f673c9f7 100644
+--- a/plugins/sftp/mounter.cpp
++++ b/plugins/sftp/mounter.cpp
+@@ -145,6 +145,7 @@ void Mounter::onPackageReceived(const NetworkPacket& np)
+         << QStringLiteral("-o") << QStringLiteral("reconnect")
+         << QStringLiteral("-o") << QStringLiteral("ServerAliveInterval=30")
+         << QStringLiteral("-o") << QStringLiteral("password_stdin")
++        << QStringLiteral("-o") << QStringLiteral("KexAlgorithms=+diffie-hellman-group14-sha1")
+         ;
+ 
+     m_proc->setProgram(program, arguments);
diff --git a/source/kde/kde/patch/kdelibs.patch b/source/kde/kde/patch/kdelibs.patch
new file mode 100644
index 000000000..0cdcc9ca4
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs.patch
@@ -0,0 +1,26 @@
+# Slackware ships a different version of XML DTDs:
+cat $CWD/patch/kdelibs/kdelibs.docbook.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Make uPnP support depend on the environment variable SOLID_UPNP,
+# e.g. by creating an /etc/profile.d/upnp.sh file with the following contents:
+# export SOLID_UPNP=1
+cat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Revert 3 patches which (although they probably follow the FDo spec better),
+# cause incorrect icon overrides:
+cat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/kdelibs/coding-style-fixes.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/kdelibs/return-application-icons-properly.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Support OpenSSL-1.1.x:
+cat $CWD/patch/kdelibs/kdelibs-openssl-1.1.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Security: remove support for $(...) in config keys with [$e] marker.
+# (CVE-2019-14744):
+cat $CWD/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Support TLS v1.1 and TLS v1.2:
+cat $CWD/patch/kdelibs/kde4libs-4.14.26.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix for the relocated grantlee-qt4 includes:
+cat $CWD/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kdelibs/coding-style-fixes.patch b/source/kde/kde/patch/kdelibs/coding-style-fixes.patch
new file mode 100644
index 000000000..11108f0a4
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/coding-style-fixes.patch
@@ -0,0 +1,62 @@
+From 2173580f070e806d4715e13048c697c49ec262e2 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Thu, 21 Feb 2013 17:59:58 +0100
+Subject: [PATCH 047/111] coding style fixes
+
+---
+ kdeui/icons/kiconloader.cpp | 27 ++++++++++++---------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
+index 6fed667..dba474d 100644
+--- a/kdeui/icons/kiconloader.cpp
++++ b/kdeui/icons/kiconloader.cpp
+@@ -938,32 +938,29 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
+         }
+     }
+ 
+-    foreach (KIconThemeNode *themeNode, links)
+-    {
++    foreach (KIconThemeNode *themeNode, links) {
+         QString currentName = name;
+ 
+-        while (!currentName.isEmpty())
+-        {
+-
++        while (!currentName.isEmpty()) {
+             //kDebug(264) << "Looking up" << currentName;
+ 
+-// The following code has been commented out because the Qt SVG renderer needs
+-// to be improved. If you are going to change/remove some code from this part,
+-// please contact me before (ereslibre@kde.org), or kde-core-devel@kde.org. (ereslibre)
+-            for (int i = 0 ; i < 4 ; i++)
+-            {
++            for (int i = 0 ; i < 4 ; i++) {
+                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact);
+-                if (icon.isValid())
+-                    return icon;
++                if (icon.isValid()) {
++                    break;
++                }
+ 
+                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest);
+-                if (icon.isValid())
+-                    return icon;
++                if (icon.isValid()) {
++                    break;
++                }
+             }
++            //kDebug(264) << "Looking up" << currentName;
+ 
+-            if (genericFallback)
++            if (genericFallback) {
+                 // we already tested the base name
+                 break;
++            }
+ 
+             int rindex = currentName.lastIndexOf('-');
+             if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc
+-- 
+1.8.1.4
+
+
diff --git a/source/kde/kde/patch/kdelibs/kde4libs-4.14.26.diff b/source/kde/kde/patch/kdelibs/kde4libs-4.14.26.diff
new file mode 100644
index 000000000..2bc275ac7
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/kde4libs-4.14.26.diff
@@ -0,0 +1,11 @@
+--- a/kio/kio/tcpslavebase.cpp
++++ b/kio/kio/tcpslavebase.cpp
+@@ -499,7 +499,7 @@
+ {
+     if (d->usingSSL)
+         return false;
+-    return d->startTLSInternal(KTcpSocket::TlsV1) & ResultOk;
++    return d->startTLSInternal(KTcpSocket::SecureProtocols) & ResultOk;
+ }
+ 
+ TCPSlaveBase::SslResult TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal (KTcpSocket::SslVersion version,
diff --git a/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch b/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
new file mode 100644
index 000000000..1f6b7fcb0
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
@@ -0,0 +1,4007 @@
+--- kdelibs-4.14.26/kio/CMakeLists.txt.omv~	2016-11-14 22:38:29.427137096 +0100
++++ kdelibs-4.14.26/kio/CMakeLists.txt	2016-11-14 22:39:21.476667341 +0100
+@@ -325,6 +325,7 @@ install(FILES kssl/ksslcertificatemanage
+         DESTINATION  ${DATA_INSTALL_DIR}/kconf_update)
+ 
+ kde4_add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS})
++target_link_libraries(kio -lssl -lcrypto)
+ 
+ if(NOT KIO_NO_NEPOMUK)
+   kde4_add_executable(kfilemetadatareader ${kfilemetadatareaderprocess_SRCS})
+--- kdelibs-4.14.26/kio/kssl/kopenssl.cpp.omv~	2016-11-07 00:11:51.000000000 +0100
++++ kdelibs-4.14.26/kio/kssl/kopenssl.cpp	2016-11-14 22:11:02.355008887 +0100
+@@ -18,223 +18,52 @@
+ 
+ #include "kopenssl.h"
+ 
+-#include <config.h>
+ #include <ksslconfig.h>
+ 
+-#ifdef KSSL_HAVE_SSL
++#if KSSL_HAVE_SSL
+ #include <openssl/opensslv.h>
++#include <openssl/err.h>
+ #endif
+ 
+-#include <kdebug.h>
+ #include <kconfig.h>
+ #include <kconfiggroup.h>
+-#include <klibrary.h>
+ #include <QtCore/QCoreApplication>
+ #include <QtCore/QFile>
++#include <QtCore/QLibrary>
+ #include <QtCore/QRegExp>
+ 
+-
+-#include <stdio.h>
+-#include <unistd.h>
+-
+-extern "C" {
+-#ifdef KSSL_HAVE_SSL
+-static int (*K_SSL_connect)     (SSL *) = 0L;
+-static int (*K_SSL_accept)      (SSL *) = 0L;
+-static int (*K_SSL_read)        (SSL *, void *, int) = 0L;
+-static int (*K_SSL_write)       (SSL *, const void *, int) = 0L;
+-static SSL *(*K_SSL_new)        (SSL_CTX *) = 0L;
+-static void (*K_SSL_free)       (SSL *) = 0L;
+-static int (*K_SSL_shutdown)    (SSL *) = 0L;
+-static SSL_CTX *(*K_SSL_CTX_new)(SSL_METHOD *) = 0L;
+-static void (*K_SSL_CTX_free)   (SSL_CTX *) = 0L;
+-static int (*K_SSL_set_fd)      (SSL *, int) = 0L;
+-static int (*K_SSL_pending)     (SSL *) = 0L;
+-static int (*K_SSL_peek)        (SSL *, void *, int) = 0L;
+-static int (*K_SSL_CTX_set_cipher_list)(SSL_CTX *, const char *) = 0L;
+-static void (*K_SSL_CTX_set_verify)(SSL_CTX *, int,
+-                         int (*)(int, X509_STORE_CTX *)) = 0L;
+-static int (*K_SSL_use_certificate)(SSL *, X509 *) = 0L;
+-static SSL_CIPHER *(*K_SSL_get_current_cipher)(SSL *) = 0L;
+-static long (*K_SSL_ctrl)      (SSL *,int, long, char *) = 0L;
+-static int (*K_RAND_egd)        (const char *) = 0L;
+-static const char* (*K_RAND_file_name) (char *, size_t) = 0L;
+-static int (*K_RAND_load_file)  (const char *, long) = 0L;
+-static int (*K_RAND_write_file) (const char *) = 0L;
+-static SSL_METHOD * (*K_TLSv1_client_method) () = 0L;
+-static SSL_METHOD * (*K_SSLv23_client_method) () = 0L;
+-static X509 * (*K_SSL_get_peer_certificate) (SSL *) = 0L;
+-static int (*K_SSL_CIPHER_get_bits) (SSL_CIPHER *,int *) = 0L;
+-static char * (*K_SSL_CIPHER_get_version) (SSL_CIPHER *) = 0L;
+-static const char * (*K_SSL_CIPHER_get_name) (SSL_CIPHER *) = 0L;
+-static char * (*K_SSL_CIPHER_description) (SSL_CIPHER *, char *, int) = 0L;
+-static X509 * (*K_d2i_X509) (X509 **,unsigned char **,long) = 0L;
+-static int (*K_i2d_X509) (X509 *,unsigned char **) = 0L;
+-static int (*K_X509_cmp) (X509 *, X509 *) = 0L;
+-static void (*K_X509_STORE_CTX_free) (X509_STORE_CTX *) = 0L;
+-static int (*K_X509_verify_cert) (X509_STORE_CTX *) = 0L;
+-static X509_STORE_CTX *(*K_X509_STORE_CTX_new) (void) = 0L;
+-static void (*K_X509_STORE_free) (X509_STORE *) = 0L;
+-static X509_STORE *(*K_X509_STORE_new) (void) = 0L;
+-static void (*K_X509_free) (X509 *) = 0L;
+-static char *(*K_X509_NAME_oneline) (X509_NAME *,char *,int) = 0L;
+-static X509_NAME *(*K_X509_get_subject_name) (X509 *) = 0L;
+-static X509_NAME *(*K_X509_get_issuer_name) (X509 *) = 0L;
+-static X509_LOOKUP *(*K_X509_STORE_add_lookup) (X509_STORE *, X509_LOOKUP_METHOD *) = 0L;
+-static X509_LOOKUP_METHOD *(*K_X509_LOOKUP_file)(void) = 0L;
+-static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = 0L;
+-static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = 0L;
+-static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = 0L;
+-static void (*K_CRYPTO_free)       (void *) = 0L;
+-static X509* (*K_X509_dup)         (X509 *) = 0L;
+-static BIO_METHOD *(*K_BIO_s_mem) (void) = 0L;
+-static BIO* (*K_BIO_new) (BIO_METHOD *) = 0L;
+-static BIO* (*K_BIO_new_fp)   (FILE *, int) = 0L;
+-static BIO* (*K_BIO_new_mem_buf) (void *, int) = 0L;
+-static int  (*K_BIO_free)           (BIO *) = 0L;
+-static long (*K_BIO_ctrl) (BIO *,int,long,void *) = 0L;
+-static int  (*K_BIO_write) (BIO *b, const void *data, int len) = 0L;
+-static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
+-                                   const EVP_CIPHER *,unsigned char *,int ,
+-                                            pem_password_cb *, void *) = 0L;
+-static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
+-static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
+-static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
+-static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
+-static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
+-static int (*K_PKCS12_newpass) (PKCS12*, char*, char*) = 0L;
+-static PKCS12* (*K_d2i_PKCS12_fp) (FILE*, PKCS12**) = 0L;
+-static PKCS12* (*K_PKCS12_new) (void) = 0L;
+-static void (*K_PKCS12_free) (PKCS12 *) = 0L;
+-static int (*K_PKCS12_parse) (PKCS12*, const char *, EVP_PKEY**,
+-                                             X509**, STACK_OF(X509)**) = 0L;
+-static void (*K_EVP_PKEY_free) (EVP_PKEY *) = 0L;
+-static EVP_PKEY* (*K_EVP_PKEY_new) () = 0L;
+-static void (*K_X509_REQ_free) (X509_REQ *) = 0L;
+-static X509_REQ* (*K_X509_REQ_new) () = 0L;
+-static int (*K_SSL_CTX_use_PrivateKey) (SSL_CTX*, EVP_PKEY*) = 0L;
+-static int (*K_SSL_CTX_use_certificate) (SSL_CTX*, X509*) = 0L;
+-static int (*K_SSL_get_error) (SSL*, int) = 0L;
+-static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = 0L;
+-static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = 0L;
+-static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = 0L;
+-static void (*K_sk_free) (STACK*) = 0L;
+-static int (*K_sk_num) (STACK*) = 0L;
+-static char* (*K_sk_pop) (STACK*) = 0L;
+-static char* (*K_sk_value) (STACK*, int) = 0L;
+-static STACK* (*K_sk_new) (int (*)()) = 0L;
+-static int (*K_sk_push) (STACK*, char*) = 0L;
+-static STACK* (*K_sk_dup) (STACK *) = 0L;
+-static char * (*K_i2s_ASN1_INTEGER) (X509V3_EXT_METHOD *, ASN1_INTEGER *) =0L;
+-static ASN1_INTEGER * (*K_X509_get_serialNumber) (X509 *) = 0L;
+-static EVP_PKEY *(*K_X509_get_pubkey)(X509 *) = 0L;
+-static int (*K_i2d_PublicKey)(EVP_PKEY *, unsigned char **) = 0L;
+-static int (*K_X509_check_private_key)(X509 *, EVP_PKEY *) = 0L;
+-static char * (*K_BN_bn2hex)(const BIGNUM *) = 0L;
+-static int (*K_X509_digest)(const X509 *,const EVP_MD *, unsigned char *, unsigned int *) = 0L;
+-static EVP_MD* (*K_EVP_md5)() = 0L;
+-static void (*K_ASN1_INTEGER_free)(ASN1_INTEGER *) = 0L;
+-static int (*K_OBJ_obj2nid)(ASN1_OBJECT *) = 0L;
+-static const char * (*K_OBJ_nid2ln)(int) = 0L;
+-static int (*K_X509_get_ext_count)(X509*) = 0L;
+-static int (*K_X509_get_ext_by_NID)(X509*, int, int) = 0L;
+-static int (*K_X509_get_ext_by_OBJ)(X509*,ASN1_OBJECT*,int) = 0L;
+-static X509_EXTENSION *(*K_X509_get_ext)(X509*, int loc) = 0L;
+-static X509_EXTENSION *(*K_X509_delete_ext)(X509*, int) = 0L;
+-static int (*K_X509_add_ext)(X509*, X509_EXTENSION*, int) = 0L;
+-static void *(*K_X509_get_ext_d2i)(X509*, int, int*, int*) = 0L;
+-static char *(*K_i2s_ASN1_OCTET_STRING)(X509V3_EXT_METHOD*, ASN1_OCTET_STRING*) = 0L;
+-static int (*K_ASN1_BIT_STRING_get_bit)(ASN1_BIT_STRING*, int) = 0L;
+-static PKCS7 *(*K_PKCS7_new)() = 0L;
+-static void (*K_PKCS7_free)(PKCS7*) = 0L;
+-static void (*K_PKCS7_content_free)(PKCS7*) = 0L;
+-static int (*K_i2d_PKCS7)(PKCS7*, unsigned char**) = 0L;
+-static PKCS7 *(*K_d2i_PKCS7)(PKCS7**, unsigned char**,long) = 0L;
+-static int (*K_i2d_PKCS7_fp)(FILE*,PKCS7*) = 0L;
+-static PKCS7* (*K_d2i_PKCS7_fp)(FILE*,PKCS7**) = 0L;
+-static int (*K_i2d_PKCS7_bio)(BIO *bp,PKCS7 *p7) = 0L;
+-static PKCS7 *(*K_d2i_PKCS7_bio)(BIO *bp,PKCS7 **p7) = 0L;
+-static PKCS7* (*K_PKCS7_dup)(PKCS7*) = 0L;
+-static STACK_OF(X509_NAME) *(*K_SSL_load_client_CA_file)(const char*) = 0L;
+-static STACK_OF(X509_INFO) *(*K_PEM_X509_INFO_read)(FILE*, STACK_OF(X509_INFO)*, pem_password_cb*, void*) = 0L;
+-static char *(*K_ASN1_d2i_fp)(char *(*)(),char *(*)(),FILE*,unsigned char**) = 0L;
+-static X509 *(*K_X509_new)() = 0L;
+-static int (*K_X509_PURPOSE_get_count)() = 0L;
+-static int (*K_X509_PURPOSE_get_id)(X509_PURPOSE *) = 0L;
+-static int (*K_X509_check_purpose)(X509*,int,int) = 0L;
+-static X509_PURPOSE* (*K_X509_PURPOSE_get0)(int) = 0L;
+-static int (*K_EVP_PKEY_assign)(EVP_PKEY*, int, char*) = 0L;
+-static int (*K_X509_REQ_set_pubkey)(X509_REQ*, EVP_PKEY*) = 0L;
+-static RSA *(*K_RSA_generate_key)(int, unsigned long, void (*)(int,int,void *), void *) = 0L;
+-static int (*K_i2d_X509_REQ_fp)(FILE*, X509_REQ*) = 0L;
+-static void (*K_ERR_clear_error)() = 0L;
+-static unsigned long (*K_ERR_get_error)() = 0L;
+-static void (*K_ERR_print_errors_fp)(FILE*) = 0L;
+-static PKCS7 *(*K_PKCS7_sign)(X509*, EVP_PKEY*, STACK_OF(X509)*, BIO*, int) = 0L;
+-static int (*K_PKCS7_verify)(PKCS7*,STACK_OF(X509)*,X509_STORE*,BIO*,BIO*,int) = 0L;
+-static STACK_OF(X509) *(*K_PKCS7_get0_signers)(PKCS7 *, STACK_OF(X509) *, int) = 0L;
+-static PKCS7 *(*K_PKCS7_encrypt)(STACK_OF(X509) *, BIO *, EVP_CIPHER *, int) = 0L;
+-static int (*K_PKCS7_decrypt)(PKCS7 *, EVP_PKEY *, X509 *, BIO *, int) = 0L;
+-static SSL_SESSION* (*K_SSL_get1_session)(SSL*) = 0L;
+-static void (*K_SSL_SESSION_free)(SSL_SESSION*) = 0L;
+-static int (*K_SSL_set_session)(SSL*,SSL_SESSION*) = 0L;
+-static SSL_SESSION* (*K_d2i_SSL_SESSION)(SSL_SESSION**,unsigned char**, long) = 0L;
+-static int (*K_i2d_SSL_SESSION)(SSL_SESSION*,unsigned char**) = 0L;
+-static STACK *(*K_X509_get1_email)(X509 *x) = 0L;
+-static void (*K_X509_email_free)(STACK *sk) = 0L;
+-static EVP_CIPHER *(*K_EVP_des_ede3_cbc)() = 0L;
+-static EVP_CIPHER *(*K_EVP_des_cbc)() = 0L;
+-static EVP_CIPHER *(*K_EVP_rc2_cbc)() = 0L;
+-static EVP_CIPHER *(*K_EVP_rc2_64_cbc)() = 0L;
+-static EVP_CIPHER *(*K_EVP_rc2_40_cbc)() = 0L;
+-static int (*K_i2d_PrivateKey_fp)(FILE*,EVP_PKEY*) = 0L;
+-static int (*K_i2d_PKCS8PrivateKey_fp)(FILE*, EVP_PKEY*, const EVP_CIPHER*, char*, int, pem_password_cb*, void*) = 0L;
+-static void (*K_RSA_free)(RSA*) = 0L;
+-static EVP_CIPHER *(*K_EVP_bf_cbc)() = 0L;
+-static int (*K_X509_REQ_sign)(X509_REQ*, EVP_PKEY*, const EVP_MD*) = 0L;
+-static int (*K_X509_NAME_add_entry_by_txt)(X509_NAME*, char*, int, unsigned char*, int, int, int) = 0L;
+-static X509_NAME *(*K_X509_NAME_new)() = 0L;
+-static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
+-static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+-static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
+-static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
+-
+-#endif
+-}
+-
+-
+ class KOpenSSLProxyPrivate
+ {
+ public:
+-   KOpenSSLProxyPrivate()
+-    : sslLib(0), cryptoLib(0), ok(false)
+-   {}
+-
+-   KLibrary *sslLib;
+-   KLibrary *cryptoLib;
+-   bool ok;
+-
+-   static KOpenSSLProxy *sSelf;
+-   static void cleanupKOpenSSLProxy() {
+-      delete KOpenSSLProxyPrivate::sSelf;
+-   }
++    KOpenSSLProxyPrivate()
++        : ok(true)
++    {}
++
++    bool ok;
++
++    static KOpenSSLProxy *sSelf;
++    static void cleanupKOpenSSLProxy()
++    {
++        delete KOpenSSLProxyPrivate::sSelf;
++    }
+ };
+ KOpenSSLProxy *KOpenSSLProxyPrivate::sSelf = 0;
+ 
+-bool KOpenSSLProxy::hasLibSSL() const {
+-   return d->sslLib != 0L;
++bool KOpenSSLProxy::hasLibSSL() const
++{
++    return true;
+ }
+ 
+-
+-bool KOpenSSLProxy::hasLibCrypto() const {
+-   return d->cryptoLib != 0L;
++bool KOpenSSLProxy::hasLibCrypto() const
++{
++    return true;
+ }
+ 
+-
+-void KOpenSSLProxy::destroy() {
+-   KOpenSSLProxy *x = KOpenSSLProxyPrivate::sSelf;
+-   KOpenSSLProxyPrivate::sSelf = 0;
+-   delete x;
++void KOpenSSLProxy::destroy()
++{
++    KOpenSSLProxy *x = KOpenSSLProxyPrivate::sSelf;
++    KOpenSSLProxyPrivate::sSelf = 0;
++    delete x;
+ }
+ 
+ #ifdef __OpenBSD__
+@@ -244,1347 +73,842 @@ void KOpenSSLProxy::destroy() {
+ 
+ static QString findMostRecentLib(QString dir, QString name)
+ {
+-       // Grab all shared libraries in the directory
+-       QString filter = "lib"+name+".so.*";
+-       QDir d(dir, filter);
+-       if (!d.exists())
+-               return 0L;
+-       QStringList l = d.entryList();
+-
+-       // Find the best one
+-       int bestmaj = -1;
+-       int bestmin = -1;
+-       QString best = 0L;
+-       // where do we start
+-       uint s = filter.length()-1;
+-       for (QStringList::const_iterator it = l.begin(); it != l.end(); ++it) {
+-               QString numberpart = (*it).mid(s);
+-               uint endmaj = numberpart.indexOf('.');
+-               if (endmaj == -1)
+-                       continue;
+-               bool ok;
+-               int maj = numberpart.left(endmaj).toInt(&ok);
+-               if (!ok)
+-                       continue;
+-               int min = numberpart.mid(endmaj+1).toInt(&ok);
+-               if (!ok)
+-                       continue;
+-               if (maj > bestmaj || (maj == bestmaj && min > bestmin)) {
+-                       bestmaj = maj;
+-                       bestmin = min;
+-                       best = (*it);
+-               }
+-       }
+-       if (best.isNull())
+-               return 0L;
+-       else
+-               return dir+'/'+best;
++    // Grab all shared libraries in the directory
++    QString filter = "lib" + name + ".so.*";
++    QDir d(dir, filter);
++    if (!d.exists()) {
++        return 0L;
++    }
++    QStringList l = d.entryList();
++
++    // Find the best one
++    int bestmaj = -1;
++    int bestmin = -1;
++    QString best = 0L;
++    // where do we start
++    uint s = filter.length() - 1;
++    for (QStringList::const_iterator it = l.begin(); it != l.end(); ++it) {
++        QString numberpart = (*it).mid(s);
++        uint endmaj = numberpart.indexOf('.');
++        if (endmaj == -1) {
++            continue;
++        }
++        bool ok;
++        int maj = numberpart.left(endmaj).toInt(&ok);
++        if (!ok) {
++            continue;
++        }
++        int min = numberpart.mid(endmaj + 1).toInt(&ok);
++        if (!ok) {
++            continue;
++        }
++        if (maj > bestmaj || (maj == bestmaj && min > bestmin)) {
++            bestmaj = maj;
++            bestmin = min;
++            best = (*it);
++        }
++    }
++    if (best.isNull()) {
++        return 0L;
++    } else {
++        return dir + '/' + best;
++    }
+ }
+ #endif
+ 
+ KOpenSSLProxy::KOpenSSLProxy()
+     : d(new KOpenSSLProxyPrivate())
+ {
+-    QStringList libpaths, libnamesc, libnamess;
+-
+-   d->cryptoLib = 0L;
+-   d->sslLib = 0L;
+-
+-   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 KLibrary("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 KLibrary(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.toLatin1().constData());
+-	     tmpStr.remove(QRegExp("\\(.*\\)"));
+-         if (!access(tmpStr.toLatin1(), R_OK)) {
+-            d->cryptoLib = new KLibrary(alib);
+-            d->cryptoLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
+-         } 
+-         if (d->cryptoLib && d->cryptoLib->load()) {
+-             break;
+-         }
+-         else {
+-             delete d->cryptoLib;
+-             d->cryptoLib = 0;
+-         }
+-      }
+-      if (d->cryptoLib) break;
+-   }
+-
+-   if (d->cryptoLib) {
+-#ifdef KSSL_HAVE_SSL
+-      K_X509_free = (void (*) (X509 *)) d->cryptoLib->resolveFunction("X509_free");
+-      K_RAND_egd = (int (*)(const char *)) d->cryptoLib->resolveFunction("RAND_egd");
+-      K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolveFunction("RAND_load_file");
+-      K_RAND_file_name = (const char* (*)(char *, size_t)) d->cryptoLib->resolveFunction("RAND_file_name");
+-      K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolveFunction("RAND_write_file");
+-      K_CRYPTO_free = (void (*) (void *)) d->cryptoLib->resolveFunction("CRYPTO_free");
+-      K_d2i_X509 = (X509 * (*)(X509 **,unsigned char **,long)) d->cryptoLib->resolveFunction("d2i_X509");
+-      K_i2d_X509 = (int (*)(X509 *,unsigned char **)) d->cryptoLib->resolveFunction("i2d_X509");
+-      K_X509_cmp = (int (*)(X509 *, X509 *)) d->cryptoLib->resolveFunction("X509_cmp");
+-      K_X509_STORE_CTX_new = (X509_STORE_CTX * (*) (void)) d->cryptoLib->resolveFunction("X509_STORE_CTX_new");
+-      K_X509_STORE_CTX_free = (void (*) (X509_STORE_CTX *)) d->cryptoLib->resolveFunction("X509_STORE_CTX_free");
+-      K_X509_verify_cert = (int (*) (X509_STORE_CTX *)) d->cryptoLib->resolveFunction("X509_verify_cert");
+-      K_X509_STORE_new = (X509_STORE * (*) (void)) d->cryptoLib->resolveFunction("X509_STORE_new");
+-      K_X509_STORE_free = (void (*) (X509_STORE *)) d->cryptoLib->resolveFunction("X509_STORE_free");
+-      K_X509_NAME_oneline = (char * (*) (X509_NAME *,char *,int)) d->cryptoLib->resolveFunction("X509_NAME_oneline");
+-      K_X509_get_subject_name = (X509_NAME * (*) (X509 *)) d->cryptoLib->resolveFunction("X509_get_subject_name");
+-      K_X509_get_issuer_name = (X509_NAME * (*) (X509 *)) d->cryptoLib->resolveFunction("X509_get_issuer_name");
+-      K_X509_STORE_add_lookup = (X509_LOOKUP *(*) (X509_STORE *, X509_LOOKUP_METHOD *)) d->cryptoLib->resolveFunction("X509_STORE_add_lookup");
+-      K_X509_LOOKUP_file = (X509_LOOKUP_METHOD *(*)(void)) d->cryptoLib->resolveFunction("X509_LOOKUP_file");
+-      K_X509_LOOKUP_free = (void (*)(X509_LOOKUP *)) d->cryptoLib->resolveFunction("X509_LOOKUP_free");
+-      K_X509_LOOKUP_ctrl = (int (*)(X509_LOOKUP *, int, const char *, long, char **)) d->cryptoLib->resolveFunction("X509_LOOKUP_ctrl");
+-      K_X509_STORE_CTX_init = (void (*)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *)) d->cryptoLib->resolveFunction("X509_STORE_CTX_init");
+-      K_X509_dup = (X509* (*)(X509*)) d->cryptoLib->resolveFunction("X509_dup");
+-      K_BIO_s_mem = (BIO_METHOD *(*) (void)) d->cryptoLib->resolveFunction("BIO_s_mem");
+-      K_BIO_new = (BIO* (*)(BIO_METHOD *)) d->cryptoLib->resolveFunction("BIO_new");
+-      K_BIO_new_fp = (BIO* (*)(FILE*, int)) d->cryptoLib->resolveFunction("BIO_new_fp");
+-      K_BIO_new_mem_buf = (BIO* (*)(void *, int)) d->cryptoLib->resolveFunction("BIO_new_mem_buf");
+-      K_BIO_free = (int (*)(BIO*)) d->cryptoLib->resolveFunction("BIO_free");
+-      K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) d->cryptoLib->resolveFunction("BIO_ctrl");
+-      K_BIO_write = (int (*) (BIO *b, const void *data, int len)) d->cryptoLib->resolveFunction("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->resolveFunction("PEM_ASN1_write_bio");
+-      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *))
+-          d->cryptoLib->resolveFunction("ASN1_item_i2d_fp");
+-      K_NETSCAPE_X509_it = (ASN1_ITEM *) d->cryptoLib->resolveFunction("NETSCAPE_X509_it");
+-      K_X509_print_fp = (int (*)(FILE*, X509*)) d->cryptoLib->resolveFunction("X509_print_fp");
+-      K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) d->cryptoLib->resolveFunction("i2d_PKCS12");
+-      K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) d->cryptoLib->resolveFunction("i2d_PKCS12_fp");
+-      K_PKCS12_newpass = (int (*)(PKCS12*, char*, char*)) d->cryptoLib->resolveFunction("PKCS12_newpass");
+-      K_d2i_PKCS12_fp = (PKCS12* (*)(FILE*, PKCS12**)) d->cryptoLib->resolveFunction("d2i_PKCS12_fp");
+-      K_PKCS12_new = (PKCS12* (*)()) d->cryptoLib->resolveFunction("PKCS12_new");
+-      K_PKCS12_free = (void (*)(PKCS12 *)) d->cryptoLib->resolveFunction("PKCS12_free");
+-      K_PKCS12_parse = (int (*)(PKCS12*, const char *, EVP_PKEY**,
+-                X509**, STACK_OF(X509)**)) d->cryptoLib->resolveFunction("PKCS12_parse");
+-      K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) d->cryptoLib->resolveFunction("EVP_PKEY_free");
+-      K_EVP_PKEY_new = (EVP_PKEY* (*)()) d->cryptoLib->resolveFunction("EVP_PKEY_new");
+-      K_X509_REQ_free = (void (*)(X509_REQ*)) d->cryptoLib->resolveFunction("X509_REQ_free");
+-      K_X509_REQ_new = (X509_REQ* (*)()) d->cryptoLib->resolveFunction("X509_REQ_new");
+-      K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) d->cryptoLib->resolveFunction("X509_STORE_CTX_set_chain");
+-      K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolveFunction("X509_STORE_CTX_set_purpose");
+-      K_sk_free = (void (*) (STACK *)) d->cryptoLib->resolveFunction("sk_free");
+-      K_sk_num = (int (*) (STACK *)) d->cryptoLib->resolveFunction("sk_num");
+-      K_sk_pop = (char* (*) (STACK *)) d->cryptoLib->resolveFunction("sk_pop");
+-      K_sk_value = (char* (*) (STACK *, int)) d->cryptoLib->resolveFunction("sk_value");
+-      K_sk_new = (STACK* (*) (int (*)())) d->cryptoLib->resolveFunction("sk_new");
+-      K_sk_push = (int (*) (STACK*, char*)) d->cryptoLib->resolveFunction("sk_push");
+-      K_sk_dup = (STACK* (*) (STACK *)) d->cryptoLib->resolveFunction("sk_dup");
+-      K_i2s_ASN1_INTEGER = (char *(*) (X509V3_EXT_METHOD *, ASN1_INTEGER *)) d->cryptoLib->resolveFunction("i2s_ASN1_INTEGER");
+-      K_X509_get_serialNumber = (ASN1_INTEGER * (*) (X509 *)) d->cryptoLib->resolveFunction("X509_get_serialNumber");
+-      K_X509_get_pubkey = (EVP_PKEY *(*)(X509 *)) d->cryptoLib->resolveFunction("X509_get_pubkey");
+-      K_i2d_PublicKey = (int (*)(EVP_PKEY *, unsigned char **)) d->cryptoLib->resolveFunction("i2d_PublicKey");
+-      K_X509_check_private_key = (int (*)(X509 *, EVP_PKEY *)) d->cryptoLib->resolveFunction("X509_check_private_key");
+-      K_BN_bn2hex = (char *(*)(const BIGNUM *)) d->cryptoLib->resolveFunction("BN_bn2hex");
+-      K_X509_digest = (int (*)(const X509 *,const EVP_MD *, unsigned char *, unsigned int *)) d->cryptoLib->resolveFunction("X509_digest");
+-      K_EVP_md5 = (EVP_MD *(*)()) d->cryptoLib->resolveFunction("EVP_md5");
+-      K_ASN1_INTEGER_free = (void (*)(ASN1_INTEGER *)) d->cryptoLib->resolveFunction("ASN1_INTEGER_free");
+-      K_OBJ_obj2nid = (int (*)(ASN1_OBJECT *)) d->cryptoLib->resolveFunction("OBJ_obj2nid");
+-      K_OBJ_nid2ln = (const char *(*)(int)) d->cryptoLib->resolveFunction("OBJ_nid2ln");
+-      K_X509_get_ext_count = (int (*)(X509*)) d->cryptoLib->resolveFunction("X509_get_ext_count");
+-      K_X509_get_ext_by_NID = (int (*)(X509*,int,int)) d->cryptoLib->resolveFunction("X509_get_ext_by_NID");
+-      K_X509_get_ext_by_OBJ = (int (*)(X509*,ASN1_OBJECT*,int)) d->cryptoLib->resolveFunction("X509_get_ext_by_OBJ");
+-      K_X509_get_ext = (X509_EXTENSION* (*)(X509*,int)) d->cryptoLib->resolveFunction("X509_get_ext");
+-      K_X509_delete_ext = (X509_EXTENSION* (*)(X509*,int)) d->cryptoLib->resolveFunction("X509_delete_ext");
+-      K_X509_add_ext = (int (*)(X509*,X509_EXTENSION*,int)) d->cryptoLib->resolveFunction("X509_add_ext");
+-      K_X509_get_ext_d2i = (void* (*)(X509*,int,int*,int*)) d->cryptoLib->resolveFunction("X509_get_ext_d2i");
+-      K_i2s_ASN1_OCTET_STRING = (char *(*)(X509V3_EXT_METHOD*,ASN1_OCTET_STRING*)) d->cryptoLib->resolveFunction("i2s_ASN1_OCTET_STRING");
+-      K_ASN1_BIT_STRING_get_bit = (int (*)(ASN1_BIT_STRING*,int)) d->cryptoLib->resolveFunction("ASN1_BIT_STRING_get_bit");
+-      K_PKCS7_new = (PKCS7 *(*)()) d->cryptoLib->resolveFunction("PKCS7_new");
+-      K_PKCS7_free = (void (*)(PKCS7*)) d->cryptoLib->resolveFunction("PKCS7_free");
+-      K_PKCS7_content_free = (void (*)(PKCS7*)) d->cryptoLib->resolveFunction("PKCS7_content_free");
+-      K_i2d_PKCS7 = (int (*)(PKCS7*, unsigned char**)) d->cryptoLib->resolveFunction("i2d_PKCS7");
+-      K_i2d_PKCS7_fp = (int (*)(FILE*,PKCS7*)) d->cryptoLib->resolveFunction("i2d_PKCS7_fp");
+-      K_i2d_PKCS7_bio = (int (*)(BIO *bp,PKCS7 *p7)) d->cryptoLib->resolveFunction("i2d_PKCS7_bio");
+-      K_d2i_PKCS7 = (PKCS7* (*)(PKCS7**,unsigned char**,long)) d->cryptoLib->resolveFunction("d2i_PKCS7");
+-      K_d2i_PKCS7_fp = (PKCS7 *(*)(FILE *,PKCS7**)) d->cryptoLib->resolveFunction("d2i_PKCS7_fp");
+-      K_d2i_PKCS7_bio = (PKCS7 *(*)(BIO *bp,PKCS7 **p7)) d->cryptoLib->resolveFunction("d2i_PKCS7_bio");
+-      K_PKCS7_dup = (PKCS7* (*)(PKCS7*)) d->cryptoLib->resolveFunction("PKCS7_dup");
+-      K_PKCS7_sign = (PKCS7 *(*)(X509*, EVP_PKEY*, STACK_OF(X509)*, BIO*, int)) d->cryptoLib->resolveFunction("PKCS7_sign");
+-      K_PKCS7_verify = (int (*)(PKCS7*,STACK_OF(X509)*,X509_STORE*,BIO*,BIO*,int)) d->cryptoLib->resolveFunction("PKCS7_verify");
+-      K_PKCS7_get0_signers = (STACK_OF(X509) *(*)(PKCS7 *, STACK_OF(X509) *, int)) d->cryptoLib->resolveFunction("PKCS7_get0_signers");
+-      K_PKCS7_encrypt = (PKCS7* (*)(STACK_OF(X509) *, BIO *, EVP_CIPHER *, int)) d->cryptoLib->resolveFunction("PKCS7_encrypt");
+-      K_PKCS7_decrypt = (int (*)(PKCS7 *, EVP_PKEY *, X509 *, BIO *, int)) d->cryptoLib->resolveFunction("PKCS7_decrypt");
+-      K_PEM_X509_INFO_read = (STACK_OF(X509_INFO) *(*)(FILE*, STACK_OF(X509_INFO)*, pem_password_cb*, void *)) d->cryptoLib->resolveFunction("PEM_X509_INFO_read");
+-      K_ASN1_d2i_fp = (char *(*)(char *(*)(),char *(*)(),FILE*,unsigned char**)) d->cryptoLib->resolveFunction("ASN1_d2i_fp");
+-      K_X509_new = (X509 *(*)()) d->cryptoLib->resolveFunction("X509_new");
+-      K_X509_PURPOSE_get_count = (int (*)()) d->cryptoLib->resolveFunction("X509_PURPOSE_get_count");
+-      K_X509_PURPOSE_get_id = (int (*)(X509_PURPOSE *)) d->cryptoLib->resolveFunction("X509_PURPOSE_get_id");
+-      K_X509_check_purpose = (int (*)(X509*,int,int)) d->cryptoLib->resolveFunction("X509_check_purpose");
+-      K_X509_PURPOSE_get0 = (X509_PURPOSE *(*)(int)) d->cryptoLib->resolveFunction("X509_PURPOSE_get0");
+-      K_EVP_PKEY_assign = (int (*)(EVP_PKEY*, int, char*)) d->cryptoLib->resolveFunction("EVP_PKEY_assign");
+-      K_X509_REQ_set_pubkey = (int (*)(X509_REQ*, EVP_PKEY*)) d->cryptoLib->resolveFunction("X509_REQ_set_pubkey");
+-      K_RSA_generate_key = (RSA* (*)(int, unsigned long, void (*)(int,int,void *), void *)) d->cryptoLib->resolveFunction("RSA_generate_key");
+-      K_i2d_X509_REQ_fp = (int (*)(FILE *, X509_REQ *)) d->cryptoLib->resolveFunction("i2d_X509_REQ_fp");
+-      K_ERR_clear_error = (void (*)()) d->cryptoLib->resolveFunction("ERR_clear_error");
+-      K_ERR_get_error = (unsigned long (*)()) d->cryptoLib->resolveFunction("ERR_get_error");
+-      K_ERR_print_errors_fp = (void (*)(FILE*)) d->cryptoLib->resolveFunction("ERR_print_errors_fp");
+-      K_X509_get1_email = (STACK *(*)(X509 *x)) d->cryptoLib->resolveFunction("X509_get1_email");
+-      K_X509_email_free = (void (*)(STACK *sk)) d->cryptoLib->resolveFunction("X509_email_free");
+-      K_EVP_des_ede3_cbc = (EVP_CIPHER *(*)()) d->cryptoLib->resolveFunction("EVP_des_ede3_cbc");
+-      K_EVP_des_cbc = (EVP_CIPHER *(*)()) d->cryptoLib->resolveFunction("EVP_des_cbc");
+-      K_EVP_rc2_cbc = (EVP_CIPHER *(*)()) d->cryptoLib->resolveFunction("EVP_rc2_cbc");
+-      K_EVP_rc2_64_cbc = (EVP_CIPHER *(*)()) d->cryptoLib->resolveFunction("EVP_rc2_64_cbc");
+-      K_EVP_rc2_40_cbc = (EVP_CIPHER *(*)()) d->cryptoLib->resolveFunction("EVP_rc2_40_cbc");
+-      K_i2d_PrivateKey_fp = (int (*)(FILE*,EVP_PKEY*)) d->cryptoLib->resolveFunction("i2d_PrivateKey_fp");
+-      K_i2d_PKCS8PrivateKey_fp = (int (*)(FILE*, EVP_PKEY*, const EVP_CIPHER*, char*, int, pem_password_cb*, void*)) d->cryptoLib->resolveFunction("i2d_PKCS8PrivateKey_fp");
+-      K_RSA_free = (void (*)(RSA*)) d->cryptoLib->resolveFunction("RSA_free");
+-      K_EVP_bf_cbc = (EVP_CIPHER *(*)()) d->cryptoLib->resolveFunction("EVP_bf_cbc");
+-      K_X509_REQ_sign = (int (*)(X509_REQ*, EVP_PKEY*, const EVP_MD*)) d->cryptoLib->resolveFunction("X509_REQ_sign");
+-      K_X509_NAME_add_entry_by_txt = (int (*)(X509_NAME*, char*, int, unsigned char*, int, int, int)) d->cryptoLib->resolveFunction("X509_NAME_add_entry_by_txt");
+-      K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
+-      K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
+-      K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
+-      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
+-#endif
+-   }
+-
+-#ifdef Q_OS_WIN
+-    d->sslLib = new KLibrary("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 KLibrary(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.toLatin1());
+-	     tmpStr.remove(QRegExp("\\(.*\\)"));
+-         if (!access(tmpStr.toLatin1(), R_OK)) {
+-         	d->sslLib = new KLibrary(alib);
+-            d->sslLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
+-         }
+-         if (d->sslLib && d->sslLib->load()) {
+-             break;
+-         }
+-         else {
+-             delete d->sslLib;
+-             d->sslLib = 0;
+-         }
+-      }
+-      if (d->sslLib) break;
+-   }
+-#endif
+-
+-   if (d->sslLib) {
+-#ifdef KSSL_HAVE_SSL
+-      // stand back from your monitor and look at this.  it's fun! :)
+-      K_SSL_connect = (int (*)(SSL *)) d->sslLib->resolveFunction("SSL_connect");
+-      K_SSL_accept = (int (*)(SSL *)) d->sslLib->resolveFunction("SSL_accept");
+-      K_SSL_read = (int (*)(SSL *, void *, int)) d->sslLib->resolveFunction("SSL_read");
+-      K_SSL_write = (int (*)(SSL *, const void *, int))
+-                            d->sslLib->resolveFunction("SSL_write");
+-      K_SSL_new = (SSL* (*)(SSL_CTX *)) d->sslLib->resolveFunction("SSL_new");
+-      K_SSL_free = (void (*)(SSL *)) d->sslLib->resolveFunction("SSL_free");
+-      K_SSL_shutdown = (int (*)(SSL *)) d->sslLib->resolveFunction("SSL_shutdown");
+-      K_SSL_CTX_new = (SSL_CTX* (*)(SSL_METHOD*)) d->sslLib->resolveFunction("SSL_CTX_new");
+-      K_SSL_CTX_free = (void (*)(SSL_CTX*)) d->sslLib->resolveFunction("SSL_CTX_free");
+-      K_SSL_set_fd = (int (*)(SSL *, int)) d->sslLib->resolveFunction("SSL_set_fd");
+-      K_SSL_pending = (int (*)(SSL *)) d->sslLib->resolveFunction("SSL_pending");
+-      K_SSL_CTX_set_cipher_list = (int (*)(SSL_CTX *, const char *))
+-                                  d->sslLib->resolveFunction("SSL_CTX_set_cipher_list");
+-      K_SSL_CTX_set_verify = (void (*)(SSL_CTX*, int, int (*)(int, X509_STORE_CTX*))) d->sslLib->resolveFunction("SSL_CTX_set_verify");
+-      K_SSL_use_certificate = (int (*)(SSL*, X509*))
+-                                  d->sslLib->resolveFunction("SSL_CTX_use_certificate");
+-      K_SSL_get_current_cipher = (SSL_CIPHER *(*)(SSL *))
+-                                  d->sslLib->resolveFunction("SSL_get_current_cipher");
+-      K_SSL_ctrl = (long (*)(SSL * ,int, long, char *))
+-                                  d->sslLib->resolveFunction("SSL_ctrl");
+-      K_TLSv1_client_method = (SSL_METHOD *(*)()) d->sslLib->resolveFunction("TLSv1_client_method");
+-      K_SSLv23_client_method = (SSL_METHOD *(*)()) d->sslLib->resolveFunction("SSLv23_client_method");
+-      K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) d->sslLib->resolveFunction("SSL_get_peer_certificate");
+-      K_SSL_CIPHER_get_bits = (int (*)(SSL_CIPHER *,int *)) d->sslLib->resolveFunction("SSL_CIPHER_get_bits");
+-      K_SSL_CIPHER_get_version = (char * (*)(SSL_CIPHER *)) d->sslLib->resolveFunction("SSL_CIPHER_get_version");
+-      K_SSL_CIPHER_get_name = (const char * (*)(SSL_CIPHER *)) d->sslLib->resolveFunction("SSL_CIPHER_get_name");
+-      K_SSL_CIPHER_description = (char * (*)(SSL_CIPHER *, char *, int)) d->sslLib->resolveFunction("SSL_CIPHER_description");
+-      K_SSL_CTX_use_PrivateKey = (int (*)(SSL_CTX*, EVP_PKEY*)) d->sslLib->resolveFunction("SSL_CTX_use_PrivateKey");
+-      K_SSL_CTX_use_certificate = (int (*)(SSL_CTX*, X509*)) d->sslLib->resolveFunction("SSL_CTX_use_certificate");
+-      K_SSL_get_error = (int (*)(SSL*, int)) d->sslLib->resolveFunction("SSL_get_error");
+-      K_SSL_get_peer_cert_chain = (STACK_OF(X509)* (*)(SSL*)) d->sslLib->resolveFunction("SSL_get_peer_cert_chain");
+-      K_SSL_load_client_CA_file = (STACK_OF(X509_NAME)* (*)(const char *)) d->sslLib->resolveFunction("SSL_load_client_CA_file");
+-      K_SSL_peek = (int (*)(SSL*,void*,int)) d->sslLib->resolveFunction("SSL_peek");
+-      K_SSL_get1_session = (SSL_SESSION* (*)(SSL*)) d->sslLib->resolveFunction("SSL_get1_session");
+-      K_SSL_SESSION_free = (void (*)(SSL_SESSION*)) d->sslLib->resolveFunction("SSL_SESSION_free");
+-      K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
+-      K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
+-      K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
+-      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
+-#endif
+-
+-
+-      // Initialize the library (once only!)
+-      KLibrary::void_function_ptr x;
+-      x = d->sslLib->resolveFunction("SSL_library_init");
+-      if (d->cryptoLib) {
+-         if (x) ((int (*)())x)();
+-         x = d->cryptoLib->resolveFunction("OpenSSL_add_all_algorithms");
+-         if (!x)
+-            x = d->cryptoLib->resolveFunction("OPENSSL_add_all_algorithms");
+-         if (x) {
+-           ((void (*)())x)();
+-         } else {
+-           x = d->cryptoLib->resolveFunction("OpenSSL_add_all_algorithms_conf");
+-           if (!x)
+-              x = d->cryptoLib->resolveFunction("OPENSSL_add_all_algorithms_conf");
+-           if (x) {
+-             ((void (*)())x)();
+-           } else {
+-             x = d->cryptoLib->resolveFunction("OpenSSL_add_all_algorithms_noconf");
+-             if (!x)
+-                x = d->cryptoLib->resolveFunction("OPENSSL_add_all_algorithms_noconf");
+-             if (x)
+-               ((void (*)())x)();
+-           }
+-         }
+-         x = d->cryptoLib->resolveFunction("OpenSSL_add_all_ciphers");
+-         if (!x)
+-            x = d->cryptoLib->resolveFunction("OPENSSL_add_all_ciphers");
+-         if (x) ((void (*)())x)();
+-         x = d->cryptoLib->resolveFunction("OpenSSL_add_all_digests");
+-         if (!x)
+-            x = d->cryptoLib->resolveFunction("OPENSSL_add_all_digests");
+-         if (x) ((void (*)())x)();
+-      }
+-   }
+-
+ }
+ 
+-KOpenSSLProxy::~KOpenSSLProxy() {
+-   if (d->sslLib) {
+-	d->sslLib->unload();
+-   }
+-   if (d->cryptoLib) {
+-	d->cryptoLib->unload();
+-   }
+-
+-   KOpenSSLProxyPrivate::sSelf = 0;
+-   delete d;
++KOpenSSLProxy::~KOpenSSLProxy()
++{
++    KOpenSSLProxyPrivate::sSelf = 0;
++    delete d;
+ }
+ 
+-
+ // FIXME: we should check "ok" and allow this to init the lib if !ok.
+ 
+-KOpenSSLProxy *KOpenSSLProxy::self() {
+-#ifdef KSSL_HAVE_SSL
+-   if(!KOpenSSLProxyPrivate::sSelf) {
+-      KOpenSSLProxyPrivate::sSelf = new KOpenSSLProxy();
+-      qAddPostRoutine(KOpenSSLProxyPrivate::cleanupKOpenSSLProxy);
+-   }
++KOpenSSLProxy *KOpenSSLProxy::self()
++{
++#if KSSL_HAVE_SSL
++    if (!KOpenSSLProxyPrivate::sSelf) {
++        KOpenSSLProxyPrivate::sSelf = new KOpenSSLProxy();
++        qAddPostRoutine(KOpenSSLProxyPrivate::cleanupKOpenSSLProxy);
++    }
+ #endif
+-   return KOpenSSLProxyPrivate::sSelf;
++    return KOpenSSLProxyPrivate::sSelf;
+ }
+ 
++#if KSSL_HAVE_SSL
+ 
+-
+-
+-
+-
+-
+-#ifdef KSSL_HAVE_SSL
+-
+-
+-
+-int KOpenSSLProxy::SSL_connect(SSL *ssl) {
+-   if (K_SSL_connect) return (K_SSL_connect)(ssl);
+-   return -1;
++int KOpenSSLProxy::SSL_connect(SSL *ssl)
++{
++    return ::SSL_connect(ssl);
+ }
+ 
+-
+-int KOpenSSLProxy::SSL_accept(SSL *ssl) {
+-   if (K_SSL_accept) return (K_SSL_accept)(ssl);
+-   return -1;
++int KOpenSSLProxy::SSL_accept(SSL *ssl)
++{
++    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;
++int KOpenSSLProxy::SSL_read(SSL *ssl, void *buf, int num)
++{
++    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;
++int KOpenSSLProxy::SSL_write(SSL *ssl, const void *buf, int num)
++{
++    return ::SSL_write(ssl, buf, num);
+ }
+ 
+-
+-SSL *KOpenSSLProxy::SSL_new(SSL_CTX *ctx) {
+-   if (K_SSL_new) return (K_SSL_new)(ctx);
+-   return 0L;
++SSL *KOpenSSLProxy::SSL_new(SSL_CTX *ctx)
++{
++    return ::SSL_new(ctx);
+ }
+ 
+-
+-void KOpenSSLProxy::SSL_free(SSL *ssl) {
+-   if (K_SSL_free) (K_SSL_free)(ssl);
++void KOpenSSLProxy::SSL_free(SSL *ssl)
++{
++    return ::SSL_free(ssl);
+ }
+ 
+-
+-int KOpenSSLProxy::SSL_shutdown(SSL *ssl) {
+-   if (K_SSL_shutdown) return (K_SSL_shutdown)(ssl);
+-   return -1;
++int KOpenSSLProxy::SSL_shutdown(SSL *ssl)
++{
++    return ::SSL_shutdown(ssl);
+ }
+ 
+-
+-SSL_CTX *KOpenSSLProxy::SSL_CTX_new(SSL_METHOD *method) {
+-   if (K_SSL_CTX_new) return (K_SSL_CTX_new)(method);
+-   return 0L;
++SSL_CTX *KOpenSSLProxy::SSL_CTX_new(const SSL_METHOD *method)
++{
++    return ::SSL_CTX_new(method);
+ }
+ 
+-
+-void KOpenSSLProxy::SSL_CTX_free(SSL_CTX *ctx) {
+-   if (K_SSL_CTX_free) (K_SSL_CTX_free)(ctx);
++void KOpenSSLProxy::SSL_CTX_free(SSL_CTX *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;
++int KOpenSSLProxy::SSL_set_fd(SSL *ssl, int fd)
++{
++    return ::SSL_set_fd(ssl, fd);
+ }
+ 
+-
+-int KOpenSSLProxy::SSL_pending(SSL *ssl) {
+-   if (K_SSL_pending) return (K_SSL_pending)(ssl);
+-   return -1;
++int KOpenSSLProxy::SSL_pending(SSL *ssl)
++{
++    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;
++int KOpenSSLProxy::SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)
++{
++    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);
+-}
+-
+-
+-int KOpenSSLProxy::SSL_use_certificate(SSL *ssl, X509 *x) {
+-   if (K_SSL_use_certificate) return (K_SSL_use_certificate)(ssl, x);
+-   return -1;
++                                       int (*verify_callback)(int, X509_STORE_CTX *))
++{
++    ::SSL_CTX_set_verify(ctx, mode, verify_callback);
+ }
+ 
+-
+-SSL_CIPHER *KOpenSSLProxy::SSL_get_current_cipher(SSL *ssl) {
+-   if (K_SSL_get_current_cipher) return (K_SSL_get_current_cipher)(ssl);
+-   return 0L;
++int KOpenSSLProxy::SSL_use_certificate(SSL *ssl, X509 *x)
++{
++    return ::SSL_use_certificate(ssl, x);
+ }
+ 
+-
+-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;
++const SSL_CIPHER *KOpenSSLProxy::SSL_get_current_cipher(SSL *ssl)
++{
++    return ::SSL_get_current_cipher(ssl);
+ }
+ 
+-
+-int KOpenSSLProxy::RAND_egd(const char *path) {
+-   if (K_RAND_egd) return (K_RAND_egd)(path);
+-   return -1;
++long KOpenSSLProxy::SSL_ctrl(SSL *ssl, int cmd, long larg, char *parg)
++{
++    return ::SSL_ctrl(ssl, cmd, larg, parg);
+ }
+ 
+-
+-SSL_METHOD *KOpenSSLProxy::TLSv1_client_method() {
+-   if (K_TLSv1_client_method) return (K_TLSv1_client_method)();
+-   return 0L;
++int KOpenSSLProxy::RAND_egd(const char *path)
++{
++#ifndef OPENSSL_NO_EGD
++    return ::RAND_egd(path);
++#endif
++    return 0;
+ }
+ 
+-
+-SSL_METHOD *KOpenSSLProxy::SSLv23_client_method() {
+-   if (K_SSLv23_client_method) return (K_SSLv23_client_method)();
+-   return 0L;
++const SSL_METHOD *KOpenSSLProxy::TLSv1_client_method()
++{
++    return ::TLSv1_client_method();
+ }
+ 
+-
+-X509 *KOpenSSLProxy::SSL_get_peer_certificate(SSL *s) {
+-   if (K_SSL_get_peer_certificate) return (K_SSL_get_peer_certificate)(s);
+-   return 0L;
++const SSL_METHOD *KOpenSSLProxy::SSLv23_client_method()
++{
++    return ::SSLv23_client_method();
+ }
+ 
+-
+-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;
++X509 *KOpenSSLProxy::SSL_get_peer_certificate(SSL *s)
++{
++    return ::SSL_get_peer_certificate(s);
+ }
+ 
+-
+-char * KOpenSSLProxy::SSL_CIPHER_get_version(SSL_CIPHER *c) {
+-   if (K_SSL_CIPHER_get_version) return (K_SSL_CIPHER_get_version)(c);
+-   return 0L;
++int KOpenSSLProxy::SSL_CIPHER_get_bits(SSL_CIPHER *c, int *alg_bits)
++{
++    return ::SSL_CIPHER_get_bits(c, alg_bits);
+ }
+ 
+-
+-const char * KOpenSSLProxy::SSL_CIPHER_get_name(SSL_CIPHER *c) {
+-   if (K_SSL_CIPHER_get_name) return (K_SSL_CIPHER_get_name)(c);
+-   return 0L;
++const char *KOpenSSLProxy::SSL_CIPHER_get_version(SSL_CIPHER *c)
++{
++    return ::SSL_CIPHER_get_version(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 0L;
++const char *KOpenSSLProxy::SSL_CIPHER_get_name(SSL_CIPHER *c)
++{
++    return ::SSL_CIPHER_get_name(c);
+ }
+ 
+-
+-X509 * KOpenSSLProxy::d2i_X509(X509 **a,unsigned char **pp,long length) {
+-   if (K_d2i_X509) return (K_d2i_X509)(a,pp,length);
+-   return 0L;
++char *KOpenSSLProxy::SSL_CIPHER_description(SSL_CIPHER *c, char *buf, int size)
++{
++    return ::SSL_CIPHER_description(c, buf, size);
+ }
+ 
+-
+-int KOpenSSLProxy::i2d_X509(X509 *a,unsigned char **pp) {
+-   if (K_i2d_X509) return (K_i2d_X509)(a,pp);
+-   return -1;
++X509 *KOpenSSLProxy::d2i_X509(X509 **a, const unsigned char **pp, long length)
++{
++    return ::d2i_X509(a, pp, length);
+ }
+ 
+-
+-int KOpenSSLProxy::X509_cmp(X509 *a, X509 *b) {
+-   if (K_X509_cmp) return (K_X509_cmp)(a,b);
+-   return 0;
++int KOpenSSLProxy::i2d_X509(X509 *a, unsigned char **pp)
++{
++    return ::i2d_X509(a, pp);
+ }
+ 
+-
+-X509_STORE *KOpenSSLProxy::X509_STORE_new(void) {
+-   if (K_X509_STORE_new) return (K_X509_STORE_new)();
+-   return 0L;
++int KOpenSSLProxy::X509_cmp(X509 *a, X509 *b)
++{
++    return ::X509_cmp(a, b);
+ }
+ 
+-
+-void KOpenSSLProxy::X509_STORE_free(X509_STORE *v) {
+-   if (K_X509_STORE_free) (K_X509_STORE_free)(v);
++X509_STORE *KOpenSSLProxy::X509_STORE_new(void)
++{
++    return ::X509_STORE_new();
+ }
+ 
+-
+-X509_STORE_CTX *KOpenSSLProxy::X509_STORE_CTX_new(void) {
+-   if (K_X509_STORE_CTX_new) return (K_X509_STORE_CTX_new)();
+-   return 0L;
++void KOpenSSLProxy::X509_STORE_free(X509_STORE *v)
++{
++    ::X509_STORE_free(v);
+ }
+ 
+-
+-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 *KOpenSSLProxy::X509_STORE_CTX_new(void)
++{
++    return ::X509_STORE_CTX_new();
+ }
+ 
+-
+-int KOpenSSLProxy::X509_verify_cert(X509_STORE_CTX *ctx) {
+-   if (K_X509_verify_cert) return (K_X509_verify_cert)(ctx);
+-   return -1;
++void KOpenSSLProxy::X509_STORE_CTX_free(X509_STORE_CTX *ctx)
++{
++    ::X509_STORE_CTX_free(ctx);
+ }
+ 
+-
+-void KOpenSSLProxy::X509_free(X509 *a) {
+-   if (K_X509_free) (K_X509_free)(a);
++int KOpenSSLProxy::X509_verify_cert(X509_STORE_CTX *ctx)
++{
++    return ::X509_verify_cert(ctx);
+ }
+ 
+-
+-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 0L;
++void KOpenSSLProxy::X509_free(X509 *a)
++{
++    ::X509_free(a);
+ }
+ 
+-
+-X509_NAME *KOpenSSLProxy::X509_get_subject_name(X509 *a) {
+-   if (K_X509_get_subject_name) return (K_X509_get_subject_name)(a);
+-   return 0L;
++char *KOpenSSLProxy::X509_NAME_oneline(X509_NAME *a, char *buf, int size)
++{
++    return ::X509_NAME_oneline(a, buf, size);
+ }
+ 
+-
+-X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a) {
+-   if (K_X509_get_issuer_name) return (K_X509_get_issuer_name)(a);
+-   return 0L;
++X509_NAME *KOpenSSLProxy::X509_get_subject_name(X509 *a)
++{
++    return ::X509_get_subject_name(a);
+ }
+ 
+-
+-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 0L;
++X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a)
++{
++    return ::X509_get_issuer_name(a);
+ }
+ 
+-
+-X509_LOOKUP_METHOD *KOpenSSLProxy::X509_LOOKUP_file(void) {
+-   if (K_X509_LOOKUP_file) return (K_X509_LOOKUP_file)();
+-   return 0L;
++X509_LOOKUP *KOpenSSLProxy::X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m)
++{
++    return ::X509_STORE_add_lookup(v, m);
+ }
+ 
+-
+-void KOpenSSLProxy::X509_LOOKUP_free(X509_LOOKUP *x) {
+-   if (K_X509_LOOKUP_free) (K_X509_LOOKUP_free)(x);
++X509_LOOKUP_METHOD *KOpenSSLProxy::X509_LOOKUP_file(void)
++{
++    return ::X509_LOOKUP_file();
+ }
+ 
+-
+-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;
++void KOpenSSLProxy::X509_LOOKUP_free(X509_LOOKUP *x)
++{
++    ::X509_LOOKUP_free(x);
+ }
+ 
+-
+-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);
++int KOpenSSLProxy::X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret)
++{
++    return ::X509_LOOKUP_ctrl(ctx, cmd, argc, argl, ret);
+ }
+ 
+-
+-void KOpenSSLProxy::CRYPTO_free(void *x) {
+-   if (K_CRYPTO_free) (K_CRYPTO_free)(x);
++void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509, STACK_OF(X509) *chain)
++{
++    ::X509_STORE_CTX_init(ctx, store, x509, chain);
+ }
+ 
+-
+-X509 *KOpenSSLProxy::X509_dup(X509 *x509) {
+-   if (K_X509_dup) return (K_X509_dup)(x509);
+-   return 0L;
++void KOpenSSLProxy::CRYPTO_free(void *x)
++{
++    ::CRYPTO_free(x, OPENSSL_FILE, OPENSSL_LINE);
+ }
+ 
+-
+-BIO *KOpenSSLProxy::BIO_new(BIO_METHOD *type) {
+-    if (K_BIO_new) return (K_BIO_new)(type);
+-    else return 0L;
++X509 *KOpenSSLProxy::X509_dup(X509 *x509)
++{
++    return ::X509_dup(x509);
+ }
+ 
+-
+-BIO_METHOD *KOpenSSLProxy::BIO_s_mem(void) {
+-    if (K_BIO_s_mem) return (K_BIO_s_mem)();
+-    else return 0L;
++BIO *KOpenSSLProxy::BIO_new(BIO_METHOD *type)
++{
++    return ::BIO_new(type);
+ }
+ 
+-
+-BIO *KOpenSSLProxy::BIO_new_fp(FILE *stream, int close_flag) {
+-   if (K_BIO_new_fp) return (K_BIO_new_fp)(stream, close_flag);
+-   return 0L;
++const BIO_METHOD *KOpenSSLProxy::BIO_s_mem(void)
++{
++    return ::BIO_s_mem();
+ }
+ 
+-
+-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 0L;
++BIO *KOpenSSLProxy::BIO_new_fp(FILE *stream, int close_flag)
++{
++    return ::BIO_new_fp(stream, close_flag);
+ }
+ 
+-
+-int KOpenSSLProxy::BIO_free(BIO *a) {
+-   if (K_BIO_free) return (K_BIO_free)(a);
+-   return -1;
++BIO *KOpenSSLProxy::BIO_new_mem_buf(void *buf, int len)
++{
++    return ::BIO_new_mem_buf(buf, len);
+ }
+ 
+-
+-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
++int KOpenSSLProxy::BIO_free(BIO *a)
++{
++    return ::BIO_free(a);
+ }
+ 
+-
+-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;
++long KOpenSSLProxy::BIO_ctrl(BIO *bp, int cmd, long larg, void *parg)
++{
++    return ::BIO_ctrl(bp, cmd, larg, parg);
+ }
+ 
+-
+-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, 0L, 0L, 0, 0L, 0L);
+-   else return -1;
++int KOpenSSLProxy::BIO_write(BIO *b, const void *data, int len)
++{
++    return ::BIO_write(b, data, len);
+ }
+ 
+-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;
++int KOpenSSLProxy::PEM_write_bio_X509(BIO *bp, X509 *x)
++{
++    return ::PEM_ASN1_write_bio(reinterpret_cast<i2d_of_void*>(::i2d_X509), PEM_STRING_X509, bp, (char *)x, 0L, 0L, 0, 0L, 0L);
+ }
+ 
+-
+-int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
+-   if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
+-   return -1;
++int KOpenSSLProxy::X509_print(FILE *fp, X509 *x)
++{
++    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 0L;
++PKCS12 *KOpenSSLProxy::d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
++{
++    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;
++int KOpenSSLProxy::PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass)
++{
++    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;
++int KOpenSSLProxy::i2d_PKCS12(PKCS12 *p12, unsigned char **p)
++{
++    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;
++int KOpenSSLProxy::i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
++{
++    return ::i2d_PKCS12_fp(fp, p12);
+ }
+ 
+-
+-PKCS12 *KOpenSSLProxy::PKCS12_new(void) {
+-   if (K_PKCS12_new) return (K_PKCS12_new)();
+-   else return 0L;
++PKCS12 *KOpenSSLProxy::PKCS12_new(void)
++{
++    return ::PKCS12_new();
+ }
+ 
+-
+-void KOpenSSLProxy::PKCS12_free(PKCS12 *a) {
+-   if (K_PKCS12_free) (K_PKCS12_free)(a);
++void KOpenSSLProxy::PKCS12_free(PKCS12 *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;
++                                X509 **cert, STACK_OF(X509) **ca)
++{
++    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);
++void KOpenSSLProxy::EVP_PKEY_free(EVP_PKEY *x)
++{
++    ::EVP_PKEY_free(x);
+ }
+ 
+-
+-EVP_PKEY* KOpenSSLProxy::EVP_PKEY_new() {
+-   if (K_EVP_PKEY_new) return (K_EVP_PKEY_new)();
+-   else return 0L;
++EVP_PKEY *KOpenSSLProxy::EVP_PKEY_new()
++{
++    return ::EVP_PKEY_new();
+ }
+ 
+-
+-void KOpenSSLProxy::X509_REQ_free(X509_REQ *x) {
+-   if (K_X509_REQ_free) (K_X509_REQ_free)(x);
++void KOpenSSLProxy::X509_REQ_free(X509_REQ *x)
++{
++    ::X509_REQ_free(x);
+ }
+ 
+-
+-X509_REQ* KOpenSSLProxy::X509_REQ_new() {
+-   if (K_X509_REQ_new) return (K_X509_REQ_new)();
+-   else return 0L;
++X509_REQ *KOpenSSLProxy::X509_REQ_new()
++{
++    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;
++int KOpenSSLProxy::SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey)
++{
++    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;
++int KOpenSSLProxy::SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x)
++{
++    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;
++int KOpenSSLProxy::SSL_get_error(SSL *ssl, int rc)
++{
++    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 0L;
++STACK_OF(X509) *KOpenSSLProxy::SSL_get_peer_cert_chain(SSL *s)
++{
++    return ::SSL_get_peer_cert_chain(s);
+ }
+ 
+-
+-void KOpenSSLProxy::sk_free(STACK *s) {
+-   if (K_sk_free) (K_sk_free)(s);
++void KOpenSSLProxy::sk_free(STACK *s)
++{
++    ::OPENSSL_sk_free(s);
+ }
+ 
+-
+-int KOpenSSLProxy::sk_num(STACK *s) {
+-   if (K_sk_num) return (K_sk_num)(s);
+-   else return -1;
++int KOpenSSLProxy::sk_num(STACK *s)
++{
++    return ::OPENSSL_sk_num(s);
+ }
+ 
+-
+-char *KOpenSSLProxy::sk_pop(STACK *s) {
+-   if (K_sk_pop) return (K_sk_pop)(s);
+-   else return 0L;
++char *KOpenSSLProxy::sk_pop(STACK *s)
++{
++    return static_cast<char*>(::OPENSSL_sk_pop(s));
+ }
+ 
+-
+-char *KOpenSSLProxy::sk_value(STACK *s, int n) {
+-   if (K_sk_value) return (K_sk_value)(s, n);
+-   else return 0L;
++char *KOpenSSLProxy::sk_value(STACK *s, int n)
++{
++    return static_cast<char*>(::sk_value(s, n));
+ }
+ 
+-
+-void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
+-   if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
++void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* 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);
++void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int 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 0L;
++STACK *KOpenSSLProxy::sk_dup(STACK *s)
++{
++    return ::sk_dup(s);
+ }
+ 
+-
+-STACK* KOpenSSLProxy::sk_new(int (*cmp)()) {
+-   if (K_sk_new) return (K_sk_new)(cmp);
+-   else return 0L;
++STACK *KOpenSSLProxy::sk_new(OPENSSL_sk_compfunc cmp)
++{
++    return ::sk_new(cmp);
+ }
+ 
+-
+-int KOpenSSLProxy::sk_push(STACK* s, char* d) {
+-   if (K_sk_push) return (K_sk_push)(s,d);
+-   else return -1;
++int KOpenSSLProxy::sk_push(STACK *s, char *d)
++{
++    return ::sk_push(s, d);
+ }
+ 
+-
+-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 0L;
++char *KOpenSSLProxy::i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint)
++{
++    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 0L;
++ASN1_INTEGER *KOpenSSLProxy::X509_get_serialNumber(X509 *x)
++{
++    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 0L;
++EVP_PKEY *KOpenSSLProxy::X509_get_pubkey(X509 *x)
++{
++    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;
++int KOpenSSLProxy::i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
++{
++    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;
++int KOpenSSLProxy::X509_check_private_key(X509 *x, EVP_PKEY *p)
++{
++    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 0L;
++char *KOpenSSLProxy::BN_bn2hex(const BIGNUM *a)
++{
++    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;
++int KOpenSSLProxy::X509_digest(const X509 *x, const EVP_MD *t, unsigned char *md, unsigned int *len)
++{
++    return ::X509_digest(x, t, md, len);
+ }
+ 
+-
+-EVP_MD *KOpenSSLProxy::EVP_md5() {
+-   if (K_EVP_md5) return (K_EVP_md5)();
+-   return 0L;
++const EVP_MD *KOpenSSLProxy::EVP_md5()
++{
++    return ::EVP_md5();
+ }
+ 
+-
+-void KOpenSSLProxy::ASN1_INTEGER_free(ASN1_INTEGER *a) {
+-   if (K_ASN1_INTEGER_free) (K_ASN1_INTEGER_free)(a);
++void KOpenSSLProxy::ASN1_INTEGER_free(ASN1_INTEGER *a)
++{
++    ::ASN1_INTEGER_free(a);
+ }
+ 
+-
+-int KOpenSSLProxy::OBJ_obj2nid(ASN1_OBJECT *o) {
+-   if (K_OBJ_obj2nid) return (K_OBJ_obj2nid)(o);
+-   else return -1;
++int KOpenSSLProxy::OBJ_obj2nid(ASN1_OBJECT *o)
++{
++    return ::OBJ_obj2nid(o);
+ }
+ 
+-
+-const char * KOpenSSLProxy::OBJ_nid2ln(int n) {
+-   if (K_OBJ_nid2ln) return (K_OBJ_nid2ln)(n);
+-   else return 0L;
++const char *KOpenSSLProxy::OBJ_nid2ln(int n)
++{
++    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;
++int KOpenSSLProxy::X509_get_ext_count(X509 *x)
++{
++    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;
++int KOpenSSLProxy::X509_get_ext_by_NID(X509 *x, int nid, int lastpos)
++{
++    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;
++int KOpenSSLProxy::X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos)
++{
++    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 0L;
++X509_EXTENSION *KOpenSSLProxy::X509_get_ext(X509 *x, int loc)
++{
++    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 0L;
++X509_EXTENSION *KOpenSSLProxy::X509_delete_ext(X509 *x, int loc)
++{
++    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;
++int KOpenSSLProxy::X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
++{
++    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 0L;
++void *KOpenSSLProxy::X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)
++{
++    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 0L;
++char *KOpenSSLProxy::i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5)
++{
++    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;
++int KOpenSSLProxy::ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
++{
++    return ::ASN1_BIT_STRING_get_bit(a, n);
+ }
+ 
+-
+-PKCS7 *KOpenSSLProxy::PKCS7_new(void) {
+-   if (K_PKCS7_new) return (K_PKCS7_new)();
+-   else return 0L;
++PKCS7 *KOpenSSLProxy::PKCS7_new(void)
++{
++    return ::PKCS7_new();
+ }
+ 
+-
+-void KOpenSSLProxy::PKCS7_free(PKCS7 *a) {
+-   if (K_PKCS7_free) (K_PKCS7_free)(a);
++void KOpenSSLProxy::PKCS7_free(PKCS7 *a)
++{
++    ::PKCS7_free(a);
+ }
+ 
+-
+-void KOpenSSLProxy::PKCS7_content_free(PKCS7 *a) {
+-   if (K_PKCS7_content_free) (K_PKCS7_content_free)(a);
++void KOpenSSLProxy::PKCS7_content_free(PKCS7 *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;
++int KOpenSSLProxy::i2d_PKCS7(PKCS7 *a, unsigned char **pp)
++{
++    return ::i2d_PKCS7(a, pp);
+ }
+ 
+-
+-PKCS7 *KOpenSSLProxy::d2i_PKCS7(PKCS7 **a, unsigned char **pp,long length) {
+-   if (K_d2i_PKCS7) return (K_d2i_PKCS7)(a,pp,length);
+-   else return 0L;
++PKCS7 *KOpenSSLProxy::d2i_PKCS7(PKCS7 **a, const unsigned char **pp, long length)
++{
++    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;
++int KOpenSSLProxy::i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
++{
++    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 0L;
++PKCS7 *KOpenSSLProxy::d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
++{
++    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;
++int KOpenSSLProxy::i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
++{
++    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 0L;
++PKCS7 *KOpenSSLProxy::d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
++{
++    return ::d2i_PKCS7_bio(bp, p7);
+ }
+ 
+-
+-PKCS7 *KOpenSSLProxy::PKCS7_dup(PKCS7 *p7) {
+-   if (K_PKCS7_dup) return (K_PKCS7_dup)(p7);
+-   else return 0L;
++PKCS7 *KOpenSSLProxy::PKCS7_dup(PKCS7 *p7)
++{
++    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 0L;
++                                 BIO *data, int flags)
++{
++    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;
++int KOpenSSLProxy::PKCS7_verify(PKCS7 *p, STACK_OF(X509)* st, X509_STORE *s, BIO *in, BIO *out, int flags)
++{
++    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 0L;
++STACK_OF(X509) *KOpenSSLProxy::PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags)
++{
++    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 0L;
++                                    int flags)
++{
++    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;
++int KOpenSSLProxy::PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
++{
++    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 0L;
++STACK_OF(X509_NAME) *KOpenSSLProxy::SSL_load_client_CA_file(const char *file)
++{
++    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 0L;
++STACK_OF(X509_INFO) *KOpenSSLProxy::PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
++{
++    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 0L;
++X509 *KOpenSSLProxy::X509_d2i_fp(FILE *out, X509 **buf)
++{
++        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;
++int KOpenSSLProxy::SSL_peek(SSL *ssl, void *buf, int num)
++{
++    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 0L;
++const char *KOpenSSLProxy::RAND_file_name(char *buf, size_t num)
++{
++    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;
++int KOpenSSLProxy::RAND_load_file(const char *filename, long max_bytes)
++{
++    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;
++int KOpenSSLProxy::RAND_write_file(const char *filename)
++{
++    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;
++int KOpenSSLProxy::X509_PURPOSE_get_count()
++{
++    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;
++int KOpenSSLProxy::X509_PURPOSE_get_id(X509_PURPOSE *p)
++{
++    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;
++int KOpenSSLProxy::X509_check_purpose(X509 *x, int id, int ca)
++{
++    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 0L;
++X509_PURPOSE *KOpenSSLProxy::X509_PURPOSE_get0(int idx)
++{
++    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;
++int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
++{
++    return ::EVP_PKEY_assign(pkey, type, key);
+ }
+ 
+-
+-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;
++int KOpenSSLProxy::X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey)
++{
++    return ::X509_REQ_set_pubkey(x, pkey);
+ }
+ 
+-
+-RSA* KOpenSSLProxy::RSA_generate_key(int bits, unsigned long e, void
+-                        (*callback)(int,int,void *), void *cb_arg) {
+-   if (K_RSA_generate_key) return (K_RSA_generate_key)(bits, e, callback, cb_arg);
+-   else return 0L;
++RSA *KOpenSSLProxy::RSA_generate_key(int bits, unsigned long e, void
++                                     (*callback)(int, int, void *), void *cb_arg)
++{
++    return ::RSA_generate_key(bits, e, callback, cb_arg);
+ }
+ 
+-STACK *KOpenSSLProxy::X509_get1_email(X509 *x) {
+-   if (K_X509_get1_email) return (K_X509_get1_email)(x);
+-   else return 0L;
++STACK *KOpenSSLProxy::X509_get1_email(X509 *x)
++{
++    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);
++void KOpenSSLProxy::X509_email_free(STACK *sk)
++{
++    ::X509_email_free(reinterpret_cast<STACK_OF(OPENSSL_STRING)*>(sk));
+ }
+ 
+-EVP_CIPHER *KOpenSSLProxy::EVP_des_ede3_cbc() {
+-    if (K_EVP_des_ede3_cbc) return (K_EVP_des_ede3_cbc)();
+-    else return 0L;
++const EVP_CIPHER *KOpenSSLProxy::EVP_des_ede3_cbc()
++{
++    return ::EVP_des_ede3_cbc();
+ }
+ 
+-EVP_CIPHER *KOpenSSLProxy::EVP_des_cbc() {
+-    if (K_EVP_des_cbc) return (K_EVP_des_cbc)();
+-    else return 0L;
++const EVP_CIPHER *KOpenSSLProxy::EVP_des_cbc()
++{
++    return ::EVP_des_cbc();
+ }
+ 
+-EVP_CIPHER *KOpenSSLProxy::EVP_rc2_cbc() {
+-    if (K_EVP_rc2_cbc) return (K_EVP_rc2_cbc)();
+-    else return 0L;
++const EVP_CIPHER *KOpenSSLProxy::EVP_rc2_cbc()
++{
++    return ::EVP_rc2_cbc();
+ }
+ 
+-EVP_CIPHER *KOpenSSLProxy::EVP_rc2_64_cbc() {
+-    if (K_EVP_rc2_64_cbc) return (K_EVP_rc2_64_cbc)();
+-    else return 0L;
++const EVP_CIPHER *KOpenSSLProxy::EVP_rc2_64_cbc()
++{
++    return ::EVP_rc2_64_cbc();
+ }
+ 
+-EVP_CIPHER *KOpenSSLProxy::EVP_rc2_40_cbc() {
+-    if (K_EVP_rc2_40_cbc) return (K_EVP_rc2_40_cbc)();
+-    else return 0L;
++const EVP_CIPHER *KOpenSSLProxy::EVP_rc2_40_cbc()
++{
++    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;
++int KOpenSSLProxy::i2d_X509_REQ_fp(FILE *fp, X509_REQ *x)
++{
++    return ::i2d_X509_REQ_fp(fp, x);
+ }
+ 
+-
+-void KOpenSSLProxy::ERR_clear_error() {
+-   if (K_ERR_clear_error) (K_ERR_clear_error)();
++void KOpenSSLProxy::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;
++unsigned long KOpenSSLProxy::ERR_get_error()
++{
++    return ::ERR_get_error();
+ }
+ 
+-
+-void KOpenSSLProxy::ERR_print_errors_fp(FILE* fp) {
+-   if (K_ERR_print_errors_fp) (K_ERR_print_errors_fp)(fp);
++void KOpenSSLProxy::ERR_print_errors_fp(FILE *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 0L;
++SSL_SESSION *KOpenSSLProxy::SSL_get1_session(SSL *ssl)
++{
++    return ::SSL_get1_session(ssl);
+ }
+ 
+-
+-void KOpenSSLProxy::SSL_SESSION_free(SSL_SESSION *session) {
+-   if (K_SSL_SESSION_free) (K_SSL_SESSION_free)(session);
++void KOpenSSLProxy::SSL_SESSION_free(SSL_SESSION *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;
++int KOpenSSLProxy::SSL_set_session(SSL *ssl, SSL_SESSION *session)
++{
++    return ::SSL_set_session(ssl, session);
+ }
+ 
+-
+-SSL_SESSION *KOpenSSLProxy::d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, long length) {
+-   if (K_d2i_SSL_SESSION) return (K_d2i_SSL_SESSION)(a, pp, length);
+-   else return 0L;
++SSL_SESSION *KOpenSSLProxy::d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length)
++{
++    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;
++int KOpenSSLProxy::i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
++{
++    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;
++int KOpenSSLProxy::i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *p)
++{
++    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;
++int KOpenSSLProxy::i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *p, const EVP_CIPHER *c, char *k, int klen, pem_password_cb *cb, void *u)
++{
++    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);
++void KOpenSSLProxy::RSA_free(RSA *rsa)
++{
++    return ::RSA_free(rsa);
+ }
+ 
+-
+-EVP_CIPHER *KOpenSSLProxy::EVP_bf_cbc() {
+-   if (K_EVP_bf_cbc) return (K_EVP_bf_cbc)();
+-   return 0L;
++const EVP_CIPHER *KOpenSSLProxy::EVP_bf_cbc()
++{
++    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;
++int KOpenSSLProxy::X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
++{
++    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;
++        int type, unsigned char *bytes, int len, int loc, int set)
++{
++    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 0L;
++X509_NAME *KOpenSSLProxy::X509_NAME_new()
++{
++    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;
++int KOpenSSLProxy::X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name)
++{
++    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 0L;
++unsigned char *KOpenSSLProxy::ASN1_STRING_data(ASN1_STRING *x)
++{
++    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;
++int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x)
++{
++    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 0L;
++STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL *ssl)
++{
++    return ::SSL_get_ciphers(ssl);
+ }
+ 
+ #endif
+-
+--- kdelibs-4.14.26/kio/kssl/kopenssl.h.omv~	2016-11-14 21:58:51.376629071 +0100
++++ kdelibs-4.14.26/kio/kssl/kopenssl.h	2016-11-14 22:11:08.549870329 +0100
+@@ -16,7 +16,6 @@
+    Boston, MA 02110-1301, USA.
+ */
+ 
+-
+ // IF YOU ARE USING THIS CLASS, YOU ARE MAKING A MISTAKE.
+ 
+ #ifndef __KOPENSSLPROXY_H
+@@ -25,11 +24,9 @@
+ #define KOSSL KOpenSSLProxy
+ class KOpenSSLProxyPrivate;
+ 
+-#include <kio/kio_export.h>
+-
+ #include <ksslconfig.h>
+ 
+-#ifdef KSSL_HAVE_SSL
++#if KSSL_HAVE_SSL
+ #define crypt _openssl_crypt
+ #include <openssl/ssl.h>
+ #include <openssl/x509.h>
+@@ -62,833 +59,773 @@ class KOpenSSLProxyPrivate;
+  * @short KDE OpenSSL Wrapper
+  * @internal
+  */
+-class KOpenSSLProxy {
++class KOpenSSLProxy
++{
+ public:
+ 
+-   /**
+-    * Return an instance of class KOpenSSLProxy *
+-    * You cannot delete this object.  It is a singleton class.
+-    */
+-   static KOpenSSLProxy *self();
+-
+-   /**
+-    *   Return true of libcrypto was found and loaded
+-    */
+-   bool hasLibCrypto() const;
+-
+-   /**
+-    *   Return true of libssl was found and loaded
+-    */
+-   bool hasLibSSL() const;
+-
+-   /**
+-    *   Destroy the class and start over - don't use this unless you know
+-    *   what you are doing.
+-    */
+-   void destroy();
+-
+-   // Here are the symbols that we need.
+-#ifdef KSSL_HAVE_SSL
+-
+-   /*
+-    *   SSL_connect - initiate the TLS/SSL handshake with an TLS/SSL server
+-    */
+-   int SSL_connect(SSL *ssl);
+-
+-   /*
+-    *   SSL_accept - initiate the TLS/SSL handshake with an TLS/SSL server
+-    */
+-   int SSL_accept(SSL *ssl);
+-
+-   /*
+-    *   SSL_get_error - get the error code
+-    */
+-   int SSL_get_error(SSL *ssl, int rc);
+-
+-   /*
+-    *   SSL_read - read bytes from a TLS/SSL connection.
+-    */
+-   int SSL_read(SSL *ssl, void *buf, int num);
+-
+-   /*
+-    *   SSL_write - write bytes to a TLS/SSL connection.
+-    */
+-   int SSL_write(SSL *ssl, const void *buf, int num);
+-
+-   /*
+-    *   SSL_new - create a new SSL structure for a connection
+-    */
+-   SSL *SSL_new(SSL_CTX *ctx);
+-
+-   /*
+-    *   SSL_free - free an allocated SSL structure
+-    */
+-   void SSL_free(SSL *ssl);
+-
+-   /*
+-    *   SSL_shutdown - shutdown an allocated SSL connection
+-    */
+-   int SSL_shutdown(SSL *ssl);
+-
+-   /*
+-    *   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_free - free an allocated SSL_CTX object
+-    */
+-   void SSL_CTX_free(SSL_CTX *ctx);
+-
+-   /*
+-    *   SSL_set_fd - connect the SSL object with a file descriptor
+-    */
+-   int SSL_set_fd(SSL *ssl, int fd);
+-
+-   /*
+-    *   SSL_pending - obtain number of readable bytes buffered in an SSL object
+-    */
+-   int SSL_pending(SSL *ssl);
+-
+-   /*
+-    *   SSL_peek - obtain bytes buffered in an SSL object
+-    */
+-   int SSL_peek(SSL *ssl, void *buf, int num);
+-
+-   /*
+-    *   SSL_CTX_set_cipher_list - choose list of available SSL_CIPHERs
+-    */
+-   int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str);
+-
+-   /*
+-    *   SSL_CTX_set_verify - set peer certificate verification parameters
+-    */
+-   void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
+-                         int (*verify_callback)(int, X509_STORE_CTX *));
+-
+-   /*
+-    *   SSL_use_certificate - load certificate
+-    */
+-   int SSL_use_certificate(SSL *ssl, X509 *x);
+-
+-   /*
+-    *   SSL_get_current_cipher - get SSL_CIPHER of a connection
+-    */
+-   SSL_CIPHER *SSL_get_current_cipher(SSL *ssl);
+-
+-   /*
+-    *   SSL_set_options - manipulate SSL engine options
+-    *   Note: These are all mapped to SSL_ctrl so call them as the comment
+-    *         specifies but know that they use SSL_ctrl.  They are #define
+-    *         so they will map to the one in this class if called as a
+-    *         member function of this class.
+-    */
+-   /* long SSL_set_options(SSL *ssl, long options); */
+-   /*   Returns 0 if not reused, 1 if session id is reused */
+-   /*   int SSL_session_reused(SSL *ssl); */
+-   long    SSL_ctrl(SSL *ssl,int cmd, long larg, char *parg);
+-
+-   /*
+-    *   RAND_egd - set the path to the EGD
+-    */
+-   int RAND_egd(const char *path);
+-
+-
+-   /*
+-    *   RAND_file_name
+-    */
+-   const char *RAND_file_name(char *buf, size_t num);
+-
+-
+-   /*
+-    *   RAND_load_file
+-    */
+-   int RAND_load_file(const char *filename, long max_bytes);
+-
+-
+-   /*
+-    *   RAND_write_file
+-    */
+-   int RAND_write_file(const char *filename);
+-
+-
+-   /*
+-    *   TLSv1_client_method - return a TLSv1 client method object
+-    */
+-   SSL_METHOD *TLSv1_client_method();
+-
+-
+-   /*
+-    *   SSLv23_client_method - return a SSLv23 client method object
+-    */
+-   SSL_METHOD *SSLv23_client_method();
+-
+-
+-   /*
+-    *   SSL_get_peer_certificate - return the peer's certificate
+-    */
+-   X509 *SSL_get_peer_certificate(SSL *s);
+-
+-
+-   /*
+-    *   SSL_get_peer_cert_chain - get the peer's certificate chain
+-    */
+-   STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s);
+-
+-   /*
+-    *   SSL_CIPHER_get_bits - get the number of bits in this cipher
+-    */
+-   int SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits);
+-
+-
+-   /*
+-    *   SSL_CIPHER_get_version - get the version of this cipher
+-    */
+-   char *SSL_CIPHER_get_version(SSL_CIPHER *c);
+-
+-
+-   /*
+-    *   SSL_CIPHER_get_name - get the name of this cipher
+-    */
+-   const char *SSL_CIPHER_get_name(SSL_CIPHER *c);
+-
+-
+-   /*
+-    *   SSL_CIPHER_description - get the description of this cipher
+-    */
+-   char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size);
+-
+-
+-   /*
+-    *   SSL_CTX_use_PrivateKey - set the private key for the session.
+-    *                          - for use with client certificates
+-    */
+-   int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
+-
+-
+-   /*
+-    *   SSL_CTX_use_certificate - set the client certificate for the session.
+-    */
+-   int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
+-
+-
+-   /*
+-    *   d2i_X509 - Convert a text representation of X509 to an X509 object
+-    */
+-   X509 * d2i_X509(X509 **a,unsigned char **pp,long length);
+-
+-
+-   /*
+-    *   i2d_X509 - Convert an X509 object into a text representation
+-    */
+-   int i2d_X509(X509 *a,unsigned char **pp);
+-
+-
+-   /*
+-    *   X509_cmp - compare two X509 objects
+-    */
+-   int X509_cmp(X509 *a, X509 *b);
+-
+-
+-   /*
+-    *   X509_dup - duplicate an X509 object
+-    */
+-   X509 *X509_dup(X509 *x509);
+-
+-
+-   /*
+-    *   X509_STORE_CTX_new - create an X509 store context
+-    */
+-   X509_STORE_CTX *X509_STORE_CTX_new(void);
+-
+-
+-   /*
+-    *   X509_STORE_CTX_free - free up an X509 store context
+-    */
+-   void X509_STORE_CTX_free(X509_STORE_CTX *v);
+-
+-
+-   /*
+-    *   X509_STORE_CTX_set_chain - set the certificate chain
+-    */
+-   void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
+-
+-   /*
+-    *   X509_STORE_CTX_set_purpose - set the purpose of the certificate
+-    */
+-   void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
+-
+-   /*
+-    *   X509_verify_cert - verify the certificate
+-    */
+-   int X509_verify_cert(X509_STORE_CTX *v);
+-
+-
+-   /*
+-    *   X509_STORE_new - create an X509 store
+-    */
+-   X509_STORE *X509_STORE_new(void);
+-
+-
+-   /*
+-    *   X509_STORE_free - free up an X509 store
+-    */
+-   void X509_STORE_free(X509_STORE *v);
+-
+-
+-   /*
+-    *   X509_free - free up an X509
+-    */
+-   void X509_free(X509 *v);
+-
+-
+-   /*
+-    *   X509_NAME_oneline - return the X509 data in a string
+-    */
+-   char *X509_NAME_oneline(X509_NAME *a, char *buf, int size);
+-
+-
+-   /*
+-    *   X509_get_subject_name - return the X509_NAME for the subject field
+-    */
+-   X509_NAME *X509_get_subject_name(X509 *a);
+-
+-
+-   /*
+-    *   X509_get_issuer_name - return the X509_NAME for the issuer field
+-    */
+-   X509_NAME *X509_get_issuer_name(X509 *a);
+-
+-
+-   /*
+-    *   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);
+-
+-
+-   /*
+-    *   X509_LOOKUP_file - Definition of the LOOKUP_file method
+-    */
+-   X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
+-
+-
+-   /*
+-    *   X509_LOOKUP_free - Free an X509_LOOKUP
+-    */
+-   void X509_LOOKUP_free(X509_LOOKUP *x);
+-
+-
+-   /*
+-    *   X509_LOOKUP_ctrl - This is not normally called directly (use macros)
+-    */
+-   int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret);
+-
+-
+-   /*
+-    *   X509_STORE_CTX_init - initialize an X509 STORE context
+-    */
+-   void X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509, STACK_OF(X509) *chain);
+-
+-
+-   /*
+-    *   CRYPTO_free - free up an internally allocated object
+-    */
+-   void CRYPTO_free(void *x);
+-
+-   /*
+-    *   BIO_new - create new BIO
+-    */
+-   BIO *BIO_new(BIO_METHOD *type);
+-
+-   /*
+-    *   BIO methods - only one defined here yet
+-    */
+-   BIO_METHOD *BIO_s_mem(void);
+-
+-   /*
+-    *   BIO_new_fp - nastiness called BIO - used to create BIO* from FILE*
+-    */
+-   BIO *BIO_new_fp(FILE *stream, int close_flag);
+-
+-   /*
+-    *   BIO_new_mem_buf - read only BIO from memory region
+-    */
+-   BIO *BIO_new_mem_buf(void *buf, int len);
+-
+-   /*
+-    *   BIO_free - nastiness called BIO - used to destroy BIO*
+-    */
+-   int BIO_free(BIO *a);
+-
+-   /*
+-    *   BIO_ctrl - BIO control method
+-    */
+-   long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
+-
+-   /*
+-    *   BIO_write - equivalent to ::write for BIO
+-    */
+-   int BIO_write(BIO *b, const void *data, int len);
+-
+-   /*
+-    *   PEM_write_bio_X509 - write a PEM encoded cert to a BIO*
+-    */
+-   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);
+-
+-
+-   /*
+-    *   X509_print - print the text form of an X509
+-    */
+-   int X509_print(FILE *fp, X509 *x);
+-
+-
+-   /*
+-    *   Read a PKCS#12 cert from fp
+-    */
+-   PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
+-
+-
+-   /*
+-    *   Change the password on a PKCS#12 cert
+-    */
+-   int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
+-
+-
+-   /*
+-    *   Write a PKCS#12 to mem
+-    */
+-   int i2d_PKCS12(PKCS12 *p12, unsigned char **p);
+-
+-
+-   /*
+-    *   Write a PKCS#12 to FILE*
+-    */
+-   int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
+-
+-
+-   /*
+-    *   Create a new PKCS#12 object
+-    */
+-   PKCS12 *PKCS12_new(void);
+-
+-
+-   /*
+-    *   Destroy that PKCS#12 that you created!
+-    */
+-   void PKCS12_free(PKCS12 *a);
+-
+-
+-   /*
+-    *   Parse the PKCS#12
+-    */
+-   int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey,
+-                    X509 **cert, STACK_OF(X509) **ca);
+-
+-
+-   /*
+-    *   Free the Private Key
+-    */
+-   void EVP_PKEY_free(EVP_PKEY *x);
+-
+-
+-   /*
+-    *   Pop off the stack
+-    */
+-   char *sk_pop(STACK *s);
+-
+-
+-   /*
+-    *   Free the stack
+-    */
+-   void sk_free(STACK *s);
++    /**
++     * Return an instance of class KOpenSSLProxy *
++     * You cannot delete this object.  It is a singleton class.
++     */
++    static KOpenSSLProxy *self();
++
++    /**
++     *   Return true of libcrypto was found and loaded
++     */
++    bool hasLibCrypto() const;
++
++    /**
++     *   Return true of libssl was found and loaded
++     */
++    bool hasLibSSL() const;
++
++    /**
++     *   Destroy the class and start over - don't use this unless you know
++     *   what you are doing.
++     */
++    void destroy();
++
++    // Here are the symbols that we need.
++#if KSSL_HAVE_SSL
++
++    /*
++     *   SSL_connect - initiate the TLS/SSL handshake with an TLS/SSL server
++     */
++    int SSL_connect(SSL *ssl);
++
++    /*
++     *   SSL_accept - initiate the TLS/SSL handshake with an TLS/SSL server
++     */
++    int SSL_accept(SSL *ssl);
++
++    /*
++     *   SSL_get_error - get the error code
++     */
++    int SSL_get_error(SSL *ssl, int rc);
++
++    /*
++     *   SSL_read - read bytes from a TLS/SSL connection.
++     */
++    int SSL_read(SSL *ssl, void *buf, int num);
++
++    /*
++     *   SSL_write - write bytes to a TLS/SSL connection.
++     */
++    int SSL_write(SSL *ssl, const void *buf, int num);
++
++    /*
++     *   SSL_new - create a new SSL structure for a connection
++     */
++    SSL *SSL_new(SSL_CTX *ctx);
++
++    /*
++     *   SSL_free - free an allocated SSL structure
++     */
++    void SSL_free(SSL *ssl);
++
++    /*
++     *   SSL_shutdown - shutdown an allocated SSL connection
++     */
++    int SSL_shutdown(SSL *ssl);
++
++    /*
++     *   SSL_CTX_new - create a new SSL_CTX object as framework for TLS/SSL enabled functions
++     */
++    SSL_CTX *SSL_CTX_new(const SSL_METHOD *method);
++
++    /*
++     *   SSL_CTX_free - free an allocated SSL_CTX object
++     */
++    void SSL_CTX_free(SSL_CTX *ctx);
++
++    /*
++     *   SSL_set_fd - connect the SSL object with a file descriptor
++     */
++    int SSL_set_fd(SSL *ssl, int fd);
++
++    /*
++     *   SSL_pending - obtain number of readable bytes buffered in an SSL object
++     */
++    int SSL_pending(SSL *ssl);
++
++    /*
++     *   SSL_peek - obtain bytes buffered in an SSL object
++     */
++    int SSL_peek(SSL *ssl, void *buf, int num);
++
++    /*
++     *   SSL_CTX_set_cipher_list - choose list of available SSL_CIPHERs
++     */
++    int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str);
++
++    /*
++     *   SSL_CTX_set_verify - set peer certificate verification parameters
++     */
++    void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
++                            int (*verify_callback)(int, X509_STORE_CTX *));
++
++    /*
++     *   SSL_use_certificate - load certificate
++     */
++    int SSL_use_certificate(SSL *ssl, X509 *x);
++
++    /*
++     *   SSL_get_current_cipher - get SSL_CIPHER of a connection
++     */
++    const SSL_CIPHER *SSL_get_current_cipher(SSL *ssl);
++
++    /*
++     *   SSL_set_options - manipulate SSL engine options
++     *   Note: These are all mapped to SSL_ctrl so call them as the comment
++     *         specifies but know that they use SSL_ctrl.  They are #define
++     *         so they will map to the one in this class if called as a
++     *         member function of this class.
++     */
++    /* long SSL_set_options(SSL *ssl, long options); */
++    /*   Returns 0 if not reused, 1 if session id is reused */
++    /*   int SSL_session_reused(SSL *ssl); */
++    long    SSL_ctrl(SSL *ssl, int cmd, long larg, char *parg);
++
++    /*
++     *   RAND_egd - set the path to the EGD
++     */
++    int RAND_egd(const char *path);
++
++    /*
++     *   RAND_file_name
++     */
++    const char *RAND_file_name(char *buf, size_t num);
++
++    /*
++     *   RAND_load_file
++     */
++    int RAND_load_file(const char *filename, long max_bytes);
++
++    /*
++     *   RAND_write_file
++     */
++    int RAND_write_file(const char *filename);
++
++    /*
++     *   TLSv1_client_method - return a TLSv1 client method object
++     */
++    const SSL_METHOD *TLSv1_client_method();
++
++    /*
++     *   SSLv23_client_method - return a SSLv23 client method object
++     */
++    const SSL_METHOD *SSLv23_client_method();
++
++    /*
++     *   SSL_get_peer_certificate - return the peer's certificate
++     */
++    X509 *SSL_get_peer_certificate(SSL *s);
++
++    /*
++     *   SSL_get_peer_cert_chain - get the peer's certificate chain
++     */
++    STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s);
++
++    /*
++     *   SSL_CIPHER_get_bits - get the number of bits in this cipher
++     */
++    int SSL_CIPHER_get_bits(SSL_CIPHER *c, int *alg_bits);
++
++    /*
++     *   SSL_CIPHER_get_version - get the version of this cipher
++     */
++    const char *SSL_CIPHER_get_version(SSL_CIPHER *c);
++
++    /*
++     *   SSL_CIPHER_get_name - get the name of this cipher
++     */
++    const char *SSL_CIPHER_get_name(SSL_CIPHER *c);
++
++    /*
++     *   SSL_CIPHER_description - get the description of this cipher
++     */
++    char *SSL_CIPHER_description(SSL_CIPHER *, char *buf, int size);
++
++    /*
++     *   SSL_CTX_use_PrivateKey - set the private key for the session.
++     *                          - for use with client certificates
++     */
++    int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
++
++    /*
++     *   SSL_CTX_use_certificate - set the client certificate for the session.
++     */
++    int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
++
++    /*
++     *   d2i_X509 - Convert a text representation of X509 to an X509 object
++     */
++    X509 *d2i_X509(X509 **a, const unsigned char **pp, long length);
++
++    /*
++     *   i2d_X509 - Convert an X509 object into a text representation
++     */
++    int i2d_X509(X509 *a, unsigned char **pp);
++
++    /*
++     *   X509_cmp - compare two X509 objects
++     */
++    int X509_cmp(X509 *a, X509 *b);
++
++    /*
++     *   X509_dup - duplicate an X509 object
++     */
++    X509 *X509_dup(X509 *x509);
++
++    /*
++     *   X509_STORE_CTX_new - create an X509 store context
++     */
++    X509_STORE_CTX *X509_STORE_CTX_new(void);
++
++    /*
++     *   X509_STORE_CTX_free - free up an X509 store context
++     */
++    void X509_STORE_CTX_free(X509_STORE_CTX *v);
++
++    /*
++     *   X509_STORE_CTX_set_chain - set the certificate chain
++     */
++    void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
++
++    /*
++     *   X509_STORE_CTX_set_purpose - set the purpose of the certificate
++     */
++    void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
++
++    /*
++     *   X509_verify_cert - verify the certificate
++     */
++    int X509_verify_cert(X509_STORE_CTX *v);
++
++    /*
++     *   X509_STORE_new - create an X509 store
++     */
++    X509_STORE *X509_STORE_new(void);
++
++    /*
++     *   X509_STORE_free - free up an X509 store
++     */
++    void X509_STORE_free(X509_STORE *v);
++
++    /*
++     *   X509_free - free up an X509
++     */
++    void X509_free(X509 *v);
++
++    /*
++     *   X509_NAME_oneline - return the X509 data in a string
++     */
++    char *X509_NAME_oneline(X509_NAME *a, char *buf, int size);
++
++    /*
++     *   X509_get_subject_name - return the X509_NAME for the subject field
++     */
++    X509_NAME *X509_get_subject_name(X509 *a);
++
++    /*
++     *   X509_get_issuer_name - return the X509_NAME for the issuer field
++     */
++    X509_NAME *X509_get_issuer_name(X509 *a);
++
++    /*
++     *   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);
++
++    /*
++     *   X509_LOOKUP_file - Definition of the LOOKUP_file method
++     */
++    X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
++
++    /*
++     *   X509_LOOKUP_free - Free an X509_LOOKUP
++     */
++    void X509_LOOKUP_free(X509_LOOKUP *x);
++
++    /*
++     *   X509_LOOKUP_ctrl - This is not normally called directly (use macros)
++     */
++    int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret);
++
++    /*
++     *   X509_STORE_CTX_init - initialize an X509 STORE context
++     */
++    void X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509, STACK_OF(X509) *chain);
++
++    /*
++     *   CRYPTO_free - free up an internally allocated object
++     */
++    void CRYPTO_free(void *x);
++
++    /*
++     *   BIO_new - create new BIO
++     */
++    BIO *BIO_new(BIO_METHOD *type);
++
++    /*
++     *   BIO methods - only one defined here yet
++     */
++    const BIO_METHOD *BIO_s_mem(void);
++
++    /*
++     *   BIO_new_fp - nastiness called BIO - used to create BIO* from FILE*
++     */
++    BIO *BIO_new_fp(FILE *stream, int close_flag);
++
++    /*
++     *   BIO_new_mem_buf - read only BIO from memory region
++     */
++    BIO *BIO_new_mem_buf(void *buf, int len);
++
++    /*
++     *   BIO_free - nastiness called BIO - used to destroy BIO*
++     */
++    int BIO_free(BIO *a);
++
++    /*
++     *   BIO_ctrl - BIO control method
++     */
++    long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
++
++    /*
++     *   BIO_write - equivalent to ::write for BIO
++     */
++    int BIO_write(BIO *b, const void *data, int len);
++
++    /*
++     *   PEM_write_bio_X509 - write a PEM encoded cert to a BIO*
++     */
++    int PEM_write_bio_X509(BIO *bp, X509 *x);
++
++    /*
++     *   ASN1_d2i_fp - read an X509 from a DER encoded file (buf can be NULL)
++     */
++    X509 *X509_d2i_fp(FILE *out, X509 **buf);
++
++    /*
++     *   X509_print - print the text form of an X509
++     */
++    int X509_print(FILE *fp, X509 *x);
++
++    /*
++     *   Read a PKCS#12 cert from fp
++     */
++    PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
++
++    /*
++     *   Change the password on a PKCS#12 cert
++     */
++    int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
++
++    /*
++     *   Write a PKCS#12 to mem
++     */
++    int i2d_PKCS12(PKCS12 *p12, unsigned char **p);
++
++    /*
++     *   Write a PKCS#12 to FILE*
++     */
++    int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
++
++    /*
++     *   Create a new PKCS#12 object
++     */
++    PKCS12 *PKCS12_new(void);
++
++    /*
++     *   Destroy that PKCS#12 that you created!
++     */
++    void PKCS12_free(PKCS12 *a);
++
++    /*
++     *   Parse the PKCS#12
++     */
++    int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey,
++                     X509 **cert, STACK_OF(X509) **ca);
++
++    /*
++     *   Free the Private Key
++     */
++    void EVP_PKEY_free(EVP_PKEY *x);
++
++    /*
++     *   Pop off the stack
++     */
++    char *sk_pop(STACK *s);
++
++    /*
++     *   Free the stack
++     */
++    void sk_free(STACK *s);
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
++    void sk_free(void *s)
++    {
++        return sk_free(reinterpret_cast<STACK *>(s));
++    }
+ #endif
+ 
+-   /*
+-    *  Number of elements in the stack
+-    */
+-   int sk_num(STACK *s);
+-
+-
+-   /*
+-    *  Value of element n in the stack
+-    */
+-   char *sk_value(STACK *s, int n);
++    /*
++     *  Number of elements in the stack
++     */
++    int sk_num(STACK *s);
++
++    /*
++     *  Value of element n in the stack
++     */
++    char *sk_value(STACK *s, int n);
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
++    char *sk_value(void *s, int n)
++    {
++        return sk_value(reinterpret_cast<STACK *>(s), n);
++    }
+ #endif
+ 
+-   /*
+-    *  Create a new stack
+-    */
+-   STACK *sk_new(int (*cmp)());
+-
+-
+-   /*
+-    *  Add an element to the stack
+-    */
+-   int sk_push(STACK *s, char *d);
++    /*
++     *  Create a new stack
++     */
++    STACK *sk_new(OPENSSL_sk_compfunc cmp);
++
++    /*
++     *  Add an element to the stack
++     */
++    int sk_push(STACK *s, char *d);
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
++    int sk_push(void *s, void *d)
++    {
++        return sk_push(reinterpret_cast<STACK *>(s), reinterpret_cast<char *>(d));
++    }
+ #endif
+ 
++    /*
++     *  Duplicate the stack
++     */
++    STACK *sk_dup(STACK *s);
++
++    /*
++     *  Convert an ASN1_INTEGER to its text form
++     */
++    char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
++
++    /*
++     *  Get the certificate's serial number
++     */
++    ASN1_INTEGER *X509_get_serialNumber(X509 *x);
++
++    /*
++     *  Get the certificate's public key
++     */
++    EVP_PKEY *X509_get_pubkey(X509 *x);
++
++    /*
++     *  Convert the public key to a decimal form
++     */
++    int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
++
++    /*
++     *  Check the private key of a PKCS bundle against the X509
++     */
++    int X509_check_private_key(X509 *x, EVP_PKEY *p);
++
++    /*
++     *  Convert a BIGNUM to a hex string
++     */
++    char *BN_bn2hex(const BIGNUM *a);
++
++    /*
++     *  Compute the digest of an X.509
++     */
++    int X509_digest(const X509 *x, const EVP_MD *t, unsigned char *md, unsigned int *len);
++
++    /*
++     *  EVP_md5
++     */
++    const EVP_MD *EVP_md5();
++
++    /*
++     *  ASN1_INTEGER free
++     */
++    void ASN1_INTEGER_free(ASN1_INTEGER *x);
++
++    /*
++     *  ASN1_STRING_data
++     */
++    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
++
++    /*
++     *  ASN1_STRING_length
++     */
++    int ASN1_STRING_length(ASN1_STRING *x);
++
++    /*
++     *
++     */
++    int OBJ_obj2nid(ASN1_OBJECT *o);
++
++    /*
++     *
++     */
++    const char *OBJ_nid2ln(int n);
++
++    /*
++     * get the number of extensions
++     */
++    int X509_get_ext_count(X509 *x);
++
++    /*
++     *
++     */
++    int X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
++
++    /*
++     *
++     */
++    int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos);
++
++    /*
++     *
++     */
++    X509_EXTENSION *X509_get_ext(X509 *x, int loc);
++
++    /*
++     *
++     */
++    X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
++
++    /*
++     *
++     */
++    int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
++
++    /*
++     *
++     */
++    void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);
++
++    /*
++     *
++     */
++    char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5);
++
++    /*
++     *
++     */
++    int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
++
++    /*
++     *
++     */
++    PKCS7 *PKCS7_new(void);
++
++    /*
++     *
++     */
++    void PKCS7_free(PKCS7 *a);
++
++    /*
++     *
++     */
++    void PKCS7_content_free(PKCS7 *a);
++
++    /*
++     *
++     */
++    int i2d_PKCS7(PKCS7 *a, unsigned char **pp);
++
++    /*
++     *
++     */
++    PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **pp, long length);
++
++    /*
++     *
++     */
++    int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7);
++
++    /*
++     *
++     */
++    PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7);
++
++    /*
++     *
++     */
++    int i2d_PKCS7_bio(BIO *bp, PKCS7 *p7);
++
++    /*
++     *
++     */
++    PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7);
++
++    /*
++     *
++     */
++    PKCS7 *PKCS7_dup(PKCS7 *p7);
++
++    /*
++     *  Create a PKCS7 signature / signed message
++     */
++    PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
++                      BIO *data, int flags);
++
++    /*
++     *  Verify a PKCS7 signature.
++     */
++    int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
++                     BIO *indata, BIO *out, int flags);
++
++    /*
++     *  Get signers of a verified PKCS7 signature
++     */
++    STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
++
++    /*
++     *  PKCS7 encrypt message
++     */
++    PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher,
++                         int flags);
++
++    /*
++     *  decrypt PKCS7 message
++     */
++    int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
++
++    /*
++     * Load a CA list file.
++     */
++    STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
++
++    /*
++     * Load a file of PEM encoded objects.
++     */
++    STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
++                                            pem_password_cb *cb, void *u);
++
++    /*
++     * Get the number of purposes available
++     */
++    int X509_PURPOSE_get_count();
++
++    /*
++     * Get the ID of a purpose
++     */
++    int X509_PURPOSE_get_id(X509_PURPOSE *);
++
++    /*
++     * Check the existence of purpose id "id" in x.  for CA, set ca = 1, else 0
++     */
++    int X509_check_purpose(X509 *x, int id, int ca);
++
++    /*
++     * Get the purpose with index #idx
++     */
++    X509_PURPOSE *X509_PURPOSE_get0(int idx);
++
++    /*
++     * Create a new Private KEY
++     */
++    EVP_PKEY *EVP_PKEY_new();
++
++    /*
++     * Assign a private key
++     */
++    int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key);
++
++    /*
++     * Generate a RSA key
++     */
++    RSA *RSA_generate_key(int bits, unsigned long e, void
++                          (*callback)(int, int, void *), void *cb_arg);
++
++    /*
++     * Create/destroy a certificate request
++     */
++    X509_REQ *X509_REQ_new();
++    void X509_REQ_free(X509_REQ *a);
++
++    /*
++     * Set the public key in the REQ object
++     */
++    int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
++
++    /* for testing */
++    int i2d_X509_REQ_fp(FILE *fp, X509_REQ *x);
++
++    /* SMime support */
++    STACK *X509_get1_email(X509 *x);
++    void X509_email_free(STACK *sk);
++
++    /* Ciphers needed for SMime */
++    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();
++
++    /* retrieve the latest error */
++    unsigned long ERR_get_error();
++
++    /* Print the errors to this stream */
++    void ERR_print_errors_fp(FILE *fp);
++
++    /* Get a pointer to the SSL session id (reference counted) */
++    SSL_SESSION *SSL_get1_session(SSL *ssl);
++
++    /* Frees a pointer to the SSL session id (reference decremented if needed) */
++    void SSL_SESSION_free(SSL_SESSION *session);
++
++    /* Set the SSL session to reuse. */
++    int SSL_set_session(SSL *ssl, SSL_SESSION *session);
++
++    /* Decode ASN.1 to SSL_SESSION */
++    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);
++
++    /* Write privatekey to FILE stream */
++    int i2d_PrivateKey_fp(FILE *, EVP_PKEY *);
++
++    /* Write PKCS#8privatekey to FILE stream */
++    int i2d_PKCS8PrivateKey_fp(FILE *, EVP_PKEY *, const EVP_CIPHER *, char *, int, pem_password_cb *, void *);
++
++    /* Free RSA structure */
++    void RSA_free(RSA *);
++
++    /* Get a blowfish CBC pointer */
++    const EVP_CIPHER *EVP_bf_cbc();
++
++    /* Sign a CSR */
++    int X509_REQ_sign(X509_REQ *, EVP_PKEY *, const EVP_MD *);
++
++    /* add a name entry */
++    int X509_NAME_add_entry_by_txt(X509_NAME *, char *, int, unsigned char *, int, int, int);
+ 
+-   /*
+-    *  Duplicate the stack
+-    */
+-   STACK *sk_dup(STACK *s);
+-
+-
+-   /*
+-    *  Convert an ASN1_INTEGER to its text form
+-    */
+-   char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
+-
+-
+-   /*
+-    *  Get the certificate's serial number
+-    */
+-   ASN1_INTEGER *X509_get_serialNumber(X509 *x);
+-
+-
+-   /*
+-    *  Get the certificate's public key
+-    */
+-   EVP_PKEY *X509_get_pubkey(X509 *x);
+-
+-
+-   /*
+-    *  Convert the public key to a decimal form
+-    */
+-   int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
+-
+-
+-   /*
+-    *  Check the private key of a PKCS bundle against the X509
+-    */
+-   int X509_check_private_key(X509 *x, EVP_PKEY *p);
+-
+-
+-   /*
+-    *  Convert a BIGNUM to a hex string
+-    */
+-   char *BN_bn2hex(const BIGNUM *a);
+-
+-
+-   /*
+-    *  Compute the digest of an X.509
+-    */
+-   int X509_digest(const X509 *x,const EVP_MD *t, unsigned char *md, unsigned int *len);
+-
+-
+-   /*
+-    *  EVP_md5
+-    */
+-   EVP_MD *EVP_md5();
+-
+-
+-   /*
+-    *  ASN1_INTEGER free
+-    */
+-   void ASN1_INTEGER_free(ASN1_INTEGER *x);
+-
+-
+-   /*
+-    *  ASN1_STRING_data
+-    */
+-   unsigned char *ASN1_STRING_data(ASN1_STRING *x);
+-
+-   /*
+-    *  ASN1_STRING_length
+-    */
+-   int ASN1_STRING_length(ASN1_STRING *x);
+-
+-   /*
+-    *
+-    */
+-   int OBJ_obj2nid(ASN1_OBJECT *o);
+-
+-   /*
+-    *
+-    */
+-   const char * OBJ_nid2ln(int n);
+-
+-   /*
+-    * get the number of extensions
+-    */
+-   int X509_get_ext_count(X509 *x);
+-
+-   /*
+-    *
+-    */
+-   int X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
+-
+-   /*
+-    *
+-    */
+-   int X509_get_ext_by_OBJ(X509 *x,ASN1_OBJECT *obj,int lastpos);
+-
+-   /*
+-    *
+-    */
+-   X509_EXTENSION *X509_get_ext(X509 *x, int loc);
+-
+-   /*
+-    *
+-    */
+-   X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
+-
+-   /*
+-    *
+-    */
+-   int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
+-
+-   /*
+-    *
+-    */
+-   void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);
+-
+-   /*
+-    *
+-    */
+-   char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5);
+-
+-   /*
+-    *
+-    */
+-   int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
+-
+-   /*
+-    *
+-    */
+-   PKCS7 *PKCS7_new(void);
+-
+-   /*
+-    *
+-    */
+-   void PKCS7_free(PKCS7 *a);
+-
+-   /*
+-    *
+-    */
+-   void PKCS7_content_free(PKCS7 *a);
+-
+-   /*
+-    *
+-    */
+-   int i2d_PKCS7(PKCS7 *a, unsigned char **pp);
+-
+-   /*
+-    *
+-    */
+-   PKCS7 *d2i_PKCS7(PKCS7 **a, unsigned char **pp,long length);
+-
+-   /*
+-    *
+-    */
+-   int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
+-
+-   /*
+-    *
+-    */
+-   PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
+-
+-   /*
+-    *
+-    */
+-   int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
+-
+-   /*
+-    *
+-    */
+-   PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
+-
+-   /*
+-    *
+-    */
+-   PKCS7 *PKCS7_dup(PKCS7 *p7);
+-
+-   /*
+-    *  Create a PKCS7 signature / signed message
+-    */
+-   PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
+-		     BIO *data, int flags);
+-
+-   /*
+-    *  Verify a PKCS7 signature.
+-    */
+-   int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
+-                                              BIO *indata, BIO *out, int flags);
+-
+-   /*
+-    *  Get signers of a verified PKCS7 signature
+-    */
+-   STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
+-
+-   /*
+-    *  PKCS7 encrypt message
+-    */
+-   PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher,
+-			int flags);
+-
+-   /*
+-    *  decrypt PKCS7 message
+-    */
+-   int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
+-
+-
+-   /*
+-    * Load a CA list file.
+-    */
+-   STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
+-
+-   /*
+-    * Load a file of PEM encoded objects.
+-    */
+-   STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
+-		           pem_password_cb *cb, void *u);
+-
+-   /*
+-    * Get the number of purposes available
+-    */
+-   int X509_PURPOSE_get_count();
+-
+-
+-   /*
+-    * Get the ID of a purpose
+-    */
+-   int X509_PURPOSE_get_id(X509_PURPOSE *);
+-
+-
+-   /*
+-    * Check the existence of purpose id "id" in x.  for CA, set ca = 1, else 0
+-    */
+-   int X509_check_purpose(X509 *x, int id, int ca);
+-
+-
+-   /*
+-    * Get the purpose with index #idx
+-    */
+-   X509_PURPOSE * X509_PURPOSE_get0(int idx);
+-
+-
+-   /*
+-    * Create a new Private KEY
+-    */
+-   EVP_PKEY* EVP_PKEY_new();
+-
+-
+-   /*
+-    * Assign a private key
+-    */
+-   int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key);
+-
+-
+-   /*
+-    * Generate a RSA key
+-    */
+-   RSA *RSA_generate_key(int bits, unsigned long e, void
+-                        (*callback)(int,int,void *), void *cb_arg);
+-
+-
+-   /*
+-    * Create/destroy a certificate request
+-    */
+-   X509_REQ *X509_REQ_new();
+-   void X509_REQ_free(X509_REQ *a);
+-
+-
+-   /*
+-    * Set the public key in the REQ object
+-    */
+-   int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
+-
+-   /* for testing */
+-   int i2d_X509_REQ_fp(FILE *fp, X509_REQ *x);
+-
+-   /* SMime support */
+-   STACK *X509_get1_email(X509 *x);
+-   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();
+-
+-   /* clear the current error  - use this often*/
+-   void ERR_clear_error();
+-
+-   /* retrieve the latest error */
+-   unsigned long ERR_get_error();
+-
+-   /* Print the errors to this stream */
+-   void ERR_print_errors_fp(FILE *fp);
+-
+-   /* Get a pointer to the SSL session id (reference counted) */
+-   SSL_SESSION *SSL_get1_session(SSL *ssl);
+-
+-   /* Frees a pointer to the SSL session id (reference decremented if needed) */
+-   void SSL_SESSION_free(SSL_SESSION *session);
+-
+-   /* Set the SSL session to reuse. */
+-   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);
+-   /* Encode SSL_SESSION to ASN.1 */
+-   int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
+-
+-   /* Write privatekey to FILE stream */
+-   int i2d_PrivateKey_fp(FILE*, EVP_PKEY*);
+-
+-   /* Write PKCS#8privatekey to FILE stream */
+-   int i2d_PKCS8PrivateKey_fp(FILE*, EVP_PKEY*, const EVP_CIPHER*, char*, int, pem_password_cb*, void*);
+-
+-   /* Free RSA structure */
+-   void RSA_free(RSA*);
+-
+-   /* Get a blowfish CBC pointer */
+-   EVP_CIPHER *EVP_bf_cbc();
+-
+-   /* Sign a CSR */
+-   int X509_REQ_sign(X509_REQ*, EVP_PKEY*, const EVP_MD*);
+-
+-   /* add a name entry */
+-   int X509_NAME_add_entry_by_txt(X509_NAME*, char*, int, unsigned char*, int, int, int);
+-
+-   /* Create a name */
+-   X509_NAME *X509_NAME_new();
++    /* Create a name */
++    X509_NAME *X509_NAME_new();
+ 
+-   /* Set the subject */
+-   int X509_REQ_set_subject_name(X509_REQ*,X509_NAME*);
++    /* Set the subject */
++    int X509_REQ_set_subject_name(X509_REQ *, X509_NAME *);
+ 
+-   /* get list of available SSL_CIPHER's sorted by preference */
+-   STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL* ssl);
++    /* get list of available SSL_CIPHER's sorted by preference */
++    STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
+ 
+ #endif
+ 
+ private:
+-   friend class KOpenSSLProxyPrivate;
+-   KOpenSSLProxy();
+-   ~KOpenSSLProxy();
+-   KOpenSSLProxyPrivate * const d;
++    friend class KOpenSSLProxyPrivate;
++    KOpenSSLProxy();
++    ~KOpenSSLProxy();
++    KOpenSSLProxyPrivate *const d;
+ };
+ 
+ #endif
+--- kdelibs-4.14.26/kio/kssl/ksslcallback.c.omv~	2016-11-14 21:58:51.376629071 +0100
++++ kdelibs-4.14.26/kio/kssl/ksslcallback.c	2016-11-14 22:35:01.105257670 +0100
+@@ -28,7 +28,7 @@ bool KSSL_X509CallBack_ca_found;
+ extern "C" {
+ static int X509Callback(int ok, X509_STORE_CTX *ctx) {
+  
+-  kDebug(7029) << "X509Callback: ok = " << ok << " error = " << ctx->error << " depth = " << ctx->error_depth;
++  //kDebug(7029) << "X509Callback: ok = " << ok << " error = " << ctx->error << " depth = " << ctx->error_depth;
+   // Here is how this works.  We put "ok = 1;" in any case that we
+   // don't consider to be an error.  In that case, it will return OK
+   // for the certificate check as long as there are no other critical
+@@ -39,14 +39,14 @@ static int X509Callback(int ok, X509_STO
+ 
+   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)
+         return 1; // Ignore errors for this certificate
+ 
+      KSSL_X509CallBack_ca_found = true;
+   }
+  
+   if (!ok) {
+-    switch (ctx->error) {
++    switch (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:
+--- kdelibs-4.14.26/kio/kssl/ksslcertchain.cpp.omv~	2016-11-14 21:58:51.376629071 +0100
++++ kdelibs-4.14.26/kio/kssl/ksslcertchain.cpp	2016-11-14 22:06:34.088906036 +0100
+@@ -44,16 +44,6 @@
+ #include <kdebug.h>
+ #include <QtCore/QStringList>
+ 
+-#ifdef KSSL_HAVE_SSL
+-#define sk_new d->kossl->sk_new
+-#define sk_push d->kossl->sk_push
+-#define sk_free d->kossl->sk_free
+-#define sk_value d->kossl->sk_value
+-#define sk_num d->kossl->sk_num
+-#define sk_dup d->kossl->sk_dup
+-#define sk_pop d->kossl->sk_pop
+-#endif
+-
+ class KSSLCertChainPrivate {
+ public:
+   KSSLCertChainPrivate() {
+--- kdelibs-4.14.26/kio/kssl/ksslcertificate.cpp.omv~	2016-11-07 00:11:51.000000000 +0100
++++ kdelibs-4.14.26/kio/kssl/ksslcertificate.cpp	2016-11-14 22:36:42.514225601 +0100
+@@ -150,7 +150,7 @@ KSSLCertificate *KSSLCertificate::fromSt
+     }
+ 
+     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(NULL, &qbap, qba.size());
+     if (!x5c) {
+         return NULL;
+@@ -173,7 +173,7 @@ QString KSSLCertificate::getSubject() co
+         return rc;
+     }
+     rc = t;
+-    d->kossl->OPENSSL_free(t);
++    OPENSSL_free(t);
+ #endif
+     return rc;
+ }
+@@ -200,14 +200,19 @@ QString KSSLCertificate::getSignatureTex
+     char *s;
+     int n, i;
+ 
+-    i = d->kossl->OBJ_obj2nid(d->m_cert->sig_alg->algorithm);
++    i = X509_get_signature_nid(d->m_cert);
+     rc = i18n("Signature Algorithm: ");
+     rc += (i == NID_undef)?i18n("Unknown"):QString(d->kossl->OBJ_nid2ln(i));
+ 
+     rc += '\n';
+     rc += i18n("Signature Contents:");
+-    n = d->m_cert->signature->length;
+-    s = (char *)d->m_cert->signature->data;
++    
++    const ASN1_BIT_STRING *sig;
++    const X509_ALGOR *alg;
++    X509_get0_signature(&sig, &alg, d->m_cert);
++    n = sig->length;
++    s = (char*)sig->data;
++
+     for (i = 0; i < n; ++i) {
+         if (i%20 != 0) {
+             rc += ':';
+@@ -234,7 +239,7 @@ void KSSLCertificate::getEmails(QStringL
+ 
+     STACK *s = d->kossl->X509_get1_email(d->m_cert);
+     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));
+         }
+         d->kossl->X509_email_free(s);
+@@ -317,13 +322,13 @@ QString rc = "";
+     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) {
+                 rc = "RSA";
+             }
+             else
+         #endif
+         #ifndef NO_DSA
+-            if (pkey->type == EVP_PKEY_DSA) {
++            if (EVP_PKEY_id(pkey) == EVP_PKEY_DSA) {
+                 rc = "DSA";
+             }
+             else
+@@ -347,8 +352,10 @@ char *x = NULL;
+     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;
++		RSA_get0_key(EVP_PKEY_get1_RSA(pkey), &n, &e, NULL);
++                x = d->kossl->BN_bn2hex(n);
+                 rc = i18n("Key type: RSA (%1 bit)", strlen(x)*4) + '\n';
+ 
+                 rc += i18n("Modulus: ");
+@@ -362,17 +369,19 @@ char *x = NULL;
+                     rc += x[i];
+                 }
+                 rc += '\n';
+-                d->kossl->OPENSSL_free(x);
++                ::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);
+             }
+         #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) {
++		const BIGNUM *p, *q, *g;
++		DSA_get0_pqg(EVP_PKEY_get1_DSA(pkey), &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';
+ 
+@@ -387,9 +396,9 @@ char *x = NULL;
+                     rc += x[i];
+                 }
+                 rc += '\n';
+-                d->kossl->OPENSSL_free(x);
++                ::OPENSSL_free(x);
+ 
+-                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->q);
++                x = d->kossl->BN_bn2hex(q);
+                 rc += i18n("160 bit prime factor: ");
+                 for (unsigned int i = 0; i < strlen(x); i++) {
+                     if (i%40 != 0 && i%2 == 0) {
+@@ -401,9 +410,9 @@ char *x = NULL;
+                     rc += x[i];
+                 }
+                 rc += '\n';
+-                d->kossl->OPENSSL_free(x);
++                ::OPENSSL_free(x);
+ 
+-                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->g);
++                x = d->kossl->BN_bn2hex(g);
+                 rc += QString("g: ");
+                 for (unsigned int i = 0; i < strlen(x); i++) {
+                     if (i%40 != 0 && i%2 == 0) {
+@@ -415,9 +424,11 @@ char *x = NULL;
+                     rc += x[i];
+                 }
+                 rc += '\n';
+-                d->kossl->OPENSSL_free(x);
++                ::OPENSSL_free(x);
+ 
+-                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->pub_key);
++		const BIGNUM *pub;
++		DSA_get0_key(EVP_PKEY_get1_DSA(pkey), &pub, NULL);
++                x = d->kossl->BN_bn2hex(pub);
+                 rc += i18n("Public key: ");
+                 for (unsigned int i = 0; i < strlen(x); i++) {
+                     if (i%40 != 0 && i%2 == 0) {
+@@ -429,7 +440,7 @@ char *x = NULL;
+                     rc += x[i];
+                 }
+                 rc += '\n';
+-                d->kossl->OPENSSL_free(x);
++                ::OPENSSL_free(x);
+             }
+         #endif
+         d->kossl->EVP_PKEY_free(pkey);
+@@ -452,7 +463,7 @@ QString rc = "";
+     }
+ 
+     rc = t;
+-    d->kossl->OPENSSL_free(t);
++    OPENSSL_free(t);
+ #endif
+ 
+     return rc;
+@@ -724,9 +735,9 @@ KSSLCertificate::KSSLValidationList KSSL
+         KSSL_X509CallBack_ca = ca ? ca->d->m_cert : 0;
+         KSSL_X509CallBack_ca_found = false;
+ 
+-        certStoreCTX->error = X509_V_OK;
++        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);
+         if (ca && !KSSL_X509CallBack_ca_found) {
+             ksslv = KSSLCertificate::Irrelevant;
+         } else {
+@@ -739,9 +750,9 @@ KSSLCertificate::KSSLValidationList KSSL
+             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);
+             rc = d->kossl->X509_verify_cert(certStoreCTX);
+-            errcode = certStoreCTX->error;
++            errcode = X509_STORE_CTX_get_error(certStoreCTX);
+             ksslv = processError(errcode);
+         }
+         d->kossl->X509_STORE_CTX_free(certStoreCTX);
+@@ -1210,7 +1221,7 @@ typedef struct NETSCAPE_X509_st
+ // what a piece of crap this is
+ QByteArray KSSLCertificate::toNetscape() {
+     QByteArray qba;
+-#ifdef KSSL_HAVE_SSL
++#if defined(KSSL_HAVE_SSL) && OPENSSL_VERSION_NUMBER < 0x01001000L
+     NETSCAPE_X509 nx;
+     ASN1_OCTET_STRING hdr;
+     KTemporaryFile ktf;
+@@ -1262,7 +1273,7 @@ bool KSSLCertificate::setCert(const QStr
+ #ifdef 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<const unsigned char *>(qba.data());
+         X509 *x5c = KOSSL::self()->d2i_X509(NULL, &qbap, qba.size());
+         if (x5c) {
+             setCert(x5c);
+@@ -1293,7 +1304,7 @@ QStringList KSSLCertificate::subjAltName
+         return rc;
+     }
+ 
+-    int cnt = d->kossl->sk_GENERAL_NAME_num(names);
++    int cnt = sk_GENERAL_NAME_num(names);
+ 
+     for (int i = 0; i < cnt; i++) {
+         const GENERAL_NAME *val = (const GENERAL_NAME *)d->kossl->sk_value(names, i);
+--- kdelibs-4.14.26/kio/kssl/kssl.cpp.omv~	2016-11-14 21:58:51.377629047 +0100
++++ kdelibs-4.14.26/kio/kssl/kssl.cpp	2016-11-14 22:12:02.469660694 +0100
+@@ -70,7 +70,7 @@ public:
+ #ifdef KSSL_HAVE_SSL
+ 	SSL *m_ssl;
+ 	SSL_CTX *m_ctx;
+-	SSL_METHOD *m_meth;
++	const SSL_METHOD *m_meth;
+ #endif
+ 	KOSSL *kossl;
+ };
+--- kdelibs-4.14.26/kio/kssl/ksslutils.cpp.omv~	2016-11-14 21:58:51.377629047 +0100
++++ kdelibs-4.14.26/kio/kssl/ksslutils.cpp	2016-11-14 22:37:20.481117236 +0100
+@@ -84,7 +84,7 @@ QString ASN1_UTCTIME_QString(ASN1_UTCTIM
+ QString ASN1_INTEGER_QString(ASN1_INTEGER *aint) {
+ char *rep = KOSSL::self()->i2s_ASN1_INTEGER(NULL, aint);
+ QString yy = rep;
+-KOSSL::self()->OPENSSL_free(rep);
++::OPENSSL_free(rep);
+ return yy;
+ }
+ 
diff --git a/source/kde/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch b/source/kde/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
new file mode 100644
index 000000000..58afcaaed
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
@@ -0,0 +1,112 @@
+From 2c3762feddf7e66cf6b64d9058f625a715694a00 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Wed, 7 Aug 2019 09:47:46 +0200
+Subject: Security: remove support for $(...) in config keys with [$e] marker.
+
+It is very unclear at this point what a valid use case for this feature
+would possibly be. The old documentation only mentions $(hostname) as
+an example, which can be done with $HOSTNAME instead.
+
+Note that $(...) is still supported in Exec lines of desktop files,
+this does not require [$e] anyway (and actually works better without it,
+otherwise the $ signs need to be doubled to obey kconfig $e escaping rules...).
+
+Thanks to Fabian Vogt for testing.
+
+(This is a backport of KDE Frameworks 5 kconfig patch to kdelibs)
+
+Differential Revision: https://phabricator.kde.org/D22989
+---
+ kdecore/config/kconfig.cpp    | 32 +-------------------------------
+ kdecore/doc/README.kiosk      | 12 ------------
+ kdecore/tests/kconfigtest.cpp |  6 +-----
+ 3 files changed, 2 insertions(+), 48 deletions(-)
+
+diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp
+index 7ea26a5..b30584b 100644
+--- a/kdecore/config/kconfig.cpp
++++ b/kdecore/config/kconfig.cpp
+@@ -160,37 +160,7 @@ QString KConfigPrivate::expandString(const QString& value)
+     int nDollarPos = aValue.indexOf( QLatin1Char('$') );
+     while( nDollarPos != -1 && nDollarPos+1 < aValue.length()) {
+         // there is at least one $
+-        if( aValue[nDollarPos+1] == QLatin1Char('(') ) {
+-            int nEndPos = nDollarPos+1;
+-            // the next character is not $
+-            while ( (nEndPos <= aValue.length()) && (aValue[nEndPos]!=QLatin1Char(')')) )
+-                nEndPos++;
+-            nEndPos++;
+-            QString cmd = aValue.mid( nDollarPos+2, nEndPos-nDollarPos-3 );
+-
+-            QString result;
+-            QByteArray oldpath = qgetenv( "PATH" );
+-            QByteArray newpath;
+-            if (KGlobal::hasMainComponent()) {
+-                newpath = QFile::encodeName(KGlobal::dirs()->resourceDirs("exe").join(QChar::fromLatin1(KPATH_SEPARATOR)));
+-                if (!newpath.isEmpty() && !oldpath.isEmpty())
+-                    newpath += KPATH_SEPARATOR;
+-            }
+-            newpath += oldpath;
+-            setenv( "PATH", newpath, 1/*overwrite*/ );
+-// FIXME: wince does not have pipes
+-#ifndef _WIN32_WCE
+-            FILE *fs = popen(QFile::encodeName(cmd).data(), "r");
+-            if (fs) {
+-                QTextStream ts(fs, QIODevice::ReadOnly);
+-                result = ts.readAll().trimmed();
+-                pclose(fs);
+-            }
+-#endif
+-            setenv( "PATH", oldpath, 1/*overwrite*/ );
+-            aValue.replace( nDollarPos, nEndPos-nDollarPos, result );
+-            nDollarPos += result.length();
+-        } else if( aValue[nDollarPos+1] != QLatin1Char('$') ) {
++        if( aValue[nDollarPos+1] != QLatin1Char('$') ) {
+             int nEndPos = nDollarPos+1;
+             // the next character is not $
+             QString aVarName;
+diff --git a/kdecore/doc/README.kiosk b/kdecore/doc/README.kiosk
+index b95002d..d902c61 100644
+--- a/kdecore/doc/README.kiosk
++++ b/kdecore/doc/README.kiosk
+@@ -640,18 +640,6 @@ The following syntax is also supported:
+ Name[$ei]=${USER}
+ 
+ 
+-Shell Commands in KDE config files.
+-===================================
+-
+-Since KDE-3.1 arbitrary entries in configuration files can contain shell 
+-commands. This way the value of a configuration entry can be determined
+-dynamically at runtime. In order to use this the entry must be marked 
+-with [$e]. 
+-
+-Example:
+-Host[$e]=$(hostname)
+-
+-
+ KDE Kiosk Application API
+ ==========================
+ 
+diff --git a/kdecore/tests/kconfigtest.cpp b/kdecore/tests/kconfigtest.cpp
+index 78e6ad1..37ea3c2 100644
+--- a/kdecore/tests/kconfigtest.cpp
++++ b/kdecore/tests/kconfigtest.cpp
+@@ -479,12 +479,8 @@ void KConfigTest::testPath()
+   QCOMPARE(group.readPathEntry("withBraces", QString()), QString("file://" + HOMEPATH) );
+   QVERIFY(group.hasKey("URL"));
+   QCOMPARE(group.readEntry("URL", QString()), QString("file://" + HOMEPATH) );
+-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
+-  // I don't know if this will work on windows
+-  // This test hangs on OS X
+   QVERIFY(group.hasKey("hostname"));
+-  QCOMPARE(group.readEntry("hostname", QString()), QHostInfo::localHostName());
+-#endif
++  QCOMPARE(group.readEntry("hostname", QString()), QString("(hostname)")); // the $ got removed because empty var name
+   QVERIFY(group.hasKey("noeol"));
+   QCOMPARE(group.readEntry("noeol", QString()), QString("foo"));
+ }
+-- 
+cgit v1.1
+
+
diff --git a/source/kde/kde/patch/kdelibs/kdelibs.docbook.patch b/source/kde/kde/patch/kdelibs/kdelibs.docbook.patch
new file mode 100644
index 000000000..6a20cd279
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/kdelibs.docbook.patch
@@ -0,0 +1,11 @@
+--- kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake.orig	2010-05-27 19:25:00.000000000 +0200
++++ kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake	2010-06-07 16:18:35.000000000 +0200
+@@ -12,7 +12,7 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-set (DOCBOOKXML_CURRENTDTD_VERSION "4.2"
++set (DOCBOOKXML_CURRENTDTD_VERSION "4.5"
+      CACHE INTERNAL "Required version of XML DTDs")
+ 
+ set (DTD_PATH_LIST
diff --git a/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch b/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
new file mode 100644
index 000000000..fd7375f9f
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
@@ -0,0 +1,11 @@
+--- ./kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp.orig	2017-11-04 20:51:22.000000000 -0500
++++ ./kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp	2020-07-12 14:19:32.175099684 -0500
+@@ -30,7 +30,7 @@
+ #include <QDebug>
+ 
+ #ifdef Grantlee_FOUND
+-#include <grantlee_core.h>
++#include <grantlee-qt4/grantlee_core.h>
+ #include "grantlee_paths.h"
+ 
+ /**
diff --git a/source/kde/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/source/kde/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
new file mode 100644
index 000000000..3a1944774
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
@@ -0,0 +1,15 @@
+--- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig	2011-07-27 20:34:39.000000000 +0200
++++ kdelibs-4.8.0/solid/solid/managerbase.cpp	2012-01-26 09:17:49.409993419 +0100
+@@ -90,7 +90,11 @@
+ #        endif
+ 
+ #        if defined (HUPNP_FOUND)
+-            m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
++            bool solidUpnpEnabled
++                = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
++            if (solidUpnpEnabled) {
++                m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
++            }
+ #        endif
+     }
+ }
diff --git a/source/kde/kde/patch/kdelibs/return-application-icons-properly.patch b/source/kde/kde/patch/kdelibs/return-application-icons-properly.patch
new file mode 100644
index 000000000..2bdb53adf
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/return-application-icons-properly.patch
@@ -0,0 +1,56 @@
+From 613c951a1157df0d8a907a155a5eaa706816d5f9 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Thu, 21 Feb 2013 17:58:11 +0100
+Subject: return application icons properly
+
+BUG:315578
+---
+ kdeui/icons/kiconloader.cpp | 31 ++++++++++++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
+index f65e941..6fed667 100644
+--- a/kdeui/icons/kiconloader.cpp
++++ b/kdeui/icons/kiconloader.cpp
+@@ -909,7 +909,36 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
+     const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" };
+     bool genericFallback = name.endsWith(QLatin1String("-x-generic"));
+ 
+-    foreach(KIconThemeNode *themeNode, links)
++    // Do two passes through themeNodes.
++    //
++    // The first pass looks for an exact match in each themeNode one after the other.
++    // If one is found and it is an app icon then return that icon.
++    //
++    // In the next pass (assuming the first pass failed), it looks for exact matches
++    // and then generic fallbacks in each themeNode one after the other
++    //
++    // The reasoning is that application icons should always match exactly, all other
++    // icons may fallback. Since we do not know what the context is here when we start
++    // looking for it, we can only go by the path found.
++    foreach (KIconThemeNode *themeNode, links) {
++        for (int i = 0 ; i < 4 ; i++) {
++            icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchExact);
++            if (icon.isValid()) {
++                break;
++            }
++
++            icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchBest);
++            if (icon.isValid()) {
++                break;
++            }
++        }
++
++        if (icon.isValid() && icon.path.contains("/apps/")) {
++            return icon;
++        }
++    }
++
++    foreach (KIconThemeNode *themeNode, links)
+     {
+         QString currentName = name;
+ 
+-- 
+1.8.1.4
+
+
diff --git a/source/kde/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch b/source/kde/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
new file mode 100644
index 000000000..b62818ed6
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
@@ -0,0 +1,31 @@
+From 0edfd42151ad57322a10a24ab4971b638e220e6e Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Thu, 21 Feb 2013 18:14:54 +0100
+Subject: [PATCH 049/111] return, not break. copy/paste error
+
+---
+ kdeui/icons/kiconloader.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
+index dba474d..ce6aeea 100644
+--- a/kdeui/icons/kiconloader.cpp
++++ b/kdeui/icons/kiconloader.cpp
+@@ -947,12 +947,12 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
+             for (int i = 0 ; i < 4 ; i++) {
+                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact);
+                 if (icon.isValid()) {
+-                    break;
++                    return icon;
+                 }
+ 
+                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest);
+                 if (icon.isValid()) {
+-                    break;
++                    return icon;
+                 }
+             }
+             //kDebug(264) << "Looking up" << currentName;
+-- 
+1.8.1.4
+
diff --git a/source/kde/kde/patch/kdelibs4support.patch b/source/kde/kde/patch/kdelibs4support.patch
new file mode 100644
index 000000000..7d6626ed1
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs4support.patch
@@ -0,0 +1,2 @@
+# Allow cmake to find our doctools:
+cat $CWD/patch/kdelibs4support/FindDocBookXML4.cmake.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff b/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
new file mode 100644
index 000000000..1b393287a
--- /dev/null
+++ b/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
@@ -0,0 +1,11 @@
+--- kdelibs4support-5.6.0/cmake/FindDocBookXML4.cmake.orig	2015-01-03 13:04:40.000000000 +0100
++++ kdelibs4support-5.6.0/cmake/FindDocBookXML4.cmake	2015-01-13 09:52:37.998230784 +0100
+@@ -16,7 +16,7 @@
+ 
+ 
+ if (NOT DocBookXML_FIND_VERSION)
+-     set(DocBookXML_FIND_VERSION "4.2")
++     set(DocBookXML_FIND_VERSION "4.5")
+ endif ()
+ 
+ set (DocBookXML4_DTD_VERSION ${DocBookXML_FIND_VERSION}
diff --git a/source/kde/kde/patch/kgpg.patch b/source/kde/kde/patch/kgpg.patch
new file mode 100644
index 000000000..f2248dfb5
--- /dev/null
+++ b/source/kde/kde/patch/kgpg.patch
@@ -0,0 +1,2 @@
+# Only autostart in Plasma:
+cat $CWD/patch/kgpg/kgpg.only.autostart.in.plasma.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff b/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
new file mode 100644
index 000000000..86a732dd1
--- /dev/null
+++ b/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
@@ -0,0 +1,9 @@
+--- ./org.kde.kgpg.desktop.orig	2020-10-03 07:23:11.000000000 -0500
++++ ./org.kde.kgpg.desktop	2020-11-01 20:10:46.729080973 -0600
+@@ -215,4 +215,6 @@
+ X-KDE-autostart-after=panel
+ X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false
+ 
++OnlyShowIn=KDE;
++
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
diff --git a/source/kde/kde/patch/kinfocenter.patch b/source/kde/kde/patch/kinfocenter.patch
new file mode 100644
index 000000000..b57d434fc
--- /dev/null
+++ b/source/kde/kde/patch/kinfocenter.patch
@@ -0,0 +1,2 @@
+# Fix linking error :
+cat $CWD/patch/kinfocenter/kinfocenter_libpci.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch b/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch
new file mode 100644
index 000000000..a2bc00796
--- /dev/null
+++ b/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch
@@ -0,0 +1,17 @@
+--- kinfocenter-5.5.5/cmake/FindPCIUTILS.cmake.orig	2016-03-01 14:32:01.000000000 +0100
++++ kinfocenter-5.5.5/cmake/FindPCIUTILS.cmake	2016-03-11 13:00:12.412315320 +0100
+@@ -19,6 +19,14 @@
+   else(RESOLV_LIBRARY)
+     set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY})
+   endif(RESOLV_LIBRARY)
++  FIND_LIBRARY(UDEV_LIBRARY NAMES udev)
++  if(UDEV_LIBRARY)
++    set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARIES} ${UDEV_LIBRARY})
++  endif(UDEV_LIBRARY)
++  FIND_LIBRARY(ZLIB_LIBRARY NAMES z)
++  if(ZLIB_LIBRARY)
++    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
++  endif(ZLIB_LIBRARY)
+ endif(PCIUTILS_LIBRARY)
+ 
+ 
diff --git a/source/kde/kde/patch/kompare.patch b/source/kde/kde/patch/kompare.patch
new file mode 100644
index 000000000..dee6dee1c
--- /dev/null
+++ b/source/kde/kde/patch/kompare.patch
@@ -0,0 +1,2 @@
+# Fix for API change in qt-5.15.2:
+cat $CWD/patch/kompare/kompare.qt-5.15.2.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff b/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff
new file mode 100644
index 000000000..fae1d772f
--- /dev/null
+++ b/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff
@@ -0,0 +1,21 @@
+diff -u -r kompare-20.08.3.orig/komparepart/kompare_part.cpp kompare-20.08.3/komparepart/kompare_part.cpp
+--- kompare-20.08.3.orig/komparepart/kompare_part.cpp	2020-10-11 01:17:46.000000000 -0500
++++ kompare-20.08.3/komparepart/kompare_part.cpp	2020-11-21 19:06:25.761427059 -0600
+@@ -610,7 +610,7 @@
+ void KomparePart::slotFilePrint()
+ {
+     QPrinter printer;
+-    printer.setOrientation(QPrinter::Landscape);
++    printer.setPageOrientation(QPageLayout::Landscape);
+     QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
+ 
+     if (dlg->exec() == QDialog::Accepted)
+@@ -625,7 +625,7 @@
+ void KomparePart::slotFilePrintPreview()
+ {
+     QPrinter printer;
+-    printer.setOrientation(QPrinter::Landscape);
++    printer.setPageOrientation(QPageLayout::Landscape);
+     QPrintPreviewDialog dlg(&printer);
+ 
+     connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);
diff --git a/source/kde/kde/patch/krename.patch b/source/kde/kde/patch/krename.patch
new file mode 100644
index 000000000..6e79ecb66
--- /dev/null
+++ b/source/kde/kde/patch/krename.patch
@@ -0,0 +1 @@
+cat $CWD/patch/krename/krename.taglib.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/krename/krename.taglib.diff b/source/kde/kde/patch/krename/krename.taglib.diff
new file mode 100644
index 000000000..a1b8a11db
--- /dev/null
+++ b/source/kde/kde/patch/krename/krename.taglib.diff
@@ -0,0 +1,191 @@
+diff -u -r --new-file krename-5.0.0.orig/cmake/modules/FindTaglib.cmake krename-5.0.0/cmake/modules/FindTaglib.cmake
+--- krename-5.0.0.orig/cmake/modules/FindTaglib.cmake	2018-02-13 01:23:49.000000000 -0600
++++ krename-5.0.0/cmake/modules/FindTaglib.cmake	2020-09-28 15:48:03.025045769 -0500
+@@ -1,84 +1,90 @@
+-# - Try to find the Taglib library
+-# Once done this will define
++#.rst:
++# FindTaglib
++#-----------
+ #
+-#  TAGLIB_FOUND - system has the taglib library
+-#  TAGLIB_CFLAGS - the taglib cflags
+-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
+-
+-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
++# Try to find the Taglib library.
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(NOT TAGLIB_MIN_VERSION)
+-  set(TAGLIB_MIN_VERSION "1.4")
+-endif(NOT TAGLIB_MIN_VERSION)
+-
+-if(NOT WIN32)
+-    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
+-       ${BIN_INSTALL_DIR}
+-    )
+-endif(NOT WIN32)
+-
+-#reset vars
+-set(TAGLIB_LIBRARIES)
+-set(TAGLIB_CFLAGS)
+-
+-# if taglib-config has been found
+-if(TAGLIBCONFIG_EXECUTABLE)
+-
+-  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
++# This will define the following variables:
++#
++# ``Taglib_FOUND``
++#       True if the system has the taglib library of at least the minimum
++#       version specified by the version parameter to find_package()
++# ``Taglib_INCLUDE_DIRS``
++#       The taglib include dirs for use with target_include_directories
++# ``Taglib_LIBRARIES``
++#       The taglib libraries for use with target_link_libraries()
++# ``Taglib_VERSION``
++#       The version of taglib that was found
++#
++# If ``Taglib_FOUND is TRUE, it will also define the following imported
++# target:
++#
++# ``Taglib::Taglib``
++#       The Taglib library
++#
++# Since 5.72.0
++#
++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
++# SPDX-License-Identifier: BSD-3-Clause
+ 
+-  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-     message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+-     set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
++find_package(PkgConfig QUIET)
+ 
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
++pkg_search_module(PC_TAGLIB QUIET taglib)
+ 
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
++find_path(Taglib_INCLUDE_DIRS
++    NAMES tag.h
++    PATH_SUFFIXES taglib
++    HINTS ${PC_TAGLIB_INCLUDEDIR}
++)
+ 
+-     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-        set(TAGLIB_FOUND TRUE)
+-        message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+-     endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
++find_library(Taglib_LIBRARIES
++    NAMES tag
++    HINTS ${PC_TAGLIB_LIBDIR}
++)
+ 
+-else(TAGLIBCONFIG_EXECUTABLE)
++set(Taglib_VERSION ${PC_TAGLIB_VERSION})
+ 
+-  include(FindLibraryWithDebug)
+-  include(FindPackageHandleStandardArgs)
++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
++    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
++        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
++
++        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
++
++        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
++
++        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
++    endif()
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Taglib
++    FOUND_VAR
++        Taglib_FOUND
++    REQUIRED_VARS
++        Taglib_LIBRARIES
++        Taglib_INCLUDE_DIRS
++    VERSION_VAR
++        Taglib_VERSION
++)
++
++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
++    add_library(Taglib::Taglib UNKNOWN IMPORTED)
++    set_target_properties(Taglib::Taglib PROPERTIES
++        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
++        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
++    )
++endif()
+ 
+-  find_path(TAGLIB_INCLUDES
+-    NAMES
+-    tag.h
+-    PATH_SUFFIXES taglib
+-    PATHS
+-    ${KDE4_INCLUDE_DIR}
+-    ${INCLUDE_INSTALL_DIR}
+-  )
++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
+ 
+-  find_library_with_debug(TAGLIB_LIBRARIES
+-    WIN32_DEBUG_POSTFIX d
+-    NAMES tag
+-    PATHS
+-    ${KDE4_LIB_DIR}
+-    ${LIB_INSTALL_DIR}
+-  )
+-
+-  find_package_handle_standard_args(Taglib DEFAULT_MSG
+-                                    TAGLIB_INCLUDES TAGLIB_LIBRARIES)
+-endif(TAGLIBCONFIG_EXECUTABLE)
+-
+-
+-if(TAGLIB_FOUND)
+-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
+-  endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-else(TAGLIB_FOUND)
+-  if(Taglib_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could not find Taglib")
+-  endif(Taglib_FIND_REQUIRED)
+-endif(TAGLIB_FOUND)
++include(FeatureSummary)
++set_package_properties(Taglib PROPERTIES
++    URL "https://taglib.org/"
++    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
++)
+diff -u -r --new-file krename-5.0.0.orig/src/CMakeLists.txt krename-5.0.0/src/CMakeLists.txt
+--- krename-5.0.0.orig/src/CMakeLists.txt	2018-02-13 01:23:49.000000000 -0600
++++ krename-5.0.0/src/CMakeLists.txt	2020-09-28 15:51:35.779050528 -0500
+@@ -6,10 +6,6 @@
+                     ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 
+-if(TAGLIB_FOUND)
+-    include_directories(${TAGLIB_INCLUDES})
+-endif()
+-
+ if(EXIV2_FOUND)
+     include_directories(${EXIV2_INCLUDE_DIR})
+ endif()
+@@ -128,7 +124,7 @@
+ )
+ if(TAGLIB_FOUND)
+     target_link_libraries(krename
+-        ${TAGLIB_LIBRARIES}
++        Taglib::Taglib
+     )
+ endif()
+ if(EXIV2_FOUND)
diff --git a/source/kde/kde/patch/ktorrent.patch b/source/kde/kde/patch/ktorrent.patch
new file mode 100644
index 000000000..0fdb4aacb
--- /dev/null
+++ b/source/kde/kde/patch/ktorrent.patch
@@ -0,0 +1,10 @@
+# Embed a copy of the GeoIP database since the download link no longer works.
+cat $CWD/patch/ktorrent/ktorrent.use.package.geoip.database.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix linking against taglib (ktorrent 5.2),
+# Thanks to Gentoo.
+cat $CWD/patch/ktorrent/ktorrent_taglib_linking.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix showing ktorrent in the system tray,
+# Thanks to Gentoo.
+cat $CWD/patch/ktorrent/ktorrent_systray.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/ktorrent/geoip.dat b/source/kde/kde/patch/ktorrent/geoip.dat
new file mode 100644
index 000000000..be8b031f7
--- /dev/null
+++ b/source/kde/kde/patch/ktorrent/geoip.dat
diff --git a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
new file mode 100644
index 000000000..e55e5ceea
--- /dev/null
+++ b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
@@ -0,0 +1,38 @@
+diff -uar ktorrent-5.1.1.orig/plugins/infowidget/geoipmanager.cpp ktorrent-5.1.1/plugins/infowidget/geoipmanager.cpp
+--- ktorrent-5.1.1.orig/plugins/infowidget/geoipmanager.cpp	2018-08-31 01:37:04.000000000 +0200
++++ ktorrent-5.1.1/plugins/infowidget/geoipmanager.cpp	2019-05-11 14:32:39.599297006 +0200
+@@ -42,7 +42,7 @@
+ #ifdef USE_SYSTEM_GEOIP
+         geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
+ #else
+-        geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("geoip.dat"));
++        geoip_data_file = QStringLiteral("/usr/share/apps/ktorrent/GeoIP/geoip.dat");
+         if (geoip_data_file.isEmpty())
+             geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat"));
+ 
+@@ -57,12 +57,6 @@
+             {
+                 QFileInfo fi(geoip_data_file);
+                 QDateTime now = QDateTime::currentDateTime();
+-                if (fi.lastModified().daysTo(now) >= 30)
+-                {
+-                    // if the last time the geoip file was modified, was more then
+-                    // 30 days ago, redownload it
+-                    downloadDataBase();
+-                }
+             }
+         }
+ #endif
+@@ -107,12 +101,6 @@
+ 
+     void GeoIPManager::downloadDataBase()
+     {
+-#ifndef USE_SYSTEM_GEOIP
+-        Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl;
+-        download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName();
+-        KIO::CopyJob* job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo);
+-        connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished);
+-#endif
+     }
+ 
+     void GeoIPManager::databaseDownloadFinished(KJob* job)
diff --git a/source/kde/kde/patch/ktorrent/ktorrent_systray.patch b/source/kde/kde/patch/ktorrent/ktorrent_systray.patch
new file mode 100644
index 000000000..50049afae
--- /dev/null
+++ b/source/kde/kde/patch/ktorrent/ktorrent_systray.patch
@@ -0,0 +1,24 @@
+From 9747a8f524942b57e2fd42254c3de73f9d42918c Mon Sep 17 00:00:00 2001
+From: Matt Scheirer <matt.scheirer@gmail.com>
+Date: Sun, 17 May 2020 02:36:09 -0400
+Subject: [PATCH] Fix starting in tray by removing redundant show() in main
+
+---
+ ktorrent/main.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ktorrent/main.cpp b/ktorrent/main.cpp
+index b5866c22..8e532c9c 100644
+--- a/ktorrent/main.cpp
++++ b/ktorrent/main.cpp
+@@ -208,7 +208,6 @@ int main(int argc, char** argv)
+         bt::InitLog(kt::DataDir(kt::CreateIfNotExists) + QLatin1String("log"), true, true, logToStdout);
+ 
+         kt::GUI widget;
+-        widget.show();
+ 
+         auto handleCmdLine = [&widget, &parser](const QStringList &arguments, const QString &workingDirectory)
+         {
+-- 
+GitLab
+
diff --git a/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch b/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch
new file mode 100644
index 000000000..7f612c8fc
--- /dev/null
+++ b/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch
@@ -0,0 +1,248 @@
+From f4c1c91d9b091941ebb4dae6aef95bcf9bc1c388 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 21 Jun 2020 14:19:49 +0200
+Subject: [PATCH] Update FindTaglib from ECM.
+
+This fixes linking for me, there was just nothing in TAGLIB_LIBRARIES
+on my system (taglib in the same custom prefix as KDE code)
+---
+ cmake/modules/FindTaglib.cmake     | 191 +++++++++++------------------
+ plugins/mediaplayer/CMakeLists.txt |   3 +-
+ 2 files changed, 74 insertions(+), 120 deletions(-)
+
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 13db60b2..1e1b9075 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -1,135 +1,90 @@
+-# - Try to find the Taglib library
+-# Once done this will define
++#.rst:
++# FindTaglib
++#-----------
+ #
+-#  TAGLIB_FOUND - system has the taglib library
+-#  TAGLIB_CFLAGS - the taglib cflags
+-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
+-
+-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
++# Try to find the Taglib library.
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(NOT TAGLIB_MIN_VERSION)
+-  set(TAGLIB_MIN_VERSION "1.6")
+-endif()
+-
+-if(NOT WIN32)
+-    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
+-       ${BIN_INSTALL_DIR}
+-    )
+-endif()
+-
+-#reset vars
+-set(TAGLIB_LIBRARIES)
+-set(TAGLIB_CFLAGS)
+-
+-# if taglib-config has been found
+-if(TAGLIBCONFIG_EXECUTABLE)
+-
+-  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+-
+-  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+-     message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+-     set(TAGLIB_FOUND FALSE)
+-  else()
+-
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+-
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
++# This will define the following variables:
++#
++# ``Taglib_FOUND``
++#       True if the system has the taglib library of at least the minimum
++#       version specified by the version parameter to find_package()
++# ``Taglib_INCLUDE_DIRS``
++#       The taglib include dirs for use with target_include_directories
++# ``Taglib_LIBRARIES``
++#       The taglib libraries for use with target_link_libraries()
++# ``Taglib_VERSION``
++#       The version of taglib that was found
++#
++# If ``Taglib_FOUND is TRUE, it will also define the following imported
++# target:
++#
++# ``Taglib::Taglib``
++#       The Taglib library
++#
++# Since 5.72.0
++#
++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
++# SPDX-License-Identifier: BSD-3-Clause
+ 
+-     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-        set(TAGLIB_FOUND TRUE)
+-     endif()
+-     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif() 
+-  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
++find_package(PkgConfig QUIET)
+ 
+-else()
++pkg_search_module(PC_TAGLIB QUIET taglib)
+ 
+-  find_path(TAGLIB_INCLUDES
+-    NAMES
+-    tag.h
++find_path(Taglib_INCLUDE_DIRS
++    NAMES tag.h
+     PATH_SUFFIXES taglib
+-    PATHS
+-    ${KDE4_INCLUDE_DIR}
+-    ${INCLUDE_INSTALL_DIR}
+-  )
+-
+-    if(NOT WIN32)
+-      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
++    HINTS ${PC_TAGLIB_INCLUDEDIR}
++)
+ 
+-      find_library(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
++find_library(Taglib_LIBRARIES
++    NAMES tag
++    HINTS ${PC_TAGLIB_LIBDIR}
++)
+ 
+-    else()
++set(Taglib_VERSION ${PC_TAGLIB_VERSION})
+ 
+-      # 1. get all possible libnames
+-      set(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})             
+-      set(newargs "")               
+-      set(libnames_release "")      
+-      set(libnames_debug "")        
++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
++    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
++        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
+ 
+-      list(LENGTH args listCount)
++        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
+ 
+-        # just one name
+-        list(APPEND libnames_release "tag")
+-        list(APPEND libnames_debug   "tagd")
+-
+-        set(newargs ${args})
+-
+-      # search the release lib
+-      find_library(TAGLIB_LIBRARIES_RELEASE
+-                   NAMES ${libnames_release}
+-                   ${newargs}
+-      )
+-
+-      # search the debug lib
+-      find_library(TAGLIB_LIBRARIES_DEBUG
+-                   NAMES ${libnames_debug}
+-                   ${newargs}
+-      )
+-
+-      if(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
+-
+-        # both libs found
+-        set(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
+-                        debug     ${TAGLIB_LIBRARIES_DEBUG})
+-
+-      else()
+-
+-        if(TAGLIB_LIBRARIES_RELEASE)
+-
+-          # only release found
+-          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
+-
+-        else()
+-
+-          # only debug (or nothing) found
+-          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
+-
+-        endif()
+-
+-      endif()
+-
+-      mark_as_advanced(TAGLIB_LIBRARIES_RELEASE)
+-      mark_as_advanced(TAGLIB_LIBRARIES_DEBUG)
++        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
+ 
++        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
+     endif()
+-  
+-  include(FindPackageMessage)
+-  include(FindPackageHandleStandardArgs)
+-  find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
+-
+ endif()
+ 
+-
+-if(TAGLIB_FOUND)
+-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
+-  endif()
+-else()
+-  if(Taglib_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could not find Taglib")
+-  endif()
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Taglib
++    FOUND_VAR
++        Taglib_FOUND
++    REQUIRED_VARS
++        Taglib_LIBRARIES
++        Taglib_INCLUDE_DIRS
++    VERSION_VAR
++        Taglib_VERSION
++)
++
++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
++    add_library(Taglib::Taglib UNKNOWN IMPORTED)
++    set_target_properties(Taglib::Taglib PROPERTIES
++        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
++        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
++    )
+ endif()
+ 
++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
++
++include(FeatureSummary)
++set_package_properties(Taglib PROPERTIES
++    URL "https://taglib.org/"
++    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
++)
+diff --git a/plugins/mediaplayer/CMakeLists.txt b/plugins/mediaplayer/CMakeLists.txt
+index 8bbeeb74..5fbe056f 100644
+--- a/plugins/mediaplayer/CMakeLists.txt
++++ b/plugins/mediaplayer/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ find_package(Taglib REQUIRED)
+-include_directories(${TAGLIB_INCLUDES})
+ #find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Multimedia MultimediaWidgets)
+ #include_directories(${Qt5Multimedia_INCLUDE_DIRS})
+ include_directories(${PHONON_INCLUDES})
+@@ -34,7 +33,7 @@ kcoreaddons_desktop_to_json(ktorrent_mediaplayer ktorrent_mediaplayer.desktop)
+ target_link_libraries(
+     ktorrent_mediaplayer
+     ktcore
+-    ${TAGLIB_LIBRARIES}
++    Taglib::Taglib
+     Phonon::phonon4qt5
+     KF5::Torrent
+     KF5::I18n
+-- 
+GitLab
+
+
diff --git a/source/kde/kde/patch/milou.patch b/source/kde/kde/patch/milou.patch
new file mode 100644
index 000000000..2caee005f
--- /dev/null
+++ b/source/kde/kde/patch/milou.patch
@@ -0,0 +1,2 @@
+# Forgotten include:
+cat $CWD/patch/milou/milou_krunner_include.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/milou/milou_krunner_include.diff b/source/kde/kde/patch/milou/milou_krunner_include.diff
new file mode 100644
index 000000000..ffd075cad
--- /dev/null
+++ b/source/kde/kde/patch/milou/milou_krunner_include.diff
@@ -0,0 +1,11 @@
+--- a/lib/qml/CMakeLists.txt	2014-07-10 17:30:16.000000000 +0200
++++ b/lib/qml/CMakeLists.txt	2014-08-01 14:50:57.417710976 +0200
+@@ -7,7 +7,7 @@
+ 
+ target_link_libraries (milouqmlplugin
+     Qt5::Qml
+-
++    KF5::Runner
+     milou
+ )
+ 
diff --git a/source/kde/kde/patch/oxygen-gtk2.patch b/source/kde/kde/patch/oxygen-gtk2.patch
new file mode 100644
index 000000000..a2dd03e7f
--- /dev/null
+++ b/source/kde/kde/patch/oxygen-gtk2.patch
@@ -0,0 +1,2 @@
+# Add more firefox-derived browsers as supported by the theme:
+cat $CWD/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch b/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
new file mode 100644
index 000000000..b6a1e557e
--- /dev/null
+++ b/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
@@ -0,0 +1,115 @@
+From b1ee5fb80c44c6c8a625333af1cfdc997d408805 Mon Sep 17 00:00:00 2001
+From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
+Date: Sat, 18 Jul 2015 20:09:28 +0200
+Subject: moved xul application names to dedicated header file, added a number
+ of xul applications to prevent crash for these CCBUG: 341181
+
+---
+ src/oxygenapplicationname.cpp   | 18 ++-----------
+ src/oxygenxulapplicationnames.h | 56 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 16 deletions(-)
+ create mode 100644 src/oxygenxulapplicationnames.h
+
+diff --git a/src/oxygenapplicationname.cpp b/src/oxygenapplicationname.cpp
+index feb5a23..17c8a1a 100644
+--- a/src/oxygenapplicationname.cpp
++++ b/src/oxygenapplicationname.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "oxygenapplicationname.h"
+ #include "oxygengtkutils.h"
++#include "oxygenxulapplicationnames.h"
+ #include "config.h"
+ 
+ #include <cstdlib>
+@@ -79,23 +80,8 @@ namespace Oxygen
+             gtkAppName == "chromium" ||
+             gtkAppName == "chromium-browser" ||
+             gtkAppName == "google-chrome" ) _name = GoogleChrome;
+-        else {
+ 
+-            // tag all mozilla-like applications (XUL)
+-            static const std::string XulAppNames[] =
+-            {
+-                "firefox",
+-                "thunderbird",
+-                "seamonkey",
+-                "iceweasel",
+-                "icecat",
+-                "icedove",
+-                "xulrunner",
+-                "komodo",
+-                "aurora",
+-                "zotero",
+-                ""
+-            };
++        else {
+ 
+             for( unsigned int index = 0; !XulAppNames[index].empty(); ++index )
+             {
+diff --git a/src/oxygenxulapplicationnames.h b/src/oxygenxulapplicationnames.h
+new file mode 100644
+index 0000000..252a1fc
+--- /dev/null
++++ b/src/oxygenxulapplicationnames.h
+@@ -0,0 +1,56 @@
++#ifndef oxygenxulapplicationname_h
++#define oxygenxulapplicationname_h
++/*
++* this file is part of the oxygen gtk engine
++* Copyright (c) 2010 Hugo Pereira Da Costa <hugo.pereira@free.fr>
++*
++* inspired notably from kdelibs/kdeui/color/kcolorutils.h
++* Copyright (C) 2007 Matthew Woehlke <mw_triad@users.sourceforge.net>
++* Copyright (C) 2007 Thomas Zander <zander@kde.org>
++* Copyright (C) 2007 Zack Rusin <zack@kde.org>
++*
++* This  library is free  software; you can  redistribute it and/or
++* modify it  under  the terms  of the  GNU Lesser  General  Public
++* License  as published  by the Free  Software  Foundation; either
++* version 2 of the License, or( at your option ) any later version.
++*
++* This library is distributed  in the hope that it will be useful,
++* but  WITHOUT ANY WARRANTY; without even  the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++* Lesser General Public License for more details.
++*
++* You should have received a copy of the GNU Lesser General Public
++* License  along  with  this library;  if not,  write to  the Free
++* Software Foundation, Inc., 51  Franklin St, Fifth Floor, Boston,
++* MA 02110-1301, USA.
++*/
++
++#include <string>
++
++namespace Oxygen
++{
++
++    // tag all mozilla-like applications (XUL)
++    static const std::string XulAppNames[] =
++    {
++        "aurora",
++        "earlybird",
++        "icecat",
++        "icedove",
++        "iceweasel",
++        "instantbird",
++        "firefox",
++        "fossamail",
++        "komodo",
++        "newmoon",
++        "palemoon",
++        "seamonkey",
++        "thunderbird",
++        "xulrunner",
++        "zotero",
++        ""
++    };
++
++}
++
++#endif
+-- 
+cgit v0.11.2
+
+
diff --git a/source/kde/kde/patch/plasma-browser-integration.patch b/source/kde/kde/patch/plasma-browser-integration.patch
new file mode 100644
index 000000000..38642df29
--- /dev/null
+++ b/source/kde/kde/patch/plasma-browser-integration.patch
@@ -0,0 +1,2 @@
+# Fix hardcoded mozilla 'lib' libdir:
+cat $CWD/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch b/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
new file mode 100644
index 000000000..c881edf42
--- /dev/null
+++ b/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2018-06-07 22:22:27.000000000 +0800
++++ b/CMakeLists.txt	2018-06-20 20:55:56.000000000 +0800
+@@ -45,7 +45,7 @@
+ option(COPY_MESSAGING_HOST_FILE_HOME "Copy the native messaging hosts json file to user home dir" FALSE)
+ add_feature_info(COPY_MESSAGING_HOST_FILE_HOME ${COPY_MESSAGING_HOST_FILE_HOME} "Enable this option to copy the native messaging hosts json file to home dir if you install plasma-browser-integration to custom prefix (non-/usr)")
+ 
+-set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/lib/mozilla" CACHE STRING "Mozilla directory")
++set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}/mozilla" CACHE STRING "Mozilla directory")
+ add_feature_info(MOZILLA_DIR On "Mozilla directory is '${MOZILLA_DIR}'")
+ 
+ add_subdirectory(host)
diff --git a/source/kde/kde/patch/plasma-desktop.patch b/source/kde/kde/patch/plasma-desktop.patch
new file mode 100644
index 000000000..fddf562e8
--- /dev/null
+++ b/source/kde/kde/patch/plasma-desktop.patch
@@ -0,0 +1,2 @@
+# Don't include Discover or Konqueror launchers on the taskbar (thanks to alienBOB):
+cat $CWD/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff b/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
new file mode 100644
index 000000000..f3400d2ea
--- /dev/null
+++ b/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
@@ -0,0 +1,11 @@
+--- ./applets/taskmanager/package/contents/config/main.xml.orig	2020-11-10 13:59:29.000000000 -0600
++++ ./applets/taskmanager/package/contents/config/main.xml	2020-11-21 19:55:26.280492839 -0600
+@@ -77,7 +77,7 @@
+     </entry>
+     <entry name="launchers" type="StringList">
+       <label>The list of launcher tasks on the widget. Usually .desktop file or executable URLs. Special URLs such as preferred://browser that expand to default applications are supported.</label>
+-      <default>applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser</default>
++      <default>applications:systemsettings.desktop,preferred://filemanager</default>
+     </entry>
+     <entry name="middleClickAction" type="Enum">
+       <label>What to do on middle-mouse click on a task button.</label>
diff --git a/source/kde/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
new file mode 100644
index 000000000..a77c521f6
--- /dev/null
+++ b/source/kde/kde/patch/sddm.patch
@@ -0,0 +1,3 @@
+# Properly honor supplemental groups, https://github.com/sddm/sddm/issues/1159 :
+cat $CWD/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
new file mode 100644
index 000000000..bf3bfd255
--- /dev/null
+++ b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
@@ -0,0 +1,183 @@
+From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
+From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
+Date: Thu, 9 May 2019 03:06:48 +0200
+Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
+
+This moves the supplemental group initialization step from
+UserSession.cpp to the Backend system, so that the Pam Backend can
+inject additional supplemental groups via modules like pam_group.so.
+
+pam_setcred(3) assumes that it operates on an already initialized
+supplemental group list. However, PamBackend calls
+pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
+PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
+must be issued to repeat the injection of PAM's supplemental groups.
+---
+ src/helper/Backend.cpp            |  5 +++++
+ src/helper/Backend.h              |  3 +++
+ src/helper/HelperApp.cpp          |  4 ++++
+ src/helper/HelperApp.h            |  1 +
+ src/helper/UserSession.cpp        | 13 ++++++++-----
+ src/helper/backend/PamBackend.cpp | 18 ++++++++++++++++++
+ src/helper/backend/PamBackend.h   |  2 ++
+ 7 files changed, 41 insertions(+), 5 deletions(-)
+
+diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
+index d6bb4d0a..35ae2bdf 100644
+--- a/src/helper/Backend.cpp
++++ b/src/helper/Backend.cpp
+@@ -29,6 +29,7 @@
+ #include <QtCore/QProcessEnvironment>
+ 
+ #include <pwd.h>
++#include <grp.h>
+ 
+ namespace SDDM {
+     Backend::Backend(HelperApp* parent)
+@@ -79,4 +80,8 @@ namespace SDDM {
+     bool Backend::closeSession() {
+         return true;
+     }
++
++    bool Backend::setupSupplementalGroups(struct passwd *pw) {
++        return !initgroups(pw->pw_name, pw->pw_gid);
++    }
+ }
+diff --git a/src/helper/Backend.h b/src/helper/Backend.h
+index b790e001..3caf1592 100644
+--- a/src/helper/Backend.h
++++ b/src/helper/Backend.h
+@@ -22,6 +22,7 @@
+ #define BACKEND_H
+ 
+ #include <QtCore/QObject>
++#include <pwd.h>
+ 
+ namespace SDDM {
+     class HelperApp;
+@@ -38,6 +39,8 @@ namespace SDDM {
+         void setAutologin(bool on = true);
+         void setGreeter(bool on = true);
+ 
++        virtual bool setupSupplementalGroups(struct passwd *pw);
++
+     public slots:
+         virtual bool start(const QString &user = QString()) = 0;
+         virtual bool authenticate() = 0;
+diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
+index cad93bd8..d0891d75 100644
+--- a/src/helper/HelperApp.cpp
++++ b/src/helper/HelperApp.cpp
+@@ -253,6 +253,10 @@ namespace SDDM {
+         return m_session;
+     }
+ 
++    Backend *HelperApp::backend() {
++        return m_backend;
++    }
++
+     const QString& HelperApp::user() const {
+         return m_user;
+     }
+diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h
+index 3742df12..cb5959a7 100644
+--- a/src/helper/HelperApp.h
++++ b/src/helper/HelperApp.h
+@@ -39,6 +39,7 @@ namespace SDDM {
+         virtual ~HelperApp();
+ 
+         UserSession *session();
++        Backend *backend();
+         const QString &user() const;
+         const QString &cookie() const;
+ 
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index f71fd358..62fd4d70 100644
+--- a/src/helper/UserSession.cpp
++++ b/src/helper/UserSession.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include "Backend.h"
+ #include "Configuration.h"
+ #include "UserSession.h"
+ #include "HelperApp.h"
+@@ -129,7 +130,8 @@ namespace SDDM {
+ #endif
+ 
+         // switch user
+-        const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
++        HelperApp* app = qobject_cast<HelperApp*>(parent());
++        const QByteArray username = app->user().toLocal8Bit();
+         struct passwd pw;
+         struct passwd *rpw;
+         long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+@@ -146,12 +148,13 @@ namespace SDDM {
+                 qCritical() << "getpwnam_r(" << username << ") failed with error: " << strerror(err);
+             exit(Auth::HELPER_OTHER_ERROR);
+         }
+-        if (setgid(pw.pw_gid) != 0) {
+-            qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
++
++        if (!app->backend()->setupSupplementalGroups(&pw)) {
++            qCritical() << "failed to set up supplemental groups for user: " << username;
+             exit(Auth::HELPER_OTHER_ERROR);
+         }
+-        if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
+-            qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
++        if (setgid(pw.pw_gid) != 0) {
++            qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
+             exit(Auth::HELPER_OTHER_ERROR);
+         }
+         if (setuid(pw.pw_uid) != 0) {
+diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp
+index f86d77d6..cccfa258 100644
+--- a/src/helper/backend/PamBackend.cpp
++++ b/src/helper/backend/PamBackend.cpp
+@@ -289,6 +289,24 @@ namespace SDDM {
+         return QString::fromLocal8Bit((const char*) m_pam->getItem(PAM_USER));
+     }
+ 
++    bool PamBackend::setupSupplementalGroups(struct passwd *pw) {
++        if (!Backend::setupSupplementalGroups(pw))
++            return false;
++
++        // pam_setcred(3) may inject additional groups into the user's
++        // list of supplemental groups, and assumes that the user's
++        // supplemental groups have already been initialized before
++        // its invocation. Since pam_setcred was already called at the
++        // start of openSession, we need to repeat this step here as
++        // the user's groups have only just now been initialized.
++
++        if (!m_pam->setCred(PAM_REINITIALIZE_CRED)) {
++            m_app->error(m_pam->errorString(), Auth::ERROR_AUTHENTICATION);
++            return false;
++        }
++        return true;
++    }
++
+     int PamBackend::converse(int n, const struct pam_message **msg, struct pam_response **resp) {
+         qDebug() << "[PAM] Conversation with" << n << "messages";
+ 
+diff --git a/src/helper/backend/PamBackend.h b/src/helper/backend/PamBackend.h
+index 4c8b4b35..5b079099 100644
+--- a/src/helper/backend/PamBackend.h
++++ b/src/helper/backend/PamBackend.h
+@@ -28,6 +28,7 @@
+ #include <QtCore/QObject>
+ 
+ #include <security/pam_appl.h>
++#include <pwd.h>
+ 
+ namespace SDDM {
+     class PamHandle;
+@@ -61,6 +62,7 @@ namespace SDDM {
+         explicit PamBackend(HelperApp *parent);
+         virtual ~PamBackend();
+         int converse(int n, const struct pam_message **msg, struct pam_response **resp);
++        virtual bool setupSupplementalGroups(struct passwd *pw);
+ 
+     public slots:
+         virtual bool start(const QString &user = QString());
+
diff --git a/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
new file mode 100644
index 000000000..2391c80ce
--- /dev/null
+++ b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
@@ -0,0 +1,88 @@
+From d3953e88a94ec25a87d3c5136517b3d1009cb1fd Mon Sep 17 00:00:00 2001
+From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
+Date: Wed, 8 May 2019 18:58:53 +0200
+Subject: [PATCH] Revert "Honor PAM's ambient supplemental groups. (#834)"
+
+This reverts commit 1bc813d08b8130e458a6550ec47fb2bfbe6de080, which
+misuses PAM and leads to pulling in all of root's supplemental groups
+during session initialization instead of only adding PAM's extra
+groups. The problem was masked due to the root user not having any
+supplemental groups in some common contexts, like running sddm from a
+systemd unit.
+---
+ src/helper/UserSession.cpp | 57 --------------------------------------
+ 1 file changed, 57 deletions(-)
+
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index b3aec356..f71fd358 100644
+--- a/src/helper/UserSession.cpp
++++ b/src/helper/UserSession.cpp
+@@ -150,67 +150,10 @@ namespace SDDM {
+             qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username;
+             exit(Auth::HELPER_OTHER_ERROR);
+         }
+-
+-#ifdef USE_PAM
+-
+-        // fetch ambient groups from PAM's environment;
+-        // these are set by modules such as pam_groups.so
+-        int n_pam_groups = getgroups(0, NULL);
+-        gid_t *pam_groups = NULL;
+-        if (n_pam_groups > 0) {
+-            pam_groups = new gid_t[n_pam_groups];
+-            if ((n_pam_groups = getgroups(n_pam_groups, pam_groups)) == -1) {
+-                qCritical() << "getgroups() failed to fetch supplemental"
+-                            << "PAM groups for user:" << username;
+-                exit(Auth::HELPER_OTHER_ERROR);
+-            }
+-        } else {
+-            n_pam_groups = 0;
+-        }
+-
+-        // fetch session's user's groups
+-        int n_user_groups = 0;
+-        gid_t *user_groups = NULL;
+-        if (-1 == getgrouplist(username.constData(), pw.pw_gid,
+-                               NULL, &n_user_groups)) {
+-            user_groups = new gid_t[n_user_groups];
+-            if ((n_user_groups = getgrouplist(username.constData(),
+-                                              pw.pw_gid, user_groups,
+-                                              &n_user_groups)) == -1 ) {
+-                qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid
+-                            << ") failed";
+-                exit(Auth::HELPER_OTHER_ERROR);
+-            }
+-        }
+-
+-        // set groups to concatenation of PAM's ambient
+-        // groups and the session's user's groups
+-        int n_groups = n_pam_groups + n_user_groups;
+-        if (n_groups > 0) {
+-            gid_t *groups = new gid_t[n_groups];
+-            memcpy(groups, pam_groups, (n_pam_groups * sizeof(gid_t)));
+-            memcpy((groups + n_pam_groups), user_groups,
+-                   (n_user_groups * sizeof(gid_t)));
+-
+-            // setgroups(2) handles duplicate groups
+-            if (setgroups(n_groups, groups) != 0) {
+-                qCritical() << "setgroups() failed for user: " << username;
+-                exit (Auth::HELPER_OTHER_ERROR);
+-            }
+-            delete[] groups;
+-        }
+-        delete[] pam_groups;
+-        delete[] user_groups;
+-
+-#else
+-
+         if (initgroups(pw.pw_name, pw.pw_gid) != 0) {
+             qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username;
+             exit(Auth::HELPER_OTHER_ERROR);
+         }
+-
+-#endif /* USE_PAM */
+-
+         if (setuid(pw.pw_uid) != 0) {
+             qCritical() << "setuid(" << pw.pw_uid << ") failed for user: " << username;
+             exit(Auth::HELPER_OTHER_ERROR);
+
author	Patrick J Volkerding <volkerdi@slackware.com>	2020-12-07 21:49:58 +0000
committer	Eric Hameleers <alien@slackware.com>	2020-12-08 08:59:51 +0100
commit	5584dad3850d8f1aa3459ed8b85b3f8b571df3d4 (patch)
tree	42cbbe668c936cf1bc0d35e57cf68afec5657776 /source/kde/kde/patch
parent	9dce810dc522c70eeca9a928b95df923a70e4f2c (diff)
download	current-5584dad3850d8f1aa3459ed8b85b3f8b571df3d4.tar.gz current-5584dad3850d8f1aa3459ed8b85b3f8b571df3d4.tar.xz