summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-06-18 06:19:23 +0000
committer Eric Hameleers <alien@slackware.com>2018-06-18 10:35:08 +0200
commit04696baa146387e730d10a1e0b0a540989eea8e6 (patch)
tree642d09926a46b27d6a853e1f761398bb013746f9
parent3a51ffacffe54c13e2e8f54390a730971cd9383b (diff)
downloadcurrent-04696baa146387e730d10a1e0b0a540989eea8e6.tar.gz
current-04696baa146387e730d10a1e0b0a540989eea8e6.tar.xz
Mon Jun 18 06:19:23 UTC 201820180618061923
a/aaa_elflibs-15.0-x86_64-1.txz: Upgraded. Upgraded to libelf-0.171.so, added libgdbm.so.6.0.0. a/etc-15.0-x86_64-6.txz: Rebuilt. Add $(uname -m) information to /etc/issue.new. Don't include /tmp directories - these are handled by aaa_base. a/kernel-generic-4.14.50-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.50-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.50-x86_64-1.txz: Upgraded. ap/man-db-2.8.3-x86_64-3.txz: Rebuilt. Recompiled against gdbm-1.15. ap/zsh-5.5.1-x86_64-2.txz: Rebuilt. Recompiled against gdbm-1.15. d/clisp-2.49_20180423_d1310adc5-x86_64-1.txz: Upgraded. Compiled against gdbm-1.15. d/kernel-headers-4.14.50-x86-1.txz: Upgraded. d/perl-5.26.2-x86_64-5.txz: Rebuilt. Recompiled against gdbm-1.15. d/python-2.7.15-x86_64-3.txz: Rebuilt. Recompiled against gdbm-1.15. d/python3-3.6.5-x86_64-4.txz: Rebuilt. Recompiled against gdbm-1.15. d/ruby-2.5.1-x86_64-4.txz: Rebuilt. Recompiled against gdbm-1.15. k/kernel-source-4.14.50-noarch-1.txz: Upgraded. kde/kdelibs-4.14.38-x86_64-3.txz: Rebuilt. Patched to build with OpenSSL-1.1.x. Thanks to nobodino. l/gdbm-1.15-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/cyrus-sasl-2.1.27_rc8-x86_64-1.txz: Upgraded. Compiled against gdbm-1.15. n/mutt-1.10.0-x86_64-2.txz: Rebuilt. Recompiled against gdbm-1.15. n/php-7.2.6-x86_64-2.txz: Rebuilt. Recompiled against gdbm-1.15. n/yptools-2.14-x86_64-11.txz: Rebuilt. Recompiled against gdbm-1.15. xap/gnuchess-6.2.5-x86_64-3.txz: Rebuilt. Recompiled against gdbm-1.15. isolinux/initrd.img: Rebuilt. Copy libefiboot to the installer (needed by efibootmgr). Compress the kernel modules with xz. Compress the initrd image with xz. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. Copy libefiboot to the installer (needed by efibootmgr). Compress the kernel modules with xz. Compress the initrd image with xz.
-rw-r--r--ChangeLog.rss63
-rw-r--r--ChangeLog.txt49
-rw-r--r--FILELIST.TXT307
-rw-r--r--README.initrd14
-rw-r--r--isolinux/message.txt2
-rw-r--r--kernels/VERSIONS.TXT2
-rwxr-xr-xrecompress.sh1
-rw-r--r--slackware64/a/maketag12
-rw-r--r--slackware64/a/maketag.ez12
-rw-r--r--slackware64/a/tagfile2
-rw-r--r--slackware64/k/maketag2
-rw-r--r--slackware64/k/maketag.ez2
-rwxr-xr-xsource/a/aaa_elflibs/aaa_elflibs.SlackBuild4
-rw-r--r--source/a/aaa_elflibs/symlinks-to-tracked-libs1
-rw-r--r--source/a/etc/_etc/etc/issue.new2
-rw-r--r--source/a/etc/doinst.sh2
-rwxr-xr-xsource/a/etc/etc.SlackBuild2
-rwxr-xr-xsource/ap/man-db/man-db.SlackBuild2
-rwxr-xr-xsource/ap/zsh/zsh.SlackBuild2
-rwxr-xr-xsource/d/clisp/source.download61
-rwxr-xr-xsource/d/perl/perl.SlackBuild2
-rwxr-xr-xsource/d/python/python.SlackBuild2
-rwxr-xr-xsource/d/python3/python3.SlackBuild2
-rwxr-xr-xsource/d/ruby/ruby.SlackBuild2
-rw-r--r--source/installer/ChangeLog.txt5
-rwxr-xr-xsource/installer/build_installer.sh9
-rw-r--r--source/k/kernel-configs/config-generic-4.14.50 (renamed from source/k/kernel-configs/config-generic-4.14.49)2
-rw-r--r--source/k/kernel-configs/config-generic-4.14.50.x64 (renamed from source/k/kernel-configs/config-generic-4.14.49.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-4.14.50-smp (renamed from source/k/kernel-configs/config-generic-smp-4.14.49-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-4.14.50 (renamed from source/k/kernel-configs/config-huge-4.14.49)2
-rw-r--r--source/k/kernel-configs/config-huge-4.14.50.x64 (renamed from source/k/kernel-configs/config-huge-4.14.49.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-4.14.50-smp (renamed from source/k/kernel-configs/config-huge-smp-4.14.49-smp)2
-rw-r--r--source/kde/FTBFSlog4
-rw-r--r--source/kde/build/kdelibs2
-rw-r--r--source/kde/patch/kdelibs.patch3
-rw-r--r--source/kde/patch/kdelibs/kdelibs-openssl-1.1.patch4007
-rwxr-xr-xsource/l/gdbm/gdbm.SlackBuild6
-rwxr-xr-xsource/n/mutt/mutt.SlackBuild2
-rwxr-xr-xsource/n/php/php.SlackBuild2
-rwxr-xr-xsource/n/yptools/yptools.SlackBuild2
-rwxr-xr-xsource/xap/gnuchess/gnuchess.SlackBuild2
41 files changed, 4388 insertions, 220 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index ec628426..a949315a 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,9 +11,66 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
- <pubDate>Sat, 16 Jun 2018 05:59:57 GMT</pubDate>
- <lastBuildDate>Sat, 16 Jun 2018 10:05:47 GMT</lastBuildDate>
- <generator>maintain_current_git.sh v 1.9</generator>
+ <pubDate>Mon, 18 Jun 2018 06:19:23 GMT</pubDate>
+ <lastBuildDate>Mon, 18 Jun 2018 08:35:03 GMT</lastBuildDate>
+ <generator>maintain_current_git.sh v 1.10</generator>
+ <item>
+ <title>Mon, 18 Jun 2018 06:19:23 GMT</title>
+ <pubDate>Mon, 18 Jun 2018 06:19:23 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20180618061923</link>
+ <guid isPermaLink="false">20180618061923</guid>
+ <description>
+ <![CDATA[<pre>
+a/aaa_elflibs-15.0-x86_64-1.txz: Upgraded.
+ Upgraded to libelf-0.171.so, added libgdbm.so.6.0.0.
+a/etc-15.0-x86_64-6.txz: Rebuilt.
+ Add $(uname -m) information to /etc/issue.new.
+ Don't include /tmp directories - these are handled by aaa_base.
+a/kernel-generic-4.14.50-x86_64-1.txz: Upgraded.
+a/kernel-huge-4.14.50-x86_64-1.txz: Upgraded.
+a/kernel-modules-4.14.50-x86_64-1.txz: Upgraded.
+ap/man-db-2.8.3-x86_64-3.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+ap/zsh-5.5.1-x86_64-2.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/clisp-2.49_20180423_d1310adc5-x86_64-1.txz: Upgraded.
+ Compiled against gdbm-1.15.
+d/kernel-headers-4.14.50-x86-1.txz: Upgraded.
+d/perl-5.26.2-x86_64-5.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/python-2.7.15-x86_64-3.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/python3-3.6.5-x86_64-4.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/ruby-2.5.1-x86_64-4.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+k/kernel-source-4.14.50-noarch-1.txz: Upgraded.
+kde/kdelibs-4.14.38-x86_64-3.txz: Rebuilt.
+ Patched to build with OpenSSL-1.1.x. Thanks to nobodino.
+l/gdbm-1.15-x86_64-1.txz: Upgraded.
+ Shared library .so-version bump.
+n/cyrus-sasl-2.1.27_rc8-x86_64-1.txz: Upgraded.
+ Compiled against gdbm-1.15.
+n/mutt-1.10.0-x86_64-2.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+n/php-7.2.6-x86_64-2.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+n/yptools-2.14-x86_64-11.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+xap/gnuchess-6.2.5-x86_64-3.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+isolinux/initrd.img: Rebuilt.
+ Copy libefiboot to the installer (needed by efibootmgr).
+ Compress the kernel modules with xz.
+ Compress the initrd image with xz.
+kernels/*: Upgraded.
+usb-and-pxe-installers/usbboot.img: Rebuilt.
+ Copy libefiboot to the installer (needed by efibootmgr).
+ Compress the kernel modules with xz.
+ Compress the initrd image with xz.
+ </pre>]]>
+ </description>
+ </item>
<item>
<title>Sat, 16 Jun 2018 05:59:57 GMT</title>
<pubDate>Sat, 16 Jun 2018 05:59:57 GMT</pubDate>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3d078480..7473fb5e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,52 @@
+Mon Jun 18 06:19:23 UTC 2018
+a/aaa_elflibs-15.0-x86_64-1.txz: Upgraded.
+ Upgraded to libelf-0.171.so, added libgdbm.so.6.0.0.
+a/etc-15.0-x86_64-6.txz: Rebuilt.
+ Add $(uname -m) information to /etc/issue.new.
+ Don't include /tmp directories - these are handled by aaa_base.
+a/kernel-generic-4.14.50-x86_64-1.txz: Upgraded.
+a/kernel-huge-4.14.50-x86_64-1.txz: Upgraded.
+a/kernel-modules-4.14.50-x86_64-1.txz: Upgraded.
+ap/man-db-2.8.3-x86_64-3.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+ap/zsh-5.5.1-x86_64-2.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/clisp-2.49_20180423_d1310adc5-x86_64-1.txz: Upgraded.
+ Compiled against gdbm-1.15.
+d/kernel-headers-4.14.50-x86-1.txz: Upgraded.
+d/perl-5.26.2-x86_64-5.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/python-2.7.15-x86_64-3.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/python3-3.6.5-x86_64-4.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+d/ruby-2.5.1-x86_64-4.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+k/kernel-source-4.14.50-noarch-1.txz: Upgraded.
+kde/kdelibs-4.14.38-x86_64-3.txz: Rebuilt.
+ Patched to build with OpenSSL-1.1.x. Thanks to nobodino.
+l/gdbm-1.15-x86_64-1.txz: Upgraded.
+ Shared library .so-version bump.
+n/cyrus-sasl-2.1.27_rc8-x86_64-1.txz: Upgraded.
+ Compiled against gdbm-1.15.
+n/mutt-1.10.0-x86_64-2.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+n/php-7.2.6-x86_64-2.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+n/yptools-2.14-x86_64-11.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+xap/gnuchess-6.2.5-x86_64-3.txz: Rebuilt.
+ Recompiled against gdbm-1.15.
+isolinux/initrd.img: Rebuilt.
+ Copy libefiboot to the installer (needed by efibootmgr).
+ Compress the kernel modules with xz.
+ Compress the initrd image with xz.
+kernels/*: Upgraded.
+usb-and-pxe-installers/usbboot.img: Rebuilt.
+ Copy libefiboot to the installer (needed by efibootmgr).
+ Compress the kernel modules with xz.
+ Compress the initrd image with xz.
++--------------------------+
Sat Jun 16 05:59:57 UTC 2018
d/cmake-3.11.4-x86_64-1.txz: Upgraded.
d/strace-4.23-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 7e2e7e56..f0f8ecaa 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,35 +1,35 @@
-Sat Jun 16 06:10:17 UTC 2018
+Mon Jun 18 06:30:58 UTC 2018
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2018-06-16 05:59 .
+drwxr-xr-x 12 root root 4096 2018-06-18 06:19 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 13424 2018-06-13 05:25 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 896053 2018-06-15 04:22 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-15 04:22 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 896053 2018-06-16 06:10 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-16 06:10 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r-- 1 root root 416865 2018-06-16 05:59 ./ChangeLog.txt
+-rw-r--r-- 1 root root 418834 2018-06-18 06:19 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
-drwxr-xr-x 2 root root 4096 2018-06-15 03:59 ./EFI/BOOT
+drwxr-xr-x 2 root root 4096 2018-06-18 06:19 ./EFI/BOOT
-rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi
-rw-r--r-- 1 root root 78 2013-09-23 20:35 ./EFI/BOOT/grub-embedded.cfg
-rw-r--r-- 1 root root 893 2018-04-17 21:17 ./EFI/BOOT/grub.cfg
--rw-r--r-- 2 root root 8828688 2018-06-12 03:31 ./EFI/BOOT/huge.s
--rw-r--r-- 2 root root 47959603 2018-06-15 03:59 ./EFI/BOOT/initrd.img
+-rw-r--r-- 2 root root 8832784 2018-06-16 20:20 ./EFI/BOOT/huge.s
+-rw-r--r-- 2 root root 35120580 2018-06-18 06:18 ./EFI/BOOT/initrd.img
-rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1179723 2018-06-15 04:22 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1179723 2018-06-17 18:00 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 725989 2018-06-16 06:08 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 725985 2018-06-18 06:29 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
--rw-r--r-- 1 root root 3634 2018-06-12 04:26 ./README.initrd
+-rw-r--r-- 1 root root 3634 2018-06-18 05:56 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
-rw-r--r-- 1 root root 8751 2016-06-28 21:44 ./README_LVM.TXT
-rw-r--r-- 1 root root 19658 2013-06-18 04:34 ./README_RAID.TXT
@@ -678,16 +678,16 @@ drwxr-xr-x 2 root root 4096 2011-01-31 03:46 ./extra/xf86-video-nouveau-bl
-rw-r--r-- 1 root root 645 2010-04-27 21:47 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txt
-rw-r--r-- 1 root root 880 2010-04-27 21:47 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz
-rw-r--r-- 1 root root 198 2010-04-27 21:47 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz.asc
-drwxr-xr-x 3 root root 4096 2018-06-15 03:59 ./isolinux
+drwxr-xr-x 3 root root 4096 2018-06-18 06:19 ./isolinux
-rw-r--r-- 1 root root 6183 2017-11-18 18:47 ./isolinux/README.TXT
-rw-r--r-- 1 root root 788 2007-03-17 19:50 ./isolinux/README_SPLIT.TXT
-rw-r--r-- 1 root root 1474560 2018-02-24 20:49 ./isolinux/efiboot.img
-rw-r--r-- 1 root root 574 2013-10-24 00:19 ./isolinux/f2.txt
--rw-r--r-- 2 root root 47959603 2018-06-15 03:59 ./isolinux/initrd.img
+-rw-r--r-- 2 root root 35120580 2018-06-18 06:18 ./isolinux/initrd.img
-rw-r--r-- 1 root root 50 2003-01-18 00:02 ./isolinux/iso.sort
-rw-r--r-- 1 root root 24576 2016-05-27 20:36 ./isolinux/isolinux.bin
-rw-r--r-- 1 root root 578 2013-03-27 03:29 ./isolinux/isolinux.cfg
--rw-r--r-- 1 root root 683 2018-06-12 04:26 ./isolinux/message.txt
+-rw-r--r-- 1 root root 683 2018-06-18 05:56 ./isolinux/message.txt
drwxr-xr-x 2 root root 4096 2003-03-17 07:31 ./isolinux/sbootmgr
-rwxr-xr-x 1 root root 36064 1995-05-12 01:23 ./isolinux/sbootmgr/RAWRITE.EXE
-rw-r--r-- 1 root root 2138 1997-12-01 01:21 ./isolinux/sbootmgr/RAWRITE12.DOC
@@ -698,12 +698,12 @@ lrwxrwxrwx 1 root root 11 2009-08-23 23:37 ./isolinux/sbootmgr/RAWRITE13
-rw-r--r-- 1 root root 1291 2003-03-17 07:31 ./isolinux/sbootmgr/README.TXT
-rw-r--r-- 1 root root 110592 2003-03-16 08:38 ./isolinux/sbootmgr/sbootmgr.dsk
-rw-r--r-- 1 root root 3024 2018-03-03 01:37 ./isolinux/setpkg
-drwxr-xr-x 5 root root 4096 2018-06-12 04:26 ./kernels
--rw-r--r-- 1 root root 37 2018-06-12 04:26 ./kernels/VERSIONS.TXT
-drwxr-xr-x 2 root root 4096 2018-06-12 03:31 ./kernels/huge.s
--rw-r--r-- 1 root root 920749 2018-06-12 03:31 ./kernels/huge.s/System.map.gz
--rw-r--r-- 2 root root 8828688 2018-06-12 03:31 ./kernels/huge.s/bzImage
--rw-r--r-- 1 root root 180740 2018-06-12 03:26 ./kernels/huge.s/config
+drwxr-xr-x 5 root root 4096 2018-06-18 05:56 ./kernels
+-rw-r--r-- 1 root root 37 2018-06-18 05:56 ./kernels/VERSIONS.TXT
+drwxr-xr-x 2 root root 4096 2018-06-16 20:20 ./kernels/huge.s
+-rw-r--r-- 1 root root 920695 2018-06-16 20:20 ./kernels/huge.s/System.map.gz
+-rw-r--r-- 2 root root 8832784 2018-06-16 20:20 ./kernels/huge.s/bzImage
+-rw-r--r-- 1 root root 180740 2018-06-16 20:17 ./kernels/huge.s/config
drwxr-xr-x 2 root root 4096 2011-03-25 03:15 ./kernels/memtest
-rw-r--r-- 1 root root 60 2011-03-24 00:19 ./kernels/memtest/README
-rw-r--r-- 1 root root 150024 2013-10-17 04:15 ./kernels/memtest/memtest
@@ -748,19 +748,19 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
-drwxr-xr-x 18 root root 4096 2018-06-16 06:08 ./slackware64
--rw-r--r-- 1 root root 288405 2018-06-16 06:08 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-16 06:08 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 359320 2018-06-16 06:06 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 3611548 2018-06-16 06:07 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2018-06-18 06:29 ./slackware64
+-rw-r--r-- 1 root root 288393 2018-06-18 06:29 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-18 06:29 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 359308 2018-06-18 06:26 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 3616619 2018-06-18 06:27 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a
+drwxr-xr-x 2 root root 20480 2018-06-18 06:26 ./slackware64/a
-rw-r--r-- 1 root root 327 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txt
-rw-r--r-- 1 root root 10972 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz.asc
--rw-r--r-- 1 root root 471 2018-05-18 17:47 ./slackware64/a/aaa_elflibs-14.2-x86_64-39.txt
--rw-r--r-- 1 root root 5418300 2018-05-18 17:47 ./slackware64/a/aaa_elflibs-14.2-x86_64-39.txz
--rw-r--r-- 1 root root 163 2018-05-18 17:47 ./slackware64/a/aaa_elflibs-14.2-x86_64-39.txz.asc
+-rw-r--r-- 1 root root 471 2018-06-18 03:22 ./slackware64/a/aaa_elflibs-15.0-x86_64-1.txt
+-rw-r--r-- 1 root root 5429976 2018-06-18 03:22 ./slackware64/a/aaa_elflibs-15.0-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:22 ./slackware64/a/aaa_elflibs-15.0-x86_64-1.txz.asc
-rw-r--r-- 1 root root 503 2018-04-16 17:32 ./slackware64/a/aaa_terminfo-6.1_20180324-x86_64-4.txt
-rw-r--r-- 1 root root 50276 2018-04-16 17:32 ./slackware64/a/aaa_terminfo-6.1_20180324-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-16 17:32 ./slackware64/a/aaa_terminfo-6.1_20180324-x86_64-4.txz.asc
@@ -830,9 +830,9 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a
-rw-r--r-- 1 root root 387 2018-04-13 13:03 ./slackware64/a/elvis-2.2_0-x86_64-4.txt
-rw-r--r-- 1 root root 711352 2018-04-13 13:03 ./slackware64/a/elvis-2.2_0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:03 ./slackware64/a/elvis-2.2_0-x86_64-4.txz.asc
--rw-r--r-- 1 root root 202 2018-06-13 20:14 ./slackware64/a/etc-15.0-x86_64-5.txt
--rw-r--r-- 1 root root 27400 2018-06-13 20:14 ./slackware64/a/etc-15.0-x86_64-5.txz
--rw-r--r-- 1 root root 163 2018-06-13 20:14 ./slackware64/a/etc-15.0-x86_64-5.txz.asc
+-rw-r--r-- 1 root root 202 2018-06-17 18:03 ./slackware64/a/etc-15.0-x86_64-6.txt
+-rw-r--r-- 1 root root 27344 2018-06-17 18:03 ./slackware64/a/etc-15.0-x86_64-6.txz
+-rw-r--r-- 1 root root 163 2018-06-17 18:03 ./slackware64/a/etc-15.0-x86_64-6.txz.asc
-rw-r--r-- 1 root root 510 2018-05-01 15:41 ./slackware64/a/eudev-3.2.5-x86_64-3.txt
-rw-r--r-- 1 root root 975148 2018-05-01 15:41 ./slackware64/a/eudev-3.2.5-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-05-01 15:41 ./slackware64/a/eudev-3.2.5-x86_64-3.txz.asc
@@ -907,15 +907,15 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a
-rw-r--r-- 1 root root 422 2018-06-11 22:44 ./slackware64/a/kernel-firmware-20180606_d114732-noarch-1.txt
-rw-r--r-- 1 root root 74994552 2018-06-11 22:44 ./slackware64/a/kernel-firmware-20180606_d114732-noarch-1.txz
-rw-r--r-- 1 root root 163 2018-06-11 22:44 ./slackware64/a/kernel-firmware-20180606_d114732-noarch-1.txz.asc
--rw-r--r-- 1 root root 624 2018-06-12 03:32 ./slackware64/a/kernel-generic-4.14.49-x86_64-1.txt
--rw-r--r-- 1 root root 5932644 2018-06-12 03:32 ./slackware64/a/kernel-generic-4.14.49-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-06-12 03:32 ./slackware64/a/kernel-generic-4.14.49-x86_64-1.txz.asc
--rw-r--r-- 1 root root 636 2018-06-12 03:31 ./slackware64/a/kernel-huge-4.14.49-x86_64-1.txt
--rw-r--r-- 1 root root 9340920 2018-06-12 03:31 ./slackware64/a/kernel-huge-4.14.49-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-06-12 03:31 ./slackware64/a/kernel-huge-4.14.49-x86_64-1.txz.asc
--rw-r--r-- 1 root root 567 2018-06-12 04:04 ./slackware64/a/kernel-modules-4.14.49-x86_64-1.txt
--rw-r--r-- 1 root root 35862712 2018-06-12 04:04 ./slackware64/a/kernel-modules-4.14.49-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-06-12 04:04 ./slackware64/a/kernel-modules-4.14.49-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 624 2018-06-16 20:21 ./slackware64/a/kernel-generic-4.14.50-x86_64-1.txt
+-rw-r--r-- 1 root root 5926412 2018-06-16 20:21 ./slackware64/a/kernel-generic-4.14.50-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-16 20:21 ./slackware64/a/kernel-generic-4.14.50-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 636 2018-06-16 20:20 ./slackware64/a/kernel-huge-4.14.50-x86_64-1.txt
+-rw-r--r-- 1 root root 9345812 2018-06-16 20:20 ./slackware64/a/kernel-huge-4.14.50-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-16 20:20 ./slackware64/a/kernel-huge-4.14.50-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 567 2018-06-16 20:38 ./slackware64/a/kernel-modules-4.14.50-x86_64-1.txt
+-rw-r--r-- 1 root root 35853012 2018-06-16 20:38 ./slackware64/a/kernel-modules-4.14.50-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-16 20:38 ./slackware64/a/kernel-modules-4.14.50-x86_64-1.txz.asc
-rw-r--r-- 1 root root 512 2018-04-13 13:07 ./slackware64/a/kmod-25-x86_64-2.txt
-rw-r--r-- 1 root root 201376 2018-04-13 13:07 ./slackware64/a/kmod-25-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:07 ./slackware64/a/kmod-25-x86_64-2.txz.asc
@@ -952,8 +952,8 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a
-rw-r--r-- 1 root root 405 2018-04-13 13:08 ./slackware64/a/lzlib-1.10-x86_64-3.txt
-rw-r--r-- 1 root root 55468 2018-04-13 13:08 ./slackware64/a/lzlib-1.10-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:08 ./slackware64/a/lzlib-1.10-x86_64-3.txz.asc
--rw-r--r-- 1 root root 8905 2018-06-12 04:26 ./slackware64/a/maketag
--rw-r--r-- 1 root root 8905 2018-06-12 04:26 ./slackware64/a/maketag.ez
+-rw-r--r-- 1 root root 9039 2018-06-18 05:56 ./slackware64/a/maketag
+-rw-r--r-- 1 root root 9039 2018-06-18 05:56 ./slackware64/a/maketag.ez
-rw-r--r-- 1 root root 591 2018-05-31 17:59 ./slackware64/a/mcelog-158-x86_64-1.txt
-rw-r--r-- 1 root root 328472 2018-05-31 17:59 ./slackware64/a/mcelog-158-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-05-31 17:59 ./slackware64/a/mcelog-158-x86_64-1.txz.asc
@@ -1053,7 +1053,7 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a
-rw-r--r-- 1 root root 378 2018-06-14 23:38 ./slackware64/a/sysvinit-scripts-2.1-noarch-12.txt
-rw-r--r-- 1 root root 21844 2018-06-14 23:38 ./slackware64/a/sysvinit-scripts-2.1-noarch-12.txz
-rw-r--r-- 1 root root 163 2018-06-14 23:38 ./slackware64/a/sysvinit-scripts-2.1-noarch-12.txz.asc
--rw-r--r-- 1 root root 1370 2018-06-12 04:26 ./slackware64/a/tagfile
+-rw-r--r-- 1 root root 1393 2018-06-18 05:56 ./slackware64/a/tagfile
-rw-r--r-- 1 root root 379 2018-04-13 13:15 ./slackware64/a/tar-1.30-x86_64-2.txt
-rw-r--r-- 1 root root 793456 2018-04-13 13:15 ./slackware64/a/tar-1.30-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/tar-1.30-x86_64-2.txz.asc
@@ -1102,7 +1102,7 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a
-rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt
-rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/ap
+drwxr-xr-x 2 root root 20480 2018-06-18 06:26 ./slackware64/ap
-rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt
-rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc
@@ -1236,9 +1236,9 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/ap
-rw-r--r-- 1 root root 163 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txz.asc
-rw-r--r-- 1 root root 6252 2018-05-25 20:16 ./slackware64/ap/maketag
-rw-r--r-- 1 root root 6252 2018-05-25 20:16 ./slackware64/ap/maketag.ez
--rw-r--r-- 1 root root 532 2018-04-13 13:25 ./slackware64/ap/man-db-2.8.3-x86_64-2.txt
--rw-r--r-- 1 root root 494724 2018-04-13 13:25 ./slackware64/ap/man-db-2.8.3-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-13 13:25 ./slackware64/ap/man-db-2.8.3-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 532 2018-06-18 03:31 ./slackware64/ap/man-db-2.8.3-x86_64-3.txt
+-rw-r--r-- 1 root root 496160 2018-06-18 03:31 ./slackware64/ap/man-db-2.8.3-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:31 ./slackware64/ap/man-db-2.8.3-x86_64-3.txz.asc
-rw-r--r-- 1 root root 489 2018-05-01 15:32 ./slackware64/ap/man-pages-4.16-noarch-1.txt
-rw-r--r-- 1 root root 3273928 2018-05-01 15:32 ./slackware64/ap/man-pages-4.16-noarch-1.txz
-rw-r--r-- 1 root root 163 2018-05-01 15:32 ./slackware64/ap/man-pages-4.16-noarch-1.txz.asc
@@ -1345,10 +1345,10 @@ drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/ap
-rw-r--r-- 1 root root 570 2018-04-13 13:34 ./slackware64/ap/xorriso-1.4.8-x86_64-2.txt
-rw-r--r-- 1 root root 948496 2018-04-13 13:34 ./slackware64/ap/xorriso-1.4.8-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:34 ./slackware64/ap/xorriso-1.4.8-x86_64-2.txz.asc
--rw-r--r-- 1 root root 506 2018-04-18 05:00 ./slackware64/ap/zsh-5.5.1-x86_64-1.txt
--rw-r--r-- 1 root root 2935316 2018-04-18 05:00 ./slackware64/ap/zsh-5.5.1-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-04-18 05:00 ./slackware64/ap/zsh-5.5.1-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 12288 2018-06-16 06:06 ./slackware64/d
+-rw-r--r-- 1 root root 506 2018-06-18 04:12 ./slackware64/ap/zsh-5.5.1-x86_64-2.txt
+-rw-r--r-- 1 root root 2936096 2018-06-18 04:12 ./slackware64/ap/zsh-5.5.1-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2018-06-18 04:12 ./slackware64/ap/zsh-5.5.1-x86_64-2.txz.asc
+drwxr-xr-x 2 root root 12288 2018-06-18 06:26 ./slackware64/d
-rw-r--r-- 1 root root 360 2018-05-22 19:10 ./slackware64/d/Cython-0.28.2-x86_64-1.txt
-rw-r--r-- 1 root root 4516748 2018-05-22 19:10 ./slackware64/d/Cython-0.28.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-05-22 19:10 ./slackware64/d/Cython-0.28.2-x86_64-1.txz.asc
@@ -1367,9 +1367,9 @@ drwxr-xr-x 2 root root 12288 2018-06-16 06:06 ./slackware64/d
-rw-r--r-- 1 root root 350 2018-04-13 13:36 ./slackware64/d/ccache-3.4.2-x86_64-2.txt
-rw-r--r-- 1 root root 87872 2018-04-13 13:36 ./slackware64/d/ccache-3.4.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:36 ./slackware64/d/ccache-3.4.2-x86_64-2.txz.asc
--rw-r--r-- 1 root root 663 2018-04-13 18:29 ./slackware64/d/clisp-2.49.20180409.0e4d38776f59-x86_64-1.txt
--rw-r--r-- 1 root root 3105504 2018-04-13 18:29 ./slackware64/d/clisp-2.49.20180409.0e4d38776f59-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-04-13 18:29 ./slackware64/d/clisp-2.49.20180409.0e4d38776f59-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 663 2018-06-18 03:06 ./slackware64/d/clisp-2.49_20180423_d1310adc5-x86_64-1.txt
+-rw-r--r-- 1 root root 3105788 2018-06-18 03:06 ./slackware64/d/clisp-2.49_20180423_d1310adc5-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:06 ./slackware64/d/clisp-2.49_20180423_d1310adc5-x86_64-1.txz.asc
-rw-r--r-- 1 root root 379 2018-06-16 05:14 ./slackware64/d/cmake-3.11.4-x86_64-1.txt
-rw-r--r-- 1 root root 8812036 2018-06-16 05:14 ./slackware64/d/cmake-3.11.4-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-16 05:14 ./slackware64/d/cmake-3.11.4-x86_64-1.txz.asc
@@ -1441,9 +1441,9 @@ drwxr-xr-x 2 root root 12288 2018-06-16 06:06 ./slackware64/d
-rw-r--r-- 1 root root 279 2018-04-13 13:53 ./slackware64/d/intltool-0.51.0-x86_64-4.txt
-rw-r--r-- 1 root root 48112 2018-04-13 13:53 ./slackware64/d/intltool-0.51.0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:53 ./slackware64/d/intltool-0.51.0-x86_64-4.txz.asc
--rw-r--r-- 1 root root 332 2018-06-12 04:04 ./slackware64/d/kernel-headers-4.14.49-x86-1.txt
--rw-r--r-- 1 root root 870552 2018-06-12 04:04 ./slackware64/d/kernel-headers-4.14.49-x86-1.txz
--rw-r--r-- 1 root root 163 2018-06-12 04:04 ./slackware64/d/kernel-headers-4.14.49-x86-1.txz.asc
+-rw-r--r-- 1 root root 332 2018-06-16 20:38 ./slackware64/d/kernel-headers-4.14.50-x86-1.txt
+-rw-r--r-- 1 root root 870524 2018-06-16 20:38 ./slackware64/d/kernel-headers-4.14.50-x86-1.txz
+-rw-r--r-- 1 root root 163 2018-06-16 20:38 ./slackware64/d/kernel-headers-4.14.50-x86-1.txz.asc
-rw-r--r-- 1 root root 498 2018-04-13 13:53 ./slackware64/d/libtool-2.4.6-x86_64-7.txt
-rw-r--r-- 1 root root 428268 2018-04-13 13:53 ./slackware64/d/libtool-2.4.6-x86_64-7.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:53 ./slackware64/d/libtool-2.4.6-x86_64-7.txz.asc
@@ -1485,36 +1485,36 @@ drwxr-xr-x 2 root root 12288 2018-06-16 06:06 ./slackware64/d
-rw-r--r-- 1 root root 469 2018-04-13 13:56 ./slackware64/d/patchelf-0.9-x86_64-2.txt
-rw-r--r-- 1 root root 50888 2018-04-13 13:56 ./slackware64/d/patchelf-0.9-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:56 ./slackware64/d/patchelf-0.9-x86_64-2.txz.asc
--rw-r--r-- 1 root root 543 2018-06-05 04:06 ./slackware64/d/perl-5.26.2-x86_64-4.txt
--rw-r--r-- 1 root root 15351532 2018-06-05 04:06 ./slackware64/d/perl-5.26.2-x86_64-4.txz
--rw-r--r-- 1 root root 163 2018-06-05 04:06 ./slackware64/d/perl-5.26.2-x86_64-4.txz.asc
+-rw-r--r-- 1 root root 543 2018-06-18 03:45 ./slackware64/d/perl-5.26.2-x86_64-5.txt
+-rw-r--r-- 1 root root 15330868 2018-06-18 03:45 ./slackware64/d/perl-5.26.2-x86_64-5.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:45 ./slackware64/d/perl-5.26.2-x86_64-5.txz.asc
-rw-r--r-- 1 root root 444 2018-04-13 14:04 ./slackware64/d/pkg-config-0.29.2-x86_64-2.txt
-rw-r--r-- 1 root root 55572 2018-04-13 14:04 ./slackware64/d/pkg-config-0.29.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:04 ./slackware64/d/pkg-config-0.29.2-x86_64-2.txz.asc
-rw-r--r-- 1 root root 337 2018-04-13 14:04 ./slackware64/d/pmake-1.111-x86_64-5.txt
-rw-r--r-- 1 root root 120924 2018-04-13 14:04 ./slackware64/d/pmake-1.111-x86_64-5.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:04 ./slackware64/d/pmake-1.111-x86_64-5.txz.asc
--rw-r--r-- 1 root root 436 2018-05-08 04:12 ./slackware64/d/python-2.7.15-x86_64-2.txt
--rw-r--r-- 1 root root 12860188 2018-05-08 04:12 ./slackware64/d/python-2.7.15-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-05-08 04:12 ./slackware64/d/python-2.7.15-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 436 2018-06-18 04:00 ./slackware64/d/python-2.7.15-x86_64-3.txt
+-rw-r--r-- 1 root root 12897664 2018-06-18 04:00 ./slackware64/d/python-2.7.15-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-18 04:00 ./slackware64/d/python-2.7.15-x86_64-3.txz.asc
-rw-r--r-- 1 root root 270 2018-04-23 22:12 ./slackware64/d/python-pip-10.0.1-x86_64-1.txt
-rw-r--r-- 1 root root 2070188 2018-04-23 22:12 ./slackware64/d/python-pip-10.0.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-04-23 22:12 ./slackware64/d/python-pip-10.0.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 562 2018-04-13 14:04 ./slackware64/d/python-setuptools-39.0.1-x86_64-2.txt
-rw-r--r-- 1 root root 656192 2018-04-13 14:04 ./slackware64/d/python-setuptools-39.0.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:04 ./slackware64/d/python-setuptools-39.0.1-x86_64-2.txz.asc
--rw-r--r-- 1 root root 663 2018-05-08 04:11 ./slackware64/d/python3-3.6.5-x86_64-3.txt
--rw-r--r-- 1 root root 13815964 2018-05-08 04:11 ./slackware64/d/python3-3.6.5-x86_64-3.txz
--rw-r--r-- 1 root root 163 2018-05-08 04:11 ./slackware64/d/python3-3.6.5-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 663 2018-06-18 04:03 ./slackware64/d/python3-3.6.5-x86_64-4.txt
+-rw-r--r-- 1 root root 13839824 2018-06-18 04:03 ./slackware64/d/python3-3.6.5-x86_64-4.txz
+-rw-r--r-- 1 root root 163 2018-06-18 04:03 ./slackware64/d/python3-3.6.5-x86_64-4.txz.asc
-rw-r--r-- 1 root root 321 2018-04-13 14:06 ./slackware64/d/rcs-5.9.4-x86_64-2.txt
-rw-r--r-- 1 root root 202908 2018-04-13 14:06 ./slackware64/d/rcs-5.9.4-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:06 ./slackware64/d/rcs-5.9.4-x86_64-2.txz.asc
-rw-r--r-- 1 root root 505 2018-04-13 14:06 ./slackware64/d/re2c-1.0.3-x86_64-2.txt
-rw-r--r-- 1 root root 202784 2018-04-13 14:06 ./slackware64/d/re2c-1.0.3-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:06 ./slackware64/d/re2c-1.0.3-x86_64-2.txz.asc
--rw-r--r-- 1 root root 408 2018-05-08 04:12 ./slackware64/d/ruby-2.5.1-x86_64-3.txt
--rw-r--r-- 1 root root 5385340 2018-05-08 04:12 ./slackware64/d/ruby-2.5.1-x86_64-3.txz
--rw-r--r-- 1 root root 163 2018-05-08 04:12 ./slackware64/d/ruby-2.5.1-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 408 2018-06-18 04:08 ./slackware64/d/ruby-2.5.1-x86_64-4.txt
+-rw-r--r-- 1 root root 5394548 2018-06-18 04:08 ./slackware64/d/ruby-2.5.1-x86_64-4.txz
+-rw-r--r-- 1 root root 163 2018-06-18 04:08 ./slackware64/d/ruby-2.5.1-x86_64-4.txz.asc
-rw-r--r-- 1 root root 426 2018-06-06 03:22 ./slackware64/d/rust-1.26.2-x86_64-1.txt
-rw-r--r-- 1 root root 74407640 2018-06-06 03:22 ./slackware64/d/rust-1.26.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-06 03:22 ./slackware64/d/rust-1.26.2-x86_64-1.txz.asc
@@ -1558,16 +1558,16 @@ drwxr-xr-x 2 root root 4096 2016-04-01 21:41 ./slackware64/f
-rw-r--r-- 1 root root 1075 2018-03-01 07:54 ./slackware64/f/maketag
-rw-r--r-- 1 root root 1075 2018-03-01 07:54 ./slackware64/f/maketag.ez
-rw-r--r-- 1 root root 32 2018-03-01 07:54 ./slackware64/f/tagfile
-drwxr-xr-x 2 root root 4096 2018-06-12 05:26 ./slackware64/k
+drwxr-xr-x 2 root root 4096 2018-06-18 06:26 ./slackware64/k
-rwxr-xr-x 1 root root 2897 2009-06-24 22:06 ./slackware64/k/install-packages
-rw-r--r-- 1 root root 446 2006-09-18 10:41 ./slackware64/k/install.end
--rw-r--r-- 1 root root 317 2018-06-12 03:25 ./slackware64/k/kernel-source-4.14.49-noarch-1.txt
--rw-r--r-- 1 root root 102048076 2018-06-12 03:25 ./slackware64/k/kernel-source-4.14.49-noarch-1.txz
--rw-r--r-- 1 root root 163 2018-06-12 03:25 ./slackware64/k/kernel-source-4.14.49-noarch-1.txz.asc
--rw-r--r-- 1 root root 1171 2018-06-12 04:26 ./slackware64/k/maketag
--rw-r--r-- 1 root root 1171 2018-06-12 04:26 ./slackware64/k/maketag.ez
--rw-r--r-- 1 root root 18 2018-06-12 04:26 ./slackware64/k/tagfile
-drwxr-xr-x 2 root root 45056 2018-06-03 05:20 ./slackware64/kde
+-rw-r--r-- 1 root root 317 2018-06-16 20:15 ./slackware64/k/kernel-source-4.14.50-noarch-1.txt
+-rw-r--r-- 1 root root 102056784 2018-06-16 20:15 ./slackware64/k/kernel-source-4.14.50-noarch-1.txz
+-rw-r--r-- 1 root root 163 2018-06-16 20:15 ./slackware64/k/kernel-source-4.14.50-noarch-1.txz.asc
+-rw-r--r-- 1 root root 1171 2018-06-18 05:56 ./slackware64/k/maketag
+-rw-r--r-- 1 root root 1171 2018-06-18 05:56 ./slackware64/k/maketag.ez
+-rw-r--r-- 1 root root 18 2018-06-18 05:56 ./slackware64/k/tagfile
+drwxr-xr-x 2 root root 45056 2018-06-18 06:26 ./slackware64/kde
-rw-r--r-- 1 root root 319 2018-06-02 22:05 ./slackware64/kde/amarok-2.9.0-x86_64-3.txt
-rw-r--r-- 1 root root 47003780 2018-06-02 22:05 ./slackware64/kde/amarok-2.9.0-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-06-02 22:05 ./slackware64/kde/amarok-2.9.0-x86_64-3.txz.asc
@@ -1738,9 +1738,9 @@ drwxr-xr-x 2 root root 45056 2018-06-03 05:20 ./slackware64/kde
-rw-r--r-- 1 root root 452 2018-04-17 10:20 ./slackware64/kde/kdegraphics-thumbnailers-4.14.3-x86_64-3.txt
-rw-r--r-- 1 root root 38232 2018-04-17 10:20 ./slackware64/kde/kdegraphics-thumbnailers-4.14.3-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-17 10:20 ./slackware64/kde/kdegraphics-thumbnailers-4.14.3-x86_64-3.txz.asc
--rw-r--r-- 1 root root 191 2018-04-17 10:53 ./slackware64/kde/kdelibs-4.14.38-x86_64-2.txt
--rw-r--r-- 1 root root 12800268 2018-04-17 10:53 ./slackware64/kde/kdelibs-4.14.38-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-17 10:53 ./slackware64/kde/kdelibs-4.14.38-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 191 2018-06-18 02:55 ./slackware64/kde/kdelibs-4.14.38-x86_64-3.txt
+-rw-r--r-- 1 root root 12813280 2018-06-18 02:55 ./slackware64/kde/kdelibs-4.14.38-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-18 02:55 ./slackware64/kde/kdelibs-4.14.38-x86_64-3.txz.asc
-rw-r--r-- 1 root root 410 2018-04-17 10:57 ./slackware64/kde/kdenetwork-filesharing-4.14.3-x86_64-3.txt
-rw-r--r-- 1 root root 38376 2018-04-17 10:57 ./slackware64/kde/kdenetwork-filesharing-4.14.3-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-17 10:57 ./slackware64/kde/kdenetwork-filesharing-4.14.3-x86_64-3.txz.asc
@@ -2407,7 +2407,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei
-rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag
-rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez
-rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile
-drwxr-xr-x 2 root root 69632 2018-06-15 00:14 ./slackware64/l
+drwxr-xr-x 2 root root 69632 2018-06-18 06:26 ./slackware64/l
-rw-r--r-- 1 root root 338 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txt
-rw-r--r-- 1 root root 149752 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz.asc
@@ -2600,9 +2600,9 @@ drwxr-xr-x 2 root root 69632 2018-06-15 00:14 ./slackware64/l
-rw-r--r-- 1 root root 499 2018-04-17 18:32 ./slackware64/l/gd-2.2.5-x86_64-1.txt
-rw-r--r-- 1 root root 151504 2018-04-17 18:32 ./slackware64/l/gd-2.2.5-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-04-17 18:32 ./slackware64/l/gd-2.2.5-x86_64-1.txz.asc
--rw-r--r-- 1 root root 186 2018-04-13 14:36 ./slackware64/l/gdbm-1.13-x86_64-2.txt
--rw-r--r-- 1 root root 182464 2018-04-13 14:36 ./slackware64/l/gdbm-1.13-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-13 14:36 ./slackware64/l/gdbm-1.13-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 186 2018-06-18 03:02 ./slackware64/l/gdbm-1.15-x86_64-1.txt
+-rw-r--r-- 1 root root 188032 2018-06-18 03:02 ./slackware64/l/gdbm-1.15-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:02 ./slackware64/l/gdbm-1.15-x86_64-1.txz.asc
-rw-r--r-- 1 root root 537 2018-04-13 14:37 ./slackware64/l/gdk-pixbuf2-2.36.12-x86_64-2.txt
-rw-r--r-- 1 root root 661532 2018-04-13 14:37 ./slackware64/l/gdk-pixbuf2-2.36.12-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:37 ./slackware64/l/gdk-pixbuf2-2.36.12-x86_64-2.txz.asc
@@ -3355,7 +3355,7 @@ drwxr-xr-x 2 root root 69632 2018-06-15 00:14 ./slackware64/l
-rw-r--r-- 1 root root 388 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txt
-rw-r--r-- 1 root root 103500 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 32768 2018-06-16 06:06 ./slackware64/n
+drwxr-xr-x 2 root root 32768 2018-06-18 06:26 ./slackware64/n
-rw-r--r-- 1 root root 368 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txt
-rw-r--r-- 1 root root 1510328 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txz.asc
@@ -3404,9 +3404,9 @@ drwxr-xr-x 2 root root 32768 2018-06-16 06:06 ./slackware64/n
-rw-r--r-- 1 root root 553 2018-05-16 20:23 ./slackware64/n/curl-7.60.0-x86_64-1.txt
-rw-r--r-- 1 root root 1231576 2018-05-16 20:23 ./slackware64/n/curl-7.60.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-05-16 20:23 ./slackware64/n/curl-7.60.0-x86_64-1.txz.asc
--rw-r--r-- 1 root root 373 2018-05-08 04:14 ./slackware64/n/cyrus-sasl-2.1.27_rc7-x86_64-1.txt
--rw-r--r-- 1 root root 992636 2018-05-08 04:14 ./slackware64/n/cyrus-sasl-2.1.27_rc7-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-05-08 04:14 ./slackware64/n/cyrus-sasl-2.1.27_rc7-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 373 2018-06-18 03:25 ./slackware64/n/cyrus-sasl-2.1.27_rc8-x86_64-1.txt
+-rw-r--r-- 1 root root 955848 2018-06-18 03:25 ./slackware64/n/cyrus-sasl-2.1.27_rc8-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:25 ./slackware64/n/cyrus-sasl-2.1.27_rc8-x86_64-1.txz.asc
-rw-r--r-- 1 root root 641 2018-04-13 15:35 ./slackware64/n/dhcp-4.4.1-x86_64-2.txt
-rw-r--r-- 1 root root 1787784 2018-04-13 15:35 ./slackware64/n/dhcp-4.4.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:35 ./slackware64/n/dhcp-4.4.1-x86_64-2.txz.asc
@@ -3576,9 +3576,9 @@ drwxr-xr-x 2 root root 32768 2018-06-16 06:06 ./slackware64/n
-rw-r--r-- 1 root root 325 2018-04-13 15:41 ./slackware64/n/mtr-0.92-x86_64-2.txt
-rw-r--r-- 1 root root 66640 2018-04-13 15:41 ./slackware64/n/mtr-0.92-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:41 ./slackware64/n/mtr-0.92-x86_64-2.txz.asc
--rw-r--r-- 1 root root 448 2018-05-22 03:44 ./slackware64/n/mutt-1.10.0-x86_64-1.txt
--rw-r--r-- 1 root root 1045384 2018-05-22 03:44 ./slackware64/n/mutt-1.10.0-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-05-22 03:44 ./slackware64/n/mutt-1.10.0-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 448 2018-06-18 03:34 ./slackware64/n/mutt-1.10.0-x86_64-2.txt
+-rw-r--r-- 1 root root 1045572 2018-06-18 03:34 ./slackware64/n/mutt-1.10.0-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:34 ./slackware64/n/mutt-1.10.0-x86_64-2.txz.asc
-rw-r--r-- 1 root root 627 2018-04-13 15:41 ./slackware64/n/nc-1.10-x86_64-2.txt
-rw-r--r-- 1 root root 53492 2018-04-13 15:41 ./slackware64/n/nc-1.10-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:41 ./slackware64/n/nc-1.10-x86_64-2.txz.asc
@@ -3690,9 +3690,9 @@ drwxr-xr-x 2 root root 32768 2018-06-16 06:06 ./slackware64/n
-rw-r--r-- 1 root root 485 2018-06-02 17:02 ./slackware64/n/p11-kit-0.23.12-x86_64-1.txt
-rw-r--r-- 1 root root 442196 2018-06-02 17:02 ./slackware64/n/p11-kit-0.23.12-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-02 17:02 ./slackware64/n/p11-kit-0.23.12-x86_64-1.txz.asc
--rw-r--r-- 1 root root 374 2018-05-25 18:31 ./slackware64/n/php-7.2.6-x86_64-1.txt
--rw-r--r-- 1 root root 6342720 2018-05-25 18:31 ./slackware64/n/php-7.2.6-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-05-25 18:31 ./slackware64/n/php-7.2.6-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 374 2018-06-18 03:55 ./slackware64/n/php-7.2.6-x86_64-2.txt
+-rw-r--r-- 1 root root 6337252 2018-06-18 03:55 ./slackware64/n/php-7.2.6-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:55 ./slackware64/n/php-7.2.6-x86_64-2.txz.asc
-rw-r--r-- 1 root root 576 2018-05-08 04:25 ./slackware64/n/pidentd-3.0.19-x86_64-4.txt
-rw-r--r-- 1 root root 43000 2018-05-08 04:25 ./slackware64/n/pidentd-3.0.19-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-05-08 04:25 ./slackware64/n/pidentd-3.0.19-x86_64-4.txz.asc
@@ -3787,9 +3787,9 @@ drwxr-xr-x 2 root root 32768 2018-06-16 06:06 ./slackware64/n
-rw-r--r-- 1 root root 601 2018-05-10 13:06 ./slackware64/n/wpa_supplicant-2.6-x86_64-6.txt
-rw-r--r-- 1 root root 1089212 2018-05-10 13:06 ./slackware64/n/wpa_supplicant-2.6-x86_64-6.txz
-rw-r--r-- 1 root root 163 2018-05-10 13:06 ./slackware64/n/wpa_supplicant-2.6-x86_64-6.txz.asc
--rw-r--r-- 1 root root 406 2018-04-13 15:57 ./slackware64/n/yptools-2.14-x86_64-10.txt
--rw-r--r-- 1 root root 189940 2018-04-13 15:57 ./slackware64/n/yptools-2.14-x86_64-10.txz
--rw-r--r-- 1 root root 163 2018-04-13 15:57 ./slackware64/n/yptools-2.14-x86_64-10.txz.asc
+-rw-r--r-- 1 root root 406 2018-06-18 04:09 ./slackware64/n/yptools-2.14-x86_64-11.txt
+-rw-r--r-- 1 root root 189104 2018-06-18 04:09 ./slackware64/n/yptools-2.14-x86_64-11.txz
+-rw-r--r-- 1 root root 163 2018-06-18 04:09 ./slackware64/n/yptools-2.14-x86_64-11.txz.asc
-rw-r--r-- 1 root root 288 2018-04-13 15:57 ./slackware64/n/ytalk-3.3.0-x86_64-4.txt
-rw-r--r-- 1 root root 50624 2018-04-13 15:57 ./slackware64/n/ytalk-3.3.0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:57 ./slackware64/n/ytalk-3.3.0-x86_64-4.txz.asc
@@ -4693,7 +4693,7 @@ drwxr-xr-x 2 root root 65536 2018-06-16 06:06 ./slackware64/x
-rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt
-rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 12288 2018-06-08 20:58 ./slackware64/xap
+drwxr-xr-x 2 root root 12288 2018-06-18 06:26 ./slackware64/xap
-rw-r--r-- 1 root root 625 2018-04-13 16:15 ./slackware64/xap/MPlayer-20180208-x86_64-3.txt
-rw-r--r-- 1 root root 2774576 2018-04-13 16:15 ./slackware64/xap/MPlayer-20180208-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 16:15 ./slackware64/xap/MPlayer-20180208-x86_64-3.txz.asc
@@ -4736,9 +4736,9 @@ drwxr-xr-x 2 root root 12288 2018-06-08 20:58 ./slackware64/xap
-rw-r--r-- 1 root root 513 2018-05-08 04:30 ./slackware64/xap/gkrellm-2.3.10-x86_64-4.txt
-rw-r--r-- 1 root root 565084 2018-05-08 04:30 ./slackware64/xap/gkrellm-2.3.10-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-05-08 04:30 ./slackware64/xap/gkrellm-2.3.10-x86_64-4.txz.asc
--rw-r--r-- 1 root root 336 2018-04-13 16:22 ./slackware64/xap/gnuchess-6.2.5-x86_64-2.txt
--rw-r--r-- 1 root root 1686620 2018-04-13 16:22 ./slackware64/xap/gnuchess-6.2.5-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-13 16:22 ./slackware64/xap/gnuchess-6.2.5-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 336 2018-06-18 03:28 ./slackware64/xap/gnuchess-6.2.5-x86_64-3.txt
+-rw-r--r-- 1 root root 1686936 2018-06-18 03:28 ./slackware64/xap/gnuchess-6.2.5-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-18 03:28 ./slackware64/xap/gnuchess-6.2.5-x86_64-3.txz.asc
-rw-r--r-- 1 root root 644 2018-06-05 04:27 ./slackware64/xap/gnuplot-5.2.4-x86_64-1.txt
-rw-r--r-- 1 root root 1405612 2018-06-05 04:27 ./slackware64/xap/gnuplot-5.2.4-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-05 04:27 ./slackware64/xap/gnuplot-5.2.4-x86_64-1.txz.asc
@@ -4933,11 +4933,11 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x 19 root root 4096 2018-06-16 06:10 ./source
--rw-r--r-- 1 root root 452745 2018-06-16 06:10 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-16 06:10 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 640875 2018-06-16 06:09 ./source/FILE_LIST
--rw-r--r-- 1 root root 14768550 2018-06-16 06:09 ./source/MANIFEST.bz2
+drwxr-xr-x 19 root root 4096 2018-06-18 06:30 ./source
+-rw-r--r-- 1 root root 452825 2018-06-18 06:30 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-18 06:30 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 640973 2018-06-18 06:30 ./source/FILE_LIST
+-rw-r--r-- 1 root root 14766475 2018-06-18 06:30 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 110 root root 4096 2018-06-14 19:02 ./source/a
-rw-r--r-- 1 root root 567 2018-03-13 18:43 ./source/a/FTBFSlog
@@ -4949,10 +4949,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/aaa_base
-rw-r--r-- 1 root root 783 2018-02-27 06:13 ./source/a/aaa_base/slack-desc
-rw-r--r-- 1 root root 15 2015-12-28 19:27 ./source/a/aaa_base/slackware-version
drwxr-xr-x 2 root root 4096 2018-05-06 19:33 ./source/a/aaa_elflibs
--rwxr-xr-x 1 root root 4268 2018-05-18 17:47 ./source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+-rwxr-xr-x 1 root root 4267 2018-06-18 03:22 ./source/a/aaa_elflibs/aaa_elflibs.SlackBuild
-rwxr-xr-x 1 root root 1630 2015-04-20 04:39 ./source/a/aaa_elflibs/display_orphans.sh
-rw-r--r-- 1 root root 930 2018-02-27 06:13 ./source/a/aaa_elflibs/slack-desc
--rw-r--r-- 1 root root 1763 2018-05-18 17:47 ./source/a/aaa_elflibs/symlinks-to-tracked-libs
+-rw-r--r-- 1 root root 1785 2018-06-18 03:21 ./source/a/aaa_elflibs/symlinks-to-tracked-libs
-rw-r--r-- 1 root root 223 2018-04-13 00:04 ./source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
-rw-r--r-- 1 root root 288 2015-08-29 17:08 ./source/a/aaa_elflibs/tracked-files
-rw-r--r-- 1 root root 213 2015-04-20 04:40 ./source/a/aaa_elflibs/tracked-files-tmp
@@ -5158,10 +5158,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/elvis
-rw-r--r-- 1 root root 1584 2003-10-21 02:32 ./source/a/elvis/elvis.clr.orig
-rw-r--r-- 1 root root 673 2010-01-27 18:31 ./source/a/elvis/elvis.ref.c.getline.diff.gz
-rw-r--r-- 1 root root 840 2018-02-27 06:13 ./source/a/elvis/slack-desc
-drwxr-xr-x 2 root root 4096 2018-06-13 20:12 ./source/a/etc
--rw-r--r-- 1 root root 28879 2018-06-13 18:49 ./source/a/etc/_etc.tar.gz
--rw-r--r-- 1 root root 1090 2018-06-13 20:12 ./source/a/etc/doinst.sh.gz
--rwxr-xr-x 1 root root 3109 2018-06-13 20:06 ./source/a/etc/etc.SlackBuild
+drwxr-xr-x 2 root root 4096 2018-06-17 18:00 ./source/a/etc
+-rw-r--r-- 1 root root 29016 2018-06-16 18:05 ./source/a/etc/_etc.tar.gz
+-rw-r--r-- 1 root root 1090 2018-06-17 17:36 ./source/a/etc/doinst.sh.gz
+-rwxr-xr-x 1 root root 3109 2018-06-16 18:02 ./source/a/etc/etc.SlackBuild
-rw-r--r-- 1 root root 763 2018-03-27 21:09 ./source/a/etc/group.new
-rw-r--r-- 1 root root 536 2002-10-11 20:17 ./source/a/etc/nsswitch.conf.gz
-rw-r--r-- 1 root root 1476 2018-03-27 21:08 ./source/a/etc/passwd.new
@@ -6116,7 +6116,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/man-db
-rw-r--r-- 1 root root 57 2018-02-07 01:17 ./source/ap/man-db/libpipeline.url
-rw-r--r-- 1 root root 1624280 2018-04-05 12:31 ./source/ap/man-db/man-db-2.8.3.tar.xz
-rw-r--r-- 1 root root 833 2018-04-05 12:31 ./source/ap/man-db/man-db-2.8.3.tar.xz.asc
--rwxr-xr-x 1 root root 8600 2018-04-23 17:20 ./source/ap/man-db/man-db.SlackBuild
+-rwxr-xr-x 1 root root 8600 2018-06-18 03:29 ./source/ap/man-db/man-db.SlackBuild
-rw-r--r-- 1 root root 431 2018-02-13 18:26 ./source/ap/man-db/man-db.cron
-rw-r--r-- 1 root root 52 2018-02-07 01:17 ./source/ap/man-db/man-db.url
-rw-r--r-- 1 root root 66 2018-01-15 06:08 ./source/ap/man-db/man2html.url
@@ -6368,9 +6368,9 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/zsh
-rw-r--r-- 1 root root 473 2018-04-16 18:33 ./source/ap/zsh/zsh-5.5.1-doc.tar.xz.asc
-rw-r--r-- 1 root root 3052832 2018-04-16 18:32 ./source/ap/zsh/zsh-5.5.1.tar.xz
-rw-r--r-- 1 root root 473 2018-04-16 18:32 ./source/ap/zsh/zsh-5.5.1.tar.xz.asc
--rwxr-xr-x 1 root root 4323 2018-04-23 17:20 ./source/ap/zsh/zsh.SlackBuild
+-rwxr-xr-x 1 root root 4323 2018-06-18 04:09 ./source/ap/zsh/zsh.SlackBuild
-rwxr-xr-x 1 root root 11921 2018-04-23 19:29 ./source/buildlist-from-changelog.sh
-drwxr-xr-x 55 root root 4096 2018-05-30 17:22 ./source/d
+drwxr-xr-x 55 root root 4096 2018-06-18 03:03 ./source/d
drwxr-xr-x 2 root root 4096 2018-05-22 18:27 ./source/d/Cython
-rw-r--r-- 1 root root 1440382 2018-04-13 05:34 ./source/d/Cython/Cython-0.28.2.tar.lz
-rwxr-xr-x 1 root root 2740 2018-05-22 18:27 ./source/d/Cython/Cython.SlackBuild
@@ -6414,13 +6414,13 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/d/ccache
-rw-r--r-- 1 root root 819 2018-03-25 20:27 ./source/d/ccache/ccache-3.4.2.tar.xz.asc
-rwxr-xr-x 1 root root 3256 2018-04-23 17:20 ./source/d/ccache/ccache.SlackBuild
-rw-r--r-- 1 root root 804 2018-02-27 06:13 ./source/d/ccache/slack-desc
-drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/d/clisp
--rw-r--r-- 1 root root 6686318 2018-04-13 18:23 ./source/d/clisp/clisp-2.49.20180409.0e4d38776f59.tar.lz
+drwxr-xr-x 2 root root 4096 2018-06-17 19:37 ./source/d/clisp
+-rw-r--r-- 1 root root 6766128 2018-06-17 19:36 ./source/d/clisp/clisp-2.49_20180423_d1310adc5.tar.xz
-rwxr-xr-x 1 root root 5356 2018-04-23 17:20 ./source/d/clisp/clisp.SlackBuild
-rw-r--r-- 1 root root 342 2018-02-04 22:09 ./source/d/clisp/clisp.c_data.compact_empty_buckets.diff.gz
-rw-r--r-- 1 root root 496777 2018-02-17 12:34 ./source/d/clisp/libffcall-2.1.tar.lz
-rw-r--r-- 1 root root 1116 2018-02-27 06:13 ./source/d/clisp/slack-desc
--rwxr-xr-x 1 root root 663 2018-02-04 19:36 ./source/d/clisp/source.download
+-rwxr-xr-x 1 root root 1890 2018-06-17 19:34 ./source/d/clisp/source.download
drwxr-xr-x 2 root root 4096 2018-06-16 05:01 ./source/d/cmake
-rw-r--r-- 1 root root 5414638 2018-06-14 17:50 ./source/d/cmake/cmake-3.11.4.tar.lz
-rwxr-xr-x 1 root root 4455 2018-04-23 17:20 ./source/d/cmake/cmake.SlackBuild
@@ -6619,7 +6619,7 @@ drwxr-xr-x 2 root root 4096 2018-06-05 03:37 ./source/d/perl
-rw-r--r-- 1 root root 844 2017-01-14 23:40 ./source/d/perl/libnet-3.08-Do-not-create-Net-libnet.cfg.patch.gz
-rw-r--r-- 1 root root 95157 2017-11-14 14:00 ./source/d/perl/libnet-3.11.tar.gz
-rw-r--r-- 1 root root 11634131 2018-04-14 11:27 ./source/d/perl/perl-5.26.2.tar.lz
--rwxr-xr-x 1 root root 13723 2018-06-05 03:56 ./source/d/perl/perl.SlackBuild
+-rwxr-xr-x 1 root root 13723 2018-06-18 03:35 ./source/d/perl/perl.SlackBuild
-rw-r--r-- 1 root root 606 2008-09-21 00:04 ./source/d/perl/perl.configure.multilib.patch.gz
-rw-r--r-- 1 root root 995 2018-02-27 06:13 ./source/d/perl/slack-desc
drwxr-xr-x 3 root root 4096 2018-04-23 17:20 ./source/d/pkg-config
@@ -6651,7 +6651,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/d/python-setuptools
-rw-r--r-- 1 root root 12642436 2018-04-29 23:20 ./source/d/python/Python-2.7.15.tar.xz
-rw-r--r-- 1 root root 801 2018-04-29 23:20 ./source/d/python/Python-2.7.15.tar.xz.asc
-rw-r--r-- 1 root root 1617467 2018-04-29 23:20 ./source/d/python/python-2.7.15-docs-text.tar.bz2
--rwxr-xr-x 1 root root 5691 2018-05-06 19:33 ./source/d/python/python.SlackBuild
+-rwxr-xr-x 1 root root 5691 2018-06-18 03:56 ./source/d/python/python.SlackBuild
-rw-r--r-- 1 root root 798 2012-05-09 18:38 ./source/d/python/python.no-static-library.diff.gz
-rw-r--r-- 1 root root 325 2009-06-09 19:23 ./source/d/python/python.readline.set_pre_input_hook.diff.gz
-rw-r--r-- 1 root root 1867 2016-12-28 19:19 ./source/d/python/python.x86_64.diff.gz
@@ -6660,7 +6660,7 @@ drwxr-xr-x 2 root root 4096 2018-05-06 19:33 ./source/d/python3
-rw-r--r-- 1 root root 17049912 2018-03-28 10:25 ./source/d/python3/Python-3.6.5.tar.xz
-rw-r--r-- 1 root root 833 2018-03-28 10:28 ./source/d/python3/Python-3.6.5.tar.xz.asc
-rw-r--r-- 1 root root 890 2017-01-12 20:00 ./source/d/python3/README
--rwxr-xr-x 1 root root 5705 2018-05-06 19:33 ./source/d/python3/python3.SlackBuild
+-rwxr-xr-x 1 root root 5705 2018-06-18 04:00 ./source/d/python3/python3.SlackBuild
-rw-r--r-- 1 root root 921 2017-01-12 20:00 ./source/d/python3/python3.no-static-library.diff.gz
-rw-r--r-- 1 root root 369 2014-05-25 17:49 ./source/d/python3/python3.readline.set_pre_input_hook.diff.gz
-rw-r--r-- 1 root root 1824 2017-04-03 19:36 ./source/d/python3/python3.x86_64.diff.gz
@@ -6677,7 +6677,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/d/re2c
-rw-r--r-- 1 root root 989 2018-02-27 06:13 ./source/d/re2c/slack-desc
drwxr-xr-x 2 root root 4096 2018-05-06 19:33 ./source/d/ruby
-rw-r--r-- 1 root root 11007709 2018-03-28 18:19 ./source/d/ruby/ruby-2.5.1.tar.lz
--rwxr-xr-x 1 root root 4776 2018-05-06 19:33 ./source/d/ruby/ruby.SlackBuild
+-rwxr-xr-x 1 root root 4776 2018-06-18 04:04 ./source/d/ruby/ruby.SlackBuild
-rw-r--r-- 1 root root 860 2018-02-27 06:13 ./source/d/ruby/slack-desc
drwxr-xr-x 2 root root 4096 2018-06-06 05:49 ./source/d/rust
-rw-r--r-- 1 root root 300 2017-10-16 20:00 ./source/d/rust/link_libffi.diff.gz
@@ -6757,9 +6757,9 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./source/f
-rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/f/slack-desc.linux-faqs
-rw-r--r-- 1 root root 801 2018-02-27 06:13 ./source/f/slack-desc.linux-howtos
drwxr-xr-x 3 root root 4096 2018-03-18 18:14 ./source/installer
--rw-r--r-- 1 root root 27988 2018-06-14 01:17 ./source/installer/ChangeLog.txt
+-rw-r--r-- 1 root root 28181 2018-06-18 04:14 ./source/installer/ChangeLog.txt
-rw-r--r-- 1 root root 6849 2018-03-11 00:53 ./source/installer/README
--rwxr-xr-x 1 root root 70854 2018-06-14 01:16 ./source/installer/build_installer.sh
+-rwxr-xr-x 1 root root 70873 2018-06-18 04:13 ./source/installer/build_installer.sh
-rwxr-xr-x 1 root root 2244 2018-03-18 19:14 ./source/installer/installer.SlackBuild
-rw-r--r-- 1 root root 1391 2013-04-01 21:47 ./source/installer/module-blacklist
drwxr-xr-x 7 root root 4096 2018-03-12 07:06 ./source/installer/sources
@@ -6792,21 +6792,21 @@ drwxr-xr-x 2 root root 4096 2018-03-11 02:36 ./source/installer/sources/e
drwxr-xr-x 2 root root 4096 2018-06-06 20:30 ./source/installer/sources/initrd
-rw-r--r-- 1 root root 142812 2018-06-06 20:30 ./source/installer/sources/initrd/skeleton_initrd.tar.gz
-rw-r--r-- 1 root root 16894 2012-09-03 20:53 ./source/installer/usbimg2disk.sh
-drwxr-xr-x 4 root root 4096 2018-06-11 23:18 ./source/k
+drwxr-xr-x 4 root root 4096 2018-06-16 17:50 ./source/k
-rwxr-xr-x 1 root root 7342 2018-03-15 18:04 ./source/k/build-all-kernels.sh
-drwxr-xr-x 2 root root 4096 2018-06-12 00:59 ./source/k/kernel-configs
--rw-r--r-- 1 root root 180792 2018-06-12 00:55 ./source/k/kernel-configs/config-generic-4.14.49
--rw-r--r-- 1 root root 180740 2018-06-12 00:59 ./source/k/kernel-configs/config-generic-4.14.49.x64
--rw-r--r-- 1 root root 182136 2018-06-12 00:55 ./source/k/kernel-configs/config-generic-smp-4.14.49-smp
--rw-r--r-- 1 root root 180792 2018-06-12 00:55 ./source/k/kernel-configs/config-huge-4.14.49
--rw-r--r-- 1 root root 180740 2018-06-12 00:58 ./source/k/kernel-configs/config-huge-4.14.49.x64
--rw-r--r-- 1 root root 182136 2018-06-12 00:55 ./source/k/kernel-configs/config-huge-smp-4.14.49-smp
+drwxr-xr-x 2 root root 4096 2018-06-16 17:58 ./source/k/kernel-configs
+-rw-r--r-- 1 root root 180792 2018-06-16 17:53 ./source/k/kernel-configs/config-generic-4.14.50
+-rw-r--r-- 1 root root 180740 2018-06-16 17:58 ./source/k/kernel-configs/config-generic-4.14.50.x64
+-rw-r--r-- 1 root root 182136 2018-06-16 17:53 ./source/k/kernel-configs/config-generic-smp-4.14.50-smp
+-rw-r--r-- 1 root root 180792 2018-06-16 17:53 ./source/k/kernel-configs/config-huge-4.14.50
+-rw-r--r-- 1 root root 180740 2018-06-16 17:58 ./source/k/kernel-configs/config-huge-4.14.50.x64
+-rw-r--r-- 1 root root 182136 2018-06-16 17:53 ./source/k/kernel-configs/config-huge-smp-4.14.50-smp
-rwxr-xr-x 1 root root 7149 2018-03-26 04:29 ./source/k/kernel-generic.SlackBuild
-rwxr-xr-x 1 root root 3779 2018-03-15 06:02 ./source/k/kernel-headers.SlackBuild
-rwxr-xr-x 1 root root 5604 2018-03-15 06:02 ./source/k/kernel-modules.SlackBuild
-rwxr-xr-x 1 root root 7881 2018-04-12 22:05 ./source/k/kernel-source.SlackBuild
--rw-r--r-- 1 root root 833 2018-06-11 20:59 ./source/k/linux-4.14.49.tar.sign
--rw-r--r-- 1 root root 100928468 2018-06-11 20:59 ./source/k/linux-4.14.49.tar.xz
+-rw-r--r-- 1 root root 833 2018-06-16 07:49 ./source/k/linux-4.14.50.tar.sign
+-rw-r--r-- 1 root root 100914360 2018-06-16 07:49 ./source/k/linux-4.14.50.tar.xz
drwxr-xr-x 2 root root 4096 2018-03-05 18:29 ./source/k/slack-desc
-rw-r--r-- 1 root root 1138 2018-02-27 06:16 ./source/k/slack-desc/slack-desc.kernel-generic-smp.i686
-rw-r--r-- 1 root root 1041 2018-02-27 06:16 ./source/k/slack-desc/slack-desc.kernel-generic.i586
@@ -6819,8 +6819,8 @@ drwxr-xr-x 2 root root 4096 2018-03-05 18:29 ./source/k/slack-desc
-rw-r--r-- 1 root root 778 2018-02-27 06:16 ./source/k/slack-desc/slack-desc.kernel-source
-rw-r--r-- 1 root root 778 2018-02-27 06:16 ./source/k/slack-desc/slack-desc.kernel-source.vanilla
-rw-r--r-- 1 root root 1000 2018-03-05 08:27 ./source/k/slack-desc/slack-desc.kernel-template
-drwxr-xr-x 14 root root 4096 2018-04-15 21:21 ./source/kde
--rw-r--r-- 1 root root 1025 2018-03-24 17:45 ./source/kde/FTBFSlog
+drwxr-xr-x 14 root root 4096 2018-06-18 02:22 ./source/kde
+-rw-r--r-- 1 root root 1204 2018-06-18 02:50 ./source/kde/FTBFSlog
drwxr-xr-x 2 root root 4096 2018-04-13 02:43 ./source/kde/build
-rw-r--r-- 1 root root 2 2018-06-02 22:02 ./source/kde/build/amarok
-rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/amor
@@ -6879,7 +6879,7 @@ drwxr-xr-x 2 root root 4096 2018-04-13 02:43 ./source/kde/build
-rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/kdegraphics-mobipocket
-rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/kdegraphics-strigi-analyzer
-rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/kdegraphics-thumbnailers
--rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/kdelibs
+-rw-r--r-- 1 root root 2 2018-06-17 17:32 ./source/kde/build/kdelibs
-rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/kdenetwork-filesharing
-rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/kdenetwork-strigi-analyzers
-rw-r--r-- 1 root root 2 2018-04-19 23:13 ./source/kde/build/kdepim
@@ -7186,9 +7186,10 @@ drwxr-xr-x 2 root root 4096 2018-01-30 20:00 ./source/kde/patch/kdeartwor
drwxr-xr-x 2 root root 4096 2015-11-19 23:23 ./source/kde/patch/kdeconnect-kde
-rw-r--r-- 1 root root 153 2015-11-19 23:19 ./source/kde/patch/kdeconnect-kde.patch
-rw-r--r-- 1 root root 470 2015-11-19 23:23 ./source/kde/patch/kdeconnect-kde/kdeconnect-kde.openssh7.diff.gz
-drwxr-xr-x 2 root root 4096 2017-08-23 20:45 ./source/kde/patch/kdelibs
--rw-r--r-- 1 root root 1082 2017-08-23 20:45 ./source/kde/patch/kdelibs.patch
+drwxr-xr-x 2 root root 4096 2018-06-17 17:32 ./source/kde/patch/kdelibs
+-rw-r--r-- 1 root root 1250 2018-06-17 17:33 ./source/kde/patch/kdelibs.patch
-rw-r--r-- 1 root root 916 2013-10-20 23:21 ./source/kde/patch/kdelibs/coding-style-fixes.patch.gz
+-rw-r--r-- 1 root root 22009 2018-06-17 17:31 ./source/kde/patch/kdelibs/kdelibs-openssl-1.1.patch.gz
-rw-r--r-- 1 root root 361 2010-06-07 15:19 ./source/kde/patch/kdelibs/kdelibs.docbook.patch.gz
-rw-r--r-- 1 root root 347 2012-01-26 08:18 ./source/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz
-rw-r--r-- 1 root root 955 2013-10-20 23:22 ./source/kde/patch/kdelibs/return-application-icons-properly.patch.gz
@@ -8289,9 +8290,9 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/gd
-rwxr-xr-x 1 root root 3953 2018-04-23 17:20 ./source/l/gd/gd.SlackBuild
-rw-r--r-- 1 root root 2594092 2017-08-30 12:59 ./source/l/gd/libgd-2.2.5.tar.xz
-rw-r--r-- 1 root root 949 2018-02-27 06:12 ./source/l/gd/slack-desc
-drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/gdbm
--rw-r--r-- 1 root root 588788 2017-03-11 16:44 ./source/l/gdbm/gdbm-1.13.tar.xz
--rwxr-xr-x 1 root root 4319 2018-04-23 17:20 ./source/l/gdbm/gdbm.SlackBuild
+drwxr-xr-x 2 root root 4096 2018-06-18 03:02 ./source/l/gdbm
+-rw-r--r-- 1 root root 599851 2018-06-16 15:54 ./source/l/gdbm/gdbm-1.15.tar.lz
+-rwxr-xr-x 1 root root 4317 2018-06-18 03:02 ./source/l/gdbm/gdbm.SlackBuild
-rw-r--r-- 1 root root 638 2018-02-27 06:12 ./source/l/gdbm/slack-desc
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/gdk-pixbuf2
-rw-r--r-- 1 root root 91 2010-11-16 21:31 ./source/l/gdk-pixbuf2/doinst.sh.gz
@@ -9755,8 +9756,8 @@ drwxr-xr-x 2 root root 4096 2018-05-16 20:21 ./source/n/curl
-rwxr-xr-x 1 root root 4954 2018-05-16 20:22 ./source/n/curl/curl.SlackBuild
-rw-r--r-- 1 root root 30 2018-04-20 16:49 ./source/n/curl/curl.url
-rw-r--r-- 1 root root 1005 2018-02-27 06:13 ./source/n/curl/slack-desc
-drwxr-xr-x 2 root root 4096 2018-05-07 05:42 ./source/n/cyrus-sasl
--rw-r--r-- 1 root root 1627076 2018-01-29 22:38 ./source/n/cyrus-sasl/cyrus-sasl-2.1.27-rc7.tar.lz
+drwxr-xr-x 2 root root 4096 2018-06-18 03:25 ./source/n/cyrus-sasl
+-rw-r--r-- 1 root root 1587249 2018-05-10 19:53 ./source/n/cyrus-sasl/cyrus-sasl-2.1.27-rc8.tar.lz
-rwxr-xr-x 1 root root 4382 2018-05-07 05:45 ./source/n/cyrus-sasl/cyrus-sasl.SlackBuild
-rw-r--r-- 1 root root 36 2018-05-07 05:40 ./source/n/cyrus-sasl/cyrus-sasl.url
-rw-r--r-- 1 root root 275 2005-07-24 22:43 ./source/n/cyrus-sasl/doinst.sh.gz
@@ -10064,7 +10065,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/mtr
drwxr-xr-x 2 root root 4096 2018-05-22 03:42 ./source/n/mutt
-rw-r--r-- 1 root root 264 2002-06-01 05:12 ./source/n/mutt/doinst.sh.gz
-rw-r--r-- 1 root root 2026136 2018-05-19 18:17 ./source/n/mutt/mutt-1.10.0.tar.lz
--rwxr-xr-x 1 root root 4253 2018-05-22 03:42 ./source/n/mutt/mutt.SlackBuild
+-rwxr-xr-x 1 root root 4253 2018-06-18 03:34 ./source/n/mutt/mutt.SlackBuild
-rw-r--r-- 1 root root 900 2018-02-27 06:13 ./source/n/mutt/slack-desc
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/nc
-rw-r--r-- 1 root root 10439 2002-03-14 16:47 ./source/n/nc/nc-110-21.diff.gz
@@ -10360,7 +10361,7 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./source/n/php/pear
-rw-r--r-- 1 root root 12113028 2018-05-24 18:10 ./source/n/php/php-7.2.6.tar.xz
-rw-r--r-- 1 root root 825 2018-05-24 18:10 ./source/n/php/php-7.2.6.tar.xz.asc
-rw-r--r-- 1 root root 387 2017-11-28 02:08 ./source/n/php/php-fpm.conf.diff.gz
--rwxr-xr-x 1 root root 9686 2018-05-25 18:22 ./source/n/php/php.SlackBuild
+-rwxr-xr-x 1 root root 9686 2018-06-18 03:49 ./source/n/php/php.SlackBuild
-rw-r--r-- 1 root root 811 2017-12-02 05:08 ./source/n/php/php.ini-development.diff.gz
-rw-r--r-- 1 root root 825 2018-02-27 06:13 ./source/n/php/slack-desc
drwxr-xr-x 2 root root 4096 2018-05-07 22:05 ./source/n/pidentd
@@ -10633,7 +10634,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/yptools
-rw-r--r-- 1 root root 1062 2017-07-18 19:12 ./source/n/yptools/yp.default
-rw-r--r-- 1 root root 202314 2014-10-20 11:06 ./source/n/yptools/ypbind-mt-1.38.tar.bz2
-rw-r--r-- 1 root root 213974 2014-07-23 11:11 ./source/n/yptools/ypserv-2.32.1.tar.bz2
--rwxr-xr-x 1 root root 10347 2018-04-23 17:20 ./source/n/yptools/yptools.SlackBuild
+-rwxr-xr-x 1 root root 10347 2018-06-18 04:08 ./source/n/yptools/yptools.SlackBuild
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/ytalk
-rw-r--r-- 1 root root 269 2006-02-03 23:28 ./source/n/ytalk/doinst.sh.gz
-rw-r--r-- 1 root root 741 2018-02-27 06:13 ./source/n/ytalk/slack-desc
@@ -12128,7 +12129,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xap/gnuchess
-rw-r--r-- 1 root root 221 2013-03-20 01:49 ./source/xap/gnuchess/eboard.ldl.diff.gz
-rw-r--r-- 1 root root 336 2015-03-23 16:11 ./source/xap/gnuchess/eboard.png16.diff.gz
-rw-r--r-- 1 root root 518760 2017-07-24 23:16 ./source/xap/gnuchess/gnuchess-6.2.5.tar.xz
--rwxr-xr-x 1 root root 6347 2018-04-23 17:20 ./source/xap/gnuchess/gnuchess.SlackBuild
+-rwxr-xr-x 1 root root 6347 2018-06-18 03:27 ./source/xap/gnuchess/gnuchess.SlackBuild
-rw-r--r-- 1 root root 792 2018-02-27 06:13 ./source/xap/gnuchess/slack-desc
-rw-r--r-- 1 root root 2731760 2016-08-01 03:55 ./source/xap/gnuchess/xboard-4.9.1.tar.xz
-rw-r--r-- 1 root root 269 2015-03-20 18:35 ./source/xap/gnuchess/xboard.conf.diff.gz
@@ -12455,8 +12456,8 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/libxfce4util
-rw-r--r-- 1 root root 386632 2015-02-28 16:06 ./source/xfce/libxfce4util/libxfce4util-4.12.1.tar.xz
-rwxr-xr-x 1 root root 4750 2018-04-23 17:20 ./source/xfce/libxfce4util/libxfce4util.SlackBuild
-rw-r--r-- 1 root root 776 2018-02-27 06:13 ./source/xfce/libxfce4util/slack-desc
-drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/orage
--rw-r--r-- 1 root root 2165672 2015-04-10 10:30 ./source/xfce/orage/orage-4.12.1.tar.xz
+drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/orage
+-rw-r--r-- 1 root root 2165672 2015-04-10 10:30 ./source/xfce/orage/orage-4.12.1.tar.xz
-rwxr-xr-x 1 root root 4085 2018-04-23 17:20 ./source/xfce/orage/orage.SlackBuild
-rw-r--r-- 1 root root 723 2017-11-14 22:05 ./source/xfce/orage/orage.libical3.diff.gz
-rw-r--r-- 1 root root 625 2018-02-27 06:13 ./source/xfce/orage/slack-desc
@@ -12592,9 +12593,9 @@ drwxr-xr-x 4 root root 4096 2018-06-13 05:57 ./testing
-rw-r--r-- 1 root root 224 2018-06-13 05:57 ./testing/PACKAGES.TXT
drwxr-xr-x 2 root root 4096 2018-06-12 19:55 ./testing/packages
drwxr-xr-x 2 root root 4096 2018-06-12 19:55 ./testing/source
-drwxr-xr-x 2 root root 4096 2018-06-15 03:59 ./usb-and-pxe-installers
+drwxr-xr-x 2 root root 4096 2018-06-18 06:19 ./usb-and-pxe-installers
-rw-r--r-- 1 root root 31203 2011-03-21 21:21 ./usb-and-pxe-installers/README_PXE.TXT
-rw-r--r-- 1 root root 9197 2013-09-25 04:33 ./usb-and-pxe-installers/README_USB.TXT
-rw-r--r-- 1 root root 574 2013-03-27 04:59 ./usb-and-pxe-installers/pxelinux.cfg_default
--rw-r--r-- 1 root root 57848832 2018-06-15 03:59 ./usb-and-pxe-installers/usbboot.img
+-rw-r--r-- 1 root root 45020160 2018-06-18 06:18 ./usb-and-pxe-installers/usbboot.img
-rw-r--r-- 1 root root 16045 2016-03-29 07:41 ./usb-and-pxe-installers/usbimg2disk.sh
diff --git a/README.initrd b/README.initrd
index 829b93cf..44ee54cc 100644
--- a/README.initrd
+++ b/README.initrd
@@ -1,7 +1,7 @@
Slackware initrd mini HOWTO
by Patrick Volkerding, volkerdi@slackware.com
-Tue Jun 12 04:26:32 UTC 2018
+Mon Jun 18 05:56:33 UTC 2018
This document describes how to create and install an initrd, which may be
required to use the 4.x kernel. Also see "man mkinitrd".
@@ -33,15 +33,15 @@ flexible to ship a generic kernel and a set of kernel modules for it.
The easiest way to make the initrd is to use the mkinitrd script included
in Slackware's mkinitrd package. We'll walk through the process of
-upgrading to the generic 4.14.49 Linux kernel using the packages
+upgrading to the generic 4.14.50 Linux kernel using the packages
found in Slackware's slackware/a/ directory.
First, make sure the kernel, kernel modules, and mkinitrd package are
installed (the current version numbers might be a little different, so
this is just an example):
- installpkg kernel-generic-4.14.49-x86_64-1.txz
- installpkg kernel-modules-4.14.49-x86_64-1.txz
+ installpkg kernel-generic-4.14.50-x86_64-1.txz
+ installpkg kernel-modules-4.14.50-x86_64-1.txz
installpkg mkinitrd-1.4.11-x86_64-7.txz
Change into the /boot directory:
@@ -52,7 +52,7 @@ Now you'll want to run "mkinitrd". I'm using ext4 for my root filesystem,
and since the disk controller requires no special support the ext4 module
will be the only one I need to load:
- mkinitrd -c -k 4.14.49 -m ext4
+ mkinitrd -c -k 4.14.50 -m ext4
This should do two things. First, it will create a directory
/boot/initrd-tree containing the initrd's filesystem. Then it will
@@ -61,10 +61,10 @@ you could make some additional changes in /boot/initrd-tree/ and
then run mkinitrd again without options to rebuild the image. That's
optional, though, and only advanced users will need to think about that.
-Here's another example: Build an initrd image using Linux 4.14.49
+Here's another example: Build an initrd image using Linux 4.14.50
kernel modules for a system with an ext4 root partition on /dev/sdb3:
- mkinitrd -c -k 4.14.49 -m ext4 -f ext4 -r /dev/sdb3
+ mkinitrd -c -k 4.14.50 -m ext4 -f ext4 -r /dev/sdb3
4. Now that I've built an initrd, how do I use it?
diff --git a/isolinux/message.txt b/isolinux/message.txt
index b1c5e4ba..1a28bb3a 100644
--- a/isolinux/message.txt
+++ b/isolinux/message.txt
@@ -1,5 +1,5 @@
-Welcome to 09Slackware6407 version 15.0 (Linux kernel 4.14.49)!
+Welcome to 09Slackware6407 version 15.0 (Linux kernel 4.14.50)!
If you need to pass extra parameters to the kernel, enter them at the prompt
below after the name of the kernel to boot (e.g., huge.s).
diff --git a/kernels/VERSIONS.TXT b/kernels/VERSIONS.TXT
index fd55f578..df5d33d0 100644
--- a/kernels/VERSIONS.TXT
+++ b/kernels/VERSIONS.TXT
@@ -1,3 +1,3 @@
-These kernels are version 4.14.49.
+These kernels are version 4.14.50.
diff --git a/recompress.sh b/recompress.sh
index 8dd80968..6a889615 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -758,6 +758,7 @@ gzip ./source/kde/patch/kdelibs/coding-style-fixes.patch
gzip ./source/kde/patch/kdelibs/return-application-icons-properly.patch
gzip ./source/kde/patch/kdelibs/kdelibs.docbook.patch
gzip ./source/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
+gzip ./source/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
gzip ./source/kde/patch/krdc/krdc_freerdp-1.1.0.patch
gzip ./source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
gzip ./source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
diff --git a/slackware64/a/maketag b/slackware64/a/maketag
index edee2afd..88f6c1e1 100644
--- a/slackware64/a/maketag
+++ b/slackware64/a/maketag
@@ -33,6 +33,7 @@ system. :^) Press ENTER when you are done." 21 76 10 \
"e2fsprogs" "Utilities for ext2/ext3 filesystems - REQUIRED" "on" \
"ed" "A clone of the old, original UN*X line editor" "on" \
"efibootmgr" "Tool to modify UEFI boot entries" "on" \
+"efivar" "Library and tools to handle UEFI variables" "on" \
"elilo" "Linux Loader for EFI-based platforms" "on" \
"elvis" "elvis text editor (vi clone) - REQUIRED" "on" \
"etc" "System config files & utilities - REQUIRED" "on" \
@@ -51,6 +52,7 @@ system. :^) Press ENTER when you are done." 21 76 10 \
"grep" "GNU grep searching tool - REQUIRED" "on" \
"grub" "GNU GRUB, the GRand Unified Bootloader" "on" \
"gzip" "GNU zip compression utility - REQUIRED" "on" \
+"haveged" "A simple entropy daemon" "on" \
"hdparm" "Get/Set IDE hard drive parameters" "on" \
"hostname" "Linux hostname utility - REQUIRED" "on" \
"hwdata" "Hardware identification and config data" "on" \
@@ -59,9 +61,9 @@ system. :^) Press ENTER when you are done." 21 76 10 \
"jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
"kbd" "Change keyboard and console mappings" "on" \
"kernel-firmware" "Linux kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 4.14.49 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 4.14.49 Linux kernel" "on" \
-"kernel-modules" "Linux 4.14.49 kernel modules -- REQUIRED" "on" \
+"kernel-generic" "Generic 4.14.50 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 4.14.50 Linux kernel" "on" \
+"kernel-modules" "Linux 4.14.50 kernel modules -- REQUIRED" "on" \
"kmod" "Kernel module utilities -- REQUIRED" "on" \
"lbzip2" "Parallel bzip2 compressor" "on" \
"less" "A text pager utility - REQUIRED" "on" \
@@ -128,7 +130,7 @@ if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
> $TMP/SeTnewtag
for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
; do
echo "$pkg: SKP" >> $TMP/SeTnewtag
done
@@ -136,7 +138,7 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 core
fi
cat /dev/null > $TMP/SeTnewtag
for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
; do
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/a/maketag.ez b/slackware64/a/maketag.ez
index edee2afd..88f6c1e1 100644
--- a/slackware64/a/maketag.ez
+++ b/slackware64/a/maketag.ez
@@ -33,6 +33,7 @@ system. :^) Press ENTER when you are done." 21 76 10 \
"e2fsprogs" "Utilities for ext2/ext3 filesystems - REQUIRED" "on" \
"ed" "A clone of the old, original UN*X line editor" "on" \
"efibootmgr" "Tool to modify UEFI boot entries" "on" \
+"efivar" "Library and tools to handle UEFI variables" "on" \
"elilo" "Linux Loader for EFI-based platforms" "on" \
"elvis" "elvis text editor (vi clone) - REQUIRED" "on" \
"etc" "System config files & utilities - REQUIRED" "on" \
@@ -51,6 +52,7 @@ system. :^) Press ENTER when you are done." 21 76 10 \
"grep" "GNU grep searching tool - REQUIRED" "on" \
"grub" "GNU GRUB, the GRand Unified Bootloader" "on" \
"gzip" "GNU zip compression utility - REQUIRED" "on" \
+"haveged" "A simple entropy daemon" "on" \
"hdparm" "Get/Set IDE hard drive parameters" "on" \
"hostname" "Linux hostname utility - REQUIRED" "on" \
"hwdata" "Hardware identification and config data" "on" \
@@ -59,9 +61,9 @@ system. :^) Press ENTER when you are done." 21 76 10 \
"jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
"kbd" "Change keyboard and console mappings" "on" \
"kernel-firmware" "Linux kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 4.14.49 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 4.14.49 Linux kernel" "on" \
-"kernel-modules" "Linux 4.14.49 kernel modules -- REQUIRED" "on" \
+"kernel-generic" "Generic 4.14.50 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 4.14.50 Linux kernel" "on" \
+"kernel-modules" "Linux 4.14.50 kernel modules -- REQUIRED" "on" \
"kmod" "Kernel module utilities -- REQUIRED" "on" \
"lbzip2" "Parallel bzip2 compressor" "on" \
"less" "A text pager utility - REQUIRED" "on" \
@@ -128,7 +130,7 @@ if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
> $TMP/SeTnewtag
for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
; do
echo "$pkg: SKP" >> $TMP/SeTnewtag
done
@@ -136,7 +138,7 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 core
fi
cat /dev/null > $TMP/SeTnewtag
for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lha libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
; do
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/a/tagfile b/slackware64/a/tagfile
index 249f2de1..42804203 100644
--- a/slackware64/a/tagfile
+++ b/slackware64/a/tagfile
@@ -20,6 +20,7 @@ dosfstools:REC
e2fsprogs:ADD
ed:REC
efibootmgr:REC
+efivar:REC
elilo:REC
elvis:ADD
etc:ADD
@@ -38,6 +39,7 @@ gptfdisk:ADD
grep:ADD
grub:REC
gzip:ADD
+haveged:REC
hdparm:ADD
hostname:ADD
hwdata:ADD
diff --git a/slackware64/k/maketag b/slackware64/k/maketag
index ac87555f..b3eff037 100644
--- a/slackware64/k/maketag
+++ b/slackware64/k/maketag
@@ -21,7 +21,7 @@ from series K. Use the UP/DOWN keys to scroll through the list, and \
the SPACE key to deselect any items you don't want to install. \
Press ENTER when you are \
done." 11 70 1 \
-"kernel-source" "Linux 4.14.49 kernel source" "on" \
+"kernel-source" "Linux 4.14.50 kernel source" "on" \
2> $TMP/SeTpkgs
if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
diff --git a/slackware64/k/maketag.ez b/slackware64/k/maketag.ez
index ac87555f..b3eff037 100644
--- a/slackware64/k/maketag.ez
+++ b/slackware64/k/maketag.ez
@@ -21,7 +21,7 @@ from series K. Use the UP/DOWN keys to scroll through the list, and \
the SPACE key to deselect any items you don't want to install. \
Press ENTER when you are \
done." 11 70 1 \
-"kernel-source" "Linux 4.14.49 kernel source" "on" \
+"kernel-source" "Linux 4.14.50 kernel source" "on" \
2> $TMP/SeTpkgs
if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index b233ca9b..9e5fe9c6 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -22,8 +22,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_elflibs
-VERSION=${VERSION:-14.2}
-BUILD=${BUILD:-39}
+VERSION=${VERSION:-15.0}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
index 0db451aa..7215c44b 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -32,6 +32,7 @@
/usr/lib/libformw.so.5
/usr/lib/libformw.so.6
/usr/lib/libgdbm.so.4
+/usr/lib/libgdbm.so.6
/usr/lib/libglib-2.0.so.0
/usr/lib/libgmodule-2.0.so.0
/usr/lib/libgmp.so.10
diff --git a/source/a/etc/_etc/etc/issue.new b/source/a/etc/_etc/etc/issue.new
index acec0a31..89168555 100644
--- a/source/a/etc/_etc/etc/issue.new
+++ b/source/a/etc/_etc/etc/issue.new
@@ -1,3 +1,3 @@
-Welcome to \s \r (\l)
+Welcome to \s \r \m (\l)
diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh
index 83376f57..17571d3c 100644
--- a/source/a/etc/doinst.sh
+++ b/source/a/etc/doinst.sh
@@ -83,7 +83,7 @@ rm -f etc/HOSTNAME.new
#rm -f etc/gshadow.new
rm -f etc/shells.new
rm -f etc/printcap.new
-rm -f etc/issue.new
+#rm -f etc/issue.new
rm -f etc/issue.net.new
#rm -f etc/profile.d/lang.csh.new
#rm -f etc/profile.d/lang.sh.new
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 72c1f02c..547e633e 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=etc
VERSION=15.0
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild
index a29657c2..b0be11d5 100755
--- a/source/ap/man-db/man-db.SlackBuild
+++ b/source/ap/man-db/man-db.SlackBuild
@@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=man-db
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
MAN2HTML=${MAN2HTML:-20180101}
diff --git a/source/ap/zsh/zsh.SlackBuild b/source/ap/zsh/zsh.SlackBuild
index f5893b24..fe2c98d0 100755
--- a/source/ap/zsh/zsh.SlackBuild
+++ b/source/ap/zsh/zsh.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=zsh
VERSION=${VERSION:-$(echo ${PKGNAM}-5.*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/clisp/source.download b/source/d/clisp/source.download
index 06bc8c9b..94658b7f 100755
--- a/source/d/clisp/source.download
+++ b/source/d/clisp/source.download
@@ -1,14 +1,47 @@
-# Pull the latest clisp sources from the upstream mercurial repository:
-rm -rf clisp-2.49
-hg clone http://hg.code.sf.net/p/clisp/clisp clisp-2.49
-# Determine date and changeset for tarball labeling:
-DATE="$(date -d "$( cd clisp-2.49 ; hg parent | grep date: | cut -b 14- | cut -f 1 -d +)" +"%Y%m%d")"
-CHANGESET="$( cd clisp-2.49 ; hg parent | grep changeset: | cut -f 3 -d :)"
-# Don't package .hg:
-rm -fr clisp-2.49/.hg*
-# Create tarball:
-mv clisp-2.49 clisp-2.49.${DATE}.${CHANGESET}
-tar cf clisp-2.49.${DATE}.${CHANGESET}.tar clisp-2.49.${DATE}.${CHANGESET}
-plzip -9 -n 6 clisp-2.49.${DATE}.${CHANGESET}.tar
-# Clean up:
-rm -rf clisp-2.49.${DATE}.${CHANGESET}
+#!/bin/sh
+
+# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf clisp
+
+# Clone repository:
+git clone https://gitlab.com/gnu-clisp/clisp
+
+# checkout $BRANCH:
+( cd clisp
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd clisp && git log -1 --format=%h )"
+DATE="$( cd clisp && git log -1 --format=%ad --date=format:%Y%m%d )"
+# Cleanup. We're not packing up the whole git repo.
+( cd clisp && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv clisp clisp-2.49_${DATE}_${HEADISAT}
+tar cf clisp-2.49_${DATE}_${HEADISAT}.tar clisp-2.49_${DATE}_${HEADISAT}
+xz -9 -f clisp-2.49_${DATE}_${HEADISAT}.tar
+rm -rf clisp-2.49_${DATE}_${HEADISAT}
+echo
+echo "clisp branch $BRANCH with HEAD at $HEADISAT packaged as clisp-2.49_${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild
index bb35a6bc..ee51ce8a 100755
--- a/source/d/perl/perl.SlackBuild
+++ b/source/d/perl/perl.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=perl
VERSION=5.26.2
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild
index c4948fcd..29deb426 100755
--- a/source/d/python/python.SlackBuild
+++ b/source/d/python/python.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=python
SRCNAM=Python
VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild
index aebf3818..ae4bcfda 100755
--- a/source/d/python3/python3.SlackBuild
+++ b/source/d/python3/python3.SlackBuild
@@ -29,7 +29,7 @@ PKGNAM=python3
SRCNAM=Python
VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild
index b3291af1..cac96aff 100755
--- a/source/d/ruby/ruby.SlackBuild
+++ b/source/d/ruby/ruby.SlackBuild
@@ -32,7 +32,7 @@ else
VERSION=$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
fi
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index c08eb143..197f94b1 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,8 @@
+Mon Jun 18 04:13:53 UTC 2018
+ Copy libefiboot to the installer (needed by efibootmgr).
+ Compress the kernel modules with xz.
+ Compress the initrd image with xz.
++--------------------------+
Thu Jun 14 01:16:42 UTC 2018
Copy libefivar to the installer (needed by efibootmgr).
+--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 29f66a47..cbccd276 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1108,6 +1108,7 @@ cp -fa${VERBOSE1} \
# Deal with /usr/lib stuff from the packages:
cd $TMP/extract-packages/usr/lib${LIBDIRSUFFIX}
cp -fa${VERBOSE1} \
+ libefiboot.so* \
libefivar.so* \
libgcc*.so* \
libhistory*.so* \
@@ -1571,8 +1572,8 @@ compress_modules()
if [ $COMPRESS_MODS -eq 1 ]; then
echo "--- Compressing kernel modules ---"
cd $PKG/$ARCH-installer-filesystem
- find ./lib/modules -type f -name "*.ko" -exec gzip -9f {} \;
- for i in $(find ./lib/modules -type l -name "*.ko") ; do ln -s $( readlink $i).gz $i.gz ; rm $i ; done
+ find ./lib/modules -type f -name "*.ko" -exec xz -9f {} \;
+ for i in $(find ./lib/modules -type l -name "*.ko") ; do ln -s $( readlink $i).xz $i.xz ; rm $i ; done
cd - 1>/dev/null
fi
@@ -1777,7 +1778,7 @@ if [ $SPLIT_INITRD -eq 1 ]; then
# Determine the size of the installer:
echo " Installer size (uncompressed): $( du -sh --exclude=$kv . )"
find . -path ./lib/modules/$kv -prune -o -print \
- | cpio -o -H newc | gzip -9fv > $CWD/initrd${usek}.img
+ | cpio -o -H newc | xz -9fv > $CWD/initrd${usek}.img
echo " New installer image for kernel $KVER$usek is ${CWD}/initrd${usek}.img"
done
cat $SLACKROOT/isolinux/isolinux.cfg | sed \
@@ -1798,7 +1799,7 @@ fi
if [ $SPLIT_INITRD -eq 0 ]; then
# Determine the size of the installer:
echo " Installer size (uncompressed): $( du -sh . )"
- find . | cpio -o -H newc | gzip -9fv > $CWD/initrd.img
+ find . | cpio -o -H newc | xz -9fv > $CWD/initrd.img
echo " New installer image is ${CWD}/initrd.img"
cp -a $SLACKROOT/isolinux/isolinux.cfg $CWD/
fi
diff --git a/source/k/kernel-configs/config-generic-4.14.49 b/source/k/kernel-configs/config-generic-4.14.50
index 523f56bd..8df87d96 100644
--- a/source/k/kernel-configs/config-generic-4.14.49
+++ b/source/k/kernel-configs/config-generic-4.14.50
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.49 Kernel Configuration
+# Linux/x86 4.14.50 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-generic-4.14.49.x64 b/source/k/kernel-configs/config-generic-4.14.50.x64
index 9a965237..c787d75a 100644
--- a/source/k/kernel-configs/config-generic-4.14.49.x64
+++ b/source/k/kernel-configs/config-generic-4.14.50.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.49 Kernel Configuration
+# Linux/x86 4.14.50 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.14.49-smp b/source/k/kernel-configs/config-generic-smp-4.14.50-smp
index b7110ca9..d29b048e 100644
--- a/source/k/kernel-configs/config-generic-smp-4.14.49-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.14.50-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.49 Kernel Configuration
+# Linux/x86 4.14.50 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.49 b/source/k/kernel-configs/config-huge-4.14.50
index 57ebbbca..429d7ad5 100644
--- a/source/k/kernel-configs/config-huge-4.14.49
+++ b/source/k/kernel-configs/config-huge-4.14.50
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.49 Kernel Configuration
+# Linux/x86 4.14.50 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.49.x64 b/source/k/kernel-configs/config-huge-4.14.50.x64
index 9b175efd..a03adf6e 100644
--- a/source/k/kernel-configs/config-huge-4.14.49.x64
+++ b/source/k/kernel-configs/config-huge-4.14.50.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.49 Kernel Configuration
+# Linux/x86 4.14.50 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.14.49-smp b/source/k/kernel-configs/config-huge-smp-4.14.50-smp
index 79cd912d..b6c6302c 100644
--- a/source/k/kernel-configs/config-huge-smp-4.14.49-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.14.50-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.49 Kernel Configuration
+# Linux/x86 4.14.50 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/kde/FTBFSlog b/source/kde/FTBFSlog
index 0233c6f1..32c5d890 100644
--- a/source/kde/FTBFSlog
+++ b/source/kde/FTBFSlog
@@ -1,3 +1,7 @@
+Mon Jun 18 02:49:16 UTC 2018
+ kdelibs: patch to build with OpenSSL-1.1.x. Thanks to nobodino.
+ All KDE packages tested and found to build properly.
++--------------------------+
Mon Feb 12 13:37:21 UTC 2018
All KDE packages tested and found to build properly.
+--------------------------+
diff --git a/source/kde/build/kdelibs b/source/kde/build/kdelibs
index 0cfbf088..00750edc 100644
--- a/source/kde/build/kdelibs
+++ b/source/kde/build/kdelibs
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/patch/kdelibs.patch b/source/kde/patch/kdelibs.patch
index c314b559..7dea979f 100644
--- a/source/kde/patch/kdelibs.patch
+++ b/source/kde/patch/kdelibs.patch
@@ -12,3 +12,6 @@ zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -
zcat $CWD/patch/kdelibs/coding-style-fixes.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Support OpenSSL-1.1.x:
+zcat $CWD/patch/kdelibs/kdelibs-openssl-1.1.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source/kde/patch/kdelibs/kdelibs-openssl-1.1.patch b/source/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
new file mode 100644
index 00000000..1f6b7fcb
--- /dev/null
+++ b/source/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/l/gdbm/gdbm.SlackBuild b/source/l/gdbm/gdbm.SlackBuild
index 3e3a386a..d6f8100f 100755
--- a/source/l/gdbm/gdbm.SlackBuild
+++ b/source/l/gdbm/gdbm.SlackBuild
@@ -26,8 +26,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gdbm
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -70,7 +70,7 @@ fi
cd $TMP
rm -rf gdbm-$VERSION
-tar xvf $CWD/gdbm-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/gdbm-$VERSION.tar.?z || exit 1
cd gdbm-$VERSION || exit 1
chown -R root:root .
find . \
diff --git a/source/n/mutt/mutt.SlackBuild b/source/n/mutt/mutt.SlackBuild
index 7abde88c..8acac300 100755
--- a/source/n/mutt/mutt.SlackBuild
+++ b/source/n/mutt/mutt.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mutt
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index f7d80825..fe7d1f7b 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=php
VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
ALPINE=2.21
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild
index 1205874d..ad9323a1 100755
--- a/source/n/yptools/yptools.SlackBuild
+++ b/source/n/yptools/yptools.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
# Package version number:
PKGNAM=yptools
VERSION=2.14
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
YPTOOLS=$VERSION
YPBINDMT=1.38
diff --git a/source/xap/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild
index 92932f30..97b36de2 100755
--- a/source/xap/gnuchess/gnuchess.SlackBuild
+++ b/source/xap/gnuchess/gnuchess.SlackBuild
@@ -27,7 +27,7 @@ VERGNUCHESS=6.2.5
VERSJENG=11.2
VEREBOARD=1.1.1
VERXBOARD=4.9.1
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then