mirror of
git://slackware.nl/current.git
synced 2024-12-26 09:58:59 +01:00
Mon Feb 17 06:03:43 UTC 2020
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded. ap/zsh-5.8-x86_64-1.txz: Upgraded. l/brotli-1.0.7-x86_64-1.txz: Added. l/gmime-3.2.6-x86_64-1.txz: Upgraded. l/hyphen-2.8.8-x86_64-1.txz: Added. l/openal-soft-1.20.1-x86_64-1.txz: Upgraded. Thanks to Skaendo and Willy Sudiarto Raharjo. l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added. Thanks to alienBOB. l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added. n/bluez-5.53-x86_64-1.txz: Upgraded. n/mutt-1.13.4-x86_64-1.txz: Upgraded. n/samba-4.11.6-x86_64-3.txz: Rebuilt. n/socat-1.7.3.4-x86_64-1.txz: Added. n/whois-5.5.6-x86_64-1.txz: Upgraded. testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt. Added patches to fix joining a DC when using krb5. Looks like the patches are already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
This commit is contained in:
Patrick J Volkerding
Eric Hameleers
parent
6087aff6ca
commit
8ea9f1e02e
65 changed files with 1912 additions and 2174 deletions
|
|
@ -11,9 +11,37 @@
|
|||
<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, 15 Feb 2020 22:57:25 GMT</pubDate>
|
||||
<lastBuildDate>Sun, 16 Feb 2020 07:59:41 GMT</lastBuildDate>
|
||||
<pubDate>Mon, 17 Feb 2020 06:03:43 GMT</pubDate>
|
||||
<lastBuildDate>Mon, 17 Feb 2020 16:59:46 GMT</lastBuildDate>
|
||||
<generator>maintain_current_git.sh v 1.11</generator>
|
||||
<item>
|
||||
<title>Mon, 17 Feb 2020 06:03:43 GMT</title>
|
||||
<pubDate>Mon, 17 Feb 2020 06:03:43 GMT</pubDate>
|
||||
<link>https://git.slackware.nl/current/tag/?h=20200217060343</link>
|
||||
<guid isPermaLink="false">20200217060343</guid>
|
||||
<description>
|
||||
<![CDATA[<pre>
|
||||
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded.
|
||||
ap/zsh-5.8-x86_64-1.txz: Upgraded.
|
||||
l/brotli-1.0.7-x86_64-1.txz: Added.
|
||||
l/gmime-3.2.6-x86_64-1.txz: Upgraded.
|
||||
l/hyphen-2.8.8-x86_64-1.txz: Added.
|
||||
l/openal-soft-1.20.1-x86_64-1.txz: Upgraded.
|
||||
Thanks to Skaendo and Willy Sudiarto Raharjo.
|
||||
l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added.
|
||||
Thanks to alienBOB.
|
||||
l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added.
|
||||
n/bluez-5.53-x86_64-1.txz: Upgraded.
|
||||
n/mutt-1.13.4-x86_64-1.txz: Upgraded.
|
||||
n/samba-4.11.6-x86_64-3.txz: Rebuilt.
|
||||
n/socat-1.7.3.4-x86_64-1.txz: Added.
|
||||
n/whois-5.5.6-x86_64-1.txz: Upgraded.
|
||||
testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt.
|
||||
Added patches to fix joining a DC when using krb5. Looks like the patches are
|
||||
already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
|
||||
</pre>]]>
|
||||
</description>
|
||||
</item>
|
||||
<item>
|
||||
<title>Sat, 15 Feb 2020 22:57:25 GMT</title>
|
||||
<pubDate>Sat, 15 Feb 2020 22:57:25 GMT</pubDate>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,23 @@
|
|||
Mon Feb 17 06:03:43 UTC 2020
|
||||
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded.
|
||||
ap/zsh-5.8-x86_64-1.txz: Upgraded.
|
||||
l/brotli-1.0.7-x86_64-1.txz: Added.
|
||||
l/gmime-3.2.6-x86_64-1.txz: Upgraded.
|
||||
l/hyphen-2.8.8-x86_64-1.txz: Added.
|
||||
l/openal-soft-1.20.1-x86_64-1.txz: Upgraded.
|
||||
Thanks to Skaendo and Willy Sudiarto Raharjo.
|
||||
l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added.
|
||||
Thanks to alienBOB.
|
||||
l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added.
|
||||
n/bluez-5.53-x86_64-1.txz: Upgraded.
|
||||
n/mutt-1.13.4-x86_64-1.txz: Upgraded.
|
||||
n/samba-4.11.6-x86_64-3.txz: Rebuilt.
|
||||
n/socat-1.7.3.4-x86_64-1.txz: Added.
|
||||
n/whois-5.5.6-x86_64-1.txz: Upgraded.
|
||||
testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt.
|
||||
Added patches to fix joining a DC when using krb5. Looks like the patches are
|
||||
already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
|
||||
+--------------------------+
|
||||
Sat Feb 15 22:57:25 UTC 2020
|
||||
a/libcgroup-0.41-x86_64-6.txz: Rebuilt.
|
||||
ap/mariadb-10.4.12-x86_64-2.txz: Rebuilt.
|
||||
|
|
|
|||
265
FILELIST.TXT
265
FILELIST.TXT
|
|
@ -1,20 +1,20 @@
|
|||
Sun Feb 16 01:10:54 UTC 2020
|
||||
Mon Feb 17 06:19:35 UTC 2020
|
||||
|
||||
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 2020-02-15 23:10 .
|
||||
drwxr-xr-x 12 root root 4096 2020-02-17 06:03 .
|
||||
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
|
||||
-rw-r--r-- 1 root root 14975 2020-02-08 21:06 ./CHANGES_AND_HINTS.TXT
|
||||
-rw-r--r-- 1 root root 955993 2020-02-15 23:10 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 23:10 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 955993 2020-02-16 01:12 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 01:12 ./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 808331 2020-02-16 01:08 ./ChangeLog.txt
|
||||
-rw-r--r-- 1 root root 809208 2020-02-17 06:03 ./ChangeLog.txt
|
||||
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
|
||||
drwxr-xr-x 2 root root 4096 2020-02-15 01:59 ./EFI/BOOT
|
||||
-rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi
|
||||
|
|
@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2020-02-15 01:59 ./EFI/BOOT
|
|||
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./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 1255774 2020-02-15 23:09 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1255774 2020-02-16 01:10 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
|
||||
-rw-r--r-- 1 root root 738957 2020-02-15 23:07 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 741734 2020-02-17 06:16 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
|
||||
-rw-r--r-- 1 root root 3629 2020-02-15 01:26 ./README.initrd
|
||||
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
|
||||
|
|
@ -831,11 +831,11 @@ 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 2020-02-15 23:07 ./slackware64
|
||||
-rw-r--r-- 1 root root 292610 2020-02-15 23:07 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 23:07 ./slackware64/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 364449 2020-02-15 23:04 ./slackware64/FILE_LIST
|
||||
-rw-r--r-- 1 root root 3785674 2020-02-15 23:05 ./slackware64/MANIFEST.bz2
|
||||
drwxr-xr-x 18 root root 4096 2020-02-17 06:17 ./slackware64
|
||||
-rw-r--r-- 1 root root 293656 2020-02-17 06:17 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-17 06:17 ./slackware64/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 365724 2020-02-17 06:14 ./slackware64/FILE_LIST
|
||||
-rw-r--r-- 1 root root 3792721 2020-02-17 06:15 ./slackware64/MANIFEST.bz2
|
||||
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
|
||||
drwxr-xr-x 2 root root 28672 2020-02-15 23:04 ./slackware64/a
|
||||
-rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt
|
||||
|
|
@ -1191,7 +1191,7 @@ drwxr-xr-x 2 root root 28672 2020-02-15 23:04 ./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 2020-02-15 23:04 ./slackware64/ap
|
||||
drwxr-xr-x 2 root root 20480 2020-02-17 06:14 ./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
|
||||
|
|
@ -1299,9 +1299,9 @@ drwxr-xr-x 2 root root 20480 2020-02-15 23:04 ./slackware64/ap
|
|||
-rw-r--r-- 1 root root 336 2019-09-04 18:33 ./slackware64/ap/jove-4.16.0.74-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 165012 2019-09-04 18:33 ./slackware64/ap/jove-4.16.0.74-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-09-04 18:33 ./slackware64/ap/jove-4.16.0.74-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 540 2019-12-30 19:04 ./slackware64/ap/ksh93-20191228_5abcbd06-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 689624 2019-12-30 19:04 ./slackware64/ap/ksh93-20191228_5abcbd06-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-12-30 19:04 ./slackware64/ap/ksh93-20191228_5abcbd06-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 540 2020-02-16 18:27 ./slackware64/ap/ksh93-20200131_e4fea8c5-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 678124 2020-02-16 18:27 ./slackware64/ap/ksh93-20200131_e4fea8c5-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 18:27 ./slackware64/ap/ksh93-20200131_e4fea8c5-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 316 2018-04-13 13:23 ./slackware64/ap/libx86-1.1-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 37356 2018-04-13 13:23 ./slackware64/ap/libx86-1.1-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 13:23 ./slackware64/ap/libx86-1.1-x86_64-3.txz.asc
|
||||
|
|
@ -1437,9 +1437,9 @@ drwxr-xr-x 2 root root 20480 2020-02-15 23:04 ./slackware64/ap
|
|||
-rw-r--r-- 1 root root 570 2019-10-27 20:13 ./slackware64/ap/xorriso-1.5.2-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 973720 2019-10-27 20:13 ./slackware64/ap/xorriso-1.5.2-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-10-27 20:13 ./slackware64/ap/xorriso-1.5.2-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 506 2020-01-07 20:18 ./slackware64/ap/zsh-5.7.1-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 3000108 2020-01-07 20:18 ./slackware64/ap/zsh-5.7.1-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2020-01-07 20:18 ./slackware64/ap/zsh-5.7.1-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 506 2020-02-16 18:00 ./slackware64/ap/zsh-5.8-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 3053312 2020-02-16 18:00 ./slackware64/ap/zsh-5.8-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 18:00 ./slackware64/ap/zsh-5.8-x86_64-1.txz.asc
|
||||
drwxr-xr-x 2 root root 20480 2020-02-15 23:04 ./slackware64/d
|
||||
-rw-r--r-- 1 root root 360 2020-02-15 18:51 ./slackware64/d/Cython-0.29.15-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 3295652 2020-02-15 18:51 ./slackware64/d/Cython-0.29.15-x86_64-1.txz
|
||||
|
|
@ -2511,7 +2511,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 2020-02-15 23:04 ./slackware64/l
|
||||
drwxr-xr-x 2 root root 69632 2020-02-17 06:14 ./slackware64/l
|
||||
-rw-r--r-- 1 root root 338 2020-02-15 20:39 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 191012 2020-02-15 20:39 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 20:39 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-3.txz.asc
|
||||
|
|
@ -2614,6 +2614,9 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 431 2020-01-01 19:53 ./slackware64/l/boost-1.72.0-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 10792500 2020-01-01 19:53 ./slackware64/l/boost-1.72.0-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2020-01-01 19:53 ./slackware64/l/boost-1.72.0-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 537 2020-02-16 20:45 ./slackware64/l/brotli-1.0.7-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 385016 2020-02-16 20:45 ./slackware64/l/brotli-1.0.7-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 20:45 ./slackware64/l/brotli-1.0.7-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 430 2018-10-20 16:42 ./slackware64/l/cairo-1.16.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 756348 2018-10-20 16:42 ./slackware64/l/cairo-1.16.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-10-20 16:42 ./slackware64/l/cairo-1.16.0-x86_64-1.txz.asc
|
||||
|
|
@ -2743,9 +2746,9 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 358 2019-09-20 17:19 ./slackware64/l/glibmm-2.62.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1196820 2019-09-20 17:19 ./slackware64/l/glibmm-2.62.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-09-20 17:19 ./slackware64/l/glibmm-2.62.0-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 297 2019-11-14 21:05 ./slackware64/l/gmime-3.2.5-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 388112 2019-11-14 21:05 ./slackware64/l/gmime-3.2.5-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-11-14 21:05 ./slackware64/l/gmime-3.2.5-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 297 2020-02-16 17:49 ./slackware64/l/gmime-3.2.6-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 388840 2020-02-16 17:49 ./slackware64/l/gmime-3.2.6-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 17:49 ./slackware64/l/gmime-3.2.6-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 576 2019-06-17 02:44 ./slackware64/l/gmm-5.3-noarch-1.txt
|
||||
-rw-r--r-- 1 root root 117712 2019-06-17 02:44 ./slackware64/l/gmm-5.3-noarch-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-06-17 02:44 ./slackware64/l/gmm-5.3-noarch-1.txz.asc
|
||||
|
|
@ -2827,6 +2830,9 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 514 2019-04-03 21:00 ./slackware64/l/hunspell-1.6.2-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 299236 2019-04-03 21:00 ./slackware64/l/hunspell-1.6.2-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2019-04-03 21:00 ./slackware64/l/hunspell-1.6.2-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 251 2020-02-16 22:55 ./slackware64/l/hyphen-2.8.8-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 79132 2020-02-16 22:55 ./slackware64/l/hyphen-2.8.8-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 22:55 ./slackware64/l/hyphen-2.8.8-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 462 2018-04-13 14:49 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 14024 2018-04-13 14:49 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 14:49 ./slackware64/l/icon-naming-utils-0.8.90-x86_64-3.txz.asc
|
||||
|
|
@ -3192,8 +3198,8 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 272 2018-04-13 15:08 ./slackware64/l/lzo-2.10-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 85468 2018-04-13 15:08 ./slackware64/l/lzo-2.10-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 15:08 ./slackware64/l/lzo-2.10-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 23767 2020-02-15 21:48 ./slackware64/l/maketag
|
||||
-rw-r--r-- 1 root root 23767 2020-02-15 21:48 ./slackware64/l/maketag.ez
|
||||
-rw-r--r-- 1 root root 24019 2020-02-17 06:04 ./slackware64/l/maketag
|
||||
-rw-r--r-- 1 root root 24019 2020-02-17 06:04 ./slackware64/l/maketag.ez
|
||||
-rw-r--r-- 1 root root 520 2018-09-12 19:31 ./slackware64/l/media-player-info-24-noarch-1.txt
|
||||
-rw-r--r-- 1 root root 20680 2018-09-12 19:31 ./slackware64/l/media-player-info-24-noarch-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-09-12 19:31 ./slackware64/l/media-player-info-24-noarch-1.txz.asc
|
||||
|
|
@ -3230,9 +3236,9 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 459 2019-12-01 18:26 ./slackware64/l/oniguruma-6.9.4-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 216072 2019-12-01 18:26 ./slackware64/l/oniguruma-6.9.4-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-12-01 18:26 ./slackware64/l/oniguruma-6.9.4-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 463 2020-02-15 01:59 ./slackware64/l/openal-soft-1.19.1-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 672480 2020-02-15 01:59 ./slackware64/l/openal-soft-1.19.1-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 01:59 ./slackware64/l/openal-soft-1.19.1-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 463 2020-02-16 05:22 ./slackware64/l/openal-soft-1.20.1-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 748300 2020-02-16 05:22 ./slackware64/l/openal-soft-1.20.1-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 05:22 ./slackware64/l/openal-soft-1.20.1-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 456 2018-04-17 08:07 ./slackware64/l/openexr-2.2.0-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 3001648 2018-04-17 08:07 ./slackware64/l/openexr-2.2.0-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-17 08:07 ./slackware64/l/openexr-2.2.0-x86_64-3.txz.asc
|
||||
|
|
@ -3380,6 +3386,9 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 275 2020-02-13 01:49 ./slackware64/l/qt5-5.13.2-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 88473400 2020-02-13 01:49 ./slackware64/l/qt5-5.13.2-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-13 01:49 ./slackware64/l/qt5-5.13.2-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 470 2020-02-17 00:05 ./slackware64/l/qt5-webkit-5.212.0_alpha3-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 16891616 2020-02-17 00:05 ./slackware64/l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-17 00:05 ./slackware64/l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 487 2018-04-13 15:21 ./slackware64/l/qtscriptgenerator-0.2.0-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 4415492 2018-04-13 15:21 ./slackware64/l/qtscriptgenerator-0.2.0-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 15:21 ./slackware64/l/qtscriptgenerator-0.2.0-x86_64-3.txz.asc
|
||||
|
|
@ -3449,7 +3458,7 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 356 2018-04-13 15:23 ./slackware64/l/t1lib-5.1.2-x86_64-4.txt
|
||||
-rw-r--r-- 1 root root 515556 2018-04-13 15:23 ./slackware64/l/t1lib-5.1.2-x86_64-4.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 15:23 ./slackware64/l/t1lib-5.1.2-x86_64-4.txz.asc
|
||||
-rw-r--r-- 1 root root 4351 2020-02-15 21:48 ./slackware64/l/tagfile
|
||||
-rw-r--r-- 1 root root 4398 2020-02-17 06:04 ./slackware64/l/tagfile
|
||||
-rw-r--r-- 1 root root 339 2018-04-17 09:07 ./slackware64/l/taglib-1.11.1-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 355744 2018-04-17 09:07 ./slackware64/l/taglib-1.11.1-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-17 09:07 ./slackware64/l/taglib-1.11.1-x86_64-3.txz.asc
|
||||
|
|
@ -3486,6 +3495,9 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 507 2019-12-19 18:57 ./slackware64/l/wavpack-5.2.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 177816 2019-12-19 18:57 ./slackware64/l/wavpack-5.2.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-12-19 18:57 ./slackware64/l/wavpack-5.2.0-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 257 2020-02-16 23:11 ./slackware64/l/woff2-20180531_a0d0ed7-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 43684 2020-02-16 23:11 ./slackware64/l/woff2-20180531_a0d0ed7-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 23:11 ./slackware64/l/woff2-20180531_a0d0ed7-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 413 2019-11-25 18:41 ./slackware64/l/xapian-core-1.4.14-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 2001944 2019-11-25 18:41 ./slackware64/l/xapian-core-1.4.14-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-11-25 18:41 ./slackware64/l/xapian-core-1.4.14-x86_64-1.txz.asc
|
||||
|
|
@ -3495,7 +3507,7 @@ drwxr-xr-x 2 root root 69632 2020-02-15 23:04 ./slackware64/l
|
|||
-rw-r--r-- 1 root root 463 2019-12-29 18:55 ./slackware64/l/zstd-1.4.4-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 405812 2019-12-29 18:55 ./slackware64/l/zstd-1.4.4-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2019-12-29 18:55 ./slackware64/l/zstd-1.4.4-x86_64-2.txz.asc
|
||||
drwxr-xr-x 2 root root 36864 2020-02-15 23:04 ./slackware64/n
|
||||
drwxr-xr-x 2 root root 36864 2020-02-17 06:14 ./slackware64/n
|
||||
-rw-r--r-- 1 root root 357 2020-02-12 17:54 ./slackware64/n/ModemManager-1.12.6-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1767108 2020-02-12 17:54 ./slackware64/n/ModemManager-1.12.6-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-12 17:54 ./slackware64/n/ModemManager-1.12.6-x86_64-1.txz.asc
|
||||
|
|
@ -3514,9 +3526,9 @@ drwxr-xr-x 2 root root 36864 2020-02-15 23:04 ./slackware64/n
|
|||
-rw-r--r-- 1 root root 334 2020-01-22 19:28 ./slackware64/n/bind-9.14.10-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 2249008 2020-01-22 19:28 ./slackware64/n/bind-9.14.10-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-01-22 19:28 ./slackware64/n/bind-9.14.10-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 333 2019-10-31 17:01 ./slackware64/n/bluez-5.52-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1098684 2019-10-31 17:01 ./slackware64/n/bluez-5.52-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-10-31 17:01 ./slackware64/n/bluez-5.52-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 333 2020-02-16 17:46 ./slackware64/n/bluez-5.53-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1109088 2020-02-16 17:46 ./slackware64/n/bluez-5.53-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 17:46 ./slackware64/n/bluez-5.53-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 366 2018-04-13 15:31 ./slackware64/n/bluez-firmware-1.2-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 71952 2018-04-13 15:31 ./slackware64/n/bluez-firmware-1.2-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 15:31 ./slackware64/n/bluez-firmware-1.2-x86_64-2.txz.asc
|
||||
|
|
@ -3702,8 +3714,8 @@ drwxr-xr-x 2 root root 36864 2020-02-15 23:04 ./slackware64/n
|
|||
-rw-r--r-- 1 root root 495 2018-11-02 19:41 ./slackware64/n/lynx-2.8.9rel.1-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1739904 2018-11-02 19:41 ./slackware64/n/lynx-2.8.9rel.1-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-11-02 19:41 ./slackware64/n/lynx-2.8.9rel.1-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 11166 2020-01-21 19:31 ./slackware64/n/maketag
|
||||
-rw-r--r-- 1 root root 11166 2020-01-21 19:31 ./slackware64/n/maketag.ez
|
||||
-rw-r--r-- 1 root root 11227 2020-02-17 06:05 ./slackware64/n/maketag
|
||||
-rw-r--r-- 1 root root 11227 2020-02-17 06:05 ./slackware64/n/maketag.ez
|
||||
-rw-r--r-- 1 root root 416 2018-10-24 20:45 ./slackware64/n/mcabber-1.1.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 245444 2018-10-24 20:45 ./slackware64/n/mcabber-1.1.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-10-24 20:45 ./slackware64/n/mcabber-1.1.0-x86_64-1.txz.asc
|
||||
|
|
@ -3716,9 +3728,9 @@ drwxr-xr-x 2 root root 36864 2020-02-15 23:04 ./slackware64/n
|
|||
-rw-r--r-- 1 root root 314 2019-08-05 19:02 ./slackware64/n/mtr-0.93-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 68616 2019-08-05 19:02 ./slackware64/n/mtr-0.93-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-08-05 19:02 ./slackware64/n/mtr-0.93-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 448 2020-01-13 17:34 ./slackware64/n/mutt-1.13.3-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1290596 2020-01-13 17:34 ./slackware64/n/mutt-1.13.3-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-01-13 17:34 ./slackware64/n/mutt-1.13.3-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 448 2020-02-16 17:53 ./slackware64/n/mutt-1.13.4-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1291428 2020-02-16 17:53 ./slackware64/n/mutt-1.13.4-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 17:53 ./slackware64/n/mutt-1.13.4-x86_64-1.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
|
||||
|
|
@ -3872,22 +3884,25 @@ drwxr-xr-x 2 root root 36864 2020-02-15 23:04 ./slackware64/n
|
|||
-rw-r--r-- 1 root root 443 2020-02-02 18:09 ./slackware64/n/s-nail-14.9.17-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 539444 2020-02-02 18:09 ./slackware64/n/s-nail-14.9.17-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-02 18:09 ./slackware64/n/s-nail-14.9.17-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 507 2020-02-15 20:57 ./slackware64/n/samba-4.11.6-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 12724856 2020-02-15 20:57 ./slackware64/n/samba-4.11.6-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 20:57 ./slackware64/n/samba-4.11.6-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 507 2020-02-16 19:53 ./slackware64/n/samba-4.11.6-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 12730672 2020-02-16 19:53 ./slackware64/n/samba-4.11.6-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 19:53 ./slackware64/n/samba-4.11.6-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 346 2018-11-08 00:52 ./slackware64/n/slrn-1.0.3a-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 470008 2018-11-08 00:52 ./slackware64/n/slrn-1.0.3a-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-11-08 00:52 ./slackware64/n/slrn-1.0.3a-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 400 2018-11-08 00:56 ./slackware64/n/snownews-1.6.10-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 122892 2018-11-08 00:56 ./slackware64/n/snownews-1.6.10-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-11-08 00:56 ./slackware64/n/snownews-1.6.10-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 496 2020-02-16 05:13 ./slackware64/n/socat-1.7.3.4-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 205408 2020-02-16 05:13 ./slackware64/n/socat-1.7.3.4-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 05:13 ./slackware64/n/socat-1.7.3.4-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 437 2020-01-03 18:16 ./slackware64/n/sshfs-3.7.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 45384 2020-01-03 18:16 ./slackware64/n/sshfs-3.7.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-01-03 18:16 ./slackware64/n/sshfs-3.7.0-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 510 2019-11-24 21:00 ./slackware64/n/stunnel-5.56-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 185648 2019-11-24 21:00 ./slackware64/n/stunnel-5.56-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-11-24 21:00 ./slackware64/n/stunnel-5.56-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 1905 2020-01-21 19:31 ./slackware64/n/tagfile
|
||||
-rw-r--r-- 1 root root 1915 2020-02-17 06:05 ./slackware64/n/tagfile
|
||||
-rw-r--r-- 1 root root 648 2018-04-13 15:54 ./slackware64/n/tcp_wrappers-7.6-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 77684 2018-04-13 15:54 ./slackware64/n/tcp_wrappers-7.6-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 15:54 ./slackware64/n/tcp_wrappers-7.6-x86_64-2.txz.asc
|
||||
|
|
@ -3921,9 +3936,9 @@ drwxr-xr-x 2 root root 36864 2020-02-15 23:04 ./slackware64/n
|
|||
-rw-r--r-- 1 root root 397 2019-04-05 17:24 ./slackware64/n/wget-1.20.3-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 691828 2019-04-05 17:24 ./slackware64/n/wget-1.20.3-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2019-04-05 17:24 ./slackware64/n/wget-1.20.3-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 367 2020-01-23 19:02 ./slackware64/n/whois-5.5.5-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 60224 2020-01-23 19:02 ./slackware64/n/whois-5.5.5-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-01-23 19:02 ./slackware64/n/whois-5.5.5-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 367 2020-02-16 17:55 ./slackware64/n/whois-5.5.6-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 60268 2020-02-16 17:55 ./slackware64/n/whois-5.5.6-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-16 17:55 ./slackware64/n/whois-5.5.6-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 677 2018-12-31 20:06 ./slackware64/n/wireless_tools-30.pre9-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 134480 2018-12-31 20:06 ./slackware64/n/wireless_tools-30.pre9-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-12-31 20:06 ./slackware64/n/wireless_tools-30.pre9-x86_64-1.txz.asc
|
||||
|
|
@ -5076,11 +5091,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./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 2020-02-15 23:09 ./source
|
||||
-rw-r--r-- 1 root root 484809 2020-02-15 23:09 ./source/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 23:09 ./source/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 683127 2020-02-15 23:08 ./source/FILE_LIST
|
||||
-rw-r--r-- 1 root root 20128324 2020-02-15 23:08 ./source/MANIFEST.bz2
|
||||
drwxr-xr-x 19 root root 4096 2020-02-17 06:19 ./source
|
||||
-rw-r--r-- 1 root root 484365 2020-02-17 06:19 ./source/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-17 06:19 ./source/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 683003 2020-02-17 06:18 ./source/FILE_LIST
|
||||
-rw-r--r-- 1 root root 20219980 2020-02-17 06:18 ./source/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
|
||||
drwxr-xr-x 112 root root 4096 2020-02-15 20:31 ./source/a
|
||||
-rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog
|
||||
|
|
@ -6285,9 +6300,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/jove
|
|||
-rw-r--r-- 1 root root 118 2019-09-04 18:30 ./source/ap/jove/jove.url
|
||||
-rw-r--r-- 1 root root 358840 2015-10-21 16:38 ./source/ap/jove/jove4.16.0.74.tar.xz
|
||||
-rw-r--r-- 1 root root 788 2018-02-27 06:12 ./source/ap/jove/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-12-30 18:56 ./source/ap/ksh93
|
||||
-rw-r--r-- 1 root root 1340284 2019-12-30 18:27 ./source/ap/ksh93/att-ast-20191228_5abcbd06.tar.lz
|
||||
-rwxr-xr-x 1 root root 1903 2018-04-16 06:18 ./source/ap/ksh93/get-att-ast.sh
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 18:26 ./source/ap/ksh93
|
||||
-rw-r--r-- 1 root root 1237946 2020-02-16 18:26 ./source/ap/ksh93/att-ast-20200131_e4fea8c5.tar.lz
|
||||
-rwxr-xr-x 1 root root 2009 2020-02-16 18:25 ./source/ap/ksh93/get-att-ast.sh
|
||||
-rwxr-xr-x 1 root root 4975 2019-12-30 19:03 ./source/ap/ksh93/ksh93.SlackBuild
|
||||
-rw-r--r-- 1 root root 993 2018-10-23 05:53 ./source/ap/ksh93/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/libx86
|
||||
|
|
@ -6635,14 +6650,14 @@ drwxr-xr-x 2 root root 4096 2019-10-27 20:13 ./source/ap/xorriso
|
|||
-rw-r--r-- 1 root root 1025 2018-02-27 06:12 ./source/ap/xorriso/slack-desc
|
||||
-rw-r--r-- 1 root root 1586238 2019-10-27 16:58 ./source/ap/xorriso/xorriso-1.5.2.tar.lz
|
||||
-rwxr-xr-x 1 root root 4605 2019-10-27 20:13 ./source/ap/xorriso/xorriso.SlackBuild
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/zsh
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 17:57 ./source/ap/zsh
|
||||
-rw-r--r-- 1 root root 140 2007-04-10 01:12 ./source/ap/zsh/doinst.sh.gz
|
||||
-rw-r--r-- 1 root root 957 2018-02-27 06:12 ./source/ap/zsh/slack-desc
|
||||
-rw-r--r-- 1 root root 3062112 2019-02-03 20:15 ./source/ap/zsh/zsh-5.7.1-doc.tar.xz
|
||||
-rw-r--r-- 1 root root 488 2019-02-03 20:15 ./source/ap/zsh/zsh-5.7.1-doc.tar.xz.asc
|
||||
-rw-r--r-- 1 root root 3126308 2019-02-03 20:15 ./source/ap/zsh/zsh-5.7.1.tar.xz
|
||||
-rw-r--r-- 1 root root 488 2019-02-03 20:15 ./source/ap/zsh/zsh-5.7.1.tar.xz.asc
|
||||
-rwxr-xr-x 1 root root 4343 2020-01-07 20:15 ./source/ap/zsh/zsh.SlackBuild
|
||||
-rw-r--r-- 1 root root 3088696 2020-02-15 22:08 ./source/ap/zsh/zsh-5.8-doc.tar.xz
|
||||
-rw-r--r-- 1 root root 488 2020-02-15 22:08 ./source/ap/zsh/zsh-5.8-doc.tar.xz.asc
|
||||
-rw-r--r-- 1 root root 3193284 2020-02-15 22:09 ./source/ap/zsh/zsh-5.8.tar.xz
|
||||
-rw-r--r-- 1 root root 488 2020-02-15 22:10 ./source/ap/zsh/zsh-5.8.tar.xz.asc
|
||||
-rwxr-xr-x 1 root root 4352 2020-02-16 17:58 ./source/ap/zsh/zsh.SlackBuild
|
||||
-rw-r--r-- 1 root root 23 2018-09-14 17:50 ./source/ap/zsh/zsh.url
|
||||
-rwxr-xr-x 1 root root 11921 2018-04-23 19:29 ./source/buildlist-from-changelog.sh
|
||||
drwxr-xr-x 58 root root 4096 2020-01-30 23:16 ./source/d
|
||||
|
|
@ -8258,7 +8273,7 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:35 ./source/kdei/kde-l10n/slack
|
|||
-rw-r--r-- 1 root root 648 2018-02-27 06:35 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa
|
||||
-rw-r--r-- 1 root root 698 2018-02-27 06:37 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN
|
||||
-rw-r--r-- 1 root root 687 2018-02-27 06:37 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW
|
||||
drwxr-xr-x 325 root root 12288 2020-02-15 20:31 ./source/l
|
||||
drwxr-xr-x 329 root root 12288 2020-02-17 00:10 ./source/l
|
||||
drwxr-xr-x 2 root root 4096 2020-02-15 17:59 ./source/l/ConsoleKit2
|
||||
-rw-r--r-- 1 root root 711364 2018-11-17 13:31 ./source/l/ConsoleKit2/ConsoleKit2-1.2.1.tar.xz
|
||||
-rwxr-xr-x 1 root root 5606 2020-02-15 19:43 ./source/l/ConsoleKit2/ConsoleKit2.SlackBuild
|
||||
|
|
@ -8431,6 +8446,12 @@ drwxr-xr-x 2 root root 4096 2020-01-01 19:46 ./source/l/boost
|
|||
-rw-r--r-- 1 root root 708 2020-01-01 19:46 ./source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch.gz
|
||||
-rw-r--r-- 1 root root 92231067 2019-12-10 00:50 ./source/l/boost/boost_1_72_0.tar.lz
|
||||
-rw-r--r-- 1 root root 884 2018-02-27 06:12 ./source/l/boost/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 20:39 ./source/l/brotli
|
||||
-rw-r--r-- 1 root root 623240 2018-10-23 10:24 ./source/l/brotli/brotli-1.0.7.tar.lz
|
||||
-rwxr-xr-x 1 root root 4334 2020-02-16 20:38 ./source/l/brotli/brotli.SlackBuild
|
||||
-rw-r--r-- 1 root root 34 2020-02-16 20:39 ./source/l/brotli/brotli.url
|
||||
-rwxr-xr-x 1 root root 1979 2020-02-16 20:26 ./source/l/brotli/repack-github-archive.sh
|
||||
-rw-r--r-- 1 root root 1024 2020-02-16 20:42 ./source/l/brotli/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/cairo
|
||||
-rw-r--r-- 1 root root 3520201 2018-10-19 20:26 ./source/l/cairo/cairo-1.16.0.tar.lz
|
||||
-rwxr-xr-x 1 root root 4338 2019-09-29 23:48 ./source/l/cairo/cairo.SlackBuild
|
||||
|
|
@ -8683,9 +8704,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/glibmm
|
|||
-rw-r--r-- 1 root root 7398144 2019-09-18 18:50 ./source/l/glibmm/glibmm-2.62.0.tar.xz
|
||||
-rwxr-xr-x 1 root root 3621 2019-09-29 23:48 ./source/l/glibmm/glibmm.SlackBuild
|
||||
-rw-r--r-- 1 root root 844 2018-02-27 06:12 ./source/l/glibmm/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-11-14 21:05 ./source/l/gmime
|
||||
-rw-r--r-- 1 root root 2220348 2019-11-14 15:14 ./source/l/gmime/gmime-3.2.5.tar.xz
|
||||
-rwxr-xr-x 1 root root 4067 2019-09-29 23:48 ./source/l/gmime/gmime.SlackBuild
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 17:48 ./source/l/gmime
|
||||
-rw-r--r-- 1 root root 2225796 2020-02-15 17:17 ./source/l/gmime/gmime-3.2.6.tar.xz
|
||||
-rwxr-xr-x 1 root root 4067 2020-02-16 17:48 ./source/l/gmime/gmime.SlackBuild
|
||||
-rw-r--r-- 1 root root 750 2018-02-27 06:12 ./source/l/gmime/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-06-17 02:43 ./source/l/gmm
|
||||
-rw-r--r-- 1 root root 351123 2018-06-19 08:46 ./source/l/gmm/gmm-5.3.tar.lz
|
||||
|
|
@ -8858,6 +8879,11 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/hunspell
|
|||
-rw-r--r-- 1 root root 506312 2017-09-27 01:15 ./source/l/hunspell/hunspell-1.6.2.tar.xz
|
||||
-rwxr-xr-x 1 root root 4293 2019-09-29 23:48 ./source/l/hunspell/hunspell.SlackBuild
|
||||
-rw-r--r-- 1 root root 966 2018-02-27 06:12 ./source/l/hunspell/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 22:55 ./source/l/hyphen
|
||||
-rw-r--r-- 1 root root 478264 2014-09-18 15:48 ./source/l/hyphen/hyphen-2.8.8.tar.lz
|
||||
-rwxr-xr-- 1 root root 4150 2020-02-16 22:50 ./source/l/hyphen/hyphen.SlackBuild
|
||||
-rw-r--r-- 1 root root 55 2020-02-16 22:47 ./source/l/hyphen/hyphen.url
|
||||
-rw-r--r-- 1 root root 738 2020-02-16 22:54 ./source/l/hyphen/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/icon-naming-utils
|
||||
-rw-r--r-- 1 root root 70352 2009-02-21 03:41 ./source/l/icon-naming-utils/icon-naming-utils-0.8.90.tar.gz
|
||||
-rwxr-xr-x 1 root root 2929 2019-09-29 23:48 ./source/l/icon-naming-utils/icon-naming-utils.SlackBuild
|
||||
|
|
@ -9556,10 +9582,10 @@ drwxr-xr-x 2 root root 4096 2019-12-01 18:25 ./source/l/oniguruma
|
|||
-rw-r--r-- 1 root root 544871 2019-11-29 04:38 ./source/l/oniguruma/onig-6.9.4.tar.lz
|
||||
-rwxr-xr-x 1 root root 4087 2019-12-01 18:26 ./source/l/oniguruma/oniguruma.SlackBuild
|
||||
-rw-r--r-- 1 root root 916 2019-12-01 18:11 ./source/l/oniguruma/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2020-02-15 19:19 ./source/l/openal-soft
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 05:22 ./source/l/openal-soft
|
||||
-rw-r--r-- 1 root root 275 2020-02-12 22:38 ./source/l/openal-soft/doinst.sh.gz
|
||||
-rw-r--r-- 1 root root 517780 2018-10-11 22:05 ./source/l/openal-soft/openal-soft-1.19.1.tar.lz
|
||||
-rwxr-xr-- 1 root root 4451 2020-02-12 22:37 ./source/l/openal-soft/openal-soft.SlackBuild
|
||||
-rw-r--r-- 1 root root 452443 2020-01-24 09:24 ./source/l/openal-soft/openal-soft-1.20.1.tar.lz
|
||||
-rwxr-xr-- 1 root root 4478 2020-02-16 05:22 ./source/l/openal-soft/openal-soft.SlackBuild
|
||||
-rw-r--r-- 1 root root 40 2020-02-15 19:19 ./source/l/openal-soft/openal-soft.url
|
||||
-rw-r--r-- 1 root root 923 2020-02-12 22:30 ./source/l/openal-soft/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/openexr
|
||||
|
|
@ -9865,48 +9891,26 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/qt/qtwebkit
|
|||
-rw-r--r-- 1 root root 76 2015-04-27 12:03 ./source/l/qt/qtwebkit/qtwebkit.url
|
||||
-rw-r--r-- 1 root root 989 2018-02-27 06:12 ./source/l/qt/qtwebkit/slack-desc
|
||||
-rw-r--r-- 1 root root 713 2018-11-29 19:17 ./source/l/qt/slack-desc
|
||||
drwxr-xr-x 4 root root 4096 2020-02-15 04:19 ./source/l/qt5
|
||||
-rw-r--r-- 1 root root 319 2013-12-17 17:08 ./source/l/qt5/doinst.sh
|
||||
drwxr-xr-x 2 root root 4096 2020-01-18 11:52 ./source/l/qt5/patches
|
||||
-rw-r--r-- 1 root root 742 2014-05-19 12:21 ./source/l/qt5/patches/platformplugin-install-path-fix.patch
|
||||
-rw-r--r-- 1 root root 588 2016-04-11 10:45 ./source/l/qt5/patches/qt5.alsa.patch
|
||||
-rw-r--r-- 1 root root 1598 2018-02-23 20:42 ./source/l/qt5/patches/qt5.cr206850.patch
|
||||
-rw-r--r-- 1 root root 1104 2020-01-18 11:48 ./source/l/qt5/patches/qt5.cve-2020-0569.patch
|
||||
-rw-r--r-- 1 root root 2511 2020-01-18 11:53 ./source/l/qt5/patches/qt5.cve-2020-0570.patch
|
||||
-rw-r--r-- 1 root root 2713 2019-02-02 18:17 ./source/l/qt5/patches/qt5.delayed_highlight.patch
|
||||
-rw-r--r-- 1 root root 1123 2016-09-04 14:19 ./source/l/qt5/patches/qt5.glibc224.patch
|
||||
-rw-r--r-- 1 root root 417 2017-06-17 20:15 ./source/l/qt5/patches/qt5.mysql.h.diff
|
||||
-rw-r--r-- 1 root root 2026 2018-06-13 14:48 ./source/l/qt5/patches/qt5.private-includes.patch
|
||||
-rw-r--r-- 1 root root 468 2014-12-13 11:02 ./source/l/qt5/patches/qt5.pulseaudio.diff
|
||||
-rw-r--r-- 1 root root 4742 2015-05-26 15:18 ./source/l/qt5/patches/qt5.qlockfile-deadlock.patch
|
||||
-rw-r--r-- 1 root root 1237 2019-07-09 17:40 ./source/l/qt5/patches/qt5.qt5uitoolsconfig.patch
|
||||
-rw-r--r-- 1 root root 779 2019-05-07 11:30 ./source/l/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch
|
||||
-rw-r--r-- 1 root root 3206 2017-01-19 13:58 ./source/l/qt5/patches/qt5.qtbug-49061.patch
|
||||
-rw-r--r-- 1 root root 2462 2016-08-16 13:45 ./source/l/qt5/patches/qt5.qtbug-49452.patch
|
||||
-rw-r--r-- 1 root root 1876 2016-04-14 08:48 ./source/l/qt5/patches/qt5.qtbug-51621.patch
|
||||
-rw-r--r-- 1 root root 3050 2016-04-11 07:57 ./source/l/qt5/patches/qt5.qtbug-51648.patch
|
||||
-rw-r--r-- 1 root root 7387 2016-04-11 07:58 ./source/l/qt5/patches/qt5.qtbug-51649.patch
|
||||
-rw-r--r-- 1 root root 5790 2016-04-11 07:59 ./source/l/qt5/patches/qt5.qtbug-51676.patch
|
||||
-rw-r--r-- 1 root root 3058 2016-04-11 19:06 ./source/l/qt5/patches/qt5.qtbug-51890.patch
|
||||
-rw-r--r-- 1 root root 7723 2016-12-04 13:38 ./source/l/qt5/patches/qt5.qtbug-51927.patch
|
||||
-rw-r--r-- 1 root root 3425 2016-08-16 13:47 ./source/l/qt5/patches/qt5.qtbug-53237.patch
|
||||
-rw-r--r-- 1 root root 1812 2017-01-19 13:59 ./source/l/qt5/patches/qt5.qtbug-55583.patch
|
||||
-rw-r--r-- 1 root root 1306 2017-06-17 18:56 ./source/l/qt5/patches/qt5.qtbug-60558.patch
|
||||
-rw-r--r-- 1 root root 3402 2017-06-17 18:55 ./source/l/qt5/patches/qt5.qtbug-61140.patch
|
||||
-rw-r--r-- 1 root root 6993 2018-02-06 15:35 ./source/l/qt5/patches/qt5.qtbug-66103.patch
|
||||
-rw-r--r-- 1 root root 1462 2019-02-02 18:18 ./source/l/qt5/patches/qt5.qtbug-69310.patch
|
||||
-rw-r--r-- 1 root root 1421 2019-09-10 18:32 ./source/l/qt5/patches/qt5.qtbug-76255.patch
|
||||
-rw-r--r-- 1 root root 4901 2019-10-16 13:40 ./source/l/qt5/patches/qt5.qtbug-77037.patch
|
||||
-rw-r--r-- 1 root root 584 2019-09-09 18:50 ./source/l/qt5/patches/qt5.qtbug-77364.patch
|
||||
-rw-r--r-- 1 root root 1369 2018-09-21 13:48 ./source/l/qt5/patches/qt5.webengine_gcc8.patch
|
||||
-rw-r--r-- 1 root root 1073 2016-02-07 21:56 ./source/l/qt5/patches/qt5.whandle.patch
|
||||
-rw-r--r-- 1 root root 4563 2019-06-30 14:05 ./source/l/qt5/patches/qtbase-qxcbwindow.patch
|
||||
-rw-r--r-- 1 root root 1611 2019-06-30 14:01 ./source/l/qt5/patches/qtbase-zlib-compression.patch
|
||||
drwxr-xr-x 4 root root 4096 2020-02-16 20:53 ./source/l/qt5
|
||||
drwxr-xr-x 3 root root 4096 2020-02-16 23:25 ./source/l/qt5-webkit
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 23:12 ./source/l/qt5-webkit/patches
|
||||
-rw-r--r-- 1 root root 658 2019-10-16 20:10 ./source/l/qt5-webkit/patches/qt5-webkit.icu65.patch.gz
|
||||
-rwxr-xr-x 1 root root 4487 2020-02-16 23:25 ./source/l/qt5-webkit/qt5-webkit.SlackBuild
|
||||
-rw-r--r-- 1 root root 90 2020-02-16 20:03 ./source/l/qt5-webkit/qt5-webkit.url
|
||||
-rw-r--r-- 1 root root 12457896 2019-06-29 18:40 ./source/l/qt5-webkit/qtwebkit-5.212.0-alpha3.tar.xz
|
||||
-rw-r--r-- 1 root root 961 2020-02-16 20:04 ./source/l/qt5-webkit/slack-desc
|
||||
-rw-r--r-- 1 root root 172 2013-12-17 17:08 ./source/l/qt5/doinst.sh.gz
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 20:53 ./source/l/qt5/patches
|
||||
-rw-r--r-- 1 root root 672 2020-01-18 11:48 ./source/l/qt5/patches/qt5.cve-2020-0569.patch.gz
|
||||
-rw-r--r-- 1 root root 1233 2020-01-18 11:53 ./source/l/qt5/patches/qt5.cve-2020-0570.patch.gz
|
||||
-rw-r--r-- 1 root root 284 2017-06-17 20:15 ./source/l/qt5/patches/qt5.mysql.h.diff.gz
|
||||
-rw-r--r-- 1 root root 250 2014-12-13 11:02 ./source/l/qt5/patches/qt5.pulseaudio.diff.gz
|
||||
-rw-r--r-- 1 root root 424 2019-05-07 11:30 ./source/l/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch.gz
|
||||
drwxr-xr-x 2 root root 4096 2013-12-17 17:08 ./source/l/qt5/profile.d
|
||||
-rw-r--r-- 1 root root 550 2013-12-17 17:08 ./source/l/qt5/profile.d/qt5.csh
|
||||
-rw-r--r-- 1 root root 436 2013-12-17 17:08 ./source/l/qt5/profile.d/qt5.sh
|
||||
-rw-r--r-- 1 root root 500830260 2019-10-31 05:19 ./source/l/qt5/qt-everywhere-src-5.13.2.tar.xz
|
||||
-rwxr-xr-x 1 root root 11475 2020-02-12 23:28 ./source/l/qt5/qt5.SlackBuild
|
||||
-rwxr-xr-x 1 root root 11461 2020-02-16 20:57 ./source/l/qt5/qt5.SlackBuild
|
||||
-rw-r--r-- 1 root root 726 2020-02-12 23:09 ./source/l/qt5/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/qtscriptgenerator
|
||||
-rw-r--r-- 1 root root 564 2009-06-05 09:21 ./source/l/qtscriptgenerator/include-everything.patch.gz
|
||||
|
|
@ -10105,6 +10109,11 @@ drwxr-xr-x 2 root root 4096 2019-12-19 18:56 ./source/l/wavpack
|
|||
-rw-r--r-- 1 root root 747536 2019-12-17 23:31 ./source/l/wavpack/wavpack-5.2.0.tar.xz
|
||||
-rwxr-xr-x 1 root root 4199 2019-12-19 18:57 ./source/l/wavpack/wavpack.SlackBuild
|
||||
-rw-r--r-- 1 root root 32 2019-12-19 18:55 ./source/l/wavpack/wavpack.url
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 23:10 ./source/l/woff2
|
||||
-rwxr-xr-x 1 root root 1790 2020-02-17 00:32 ./source/l/woff2/get-woff2.sh
|
||||
-rw-r--r-- 1 root root 743 2020-02-16 23:10 ./source/l/woff2/slack-desc
|
||||
-rw-r--r-- 1 root root 32983 2018-05-31 05:00 ./source/l/woff2/woff2-20180531_a0d0ed7.tar.lz
|
||||
-rwxr-xr-x 1 root root 3714 2020-02-16 23:08 ./source/l/woff2/woff2.SlackBuild
|
||||
drwxr-xr-x 2 root root 4096 2019-11-25 18:40 ./source/l/xapian-core
|
||||
-rw-r--r-- 1 root root 872 2018-10-30 21:09 ./source/l/xapian-core/slack-desc
|
||||
-rw-r--r-- 1 root root 2970624 2019-11-23 08:03 ./source/l/xapian-core/xapian-core-1.4.14.tar.xz
|
||||
|
|
@ -10122,7 +10131,7 @@ drwxr-xr-x 2 root root 4096 2019-12-29 18:53 ./source/l/zstd
|
|||
-rw-r--r-- 1 root root 325 2018-12-30 04:38 ./source/l/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
|
||||
-rw-r--r-- 1 root root 33 2018-11-08 01:06 ./source/l/zstd/zstd.url
|
||||
-rwxr-xr-x 1 root root 14025 2018-11-20 03:08 ./source/make_world.sh
|
||||
drwxr-xr-x 148 root root 4096 2020-02-15 20:31 ./source/n
|
||||
drwxr-xr-x 149 root root 4096 2020-02-16 05:13 ./source/n
|
||||
-rw-r--r-- 1 root root 1086 2020-01-14 04:36 ./source/n/FTBFSlog
|
||||
drwxr-xr-x 2 root root 4096 2020-02-12 17:53 ./source/n/ModemManager
|
||||
-rw-r--r-- 1 root root 2147400 2020-02-12 10:19 ./source/n/ModemManager/ModemManager-1.12.6.tar.xz
|
||||
|
|
@ -10182,14 +10191,14 @@ drwxr-xr-x 2 root root 4096 2019-08-19 18:12 ./source/n/bind/caching-exam
|
|||
-rw-r--r-- 1 root root 514 2009-05-23 08:11 ./source/n/bind/doinst.sh.gz
|
||||
-rw-r--r-- 1 root root 3378 2010-06-24 17:32 ./source/n/bind/rc.bind
|
||||
-rw-r--r-- 1 root root 786 2018-02-27 06:13 ./source/n/bind/slack-desc
|
||||
drwxr-xr-x 3 root root 4096 2019-10-31 16:44 ./source/n/bluez
|
||||
drwxr-xr-x 3 root root 4096 2020-02-16 17:45 ./source/n/bluez
|
||||
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/bluez-firmware
|
||||
-rw-r--r-- 1 root root 262963 2007-04-23 22:58 ./source/n/bluez-firmware/bluez-firmware-1.2.tar.bz2
|
||||
-rwxr-xr-x 1 root root 3876 2019-09-29 23:48 ./source/n/bluez-firmware/bluez-firmware.SlackBuild
|
||||
-rw-r--r-- 1 root root 828 2018-02-27 06:13 ./source/n/bluez-firmware/slack-desc
|
||||
-rw-r--r-- 1 root root 852 2019-10-13 03:07 ./source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch.gz
|
||||
-rw-r--r-- 1 root root 801 2019-10-31 07:49 ./source/n/bluez/bluez-5.52.tar.sign
|
||||
-rw-r--r-- 1 root root 1957504 2019-10-31 07:49 ./source/n/bluez/bluez-5.52.tar.xz
|
||||
-rw-r--r-- 1 root root 801 2020-02-15 23:02 ./source/n/bluez/bluez-5.53.tar.sign
|
||||
-rw-r--r-- 1 root root 1997504 2020-02-15 23:02 ./source/n/bluez/bluez-5.53.tar.xz
|
||||
-rwxr-xr-x 1 root root 6467 2019-10-31 17:00 ./source/n/bluez/bluez.SlackBuild
|
||||
-rw-r--r-- 1 root root 42 2019-10-31 16:44 ./source/n/bluez/bluez.url
|
||||
-rw-r--r-- 1 root root 128 2016-03-26 18:17 ./source/n/bluez/btusb.conf
|
||||
|
|
@ -10605,9 +10614,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/mtr
|
|||
-rwxr-xr-x 1 root root 3743 2019-09-29 23:48 ./source/n/mtr/mtr.SlackBuild
|
||||
-rw-r--r-- 1 root root 28 2019-08-05 19:01 ./source/n/mtr/mtr.url
|
||||
-rw-r--r-- 1 root root 765 2019-08-05 19:01 ./source/n/mtr/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2020-01-13 17:32 ./source/n/mutt
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 17:52 ./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 2279191 2020-01-12 21:39 ./source/n/mutt/mutt-1.13.3.tar.lz
|
||||
-rw-r--r-- 1 root root 2280692 2020-02-15 20:33 ./source/n/mutt/mutt-1.13.4.tar.lz
|
||||
-rwxr-xr-x 1 root root 4414 2018-12-03 03:39 ./source/n/mutt/mutt.SlackBuild
|
||||
-rw-r--r-- 1 root root 29 2018-11-26 18:07 ./source/n/mutt/mutt.url
|
||||
-rw-r--r-- 1 root root 900 2018-08-27 17:37 ./source/n/mutt/slack-desc
|
||||
|
|
@ -11044,12 +11053,15 @@ drwxr-xr-x 2 root root 4096 2020-02-02 18:08 ./source/n/s-nail
|
|||
-rwxr-xr-x 1 root root 4203 2020-02-02 18:09 ./source/n/s-nail/s-nail.SlackBuild
|
||||
-rw-r--r-- 1 root root 92 2020-02-02 18:08 ./source/n/s-nail/s-nail.url
|
||||
-rw-r--r-- 1 root root 930 2018-11-24 18:35 ./source/n/s-nail/slack-desc
|
||||
drwxr-xr-x 2 root root 4096 2020-02-15 18:00 ./source/n/samba
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 19:27 ./source/n/samba
|
||||
-rw-r--r-- 1 root root 3570 2020-01-28 13:01 ./source/n/samba/0000-use-gnutls-for-des-cbc.patch.gz
|
||||
-rw-r--r-- 1 root root 4183 2020-01-28 13:01 ./source/n/samba/0001-handle-removal-des-enctypes-from-krb5.patch.gz
|
||||
-rw-r--r-- 1 root root 810 2020-01-28 13:01 ./source/n/samba/0002-samba-tool-create-working-private-krb5.conf.patch.gz
|
||||
-rw-r--r-- 1 root root 703 2016-06-13 04:19 ./source/n/samba/doinst.sh.gz
|
||||
-rw-r--r-- 1 root root 940 2016-06-04 17:50 ./source/n/samba/rc.samba
|
||||
-rw-r--r-- 1 root root 224 2020-01-28 10:23 ./source/n/samba/samba-4.11.6.tar.asc
|
||||
-rw-r--r-- 1 root root 11570840 2020-01-28 10:23 ./source/n/samba/samba-4.11.6.tar.lz
|
||||
-rwxr-xr-x 1 root root 7620 2020-02-15 19:27 ./source/n/samba/samba.SlackBuild
|
||||
-rwxr-xr-x 1 root root 8011 2020-02-16 19:45 ./source/n/samba/samba.SlackBuild
|
||||
-rw-r--r-- 1 root root 227 2019-02-06 20:36 ./source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff.gz
|
||||
-rw-r--r-- 1 root root 129 2020-01-28 17:27 ./source/n/samba/samba.url
|
||||
-rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/n/samba/slack-desc
|
||||
|
|
@ -11067,6 +11079,11 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/snownews
|
|||
-rw-r--r-- 1 root root 151393 2018-07-30 11:06 ./source/n/snownews/snownews-1.6.10.tar.lz
|
||||
-rwxr-xr-x 1 root root 4223 2019-09-29 23:48 ./source/n/snownews/snownews.SlackBuild
|
||||
-rw-r--r-- 1 root root 272 2018-11-08 00:56 ./source/n/snownews/snownews.fake.destdir.diff.gz
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 04:59 ./source/n/socat
|
||||
-rw-r--r-- 1 root root 949 2020-02-16 05:03 ./source/n/socat/slack-desc
|
||||
-rw-r--r-- 1 root root 411744 2020-01-05 20:40 ./source/n/socat/socat-1.7.3.4.tar.lz
|
||||
-rwxr-xr-x 1 root root 4501 2020-02-16 05:12 ./source/n/socat/socat.SlackBuild
|
||||
-rw-r--r-- 1 root root 44 2020-02-16 04:58 ./source/n/socat/socat.url
|
||||
drwxr-xr-x 2 root root 4096 2020-01-03 18:16 ./source/n/sshfs
|
||||
-rw-r--r-- 1 root root 889 2018-02-27 06:13 ./source/n/sshfs/slack-desc
|
||||
-rw-r--r-- 1 root root 52724 2020-01-03 11:07 ./source/n/sshfs/sshfs-3.7.0.tar.xz
|
||||
|
|
@ -11147,9 +11164,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/wget
|
|||
-rw-r--r-- 1 root root 2135272 2019-04-05 10:12 ./source/n/wget/wget-1.20.3.tar.lz
|
||||
-rw-r--r-- 1 root root 833 2019-04-05 10:12 ./source/n/wget/wget-1.20.3.tar.lz.sig
|
||||
-rwxr-xr-x 1 root root 3891 2019-09-29 23:48 ./source/n/wget/wget.SlackBuild
|
||||
drwxr-xr-x 2 root root 4096 2020-01-23 19:02 ./source/n/whois
|
||||
drwxr-xr-x 2 root root 4096 2020-02-16 17:55 ./source/n/whois
|
||||
-rw-r--r-- 1 root root 820 2019-03-28 19:25 ./source/n/whois/slack-desc
|
||||
-rw-r--r-- 1 root root 84785 2020-01-23 09:06 ./source/n/whois/whois-5.5.5.tar.lz
|
||||
-rw-r--r-- 1 root root 84905 2020-02-16 09:31 ./source/n/whois/whois-5.5.6.tar.lz
|
||||
-rwxr-xr-x 1 root root 2907 2019-09-29 23:48 ./source/n/whois/whois.SlackBuild
|
||||
-rw-r--r-- 1 root root 33 2019-07-24 18:55 ./source/n/whois/whois.url
|
||||
drwxr-xr-x 3 root root 4096 2019-09-29 23:48 ./source/n/wireless_tools
|
||||
|
|
@ -13201,14 +13218,14 @@ drwxr-xr-x 2 root root 4096 2019-02-17 22:03 ./source/y/bsd-games/patches
|
|||
-rw-r--r-- 1 root root 313 2019-02-17 22:07 ./source/y/bsd-games/patches/bsd-games.fortunepath.diff.gz
|
||||
-rw-r--r-- 1 root root 1960 2006-09-09 00:47 ./source/y/bsd-games/patches/bsd-games.pom.diff.gz
|
||||
-rw-r--r-- 1 root root 1065 2019-02-17 22:28 ./source/y/bsd-games/slack-desc
|
||||
drwxr-xr-x 4 root root 4096 2020-02-15 23:09 ./testing
|
||||
-rw-r--r-- 1 root root 12274 2020-02-15 23:09 ./testing/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 23:09 ./testing/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 15179 2020-02-15 23:09 ./testing/FILE_LIST
|
||||
-rw-r--r-- 1 root root 113305 2020-02-15 23:09 ./testing/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 21133 2020-02-15 23:09 ./testing/PACKAGES.TXT
|
||||
drwxr-xr-x 4 root root 4096 2020-02-17 06:19 ./testing
|
||||
-rw-r--r-- 1 root root 12274 2020-02-17 06:19 ./testing/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2020-02-17 06:19 ./testing/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 15179 2020-02-17 06:19 ./testing/FILE_LIST
|
||||
-rw-r--r-- 1 root root 113248 2020-02-17 06:19 ./testing/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 21133 2020-02-17 06:19 ./testing/PACKAGES.TXT
|
||||
drwxr-xr-x 3 root root 4096 2020-02-12 00:44 ./testing/packages
|
||||
drwxr-xr-x 2 root root 12288 2020-02-15 23:09 ./testing/packages/PAM
|
||||
drwxr-xr-x 2 root root 12288 2020-02-17 06:19 ./testing/packages/PAM
|
||||
-rw-r--r-- 1 root root 338 2020-02-15 22:00 ./testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-3_pam.txt
|
||||
-rw-r--r-- 1 root root 193828 2020-02-15 22:00 ./testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-3_pam.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 22:00 ./testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-3_pam.txz.asc
|
||||
|
|
@ -13278,9 +13295,9 @@ drwxr-xr-x 2 root root 12288 2020-02-15 23:09 ./testing/packages/PAM
|
|||
-rw-r--r-- 1 root root 371 2020-02-10 23:21 ./testing/packages/PAM/proftpd-1.3.6b-x86_64-1_pam.txt
|
||||
-rw-r--r-- 1 root root 1356028 2020-02-10 23:21 ./testing/packages/PAM/proftpd-1.3.6b-x86_64-1_pam.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-10 23:21 ./testing/packages/PAM/proftpd-1.3.6b-x86_64-1_pam.txz.asc
|
||||
-rw-r--r-- 1 root root 507 2020-02-15 22:14 ./testing/packages/PAM/samba-4.11.6-x86_64-2_pam.txt
|
||||
-rw-r--r-- 1 root root 12091916 2020-02-15 22:14 ./testing/packages/PAM/samba-4.11.6-x86_64-2_pam.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-15 22:14 ./testing/packages/PAM/samba-4.11.6-x86_64-2_pam.txz.asc
|
||||
-rw-r--r-- 1 root root 507 2020-02-17 01:19 ./testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txt
|
||||
-rw-r--r-- 1 root root 12082052 2020-02-17 01:19 ./testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-17 01:19 ./testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz.asc
|
||||
-rw-r--r-- 1 root root 653 2020-02-10 23:09 ./testing/packages/PAM/screen-4.8.0-x86_64-1_pam.txt
|
||||
-rw-r--r-- 1 root root 548028 2020-02-10 23:09 ./testing/packages/PAM/screen-4.8.0-x86_64-1_pam.txz
|
||||
-rw-r--r-- 1 root root 163 2020-02-10 23:09 ./testing/packages/PAM/screen-4.8.0-x86_64-1_pam.txz.asc
|
||||
|
|
|
|||
|
|
@ -591,9 +591,12 @@ gzip ./source/n/php/php-fpm.conf.diff
|
|||
gzip ./source/n/php/doinst.sh
|
||||
gzip ./source/n/php/php.imap.api.diff
|
||||
gzip ./source/n/php/php.ini-development.diff
|
||||
gzip ./source/n/samba/0001-handle-removal-des-enctypes-from-krb5.patch
|
||||
gzip ./source/n/samba/0000-use-gnutls-for-des-cbc.patch
|
||||
gzip ./source/n/samba/smb.conf.diff
|
||||
gzip ./source/n/samba/doinst.sh
|
||||
gzip ./source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff
|
||||
gzip ./source/n/samba/0002-samba-tool-create-working-private-krb5.conf.patch
|
||||
gzip ./source/n/htdig/htdig-3.2.0b6.diff
|
||||
gzip ./source/n/htdig/htdig.conf.diff
|
||||
gzip ./source/n/htdig/doinst.sh
|
||||
|
|
@ -970,6 +973,7 @@ gzip ./source/l/desktop-file-utils/desktop-file-utils.quiet.warnings.diff
|
|||
gzip ./source/l/fuse3/doinst.sh
|
||||
gzip ./source/l/fuse3/rc.fuse3.no.source.lsb.init-functions.diff
|
||||
gzip ./source/l/gdk-pixbuf2/doinst.sh
|
||||
gzip ./source/l/qt5-webkit/patches/qt5-webkit.icu65.patch
|
||||
gzip ./source/l/pulseaudio/0002-allow-autospawn-for-root-default.diff
|
||||
gzip ./source/l/pulseaudio/030_posix-completion.diff
|
||||
gzip ./source/l/pulseaudio/020_no-parallel-make.diff
|
||||
|
|
@ -1078,6 +1082,12 @@ gzip ./source/l/giflib/giflib.GifQuantizeBuffer.diff
|
|||
gzip ./source/l/at-spi2-atk/doinst.sh
|
||||
gzip ./source/l/dconf-editor/doinst.sh
|
||||
gzip ./source/l/glib-networking/doinst.sh
|
||||
gzip ./source/l/qt5/patches/qt5.pulseaudio.diff
|
||||
gzip ./source/l/qt5/patches/qt5.cve-2020-0570.patch
|
||||
gzip ./source/l/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch
|
||||
gzip ./source/l/qt5/patches/qt5.mysql.h.diff
|
||||
gzip ./source/l/qt5/patches/qt5.cve-2020-0569.patch
|
||||
gzip ./source/l/qt5/doinst.sh
|
||||
gzip ./source/l/qca/qca.tlsunittest.cpp.diff
|
||||
gzip ./source/l/qca/Add_support_for_OpenSSL_1.1.0.diff
|
||||
gzip ./source/xap/hexchat/doinst.sh
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ you are done." 22 74 10 \
|
|||
"automoc4" "Automatic moc for Qt4" "on" \
|
||||
"babl" "A pixel format translation library" "on" \
|
||||
"boost" "Boost C++ Libraries" "on" \
|
||||
"brotli" "Brotli compression format" "on" \
|
||||
"cairo" "Vector graphics library used by GTK+" "on" \
|
||||
"cairomm" "Vector graphics library used by GTKmm" "on" \
|
||||
"chmlib" "Library for accessing CHM files" "on" \
|
||||
|
|
@ -118,6 +119,7 @@ you are done." 22 74 10 \
|
|||
"harfbuzz" "OpenType text shaping engine" "on" \
|
||||
"hicolor-icon-theme" "Standard icon theme tree" "on" \
|
||||
"hunspell" "Spell checker and morphological analyzer" "on" \
|
||||
"hyphen" "Hyphenation and justification library" "on" \
|
||||
"icon-naming-utils" "Icon naming utilities" "on" \
|
||||
"icu4c" "International Components for Unicode" "on" \
|
||||
"id3lib" "ID3 tag manipulation library" "on" \
|
||||
|
|
@ -301,6 +303,7 @@ you are done." 22 74 10 \
|
|||
"qt" "C++ GUI library used by KDE4" "on" \
|
||||
"qt-gstreamer" "C++ bindings for gstreamer" "on" \
|
||||
"qt5" "C++ GUI library used by KDE Plasma 5" "on" \
|
||||
"qt5-webkit" "Qt web browser engine" "on" \
|
||||
"qtscriptgenerator" "Qt API Bindings for QtScript" "on" \
|
||||
"raptor2" "RDF parser and serializer" "on" \
|
||||
"rasqal" "RDF parsing library" "on" \
|
||||
|
|
@ -336,6 +339,7 @@ you are done." 22 74 10 \
|
|||
"v4l-utils" "Libraries and utilities for video4linux" "on" \
|
||||
"vte" "A terminal emulator for GTK+" "on" \
|
||||
"wavpack" "WAV audio file compressor" "on" \
|
||||
"woff2" "WOFF File Format 2.0 library" "on" \
|
||||
"xapian-core" "Search Engine Library" "on" \
|
||||
"zlib" "general purpose data compression library" "on" \
|
||||
"zstd" "real-time compression algorithm" "on" \
|
||||
|
|
@ -344,7 +348,7 @@ if [ $? = 1 -o $? = 255 ]; then
|
|||
rm -f $TMP/SeTpkgs
|
||||
> $TMP/SeTnewtag
|
||||
for pkg in \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack xapian-core zlib zstd \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost brotli cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qt5-webkit qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack woff2 xapian-core zlib zstd \
|
||||
; do
|
||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||
done
|
||||
|
|
@ -352,7 +356,7 @@ ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image
|
|||
fi
|
||||
cat /dev/null > $TMP/SeTnewtag
|
||||
for PACKAGE in \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack xapian-core zlib zstd \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost brotli cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qt5-webkit qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack woff2 xapian-core zlib zstd \
|
||||
; do
|
||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ you are done." 22 74 10 \
|
|||
"automoc4" "Automatic moc for Qt4" "on" \
|
||||
"babl" "A pixel format translation library" "on" \
|
||||
"boost" "Boost C++ Libraries" "on" \
|
||||
"brotli" "Brotli compression format" "on" \
|
||||
"cairo" "Vector graphics library used by GTK+" "on" \
|
||||
"cairomm" "Vector graphics library used by GTKmm" "on" \
|
||||
"chmlib" "Library for accessing CHM files" "on" \
|
||||
|
|
@ -118,6 +119,7 @@ you are done." 22 74 10 \
|
|||
"harfbuzz" "OpenType text shaping engine" "on" \
|
||||
"hicolor-icon-theme" "Standard icon theme tree" "on" \
|
||||
"hunspell" "Spell checker and morphological analyzer" "on" \
|
||||
"hyphen" "Hyphenation and justification library" "on" \
|
||||
"icon-naming-utils" "Icon naming utilities" "on" \
|
||||
"icu4c" "International Components for Unicode" "on" \
|
||||
"id3lib" "ID3 tag manipulation library" "on" \
|
||||
|
|
@ -301,6 +303,7 @@ you are done." 22 74 10 \
|
|||
"qt" "C++ GUI library used by KDE4" "on" \
|
||||
"qt-gstreamer" "C++ bindings for gstreamer" "on" \
|
||||
"qt5" "C++ GUI library used by KDE Plasma 5" "on" \
|
||||
"qt5-webkit" "Qt web browser engine" "on" \
|
||||
"qtscriptgenerator" "Qt API Bindings for QtScript" "on" \
|
||||
"raptor2" "RDF parser and serializer" "on" \
|
||||
"rasqal" "RDF parsing library" "on" \
|
||||
|
|
@ -336,6 +339,7 @@ you are done." 22 74 10 \
|
|||
"v4l-utils" "Libraries and utilities for video4linux" "on" \
|
||||
"vte" "A terminal emulator for GTK+" "on" \
|
||||
"wavpack" "WAV audio file compressor" "on" \
|
||||
"woff2" "WOFF File Format 2.0 library" "on" \
|
||||
"xapian-core" "Search Engine Library" "on" \
|
||||
"zlib" "general purpose data compression library" "on" \
|
||||
"zstd" "real-time compression algorithm" "on" \
|
||||
|
|
@ -344,7 +348,7 @@ if [ $? = 1 -o $? = 255 ]; then
|
|||
rm -f $TMP/SeTpkgs
|
||||
> $TMP/SeTnewtag
|
||||
for pkg in \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack xapian-core zlib zstd \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost brotli cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qt5-webkit qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack woff2 xapian-core zlib zstd \
|
||||
; do
|
||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||
done
|
||||
|
|
@ -352,7 +356,7 @@ ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image
|
|||
fi
|
||||
cat /dev/null > $TMP/SeTnewtag
|
||||
for PACKAGE in \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack xapian-core zlib zstd \
|
||||
ConsoleKit2 GConf LibRaw M2Crypto Mako PyQt QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib adwaita-icon-theme akonadi alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-atk at-spi2-core atk atkmm attica audiofile automoc4 babl boost brotli cairo cairomm chmlib clucene db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre ebook-tools eigen2 eigen3 elfutils enchant esound exiv2 expat ffmpeg fftw fluidsynth freetype fribidi fuse fuse3 gamin gc gcr gd gdbm gdk-pixbuf2 gegl gexiv2 giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphite2 gsettings-desktop-schemas gsl gst-plugins-base gst-plugins-base0 gst-plugins-good gst-plugins-good0 gst-plugins-libav gstreamer gstreamer0 gtk+ gtk+2 gtk+3 gtkmm2 gtkmm3 gtkspell gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib ilmbase imagemagick isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy keybinder keyutils lame lcms lcms2 libaio libao libarchive libasyncns libatasmart libbluedevil libbluray libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcroco libdbusmenu-qt libdiscid libdvdnav libdvdread libedit libevent libexif libfakekey libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libiodbc libjpeg-turbo libkarma liblastfm libmad libmcrypt libmng libmpc libmtp libnih libnjb libnl libnl3 libnotify libodfgen libogg liboggz liboil libopusenc libpcap libplist libpng libproxy libpsl libraw1394 librevenge librsvg libsamplerate libsecret libsigc++ libsigsegv libsndfile libsodium libsoup libspectre libssh libssh2 libtasn1 libtheora libtiff libunistring libunwind libusb libusb-compat libusbmuxd libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lzo media-player-info mhash mm mozilla-nss mozjs60 mpfr ncurses neon netpbm newt ocl-icd oniguruma openal-soft openexr openjpeg opus opusfile orc pango pangomm parted pcre pcre2 phonon phonon-gstreamer pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-appdirs python-certifi python-chardet python-distro python-docutils python-future python-idna python-notify2 python-packaging python-pillow python-ply python-pygments python-requests python-sane python-six python-urllib3 qca qimageblitz qjson qt qt-gstreamer qt5 qt5-webkit qtscriptgenerator raptor2 rasqal readline redland sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop speex speexdsp startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras talloc tango-icon-theme tango-icon-theme-extras tdb tevent urwid utf8proc v4l-utils vte wavpack woff2 xapian-core zlib zstd \
|
||||
; do
|
||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ audiofile:REC
|
|||
automoc4:REC
|
||||
babl:REC
|
||||
boost:REC
|
||||
brotli:REC
|
||||
cairo:REC
|
||||
cairomm:REC
|
||||
chmlib:REC
|
||||
|
|
@ -103,6 +104,7 @@ gvfs:REC
|
|||
harfbuzz:REC
|
||||
hicolor-icon-theme:REC
|
||||
hunspell:ADD
|
||||
hyphen:REC
|
||||
icon-naming-utils:REC
|
||||
icu4c:REC
|
||||
id3lib:REC
|
||||
|
|
@ -285,7 +287,8 @@ qimageblitz:REC
|
|||
qjson:REC
|
||||
qt:ADD
|
||||
qt-gstreamer:REC
|
||||
qt5:ADD
|
||||
qt5:REC
|
||||
qt5-webkit:REC
|
||||
qtscriptgenerator:ADD
|
||||
raptor2:REC
|
||||
rasqal:REC
|
||||
|
|
@ -321,6 +324,7 @@ utf8proc:REC
|
|||
v4l-utils:REC
|
||||
vte:REC
|
||||
wavpack:OPT
|
||||
woff2:REC
|
||||
xapian-core:REC
|
||||
zlib:REC
|
||||
zstd:OPT
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ Press ENTER when you are done." \
|
|||
"samba" "SMB print/file server for Windows LANs" "on" \
|
||||
"slrn" "slrn (s-lang read news) news reader" "on" \
|
||||
"snownews" "Console RSS reader" "on" \
|
||||
"socat" "Multipurpose relay - SOcket CAT" "on" \
|
||||
"sshfs" "FUSE-based SSH filesystem client" "on" \
|
||||
"stunnel" "Universal SSL tunnel" "on" \
|
||||
"tcp_wrappers" "A daemon and wrapper to increase security" "on" \
|
||||
|
|
@ -162,7 +163,7 @@ if [ $? = 1 -o $? = 255 ]; then
|
|||
rm -f $TMP/SeTpkgs
|
||||
> $TMP/SeTnewtag
|
||||
for pkg in \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews socat sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
; do
|
||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||
done
|
||||
|
|
@ -170,7 +171,7 @@ ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware
|
|||
fi
|
||||
cat /dev/null > $TMP/SeTnewtag
|
||||
for PACKAGE in \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews socat sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
; do
|
||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ Press ENTER when you are done." \
|
|||
"samba" "SMB print/file server for Windows LANs" "on" \
|
||||
"slrn" "slrn (s-lang read news) news reader" "on" \
|
||||
"snownews" "Console RSS reader" "on" \
|
||||
"socat" "Multipurpose relay - SOcket CAT" "on" \
|
||||
"sshfs" "FUSE-based SSH filesystem client" "on" \
|
||||
"stunnel" "Universal SSL tunnel" "on" \
|
||||
"tcp_wrappers" "A daemon and wrapper to increase security" "on" \
|
||||
|
|
@ -162,7 +163,7 @@ if [ $? = 1 -o $? = 255 ]; then
|
|||
rm -f $TMP/SeTpkgs
|
||||
> $TMP/SeTnewtag
|
||||
for pkg in \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews socat sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
; do
|
||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||
done
|
||||
|
|
@ -170,7 +171,7 @@ ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware
|
|||
fi
|
||||
cat /dev/null > $TMP/SeTnewtag
|
||||
for PACKAGE in \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dnsmasq dovecot ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo iftop inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw krb5 lftp libassuan libgcrypt libgpg-error libksba libmbim libmilter libmnl libndp libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libnftnl libqmi libtirpc links lynx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nftables nghttp2 nmap nn npth ntp obexftp openldap-client openobex openssh openssl openssl10 openvpn p11-kit php pidentd pinentry popa3d postfix ppp procmail proftpd pssh rdist rp-pppoe rpcbind rsync s-nail samba slrn snownews socat sshfs stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute ulogd uucp vlan vsftpd wget whois wireless_tools wpa_supplicant yptools ytalk zd1211-firmware \
|
||||
; do
|
||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ s-nail:REC
|
|||
samba:OPT
|
||||
slrn:OPT
|
||||
snownews:OPT
|
||||
socat:REC
|
||||
sshfs:OPT
|
||||
stunnel:OPT
|
||||
tcp_wrappers:REC
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
|
@ -20,8 +20,9 @@
|
|||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
# Pull HEAD:
|
||||
BRANCH=${1:-master}
|
||||
# Use 2020.0.1 branch. Verify first that there's no better branch with
|
||||
# "git branch -a" in the unpruned repo.
|
||||
BRANCH=${1:-2020.0.1}
|
||||
|
||||
# Clear download area:
|
||||
rm -rf ast
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2008, 2009, 2010, 2011, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# Copyright 2008, 2009, 2010, 2011, 2015, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
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:-2}
|
||||
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.xz | 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
|
||||
|
|
|
|||
135
source/l/brotli/brotli.SlackBuild
Executable file
135
source/l/brotli/brotli.SlackBuild
Executable file
|
|
@ -0,0 +1,135 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2019 Eric Hameleers, Eindhoven, NL
|
||||
# Copyright 2020 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.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=brotli
|
||||
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
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
|
||||
cd $TMP
|
||||
rm -rf $PKGNAM-$VERSION
|
||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||
cd $PKGNAM-$VERSION || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# Configure, build, and install:
|
||||
mkdir cmake-build
|
||||
cd cmake-build
|
||||
cmake \
|
||||
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
|
||||
-DMAN_INSTALL_DIR=/usr/man \
|
||||
-DSYSCONF_INSTALL_DIR=/etc \
|
||||
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
|
||||
-DBUILD_TESTING=NO \
|
||||
.. || exit 1
|
||||
make $NUMJOBS || make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
cd ..
|
||||
|
||||
# Only add python3 support. We're not adding any Python 2 junk now...
|
||||
python3 setup.py install --root=$PKG
|
||||
|
||||
# No static libraries:
|
||||
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
|
||||
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Add man page:
|
||||
mkdir -p $PKG/usr/man/man1
|
||||
cp -a docs/brotli.1 $PKG/usr/man/man1/brotli.1
|
||||
chown root:root $PKG/usr/man/man1/brotli.1
|
||||
chmod 644 $PKG/usr/man/man1/brotli.1
|
||||
gzip -9 $PKG/usr/man/man1/brotli.1
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
BUILD* CONTRIBUTING* LICENSE* README* WORKSPACE* \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||
1
source/l/brotli/brotli.url
Normal file
1
source/l/brotli/brotli.url
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://github.com/google/brotli/
|
||||
50
source/l/brotli/repack-github-archive.sh
Executable file
50
source/l/brotli/repack-github-archive.sh
Executable file
|
|
@ -0,0 +1,50 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2020 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.
|
||||
|
||||
CWD=$(pwd)
|
||||
GITHUB_ARCHIVE=$(/bin/ls v[0-9]*.tar.gz)
|
||||
OUTPUT_NAME=$(tar tvvf $GITHUB_ARCHIVE | head -n 1 | tr -d / | rev | cut -f 1 -d ' ' | rev)
|
||||
OUTPUT_TIMESTAMP=$(tar tvvf $GITHUB_ARCHIVE | head -n 1 | tr -d / | rev | cut -f 2,3 -d ' ' | rev)
|
||||
|
||||
# Create a temporary extraction directory:
|
||||
EXTRACT_DIR=$(mktemp -d)
|
||||
|
||||
# Extract, repack, compress, and fix timestamp:
|
||||
( cd $EXTRACT_DIR
|
||||
tar xf $CWD/$GITHUB_ARCHIVE
|
||||
|
||||
# This is excessive:
|
||||
rm -rf $OUTPUT_NAME/tests/*
|
||||
rm -f $OUTPUT_NAME/research/img/*
|
||||
rm -f $OUTPUT_NAME/java/org/brotli/integration/*.zip
|
||||
rm -f $OUTPUT_NAME/docs/brotli-comparison-study-2015-09-22.pdf
|
||||
|
||||
tar cf $OUTPUT_NAME.tar $OUTPUT_NAME
|
||||
plzip -9 $OUTPUT_NAME.tar
|
||||
touch -d "$OUTPUT_TIMESTAMP" $OUTPUT_NAME.tar.lz
|
||||
)
|
||||
|
||||
# Move the repacked archive here:
|
||||
mv $EXTRACT_DIR/$OUTPUT_NAME.tar.lz .
|
||||
|
||||
# Remove the temporary directory:
|
||||
rm -rf $EXTRACT_DIR
|
||||
19
source/l/brotli/slack-desc
Normal file
19
source/l/brotli/slack-desc
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description.
|
||||
# Line up the first '|' above the ':' following the base package name, and
|
||||
# the '|' on the right side marks the last column you can put a character in.
|
||||
# You must make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':' except on otherwise blank lines.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
brotli: brotli (Brotli compression format)
|
||||
brotli:
|
||||
brotli: Brotli is a general purpose lossless compression algorithm that
|
||||
brotli: compresses data using a combination of a modern variant of the LZ77
|
||||
brotli: algorithm, Huffman coding, and second order context modeling, with a
|
||||
brotli: compression ratio comparable to the best currently available general
|
||||
brotli: purpose compression methods. It is similar in speed with deflate but
|
||||
brotli: offers more dense compression.
|
||||
brotli:
|
||||
brotli: Homepage: https://github.com/google/brotli/
|
||||
brotli:
|
||||
129
source/l/hyphen/hyphen.SlackBuild
Executable file
129
source/l/hyphen/hyphen.SlackBuild
Executable file
|
|
@ -0,0 +1,129 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2018 Eric Hameleers, Eindhoven, NL
|
||||
# Copyright 2020 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.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=hyphen
|
||||
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
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
|
||||
cd $TMP
|
||||
rm -rf $PKGNAM-$VERSION
|
||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||
cd $PKGNAM-$VERSION || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# Configure, build, and install:
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
||||
--mandir=/usr/man \
|
||||
--infodir=/usr/info \
|
||||
--disable-static \
|
||||
--build=$ARCH-slackware-linux || exit 1
|
||||
make $NUMJOBS || make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
|
||||
# Don't ship .la files:
|
||||
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
AUTHORS* COPYING* ChangeLog INSTALL* NEWS* README* THANKS* TODO* \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
# If there's a ChangeLog, installing at least part of the recent history
|
||||
# is useful, but don't let it get totally out of control:
|
||||
if [ -r ChangeLog ]; then
|
||||
DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
|
||||
cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
|
||||
touch -r ChangeLog $DOCSDIR/ChangeLog
|
||||
fi
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||
1
source/l/hyphen/hyphen.url
Normal file
1
source/l/hyphen/hyphen.url
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://sourceforge.net/projects/hunspell/files/Hyphen
|
||||
19
source/l/hyphen/slack-desc
Normal file
19
source/l/hyphen/slack-desc
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description.
|
||||
# Line up the first '|' above the ':' following the base package name, and
|
||||
# the '|' on the right side marks the last column you can put a character in.
|
||||
# You must make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':' except on otherwise blank lines.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
hyphen: hyphen (hyphenation and justification library)
|
||||
hyphen:
|
||||
hyphen: Hyphen is a library for high quality hyphenation and justification.
|
||||
hyphen:
|
||||
hyphen: Homepage: https://travis-ci.org/hunspell/hyphen
|
||||
hyphen:
|
||||
hyphen:
|
||||
hyphen:
|
||||
hyphen:
|
||||
hyphen:
|
||||
hyphen:
|
||||
|
|
@ -98,6 +98,7 @@ cd cmake-build
|
|||
-DMAN_INSTALL_DIR=/usr/man \
|
||||
-DSYSCONF_INSTALL_DIR=/etc \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DALSOFT_EXAMPLES=OFF \
|
||||
.. || exit 1
|
||||
make $NUMJOBS || make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
|
|
@ -118,7 +119,7 @@ chmod 644 $PKG/etc/openal/alsoft.conf.new
|
|||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
COPYING* ChangeLog READMEi* XCompile.txt docs/*.txt \
|
||||
COPYING* ChangeLog README* XCompile.txt docs/*.txt \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
# If there's a ChangeLog, installing at least part of the recent history
|
||||
|
|
|
|||
47
source/l/qt5-webkit/patches/qt5-webkit.icu65.patch
Normal file
47
source/l/qt5-webkit/patches/qt5-webkit.icu65.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Patch obtained from FreeBSD:
|
||||
# https://svnweb.freebsd.org/ports/head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp?view=co
|
||||
# -----------------------------------------------------------------------------
|
||||
Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652
|
||||
|
||||
In file included from Source/WebCore/dom/DOMAllInOne.cpp:67:
|
||||
Source/WebCore/dom/Document.cpp:4410:39: error: expected ';' after do/while statement
|
||||
U16_NEXT(characters, i, length, c)
|
||||
^
|
||||
;
|
||||
Source/WebCore/dom/Document.cpp:4415:43: error: expected ';' after do/while statement
|
||||
U16_NEXT(characters, i, length, c)
|
||||
^
|
||||
;
|
||||
Source/WebCore/dom/Document.cpp:4477:46: error: expected ';' after do/while statement
|
||||
U16_NEXT(qualifiedName, i, length, c)
|
||||
^
|
||||
;
|
||||
|
||||
--- Source/WebCore/dom/Document.cpp.orig 2019-06-26 16:25:02 UTC
|
||||
+++ Source/WebCore/dom/Document.cpp
|
||||
@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character
|
||||
unsigned i = 0;
|
||||
|
||||
UChar32 c;
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (!isValidNameStart(c))
|
||||
return false;
|
||||
|
||||
while (i < length) {
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (!isValidNamePart(c))
|
||||
return false;
|
||||
}
|
||||
@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif
|
||||
|
||||
for (unsigned i = 0; i < length;) {
|
||||
UChar32 c;
|
||||
- U16_NEXT(qualifiedName, i, length, c)
|
||||
+ U16_NEXT(qualifiedName, i, length, c);
|
||||
if (c == ':') {
|
||||
if (sawColon) {
|
||||
ec = NAMESPACE_ERR;
|
||||
|
||||
137
source/l/qt5-webkit/qt5-webkit.SlackBuild
Executable file
137
source/l/qt5-webkit/qt5-webkit.SlackBuild
Executable file
|
|
@ -0,0 +1,137 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2015 Heinz Wiesinger, Amsterdam, The Netherlands
|
||||
# Copyright 2016, 2017, 2018, 2019 Eric Hameleers, Eindhoven, NL
|
||||
# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020 Patrick J. Volkerding, Sebeka, MN, 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.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=qt5-webkit
|
||||
SRCNAM=qtwebkit
|
||||
SRCVER=${SRCVER:-5.212.0-alpha3}
|
||||
VERSION=$(echo $SRCVER | tr - _)
|
||||
BUILD=${BUILD:-1}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
|
||||
cd $TMP
|
||||
rm -rf $SRCNAM-$SRCVER
|
||||
tar xvf $CWD/$SRCNAM-$SRCVER.tar.?z || exit 1
|
||||
cd $SRCNAM-$SRCVER || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# Fix compilation against icu4c 65.1:
|
||||
zcat $CWD/patches/qt5-webkit.icu65.patch.gz | patch -p0 --verbose || exit 1
|
||||
|
||||
# Use -reduce-relocations only on i?86 and x86_64 architextures.
|
||||
# https://bugreports.qt-project.org/browse/QTBUG-36129
|
||||
if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
|
||||
RELOCATIONS="-reduce-relocations"
|
||||
else
|
||||
RELOCATIONS=""
|
||||
fi
|
||||
|
||||
export CFLAGS="$SLKCFLAGS"
|
||||
export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
|
||||
export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
|
||||
export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
|
||||
export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
|
||||
|
||||
# Configure, build, and install:
|
||||
mkdir qtwebkit-build
|
||||
cd qtwebkit-build
|
||||
cmake \
|
||||
-DPORT=Qt \
|
||||
-DQt5_DIR=$QTDIR \
|
||||
.. || exit 1
|
||||
make $NUMJOBS || make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
cd ..
|
||||
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Fix the path in prl files:
|
||||
find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
|
||||
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
LICENSE* README* \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||
2
source/l/qt5-webkit/qt5-webkit.url
Normal file
2
source/l/qt5-webkit/qt5-webkit.url
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#https://github.com/annulen/webkit/releases
|
||||
https://github.com/qtwebkit/qtwebkit/releases
|
||||
19
source/l/qt5-webkit/slack-desc
Normal file
19
source/l/qt5-webkit/slack-desc
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description.
|
||||
# Line up the first '|' above the ':' following the base package name, and
|
||||
# the '|' on the right side marks the last column you can put a character in.
|
||||
# You must make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':' except on otherwise blank lines.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
qt5-webkit: qt5-webkit (Qt web browser engine)
|
||||
qt5-webkit:
|
||||
qt5-webkit: The Qt WebKit module provides the WebView API, which allows QML
|
||||
qt5-webkit: applications to render regions of dynamic web content. A WebView
|
||||
qt5-webkit: component may share the screen with other QML components or encompass
|
||||
qt5-webkit: the full screen as specified within the QML application.
|
||||
qt5-webkit:
|
||||
qt5-webkit: Homepage: https://github.com/qtwebkit/qtwebkit
|
||||
qt5-webkit:
|
||||
qt5-webkit:
|
||||
qt5-webkit:
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
See https://bugs.webkit.org/show_bug.cgi?id=117077
|
||||
|
||||
diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
|
||||
--- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-04-09 00:11:38.000000000 +0000
|
||||
+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-05-31 01:18:29.157175082 +0000
|
||||
@@ -20,7 +20,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
-DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
|
||||
+target.path = $$[QT_INSTALL_PLUGINS]/webkit
|
||||
+INSTALLS += target
|
||||
|
||||
SOURCES += \
|
||||
WebPlugin.cpp \
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- qt-everywhere-opensource-src-5.6.0/qtbase/config.tests/unix/alsa/alsatest.cpp.orig 2016-02-29 08:15:48.203031809 +0000
|
||||
+++ qt-everywhere-opensource-src-5.6.0/qtbase/config.tests/unix/alsa/alsatest.cpp 2016-02-29 08:16:39.712811962 +0000
|
||||
@@ -32,7 +32,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include <alsa/asoundlib.h>
|
||||
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
|
||||
+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
|
||||
#error "Alsa version found too old, require >= 1.0.10"
|
||||
#endif
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
The latest MariaDB versions aren't caught properly by the checks in Qt, which
|
||||
may cause a regression to appear (regression, because it was already fixed in
|
||||
Qt by Dan Vratil): this manifests itself in Akonadi losing its connection to
|
||||
the database if running for long periods of time.
|
||||
|
||||
Until this is fixed in Qt, you may want to apply this patch in your packages:
|
||||
|
||||
https://codereview.qt-project.org/#/c/206850/
|
||||
|
||||
From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shaw <andy.shaw@qt.io>
|
||||
Date: Wed, 27 Sep 2017 09:23:10 +0200
|
||||
Subject: [PATCH] Extend the MariaDB define check to cover the later versions too
|
||||
|
||||
Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
|
||||
---
|
||||
src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
||||
index 6e428fb..b2d3e85 100644
|
||||
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
||||
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
||||
@@ -1159,14 +1159,14 @@ static void qLibraryInit()
|
||||
# endif // MYSQL_VERSION_ID
|
||||
#endif // Q_NO_MYSQL_EMBEDDED
|
||||
|
||||
-#ifdef MARIADB_BASE_VERSION
|
||||
+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
|
||||
qAddPostRoutine(mysql_server_end);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void qLibraryEnd()
|
||||
{
|
||||
-#if !defined(MARIADB_BASE_VERSION)
|
||||
+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
|
||||
# if !defined(Q_NO_MYSQL_EMBEDDED)
|
||||
# if MYSQL_VERSION_ID > 40000
|
||||
# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
From f8f0f3eef1151c9377a5c76ccfa6432e930e1307 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
|
||||
Date: Mon, 14 Jan 2019 10:37:42 +0100
|
||||
Subject: QSyntaxHighlighter: cancel delayed highlight if done manually
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It was an implicit effect before which stopped working after
|
||||
dec7961709c90f6977d2447f7fa6c6625af41cb2. Reintroduce it as some
|
||||
projects used this side-effect as a way to abort the initial
|
||||
highlighting.
|
||||
|
||||
Change-Id: I5340ee9882a242bc8b5f7f843f1cfe793a65d357
|
||||
Reviewed-by: J?drzej Nowacki <jedrzej.nowacki@qt.io>
|
||||
---
|
||||
src/gui/text/qsyntaxhighlighter.cpp | 1 +
|
||||
.../qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 19 +++++++++++++++++++
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
|
||||
index b09f8b565a..0e07b69868 100644
|
||||
--- a/src/gui/text/qsyntaxhighlighter.cpp
|
||||
+++ b/src/gui/text/qsyntaxhighlighter.cpp
|
||||
@@ -376,6 +376,7 @@ void QSyntaxHighlighter::rehighlight()
|
||||
|
||||
QTextCursor cursor(d->doc);
|
||||
d->rehighlight(cursor, QTextCursor::End);
|
||||
+ d->rehighlightPending = false; // user manually did a full rehighlight
|
||||
}
|
||||
|
||||
/*!
|
||||
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
|
||||
index 9d6ce78b24..c683ecd424 100644
|
||||
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
|
||||
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
|
||||
@@ -82,6 +82,7 @@ private slots:
|
||||
void preservePreeditArea();
|
||||
void task108530();
|
||||
void avoidUnnecessaryRehighlight();
|
||||
+ void avoidUnnecessaryDelayedRehighlight();
|
||||
void noContentsChangedDuringHighlight();
|
||||
void rehighlight();
|
||||
void rehighlightBlock();
|
||||
@@ -478,6 +479,24 @@ void tst_QSyntaxHighlighter::avoidUnnecessaryRehighlight()
|
||||
QTRY_VERIFY(!hl->highlighted);
|
||||
}
|
||||
|
||||
+void tst_QSyntaxHighlighter::avoidUnnecessaryDelayedRehighlight()
|
||||
+{
|
||||
+ // Having text in the document before creating the highlighter starts the delayed rehighlight
|
||||
+ cursor.insertText("Hello World");
|
||||
+
|
||||
+ TestHighlighter *hl = new TestHighlighter(doc);
|
||||
+ QVERIFY(!hl->highlighted);
|
||||
+
|
||||
+ hl->rehighlight();
|
||||
+ QVERIFY(hl->highlighted);
|
||||
+
|
||||
+ hl->highlighted = false;
|
||||
+ // Process events, including delayed rehighlight emission
|
||||
+ QCoreApplication::processEvents();
|
||||
+ // Should be cancelled and no extra rehighlight should be done
|
||||
+ QVERIFY(!hl->highlighted);
|
||||
+}
|
||||
+
|
||||
void tst_QSyntaxHighlighter::noContentsChangedDuringHighlight()
|
||||
{
|
||||
QVector<QTextLayout::FormatRange> formats;
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From b12ffcd411d4776f7120ccecb3be34344d930d2b Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
||||
Date: Tue, 9 Aug 2016 16:21:29 +0200
|
||||
Subject: Do not depend on Linux 4.5
|
||||
|
||||
Avoid using MADV_FREE that was only recently added to Linux. It will fail when
|
||||
run on older Linux kernels.
|
||||
|
||||
Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
|
||||
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
|
||||
---
|
||||
chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
|
||||
index 121b687..be7c3b9 100644
|
||||
--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
|
||||
+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
|
||||
@@ -39,6 +39,11 @@
|
||||
|
||||
#include <sys/mman.h>
|
||||
|
||||
+#if OS(LINUX) && defined(MADV_FREE)
|
||||
+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
|
||||
+#undef MADV_FREE
|
||||
+#endif
|
||||
+
|
||||
#ifndef MADV_FREE
|
||||
#define MADV_FREE MADV_DONTNEED
|
||||
#endif
|
||||
--
|
||||
cgit v1.0-4-g1e03
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
# Taken from http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
From 67aa365d41ebfe082b4efcfd725e4d5f08be678c Mon Sep 17 00:00:00 2001
|
||||
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||
Date: Wed, 25 Apr 2018 12:48:21 +0200
|
||||
Subject: Do emit CMake declarations for existing private headers
|
||||
|
||||
We need to make sure we don't emit CMake declarations for private
|
||||
headers if those headers are absent. However, most of the time we have
|
||||
private headers and should add them.
|
||||
|
||||
Task-number: QTBUG-37417
|
||||
Change-Id: I639eb93d008de27928dedac540894af70c1883b9
|
||||
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
||||
---
|
||||
mkspecs/features/create_cmake.prf | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
index 66acedef55..2ed708e085 100644
|
||||
--- a/mkspecs/features/create_cmake.prf
|
||||
+++ b/mkspecs/features/create_cmake.prf
|
||||
@@ -28,9 +28,13 @@ CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
|
||||
|
||||
CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE})
|
||||
|
||||
+!generated_privates {
|
||||
+ isEmpty(SYNCQT.INJECTED_PRIVATE_HEADER_FILES):isEmpty(SYNCQT.PRIVATE_HEADER_FILES): \
|
||||
+ CMAKE_NO_PRIVATE_INCLUDES = true
|
||||
+}
|
||||
+
|
||||
split_incpath {
|
||||
CMAKE_ADD_SOURCE_INCLUDE_DIRS = true
|
||||
- CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist
|
||||
CMAKE_SOURCE_INCLUDES = \
|
||||
$$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME})
|
||||
CMAKE_SOURCE_PRIVATE_INCLUDES = \
|
||||
@@ -53,10 +57,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {
|
||||
CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
|
||||
}
|
||||
|
||||
-isEmpty(QT.$${MODULE}_private.includes)| \
|
||||
- !exists($$first(QT.$${MODULE}_private.includes)): \
|
||||
- CMAKE_NO_PRIVATE_INCLUDES = true
|
||||
-
|
||||
CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
|
||||
contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
|
||||
CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
|
||||
--
|
||||
cgit v1.1-6-g87c4
|
||||
|
||||
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
# Taken from:
|
||||
# https://projects.archlinux.org/svntogit/packages.git/plain/trunk/qlockfile-deadlock.patch?h=packages/qt5
|
||||
# QTBUG-44771
|
||||
# ----------------------------------------------------------------------------
|
||||
From f58e882b7594c59b6050d3c87562fcf836d10f60 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Goffart <ogoffart@woboq.com>
|
||||
Date: Tue, 14 Apr 2015 10:58:26 +0200
|
||||
Subject: QLockFile: fix deadlock when the lock file is corrupted
|
||||
|
||||
[ChangeLog][QtCore][QLockFile] Fixed a deadlock when the lock file
|
||||
is corrupted.
|
||||
|
||||
Task-number: QTBUG-44771
|
||||
Change-Id: Ic490b09d70ff1cc1733b64949889a73720b2d0f3
|
||||
Reviewed-by: David Faure <david.faure@kdab.com>
|
||||
---
|
||||
src/corelib/io/qlockfile_unix.cpp | 10 +++++-----
|
||||
src/corelib/io/qlockfile_win.cpp | 22 +++++++++++-----------
|
||||
tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp | 17 +++++++++++++++++
|
||||
3 files changed, 33 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/corelib/io/qlockfile_unix.cpp b/qtbase/src/corelib/io/qlockfile_unix.cpp
|
||||
index bf1015a..dc9f8f7 100644
|
||||
--- a/qtbase/src/corelib/io/qlockfile_unix.cpp
|
||||
+++ b/qtbase/src/corelib/io/qlockfile_unix.cpp
|
||||
@@ -181,11 +181,11 @@ bool QLockFilePrivate::isApparentlyStale() const
|
||||
{
|
||||
qint64 pid;
|
||||
QString hostname, appname;
|
||||
- if (!getLockInfo(&pid, &hostname, &appname))
|
||||
- return false;
|
||||
- if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) {
|
||||
- if (::kill(pid, 0) == -1 && errno == ESRCH)
|
||||
- return true; // PID doesn't exist anymore
|
||||
+ if (getLockInfo(&pid, &hostname, &appname)) {
|
||||
+ if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) {
|
||||
+ if (::kill(pid, 0) == -1 && errno == ESRCH)
|
||||
+ return true; // PID doesn't exist anymore
|
||||
+ }
|
||||
}
|
||||
const qint64 age = QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime());
|
||||
return staleLockTime > 0 && age > staleLockTime;
|
||||
diff --git a/qtbase/src/corelib/io/qlockfile_win.cpp b/qtbase/src/corelib/io/qlockfile_win.cpp
|
||||
index f9f2909..3587c7b 100644
|
||||
--- a/qtbase/src/corelib/io/qlockfile_win.cpp
|
||||
+++ b/qtbase/src/corelib/io/qlockfile_win.cpp
|
||||
@@ -115,21 +115,21 @@ bool QLockFilePrivate::isApparentlyStale() const
|
||||
{
|
||||
qint64 pid;
|
||||
QString hostname, appname;
|
||||
- if (!getLockInfo(&pid, &hostname, &appname))
|
||||
- return false;
|
||||
|
||||
// On WinRT there seems to be no way of obtaining information about other
|
||||
// processes due to sandboxing
|
||||
#ifndef Q_OS_WINRT
|
||||
- if (hostname == QString::fromLocal8Bit(localHostName())) {
|
||||
- HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
|
||||
- if (!procHandle)
|
||||
- return true;
|
||||
- // We got a handle but check if process is still alive
|
||||
- DWORD dwR = ::WaitForSingleObject(procHandle, 0);
|
||||
- ::CloseHandle(procHandle);
|
||||
- if (dwR == WAIT_TIMEOUT)
|
||||
- return true;
|
||||
+ if (getLockInfo(&pid, &hostname, &appname)) {
|
||||
+ if (hostname == QString::fromLocal8Bit(localHostName())) {
|
||||
+ HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
|
||||
+ if (!procHandle)
|
||||
+ return true;
|
||||
+ // We got a handle but check if process is still alive
|
||||
+ DWORD dwR = ::WaitForSingleObject(procHandle, 0);
|
||||
+ ::CloseHandle(procHandle);
|
||||
+ if (dwR == WAIT_TIMEOUT)
|
||||
+ return true;
|
||||
+ }
|
||||
}
|
||||
#endif // !Q_OS_WINRT
|
||||
const qint64 age = QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime());
|
||||
diff --git a/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
|
||||
index 77bef94..12bea67 100644
|
||||
--- a/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
|
||||
+++ b/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
|
||||
@@ -58,6 +58,7 @@ private slots:
|
||||
void staleLongLockFromBusyProcess();
|
||||
void staleLockRace();
|
||||
void noPermissions();
|
||||
+ void corruptedLockFile();
|
||||
|
||||
public:
|
||||
QString m_helperApp;
|
||||
@@ -415,5 +416,21 @@ void tst_QLockFile::noPermissions()
|
||||
QCOMPARE(int(lockFile.error()), int(QLockFile::PermissionError));
|
||||
}
|
||||
|
||||
+void tst_QLockFile::corruptedLockFile()
|
||||
+{
|
||||
+ const QString fileName = dir.path() + "/corruptedLockFile";
|
||||
+
|
||||
+ {
|
||||
+ // Create a empty file. Typically the result of a computer crash or hard disk full.
|
||||
+ QFile file(fileName);
|
||||
+ QVERIFY(file.open(QFile::WriteOnly));
|
||||
+ }
|
||||
+
|
||||
+ QLockFile secondLock(fileName);
|
||||
+ secondLock.setStaleLockTime(100);
|
||||
+ QVERIFY(secondLock.tryLock(10000));
|
||||
+ QCOMPARE(int(secondLock.error()), int(QLockFile::NoError));
|
||||
+}
|
||||
+
|
||||
QTEST_MAIN(tst_QLockFile)
|
||||
#include "tst_qlockfile.moc"
|
||||
--
|
||||
cgit v0.11.0
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
The fix for https://bugreports.qt.io/browse/QTBUG-76244 was not complete.
|
||||
Further quoting is needed to deal with empty variables.
|
||||
-- Eric Hameleers <alien@slackware.com>
|
||||
|
||||
--- qt-everywhere-src-5.13.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-06-13 06:18:18.000000000 +0200
|
||||
+++ qt-everywhere-src-5.13.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-09 19:37:15.253291684 +0200
|
||||
@@ -57,8 +57,8 @@
|
||||
|
||||
if(EXISTS \"${prl_file_location}\")
|
||||
file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\")
|
||||
- string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings})
|
||||
- string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends})
|
||||
+ string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends \"${_prl_strings}\")
|
||||
+ string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends \"${_static_depends}\")
|
||||
string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\")
|
||||
set(_search_paths)
|
||||
string(REPLACE \"\\$\\$[QT_INSTALL_LIBS]\" \"${_qt5_install_libs}\" _static_depends \"${_static_depends}\")
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
#
|
||||
# https://github.com/qt/qtbase/commit/494376f9.patch
|
||||
#
|
||||
From 494376f980e96339b6f1eff7c41336ca4d853065 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Thu, 12 Nov 2015 10:14:51 -0800
|
||||
Subject: [PATCH] Stop unloading plugins in QPluginLoader and QFactoryLoader
|
||||
|
||||
QPluginLoader hasn't unloaded in its destructor since Qt 5.0, but we
|
||||
missed the equivalent code in QFactoryLoader (which bypasses
|
||||
QPluginLoader). Besides, QPluginLoader::unload() was still doing
|
||||
unloading, which it won't anymore.
|
||||
|
||||
Not unloading plugins is Qt's policy, as decided during the 5.0
|
||||
development process and reaffirmed now in 5.6. This is due to static
|
||||
data in plugins leaking out and remaining in use past the unloading of
|
||||
the plugin, causing crashes.
|
||||
|
||||
This does not affect QLibrary and QLibrary::unload(). Those are meant
|
||||
for non-Qt loadable modules, so unloading them may be safe.
|
||||
|
||||
Task-number: QTBUG-49061
|
||||
Discussed-on: http://lists.qt-project.org/pipermail/development/2015-November/023681.html
|
||||
Change-Id: I461e9fc7199748faa187ffff1416070f138df8db
|
||||
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
||||
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
||||
---
|
||||
src/corelib/plugin/qfactoryloader.cpp | 6 ++++--
|
||||
src/corelib/plugin/qpluginloader.cpp | 5 +++--
|
||||
2 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
|
||||
index 53b38c3..c820d53 100644
|
||||
--- a/src/corelib/plugin/qfactoryloader.cpp
|
||||
+++ b/src/corelib/plugin/qfactoryloader.cpp
|
||||
@@ -203,10 +203,12 @@ void QFactoryLoader::update()
|
||||
++keyUsageCount;
|
||||
}
|
||||
}
|
||||
- if (keyUsageCount || keys.isEmpty())
|
||||
+ if (keyUsageCount || keys.isEmpty()) {
|
||||
+ library->setLoadHints(QLibrary::PreventUnloadHint); // once loaded, don't unload
|
||||
d->libraryList += library;
|
||||
- else
|
||||
+ } else {
|
||||
library->release();
|
||||
+ }
|
||||
}
|
||||
}
|
||||
#else
|
||||
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
|
||||
index 62067c7..4752f69 100644
|
||||
--- a/src/corelib/plugin/qpluginloader.cpp
|
||||
+++ b/src/corelib/plugin/qpluginloader.cpp
|
||||
@@ -154,6 +154,7 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
|
||||
: QObject(parent), d(0), did_load(false)
|
||||
{
|
||||
setFileName(fileName);
|
||||
+ setLoadHints(QLibrary::PreventUnloadHint);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -348,7 +349,7 @@ static QString locatePlugin(const QString& fileName)
|
||||
void QPluginLoader::setFileName(const QString &fileName)
|
||||
{
|
||||
#if defined(QT_SHARED)
|
||||
- QLibrary::LoadHints lh;
|
||||
+ QLibrary::LoadHints lh = QLibrary::PreventUnloadHint;
|
||||
if (d) {
|
||||
lh = d->loadHints();
|
||||
d->release();
|
||||
@@ -394,7 +395,7 @@ QString QPluginLoader::errorString() const
|
||||
\brief Give the load() function some hints on how it should behave.
|
||||
|
||||
You can give hints on how the symbols in the plugin are
|
||||
- resolved. By default, none of the hints are set.
|
||||
+ resolved. By default since Qt 5.7, QLibrary::PreventUnloadHint is set.
|
||||
|
||||
See the documentation of QLibrary::loadHints for a complete
|
||||
description of how this property works.
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
From 6f423555eba55ccdf7287071e10576bc1b687fd2 Mon Sep 17 00:00:00 2001
|
||||
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
||||
Date: Mon, 1 Aug 2016 13:39:53 +0200
|
||||
Subject: [PATCH] REG: Fix unwanted cache flush in Freetype engine
|
||||
|
||||
The Freetype cache was almost completely disabled by
|
||||
134c6db8587a8ce156d4fa31ffa62605821851b2 because after that
|
||||
change, the lockedAlphaMapForGlyph() function would no longer
|
||||
cut off early for empty glyphs like spaces, but rather go
|
||||
through all alpha map functions before it realized that there
|
||||
was nothing to render. This would in turn invalidate the cache
|
||||
for every empty glyph, causing all glyphs to be rerendered for
|
||||
every isolated word.
|
||||
|
||||
This change adds back a cut off. This is only needed in the
|
||||
lockedAlphaMapForGlyph() function, since the superclass implementation
|
||||
of the other alpha map functions already contains a cut off for
|
||||
width/height == 0.
|
||||
|
||||
[ChangeLog][Qt Gui][Text] Fixed a performance regression in Freetype
|
||||
engine that was introduced in Qt 5.5.
|
||||
|
||||
Change-Id: I381285939909e99cc5fb5f3497fecf9fa871f29a
|
||||
Task-number: QTBUG-49452
|
||||
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
||||
---
|
||||
src/gui/text/qfontengine_ft.cpp | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
|
||||
index 4de41df..7c878da 100644
|
||||
--- a/src/gui/text/qfontengine_ft.cpp
|
||||
+++ b/src/gui/text/qfontengine_ft.cpp
|
||||
@@ -1716,7 +1716,7 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe
|
||||
|
||||
static inline QImage alphaMapFromGlyphData(QFontEngineFT::Glyph *glyph, QFontEngine::GlyphFormat glyphFormat)
|
||||
{
|
||||
- if (glyph == Q_NULLPTR)
|
||||
+ if (glyph == Q_NULLPTR || glyph->height == 0 || glyph->width == 0)
|
||||
return QImage();
|
||||
|
||||
QImage::Format format = QImage::Format_Invalid;
|
||||
@@ -1764,11 +1764,15 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe
|
||||
|
||||
currentlyLockedAlphaMap = alphaMapFromGlyphData(glyph, neededFormat);
|
||||
|
||||
+ const bool glyphHasGeometry = glyph != Q_NULLPTR && glyph->height != 0 && glyph->width != 0;
|
||||
if (!cacheEnabled && glyph != &emptyGlyph) {
|
||||
currentlyLockedAlphaMap = currentlyLockedAlphaMap.copy();
|
||||
delete glyph;
|
||||
}
|
||||
|
||||
+ if (!glyphHasGeometry)
|
||||
+ return Q_NULLPTR;
|
||||
+
|
||||
if (currentlyLockedAlphaMap.isNull())
|
||||
return QFontEngine::lockedAlphaMapForGlyph(glyphIndex, subPixelPosition, neededFormat, t, offset);
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
build with explicitlib after all
|
||||
|
||||
unlike speculated in 2fe363514, this is not a workaround at all: it
|
||||
causes that libraries' public link interfaces (LIBS) are exported in the
|
||||
first place. unlike with staticlib, this does not export LIBS_PRIVATE,
|
||||
so it wouldn't even be a particularly effective workaround for rpath
|
||||
brokenness anyway.
|
||||
|
||||
the problem was pretty well hidden by the qt module system, which at the
|
||||
level of libraries is pretty redundant with the .prl file handling,
|
||||
which shows just how stupid the whole "design" is.
|
||||
|
||||
unlike before, we now enable explicitlib for all libraries, not just qt
|
||||
modules - we enable create_prl for all of them as well, after all.
|
||||
|
||||
an immediate effect of this change is that it fixes linking on RaspPI:
|
||||
the qtcore headers make the user code require linking libatomic, so we
|
||||
must add it to our public link interface.
|
||||
|
||||
Task-number: QTBUG-51621
|
||||
Change-Id: I5742c88694db8e8a9b79d17222dc6df2b38e5ab2
|
||||
|
||||
X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=blobdiff_plain;f=mkspecs%2Ffeatures%2Fqt_build_config.prf;h=b3081b960ec192c3421d7a1c2bd5a628f0ca8455;hp=518fd93f0457c6060721c38ad8b6a0286407e562;hb=268e7ee9778de79d2485bdd028721ec7adbc1324;hpb=495e8c205424253186bef47421de63534d23dd59
|
||||
|
||||
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
|
||||
index 518fd93..b3081b9 100644
|
||||
--- a/mkspecs/features/qt_build_config.prf
|
||||
+++ b/mkspecs/features/qt_build_config.prf
|
||||
@@ -72,6 +72,10 @@ CONFIG += \
|
||||
# However, testcases should be still built with exceptions.
|
||||
exceptions_off testcase_exceptions
|
||||
|
||||
+# Under Windows, this is neither necessary (transitive deps are automatically
|
||||
+# resolved), nor functional (.res files end up in .prl files and break things).
|
||||
+unix: CONFIG += explicitlib
|
||||
+
|
||||
|
||||
defineTest(qtBuildPart) {
|
||||
bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS)
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
From b024fbe83863fc57364a52c717d5b43d654bdb5d Mon Sep 17 00:00:00 2001
|
||||
From: Weng Xuetian <wengxt@gmail.com>
|
||||
Date: Sat, 5 Mar 2016 12:23:21 -0800
|
||||
Subject: [PATCH] QtDBus: clean up signal hooks and object tree in
|
||||
closeConnection
|
||||
|
||||
If a QObject is added or passed as receiver to QDBusConnection::connect()
|
||||
and it is managed by Q_GLOBAL_STATIC or similar mechanism, it is
|
||||
possible that when that its destructor is called after the dbus daemon
|
||||
thread ends. In that case, QObject::destroyed connected via
|
||||
Qt::BlockingQueuedConnection to QDBusConnectionPrivate will cause dead
|
||||
lock since the thread is no longer processing events.
|
||||
|
||||
Task-number: QTBUG-51648
|
||||
Change-Id: I1a1810a6d6d0234af0269d5f3fc1f54101bf1547
|
||||
---
|
||||
src/dbus/qdbusconnection_p.h | 1 +
|
||||
src/dbus/qdbusintegrator.cpp | 28 +++++++++++++++++++++++++++-
|
||||
2 files changed, 28 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
|
||||
index c77daf7..565eb83 100644
|
||||
--- a/src/dbus/qdbusconnection_p.h
|
||||
+++ b/src/dbus/qdbusconnection_p.h
|
||||
@@ -254,6 +254,7 @@ private:
|
||||
const QVector<int> &metaTypes, int slotIdx);
|
||||
|
||||
SignalHookHash::Iterator removeSignalHookNoLock(SignalHookHash::Iterator it);
|
||||
+ void disconnectObjectTree(ObjectTreeNode &node);
|
||||
|
||||
bool isServiceRegisteredByThread(const QString &serviceName);
|
||||
|
||||
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
|
||||
index cd44861..a3cd47b 100644
|
||||
--- a/src/dbus/qdbusintegrator.cpp
|
||||
+++ b/src/dbus/qdbusintegrator.cpp
|
||||
@@ -1030,7 +1030,6 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate()
|
||||
qPrintable(name));
|
||||
|
||||
closeConnection();
|
||||
- rootNode.children.clear(); // free resources
|
||||
qDeleteAll(cachedMetaObjects);
|
||||
|
||||
if (mode == ClientMode || mode == PeerMode) {
|
||||
@@ -1052,6 +1051,20 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate()
|
||||
}
|
||||
}
|
||||
|
||||
+void QDBusConnectionPrivate::disconnectObjectTree(QDBusConnectionPrivate::ObjectTreeNode &haystack)
|
||||
+{
|
||||
+ QDBusConnectionPrivate::ObjectTreeNode::DataList::Iterator it = haystack.children.begin();
|
||||
+
|
||||
+ while (it != haystack.children.end()) {
|
||||
+ disconnectObjectTree(*it);
|
||||
+ it++;
|
||||
+ }
|
||||
+
|
||||
+ if (haystack.obj) {
|
||||
+ haystack.obj->disconnect(this);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void QDBusConnectionPrivate::closeConnection()
|
||||
{
|
||||
QDBusWriteLocker locker(CloseConnectionAction, this);
|
||||
@@ -1075,6 +1088,19 @@ void QDBusConnectionPrivate::closeConnection()
|
||||
}
|
||||
|
||||
qDeleteAll(pendingCalls);
|
||||
+
|
||||
+ // clean up all signal hook and object tree, to avoid QObject::destroyed
|
||||
+ // being activated to dbus daemon thread which already quits.
|
||||
+ // dbus connection is already closed, so there is nothing we could do be clean
|
||||
+ // up everything here.
|
||||
+ SignalHookHash::iterator sit = signalHooks.begin();
|
||||
+ while (sit != signalHooks.end()) {
|
||||
+ sit.value().obj->disconnect(this);
|
||||
+ sit++;
|
||||
+ }
|
||||
+
|
||||
+ disconnectObjectTree(rootNode);
|
||||
+ rootNode.children.clear(); // free resources
|
||||
}
|
||||
|
||||
void QDBusConnectionPrivate::checkThread()
|
||||
--
|
||||
2.7.1
|
||||
|
||||
|
|
@ -1,159 +0,0 @@
|
|||
From acde2e69df5dedc624674107596f276125e22864 Mon Sep 17 00:00:00 2001
|
||||
From: Weng Xuetian <wengxt@gmail.com>
|
||||
Date: Thu, 3 Mar 2016 21:56:53 -0800
|
||||
Subject: [PATCH] QtDBus: finish all pending call with error if disconnected
|
||||
|
||||
libdbus will send a local signal if connection gets disconnected. When
|
||||
this happens, end all pending calls with QDBusError::Disconnected.
|
||||
|
||||
Task-number: QTBUG-51649
|
||||
Change-Id: I5c7d2a468bb5da746d0c0e53e458c1e376f186a9
|
||||
---
|
||||
src/dbus/dbus_minimal_p.h | 2 ++
|
||||
src/dbus/qdbusintegrator.cpp | 26 +++++++++++++++++-----
|
||||
src/dbus/qdbusutil_p.h | 6 +++++
|
||||
.../dbus/qdbusconnection/tst_qdbusconnection.cpp | 22 ++++++++++++++++++
|
||||
.../dbus/qdbusconnection/tst_qdbusconnection.h | 1 +
|
||||
5 files changed, 51 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/dbus/dbus_minimal_p.h b/src/dbus/dbus_minimal_p.h
|
||||
index f0a2954..8f25b24 100644
|
||||
--- a/src/dbus/dbus_minimal_p.h
|
||||
+++ b/src/dbus/dbus_minimal_p.h
|
||||
@@ -99,9 +99,11 @@ typedef dbus_uint32_t dbus_bool_t;
|
||||
/* dbus-shared.h */
|
||||
#define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
|
||||
#define DBUS_PATH_DBUS "/org/freedesktop/DBus"
|
||||
+#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local"
|
||||
#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
|
||||
#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
|
||||
#define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
|
||||
+#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local"
|
||||
|
||||
#define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */
|
||||
#define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 /**< Request to replace the current primary owner */
|
||||
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
|
||||
index cd44861..320419f 100644
|
||||
--- a/src/dbus/qdbusintegrator.cpp
|
||||
+++ b/src/dbus/qdbusintegrator.cpp
|
||||
@@ -519,6 +519,14 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
|
||||
switch (amsg.type()) {
|
||||
case QDBusMessage::SignalMessage:
|
||||
handleSignal(amsg);
|
||||
+ // Check local disconnected signal from libdbus
|
||||
+ if (amsg.interface() == QDBusUtil::dbusInterfaceLocal()
|
||||
+ && amsg.path() == QDBusUtil::dbusPathLocal()
|
||||
+ && amsg.member() == QDBusUtil::disconnected()
|
||||
+ && !QDBusMessagePrivate::isLocal(amsg)) {
|
||||
+ while (!pendingCalls.isEmpty())
|
||||
+ processFinishedCall(pendingCalls.first());
|
||||
+ }
|
||||
// if there are any other filters in this DBusConnection,
|
||||
// let them see the signal too
|
||||
return false;
|
||||
@@ -1767,10 +1775,16 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
|
||||
|
||||
QDBusMessage &msg = call->replyMessage;
|
||||
if (call->pending) {
|
||||
- // decode the message
|
||||
- DBusMessage *reply = q_dbus_pending_call_steal_reply(call->pending);
|
||||
- msg = QDBusMessagePrivate::fromDBusMessage(reply, connection->capabilities);
|
||||
- q_dbus_message_unref(reply);
|
||||
+ // when processFinishedCall is called and pending call is not completed,
|
||||
+ // it means we received disconnected signal from libdbus
|
||||
+ if (q_dbus_pending_call_get_completed(call->pending)) {
|
||||
+ // decode the message
|
||||
+ DBusMessage *reply = q_dbus_pending_call_steal_reply(call->pending);
|
||||
+ msg = QDBusMessagePrivate::fromDBusMessage(reply, connection->capabilities);
|
||||
+ q_dbus_message_unref(reply);
|
||||
+ } else {
|
||||
+ msg = QDBusMessage::createError(QDBusError::Disconnected, QDBusUtil::disconnectedErrorMessage());
|
||||
+ }
|
||||
}
|
||||
qDBusDebug() << connection << "got message reply:" << msg;
|
||||
|
||||
@@ -2070,8 +2084,8 @@ void QDBusConnectionPrivate::sendInternal(QDBusPendingCallPrivate *pcall, void *
|
||||
pcall->pending = pending;
|
||||
q_dbus_pending_call_set_notify(pending, qDBusResultReceived, pcall, 0);
|
||||
|
||||
- // DBus won't notify us when a peer disconnects so we need to track these ourselves
|
||||
- if (mode == QDBusConnectionPrivate::PeerMode)
|
||||
+ // DBus won't notify us when a peer disconnects or server terminates so we need to track these ourselves
|
||||
+ if (mode == QDBusConnectionPrivate::PeerMode || mode == QDBusConnectionPrivate::ClientMode)
|
||||
pendingCalls.append(pcall);
|
||||
|
||||
return;
|
||||
diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h
|
||||
index 8f5ae92..ca70ff9 100644
|
||||
--- a/src/dbus/qdbusutil_p.h
|
||||
+++ b/src/dbus/qdbusutil_p.h
|
||||
@@ -155,6 +155,8 @@ namespace QDBusUtil
|
||||
{ return QStringLiteral(DBUS_SERVICE_DBUS); }
|
||||
inline QString dbusPath()
|
||||
{ return QStringLiteral(DBUS_PATH_DBUS); }
|
||||
+ inline QString dbusPathLocal()
|
||||
+ { return QStringLiteral(DBUS_PATH_LOCAL); }
|
||||
inline QString dbusInterface()
|
||||
{
|
||||
// it's the same string, but just be sure
|
||||
@@ -165,8 +167,12 @@ namespace QDBusUtil
|
||||
{ return QStringLiteral(DBUS_INTERFACE_PROPERTIES); }
|
||||
inline QString dbusInterfaceIntrospectable()
|
||||
{ return QStringLiteral(DBUS_INTERFACE_INTROSPECTABLE); }
|
||||
+ inline QString dbusInterfaceLocal()
|
||||
+ { return QStringLiteral(DBUS_INTERFACE_LOCAL); }
|
||||
inline QString nameOwnerChanged()
|
||||
{ return QStringLiteral("NameOwnerChanged"); }
|
||||
+ inline QString disconnected()
|
||||
+ { return QStringLiteral("Disconnected"); }
|
||||
inline QString disconnectedErrorMessage()
|
||||
{ return QStringLiteral("Not connected to D-Bus server"); }
|
||||
}
|
||||
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
|
||||
index e91f87d..6c7e6b1 100644
|
||||
--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
|
||||
+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
|
||||
@@ -1218,6 +1218,28 @@ void tst_QDBusConnection::callVirtualObjectLocal()
|
||||
QCOMPARE(obj.replyArguments, subPathReply.arguments());
|
||||
}
|
||||
|
||||
+void tst_QDBusConnection::pendingCallWhenDisconnected()
|
||||
+{
|
||||
+ QDBusServer *server = new QDBusServer;
|
||||
+ QDBusConnection con = QDBusConnection::connectToPeer(server->address(), "disconnect");
|
||||
+ QTestEventLoop::instance().enterLoop(2);
|
||||
+ QVERIFY(!QTestEventLoop::instance().timeout());
|
||||
+ QVERIFY(con.isConnected());
|
||||
+
|
||||
+ delete server;
|
||||
+
|
||||
+ // Make sure we call the method before we know it is disconnected.
|
||||
+ QVERIFY(con.isConnected());
|
||||
+ QDBusMessage message = QDBusMessage::createMethodCall("", "/", QString(), "method");
|
||||
+ QDBusPendingCall reply = con.asyncCall(message);
|
||||
+
|
||||
+ QTestEventLoop::instance().enterLoop(2);
|
||||
+ QVERIFY(!con.isConnected());
|
||||
+ QVERIFY(reply.isFinished());
|
||||
+ QVERIFY(reply.isError());
|
||||
+ QVERIFY(reply.error().type() == QDBusError::Disconnected);
|
||||
+}
|
||||
+
|
||||
QString MyObject::path;
|
||||
QString MyObjectWithoutInterface::path;
|
||||
QString MyObjectWithoutInterface::interface;
|
||||
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
|
||||
index a53ba32..720e484 100644
|
||||
--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
|
||||
+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
|
||||
@@ -121,6 +121,7 @@ private slots:
|
||||
void registerVirtualObject();
|
||||
void callVirtualObject();
|
||||
void callVirtualObjectLocal();
|
||||
+ void pendingCallWhenDisconnected();
|
||||
|
||||
public:
|
||||
QString serviceName() const { return "org.qtproject.Qt.Autotests.QDBusConnection"; }
|
||||
--
|
||||
2.7.1
|
||||
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
From 11c5e716b08b6b3c5a7c9fce96b0cde8624ec869 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Tue, 15 Mar 2016 11:00:20 -0700
|
||||
Subject: [PATCH] Fix QtDBus deadlock inside kded/kiod
|
||||
|
||||
Whenever a message spy was installed, we failed to actually process
|
||||
looped-back messages by queueing them for processing by the spy. That
|
||||
had as a consequence that the caller got an error reply. Worse, since
|
||||
the message had been queued, QtDBus would attempt to deliver it later.
|
||||
Since that message had isLocal==true, bad things happened inside the
|
||||
manager thread.
|
||||
|
||||
The correct solution is not to queue the message for the filter. If the
|
||||
message is local, then simply deliver directly, as we're still in the
|
||||
user's thread. This used to be the behavior in Qt 5.5.
|
||||
|
||||
Task-number: QTBUG-51676
|
||||
Change-Id: I1dc112894cde7121e8ce302ae51b438ade1ff612
|
||||
---
|
||||
src/dbus/qdbusintegrator.cpp | 42 ++++++++++++++++++++++++++++++++----------
|
||||
src/dbus/qdbusintegrator_p.h | 1 +
|
||||
2 files changed, 33 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
|
||||
index cd44861..478a2c4 100644
|
||||
--- a/src/dbus/qdbusintegrator.cpp
|
||||
+++ b/src/dbus/qdbusintegrator.cpp
|
||||
@@ -481,6 +481,11 @@ QDBusSpyCallEvent::~QDBusSpyCallEvent()
|
||||
|
||||
void QDBusSpyCallEvent::placeMetaCall(QObject *)
|
||||
{
|
||||
+ invokeSpyHooks(msg, hooks, hookCount);
|
||||
+}
|
||||
+
|
||||
+inline void QDBusSpyCallEvent::invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount)
|
||||
+{
|
||||
// call the spy hook list
|
||||
for (int i = 0; i < hookCount; ++i)
|
||||
hooks[i](msg);
|
||||
@@ -509,7 +514,12 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
|
||||
{
|
||||
if (!ref.load())
|
||||
return false;
|
||||
- if (!dispatchEnabled && !QDBusMessagePrivate::isLocal(amsg)) {
|
||||
+
|
||||
+ // local message are always delivered, regardless of filtering
|
||||
+ // or whether the dispatcher is enabled
|
||||
+ bool isLocal = QDBusMessagePrivate::isLocal(amsg);
|
||||
+
|
||||
+ if (!dispatchEnabled && !isLocal) {
|
||||
// queue messages only, we'll handle them later
|
||||
qDBusDebug() << this << "delivery is suspended";
|
||||
pendingMessages << amsg;
|
||||
@@ -523,13 +533,23 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
|
||||
// let them see the signal too
|
||||
return false;
|
||||
case QDBusMessage::MethodCallMessage:
|
||||
- // run it through the spy filters (if any) before the regular processing
|
||||
+ // run it through the spy filters (if any) before the regular processing:
|
||||
+ // a) if it's a local message, we're in the caller's thread, so invoke the filter directly
|
||||
+ // b) if it's an external message, post to the main thread
|
||||
if (Q_UNLIKELY(qDBusSpyHookList.exists()) && qApp) {
|
||||
const QDBusSpyHookList &list = *qDBusSpyHookList;
|
||||
- qDBusDebug() << this << "invoking message spies";
|
||||
- QCoreApplication::postEvent(qApp, new QDBusSpyCallEvent(this, QDBusConnection(this),
|
||||
- amsg, list.constData(), list.size()));
|
||||
- return true;
|
||||
+ if (isLocal) {
|
||||
+ Q_ASSERT(QThread::currentThread() != thread());
|
||||
+ qDBusDebug() << this << "invoking message spies directly";
|
||||
+ QDBusSpyCallEvent::invokeSpyHooks(amsg, list.constData(), list.size());
|
||||
+ } else {
|
||||
+ qDBusDebug() << this << "invoking message spies via event";
|
||||
+ QCoreApplication::postEvent(qApp, new QDBusSpyCallEvent(this, QDBusConnection(this),
|
||||
+ amsg, list.constData(), list.size()));
|
||||
+
|
||||
+ // we'll be called back, so return
|
||||
+ return true;
|
||||
+ }
|
||||
}
|
||||
|
||||
handleObjectCall(amsg);
|
||||
@@ -1451,9 +1471,9 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg)
|
||||
// that means the dispatchLock mutex is locked
|
||||
// must not call out to user code in that case
|
||||
//
|
||||
- // however, if the message is internal, handleMessage was called
|
||||
- // directly and no lock is in place. We can therefore call out to
|
||||
- // user code, if necessary
|
||||
+ // however, if the message is internal, handleMessage was called directly
|
||||
+ // (user's thread) and no lock is in place. We can therefore call out to
|
||||
+ // user code, if necessary.
|
||||
ObjectTreeNode result;
|
||||
int usedLength;
|
||||
QThread *objThread = 0;
|
||||
@@ -1492,12 +1512,14 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg)
|
||||
usedLength, msg));
|
||||
return;
|
||||
} else if (objThread != QThread::currentThread()) {
|
||||
- // synchronize with other thread
|
||||
+ // looped-back message, targeting another thread:
|
||||
+ // synchronize with it
|
||||
postEventToThread(HandleObjectCallPostEventAction, result.obj,
|
||||
new QDBusActivateObjectEvent(QDBusConnection(this), this, result,
|
||||
usedLength, msg, &sem));
|
||||
semWait = true;
|
||||
} else {
|
||||
+ // looped-back message, targeting current thread
|
||||
semWait = false;
|
||||
}
|
||||
} // release the lock
|
||||
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
|
||||
index 2bbebdf..c0d9c22 100644
|
||||
--- a/src/dbus/qdbusintegrator_p.h
|
||||
+++ b/src/dbus/qdbusintegrator_p.h
|
||||
@@ -145,6 +145,7 @@ public:
|
||||
{}
|
||||
~QDBusSpyCallEvent();
|
||||
void placeMetaCall(QObject *) Q_DECL_OVERRIDE;
|
||||
+ static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount);
|
||||
|
||||
QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up
|
||||
QDBusMessage msg;
|
||||
--
|
||||
2.7.1
|
||||
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
QTBUG-51890: qtwebengine fails to build with system nss 3.23
|
||||
Patch obtained from:
|
||||
https://github.com/qtproject/qtwebengine/commit/82900c7b96b2a6fb42fe3841df7685b820edd588.patch
|
||||
|
||||
And modified to exclude the "Subproject commit" lines.
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Koehne <kai.koehne@theqtcompany.com>
|
||||
Date: Thu, 24 Mar 2016 13:55:28 +0100
|
||||
Subject: [PATCH] Use system NSS only for certificate handling
|
||||
|
||||
Compiling against NSS 3.23 fails with current Chromium. Also, with NSS
|
||||
3.21 there are failures connecting to e.g. google.com.
|
||||
|
||||
Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL
|
||||
is always used for cryptography, and NSS only for certificate handlng.
|
||||
|
||||
Patches included in 3rdparty update:
|
||||
|
||||
0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build.
|
||||
0472123 Fix build against newer NSS
|
||||
90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56
|
||||
34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!"
|
||||
|
||||
Task-number: QTBUG-52193
|
||||
Task-number: QTBUG-51890
|
||||
Task-number: QTBUG-52068
|
||||
Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
||||
---
|
||||
src/3rdparty | 2 +-
|
||||
src/core/config/linux.pri | 9 ++++++---
|
||||
tools/qmake/mkspecs/features/configure.prf | 4 ++--
|
||||
3 files changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
#diff --git a/src/3rdparty b/src/3rdparty
|
||||
#index 3b2b78c..0a385bb 160000
|
||||
#--- a/src/3rdparty
|
||||
#+++ b/src/3rdparty
|
||||
#@@ -1 +1 @@
|
||||
#-Subproject commit 3b2b78caa761db2b7b25dc51c3dae8316f595db1
|
||||
#+Subproject commit 0a385bb01d9cf060fae4c9d350ee98561654df96
|
||||
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
|
||||
index 88c1a41..39eeb2a 100644
|
||||
--- a/src/core/config/linux.pri
|
||||
+++ b/src/core/config/linux.pri
|
||||
@@ -18,11 +18,14 @@ GYP_CONFIG += \
|
||||
use_gio=0 \
|
||||
use_gnome_keyring=0 \
|
||||
use_kerberos=0 \
|
||||
- use_pango=0
|
||||
+ use_pango=0 \
|
||||
+ use_openssl=1
|
||||
|
||||
-!use?(nss) {
|
||||
+use?(nss) {
|
||||
+ GYP_CONFIG += use_nss_certs=1 \
|
||||
+ use_openssl_certs=0
|
||||
+} else {
|
||||
GYP_CONFIG += use_nss_certs=0 \
|
||||
- use_openssl=1 \
|
||||
use_openssl_certs=1
|
||||
}
|
||||
|
||||
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
|
||||
index 4cb4600..953572d 100644
|
||||
--- a/tools/qmake/mkspecs/features/configure.prf
|
||||
+++ b/tools/qmake/mkspecs/features/configure.prf
|
||||
@@ -72,9 +72,9 @@ defineTest(runConfigure) {
|
||||
defineTest(finalizeConfigure) {
|
||||
linux {
|
||||
use?(nss) {
|
||||
- log("SSL............................... Using system NSS$${EOL}")
|
||||
+ log("Certificate handling.............. Using system NSS$${EOL}")
|
||||
} else {
|
||||
- log("SSL............................... Using bundled BoringSSL$${EOL}")
|
||||
+ log("Certificate handling.............. Using bundled BoringSSL$${EOL}")
|
||||
}
|
||||
use?(system_icu) {
|
||||
packagesExist("icu-uc icu-i18n") {
|
||||
|
|
@ -1,185 +0,0 @@
|
|||
From 5149aa68eca6ede8836ec4f07a14d22d9da9b161 Mon Sep 17 00:00:00 2001
|
||||
From: Mitch Curtis <mitch.curtis@qt.io>
|
||||
Date: Tue, 13 Sep 2016 12:42:12 +0200
|
||||
Subject: Fix crash on exit when using default property aliases with layouts
|
||||
|
||||
The layout was being destroyed before the text, which meant that the
|
||||
removeItemChangeListener() call never got hit. To ensure that the
|
||||
listener is always removed, loop through each child in QQuickLayout's
|
||||
destructor.
|
||||
|
||||
This is a manual cherry-pick of
|
||||
59c6c0e0b1b5b46747595a58e11311b7393d7e70.
|
||||
|
||||
Task-number: QTBUG-51927
|
||||
Change-Id: I669f42beb8c3dd6b4b741cae0b16e017bb3409df
|
||||
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
||||
---
|
||||
src/imports/layouts/qquicklayout.cpp | 4 ++
|
||||
.../qquicklayouts/data/rowlayout/Container.qml | 55 ++++++++++++++++++++++
|
||||
.../qquicklayouts/data/rowlayout/ContainerUser.qml | 53 +++++++++++++++++++++
|
||||
.../quick/qquicklayouts/data/tst_rowlayout.qml | 12 +++++
|
||||
4 files changed, 124 insertions(+)
|
||||
create mode 100644 tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml
|
||||
create mode 100644 tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml
|
||||
|
||||
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
|
||||
index abc8f97..9914826 100644
|
||||
--- a/src/imports/layouts/qquicklayout.cpp
|
||||
+++ b/src/imports/layouts/qquicklayout.cpp
|
||||
@@ -698,6 +698,10 @@ QQuickLayout::QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent)
|
||||
QQuickLayout::~QQuickLayout()
|
||||
{
|
||||
d_func()->m_isReady = false;
|
||||
+
|
||||
+ const auto childItems = d_func()->childItems;
|
||||
+ for (QQuickItem *child : childItems)
|
||||
+ QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::SiblingOrder);
|
||||
}
|
||||
|
||||
QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object)
|
||||
diff --git a/tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml b/tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml
|
||||
new file mode 100644
|
||||
index 0000000..22205c1
|
||||
--- /dev/null
|
||||
+++ b/tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml
|
||||
@@ -0,0 +1,55 @@
|
||||
+/****************************************************************************
|
||||
+**
|
||||
+** Copyright (C) 2016 The Qt Company Ltd.
|
||||
+** Contact: http://www.qt.io/licensing/
|
||||
+**
|
||||
+** This file is part of the test suite of the Qt Toolkit.
|
||||
+**
|
||||
+** $QT_BEGIN_LICENSE:BSD$
|
||||
+** You may use this file under the terms of the BSD license as follows:
|
||||
+**
|
||||
+** "Redistribution and use in source and binary forms, with or without
|
||||
+** modification, are permitted provided that the following conditions are
|
||||
+** met:
|
||||
+** * Redistributions of source code must retain the above copyright
|
||||
+** notice, this list of conditions and the following disclaimer.
|
||||
+** * Redistributions in binary form must reproduce the above copyright
|
||||
+** notice, this list of conditions and the following disclaimer in
|
||||
+** the documentation and/or other materials provided with the
|
||||
+** distribution.
|
||||
+** * Neither the name of The Qt Company Ltd nor the names of its
|
||||
+** contributors may be used to endorse or promote products derived
|
||||
+** from this software without specific prior written permission.
|
||||
+**
|
||||
+**
|
||||
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
+** "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 COPYRIGHT
|
||||
+** OWNER OR CONTRIBUTORS 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."
|
||||
+**
|
||||
+** $QT_END_LICENSE$
|
||||
+**
|
||||
+****************************************************************************/
|
||||
+
|
||||
+import QtQuick 2.7
|
||||
+import QtQuick.Layouts 1.3
|
||||
+
|
||||
+Item {
|
||||
+ objectName: "qtbug51927-window"
|
||||
+ visible: true
|
||||
+
|
||||
+ default property alias _contents: customContent.data
|
||||
+
|
||||
+ RowLayout {
|
||||
+ id: customContent
|
||||
+ objectName: "qtbug51927-columnLayout"
|
||||
+ anchors.fill: parent
|
||||
+ }
|
||||
+}
|
||||
diff --git a/tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml b/tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml
|
||||
new file mode 100644
|
||||
index 0000000..ff7ce62
|
||||
--- /dev/null
|
||||
+++ b/tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml
|
||||
@@ -0,0 +1,53 @@
|
||||
+/****************************************************************************
|
||||
+**
|
||||
+** Copyright (C) 2016 The Qt Company Ltd.
|
||||
+** Contact: http://www.qt.io/licensing/
|
||||
+**
|
||||
+** This file is part of the test suite of the Qt Toolkit.
|
||||
+**
|
||||
+** $QT_BEGIN_LICENSE:BSD$
|
||||
+** You may use this file under the terms of the BSD license as follows:
|
||||
+**
|
||||
+** "Redistribution and use in source and binary forms, with or without
|
||||
+** modification, are permitted provided that the following conditions are
|
||||
+** met:
|
||||
+** * Redistributions of source code must retain the above copyright
|
||||
+** notice, this list of conditions and the following disclaimer.
|
||||
+** * Redistributions in binary form must reproduce the above copyright
|
||||
+** notice, this list of conditions and the following disclaimer in
|
||||
+** the documentation and/or other materials provided with the
|
||||
+** distribution.
|
||||
+** * Neither the name of The Qt Company Ltd nor the names of its
|
||||
+** contributors may be used to endorse or promote products derived
|
||||
+** from this software without specific prior written permission.
|
||||
+**
|
||||
+**
|
||||
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
+** "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 COPYRIGHT
|
||||
+** OWNER OR CONTRIBUTORS 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."
|
||||
+**
|
||||
+** $QT_END_LICENSE$
|
||||
+**
|
||||
+****************************************************************************/
|
||||
+
|
||||
+import QtQuick 2.6
|
||||
+import QtQuick.Window 2.2
|
||||
+
|
||||
+Container {
|
||||
+ visible: true
|
||||
+
|
||||
+ Text {
|
||||
+ objectName: "qtbug51927-text"
|
||||
+ text: qsTr("Hello World")
|
||||
+ anchors.centerIn: parent
|
||||
+ renderType: Text.QtRendering
|
||||
+ }
|
||||
+}
|
||||
diff --git a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml
|
||||
index 33b8fd0..2d4e227 100644
|
||||
--- a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml
|
||||
+++ b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml
|
||||
@@ -926,5 +926,17 @@ Item {
|
||||
waitForRendering(layout)
|
||||
layout.destroy()
|
||||
}
|
||||
+
|
||||
+
|
||||
+ function test_defaultPropertyAliasCrash() {
|
||||
+ var containerUserComponent = Qt.createComponent("rowlayout/ContainerUser.qml");
|
||||
+ compare(containerUserComponent.status, Component.Ready);
|
||||
+
|
||||
+ var containerUser = containerUserComponent.createObject(testCase);
|
||||
+ verify(containerUser);
|
||||
+
|
||||
+ // Shouldn't crash.
|
||||
+ containerUser.destroy();
|
||||
+ }
|
||||
}
|
||||
}
|
||||
--
|
||||
cgit v1.0-4-g1e03
|
||||
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
From 8e889378115c69508b050a511621ac8e30ec4158 Mon Sep 17 00:00:00 2001
|
||||
From: Jesus Fernandez <jesus.fernandez@theqtcompany.com>
|
||||
Date: Mon, 13 Jun 2016 19:09:15 +0200
|
||||
Subject: [PATCH] Fix UNSIGNED values in QMYSQL
|
||||
|
||||
The unsigned flag in columns was ignored when creating the list of
|
||||
bound values in a mysql table. So the result iteration with
|
||||
QSqlQuery::next stops after the first wrong truncated value.
|
||||
|
||||
[ChangeLog][QtSql] Fixed QSqlQuery::prepare value truncation error when
|
||||
using UNSIGNED values in a MySQL database.
|
||||
|
||||
Task-number: QTBUG-53969
|
||||
Task-number: QTBUG-53237
|
||||
Change-Id: I10d977993445f2794f1dd8c88b2e83517ef524f3
|
||||
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
||||
---
|
||||
src/sql/drivers/mysql/qsql_mysql.cpp | 1 +
|
||||
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 39 +++++++++++++++++++++++
|
||||
2 files changed, 40 insertions(+)
|
||||
|
||||
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
|
||||
index 96bdcc4..55bf499 100644
|
||||
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
|
||||
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
|
||||
@@ -387,6 +387,7 @@ bool QMYSQLResultPrivate::bindInValues()
|
||||
bind->buffer_length = f.bufLength = fieldInfo->length + 1;
|
||||
bind->is_null = &f.nullIndicator;
|
||||
bind->length = &f.bufLength;
|
||||
+ bind->is_unsigned = fieldInfo->flags & UNSIGNED_FLAG ? 1 : 0;
|
||||
f.outField=field;
|
||||
|
||||
++i;
|
||||
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
|
||||
index bd553d5..f1c4333 100644
|
||||
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
|
||||
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
|
||||
@@ -233,6 +233,9 @@ private slots:
|
||||
void QTBUG_36211_data() { generic_data("QPSQL"); }
|
||||
void QTBUG_36211();
|
||||
|
||||
+ void QTBUG_53969_data() { generic_data("QMYSQL"); }
|
||||
+ void QTBUG_53969();
|
||||
+
|
||||
void sqlite_constraint_data() { generic_data("QSQLITE"); }
|
||||
void sqlite_constraint();
|
||||
|
||||
@@ -3652,6 +3655,42 @@ void tst_QSqlQuery::QTBUG_36211()
|
||||
}
|
||||
}
|
||||
|
||||
+void tst_QSqlQuery::QTBUG_53969()
|
||||
+{
|
||||
+ QFETCH( QString, dbName );
|
||||
+ QVector<int> values = QVector<int>() << 10 << 20 << 127 << 128 << 1, tableValues;
|
||||
+ QSqlDatabase db = QSqlDatabase::database( dbName );
|
||||
+ CHECK_DATABASE( db );
|
||||
+ tableValues.reserve(values.size());
|
||||
+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer) {
|
||||
+ const QString tableName(qTableName("bug53969", __FILE__, db));
|
||||
+ tst_Databases::safeDropTable( db, tableName );
|
||||
+
|
||||
+ QSqlQuery q(db);
|
||||
+ QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (id INT AUTO_INCREMENT PRIMARY KEY, "
|
||||
+ "test_number TINYINT(3) UNSIGNED)")
|
||||
+ .arg(tableName)));
|
||||
+
|
||||
+ QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (test_number) VALUES (:value)"));
|
||||
+
|
||||
+ QVector<int>::iterator begin = values.begin(), end = values.end(), it;
|
||||
+ for (it = begin; it != end; ++it) {
|
||||
+ q.bindValue(":value", *it);
|
||||
+ QVERIFY_SQL(q, exec());
|
||||
+ }
|
||||
+
|
||||
+ QVERIFY_SQL(q, prepare("SELECT test_number FROM " + tableName));
|
||||
+ QVERIFY_SQL(q, exec());
|
||||
+
|
||||
+ while (q.next()) {
|
||||
+ bool ok;
|
||||
+ tableValues.push_back(q.value(0).toUInt(&ok));
|
||||
+ QVERIFY(ok);
|
||||
+ }
|
||||
+ QCOMPARE(values, tableValues);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void tst_QSqlQuery::oraOCINumber()
|
||||
{
|
||||
QFETCH( QString, dbName );
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
#
|
||||
# https://github.com/qt/qtbase/commit/84ea00d4.patch
|
||||
#
|
||||
From 84ea00d47049d882f2fabf1446ec6c6eb5fe3038 Mon Sep 17 00:00:00 2001
|
||||
From: J-P Nurmi <jpnurmi@qt.io>
|
||||
Date: Tue, 6 Dec 2016 16:30:31 +0100
|
||||
Subject: [PATCH] QGtk3Dialog: don't crash on Wayland
|
||||
|
||||
Check if it's an X11 window before calling XSetTransientForHint().
|
||||
No transient parent will be set for GTK+ dialogs on Wayland. That
|
||||
has to be implemented separately.
|
||||
|
||||
Task-number: QTBUG-55583
|
||||
Change-Id: Iabc2a72681c8157bb2f2fe500892853aa397106b
|
||||
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
|
||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||
---
|
||||
src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
|
||||
index ba5089a..699b058 100644
|
||||
--- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
|
||||
+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
|
||||
@@ -135,10 +135,12 @@ bool QGtk3Dialog::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWind
|
||||
|
||||
GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget);
|
||||
if (parent) {
|
||||
- GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
|
||||
- XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
|
||||
- gdk_x11_window_get_xid(gdkWindow),
|
||||
- parent->winId());
|
||||
+ if (GDK_IS_X11_WINDOW(gdkWindow)) {
|
||||
+ GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
|
||||
+ XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
|
||||
+ gdk_x11_window_get_xid(gdkWindow),
|
||||
+ parent->winId());
|
||||
+ }
|
||||
}
|
||||
|
||||
if (modality != Qt::NonModal) {
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
https://github.com/qt/qtbase/commit/f45c6c18.patch
|
||||
|
||||
From f45c6c180463ccb6620e1d273a264f14a1204a93 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Wed, 3 May 2017 14:08:50 -0700
|
||||
Subject: [PATCH] QInternal::unregisterCallback: don't crash on unregistering
|
||||
during exit
|
||||
|
||||
Task-number: QTBUG-60558
|
||||
Change-Id: Ica9894dc9b5e48278fd4fffd14bb34c6d98d2555
|
||||
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
|
||||
---
|
||||
src/corelib/global/qglobal.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
|
||||
index c37503f3db..22fc20d47e 100644
|
||||
--- a/src/corelib/global/qglobal.cpp
|
||||
+++ b/src/corelib/global/qglobal.cpp
|
||||
@@ -3988,8 +3988,10 @@ bool QInternal::registerCallback(Callback cb, qInternalCallback callback)
|
||||
bool QInternal::unregisterCallback(Callback cb, qInternalCallback callback)
|
||||
{
|
||||
if (cb >= 0 && cb < QInternal::LastCallback) {
|
||||
- QInternal_CallBackTable *cbt = global_callback_table();
|
||||
- return (bool) cbt->callbacks[cb].removeAll(callback);
|
||||
+ if (global_callback_table.exists()) {
|
||||
+ QInternal_CallBackTable *cbt = global_callback_table();
|
||||
+ return (bool) cbt->callbacks[cb].removeAll(callback);
|
||||
+ }
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
https://github.com/qt/qtbase/commit/744fd39e.patch
|
||||
|
||||
From 744fd39e66b0b44e65a2505d674fa1cda8b205a4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
|
||||
Date: Fri, 2 Jun 2017 11:09:55 +0200
|
||||
Subject: [PATCH] xcb: Don't destroy foreign windows
|
||||
|
||||
We can't rely on virtual dispatch in the destructor.
|
||||
|
||||
Task-number: QTBUG-61140
|
||||
Change-Id: Ib1026caf126095778c24254775cb5a0bfecf3a38
|
||||
Reviewed-by: Fabian Vogt
|
||||
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
|
||||
---
|
||||
src/plugins/platforms/xcb/qxcbintegration.cpp | 18 +-----------------
|
||||
src/plugins/platforms/xcb/qxcbwindow.cpp | 16 ++++++++++------
|
||||
src/plugins/platforms/xcb/qxcbwindow.h | 12 ++++++++++++
|
||||
3 files changed, 23 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
|
||||
index b414bee204..8e3ee20329 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
|
||||
@@ -214,25 +214,9 @@ QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const
|
||||
return xcbWindow;
|
||||
}
|
||||
|
||||
-class QXcbForeignWindow : public QXcbWindow
|
||||
-{
|
||||
-public:
|
||||
- QXcbForeignWindow(QWindow *window, WId nativeHandle)
|
||||
- : QXcbWindow(window) { m_window = nativeHandle; }
|
||||
- ~QXcbForeignWindow() {}
|
||||
- bool isForeignWindow() const override { return true; }
|
||||
-
|
||||
-protected:
|
||||
- // No-ops
|
||||
- void create() override {}
|
||||
- void destroy() override {}
|
||||
-};
|
||||
-
|
||||
QPlatformWindow *QXcbIntegration::createForeignWindow(QWindow *window, WId nativeHandle) const
|
||||
{
|
||||
- QXcbWindow *xcbWindow = new QXcbForeignWindow(window, nativeHandle);
|
||||
- xcbWindow->create();
|
||||
- return xcbWindow;
|
||||
+ return new QXcbForeignWindow(window, nativeHandle);
|
||||
}
|
||||
|
||||
#ifndef QT_NO_OPENGL
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
index 289d0720e7..d6c69d52ef 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
@@ -597,13 +597,17 @@ QXcbWindow::~QXcbWindow()
|
||||
}
|
||||
|
||||
destroy();
|
||||
+}
|
||||
|
||||
- if (isForeignWindow()) {
|
||||
- if (connection()->mouseGrabber() == this)
|
||||
- connection()->setMouseGrabber(Q_NULLPTR);
|
||||
- if (connection()->mousePressWindow() == this)
|
||||
- connection()->setMousePressWindow(Q_NULLPTR);
|
||||
- }
|
||||
+QXcbForeignWindow::~QXcbForeignWindow()
|
||||
+{
|
||||
+ // Clear window so that destroy() does not affect it
|
||||
+ m_window = 0;
|
||||
+
|
||||
+ if (connection()->mouseGrabber() == this)
|
||||
+ connection()->setMouseGrabber(nullptr);
|
||||
+ if (connection()->mousePressWindow() == this)
|
||||
+ connection()->setMousePressWindow(nullptr);
|
||||
}
|
||||
|
||||
void QXcbWindow::destroy()
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
index 56628094ee..f38343b6c2 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
@@ -278,6 +278,18 @@ public Q_SLOTS:
|
||||
xcb_cursor_t m_currentBitmapCursor = XCB_CURSOR_NONE;
|
||||
};
|
||||
|
||||
+class QXcbForeignWindow : public QXcbWindow
|
||||
+{
|
||||
+public:
|
||||
+ QXcbForeignWindow(QWindow *window, WId nativeHandle)
|
||||
+ : QXcbWindow(window) { m_window = nativeHandle; }
|
||||
+ ~QXcbForeignWindow();
|
||||
+ bool isForeignWindow() const override { return true; }
|
||||
+
|
||||
+protected:
|
||||
+ void create() override {} // No-op
|
||||
+};
|
||||
+
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Q_DECLARE_METATYPE(QXcbWindow*)
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a7771f206d4b29be549d3827c36a46679d90de6
|
||||
|
||||
From 4a7771f206d4b29be549d3827c36a46679d90de6 Mon Sep 17 00:00:00 2001
|
||||
From: Eike Hein <hein@kde.org>
|
||||
Date: Sun, 7 Jan 2018 13:02:01 +0900
|
||||
Subject: QSimpleDrag: Fix mouse release coords for delayed event transmission
|
||||
|
||||
On platforms such as XCB, the drag cursor pixmap is shown via a window
|
||||
(a QShapedPixmapWindow) under the cursor.
|
||||
|
||||
The mouse button release event at the end of the drag is received in
|
||||
this QXcbWindow, but intercepted by an event filter that QSimpleDrag
|
||||
installs on the QApplication. It then resends it unmodified(!) after
|
||||
the drag has ended and the drag pixmap window destroyed, causing it to
|
||||
be delivered to the new top-level window.
|
||||
|
||||
The local coordinates in the unmodified QMouseEvent are local to the
|
||||
drag pixmap window and don't match the window it is delayed-transmitted
|
||||
to.
|
||||
|
||||
This ends up having fatal, user-visible effects particularly in Qt
|
||||
Quick: QQuickWindow synthesizes a hover event once per frame using
|
||||
the last received mouse coordinates, here: the release posted by
|
||||
QSimpleDrag. This is done to update the hover event state for items
|
||||
under the cursor when the mouse hasn't moved (e.g. QQuickMouseArea::
|
||||
containsMouse). The bogus event coordinates in the release event then
|
||||
usually end up causing an item near the top-left of the QQuickWindow
|
||||
to assume it is hovered (because drag pixmap windows tend to be small),
|
||||
even when the mouse cursor is actually far away from it at the end of
|
||||
the drag.
|
||||
|
||||
This shows up e.g. in the Plasma 5 desktop, where dragging an icon
|
||||
on the desktop will cause the icon at the top-left of the screen (if
|
||||
any) to switch to hovered state, as the release coordinates on the
|
||||
drag pixmap window (showing a dragged icon) fall into the geometry
|
||||
of the top-left icon.
|
||||
|
||||
QSimpleDrag contains a topLevelAt() function to find the top-level
|
||||
window under the global cursor coordinates that is not the drag
|
||||
pixmap window. This is used by the drop event delivery code.
|
||||
|
||||
This patch uses this function to find the relevant top-level window,
|
||||
then asks it to map the global cusor coordinates to its local
|
||||
coordinate system, then synthesizes a new QMouseEvent with local
|
||||
coordinates computed in this fashion. As a result the window now
|
||||
gets a release event with coordinates that make sense and are
|
||||
correct.
|
||||
|
||||
Task-number: QTBUG-66103
|
||||
Change-Id: I04ebe6ccd4a991fdd4b540ff0227973ea8896a9d
|
||||
Reviewed-by: Eike Hein <hein@kde.org>
|
||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||
---
|
||||
src/gui/kernel/qsimpledrag.cpp | 32 +++++++++++++++++++++++++++-----
|
||||
src/gui/kernel/qsimpledrag_p.h | 6 +++---
|
||||
2 files changed, 30 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
|
||||
index a1e25dc53c..87d3ba5915 100644
|
||||
--- a/src/gui/kernel/qsimpledrag.cpp
|
||||
+++ b/src/gui/kernel/qsimpledrag.cpp
|
||||
@@ -58,6 +58,7 @@
|
||||
|
||||
#include <QtCore/QEventLoop>
|
||||
#include <QtCore/QDebug>
|
||||
+#include <QtCore/QLoggingCategory>
|
||||
|
||||
#include <private/qguiapplication_p.h>
|
||||
#include <private/qdnd_p.h>
|
||||
@@ -69,6 +70,8 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
#ifndef QT_NO_DRAGANDDROP
|
||||
|
||||
+Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd")
|
||||
+
|
||||
static QWindow* topLevelAt(const QPoint &pos)
|
||||
{
|
||||
QWindowList list = QGuiApplication::topLevelWindows();
|
||||
@@ -94,10 +97,10 @@ static QWindow* topLevelAt(const QPoint &pos)
|
||||
*/
|
||||
|
||||
QBasicDrag::QBasicDrag() :
|
||||
- m_restoreCursor(false), m_eventLoop(0),
|
||||
+ m_current_window(nullptr), m_restoreCursor(false), m_eventLoop(nullptr),
|
||||
m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false),
|
||||
- m_drag(0), m_drag_icon_window(0), m_useCompositing(true),
|
||||
- m_screen(Q_NULLPTR)
|
||||
+ m_drag(nullptr), m_drag_icon_window(nullptr), m_useCompositing(true),
|
||||
+ m_screen(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -161,6 +164,7 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
|
||||
return true; // Eat all mouse move events
|
||||
}
|
||||
case QEvent::MouseButtonRelease:
|
||||
+ {
|
||||
disableEventFilter();
|
||||
if (canDrop()) {
|
||||
QPoint nativePosition = getNativeMousePos(e, m_drag_icon_window);
|
||||
@@ -169,8 +173,25 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
|
||||
cancel();
|
||||
}
|
||||
exitDndEventLoop();
|
||||
- QCoreApplication::postEvent(o, new QMouseEvent(*static_cast<QMouseEvent *>(e)));
|
||||
+
|
||||
+ // If a QShapedPixmapWindow (drag feedback) is being dragged along, the
|
||||
+ // mouse event's localPos() will be relative to that, which is useless.
|
||||
+ // We want a position relative to the window where the drag ends, if possible (?).
|
||||
+ // If there is no such window (belonging to this Qt application),
|
||||
+ // make the event relative to the window where the drag started. (QTBUG-66103)
|
||||
+ const QMouseEvent *release = static_cast<QMouseEvent *>(e);
|
||||
+ const QWindow *releaseWindow = topLevelAt(release->globalPos());
|
||||
+ qCDebug(lcDnd) << "mouse released over" << releaseWindow << "after drag from" << m_current_window << "globalPos" << release->globalPos();
|
||||
+ if (!releaseWindow)
|
||||
+ releaseWindow = m_current_window;
|
||||
+ QPoint releaseWindowPos = (releaseWindow ? releaseWindow->mapFromGlobal(release->globalPos()) : release->globalPos());
|
||||
+ QMouseEvent *newRelease = new QMouseEvent(release->type(),
|
||||
+ releaseWindowPos, releaseWindowPos, release->screenPos(),
|
||||
+ release->button(), release->buttons(),
|
||||
+ release->modifiers(), release->source());
|
||||
+ QCoreApplication::postEvent(o, newRelease);
|
||||
return true; // defer mouse release events until drag event loop has returned
|
||||
+ }
|
||||
case QEvent::MouseButtonDblClick:
|
||||
case QEvent::Wheel:
|
||||
return true;
|
||||
@@ -349,7 +370,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point)
|
||||
into account.
|
||||
*/
|
||||
|
||||
-QSimpleDrag::QSimpleDrag() : m_current_window(0)
|
||||
+QSimpleDrag::QSimpleDrag()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -373,6 +394,7 @@ void QSimpleDrag::startDrag()
|
||||
updateCursor(Qt::IgnoreAction);
|
||||
}
|
||||
setExecutedDropAction(Qt::IgnoreAction);
|
||||
+ qCDebug(lcDnd) << "drag began from" << m_current_window<< "cursor pos" << QCursor::pos() << "can drop?" << canDrop();
|
||||
}
|
||||
|
||||
void QSimpleDrag::cancel()
|
||||
diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
|
||||
index 0b8a0bc703..bbd7f7f4bb 100644
|
||||
--- a/src/gui/kernel/qsimpledrag_p.h
|
||||
+++ b/src/gui/kernel/qsimpledrag_p.h
|
||||
@@ -105,6 +105,9 @@ protected:
|
||||
|
||||
QDrag *drag() const { return m_drag; }
|
||||
|
||||
+protected:
|
||||
+ QWindow *m_current_window;
|
||||
+
|
||||
private:
|
||||
void enableEventFilter();
|
||||
void disableEventFilter();
|
||||
@@ -132,9 +135,6 @@ protected:
|
||||
virtual void cancel() Q_DECL_OVERRIDE;
|
||||
virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
|
||||
virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
|
||||
-
|
||||
-private:
|
||||
- QWindow *m_current_window;
|
||||
};
|
||||
|
||||
#endif // QT_NO_DRAGANDDROP
|
||||
--
|
||||
cgit v1.1-6-g87c4
|
||||
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From fcba9fa861574f33e1d2e54d8c8d6da8062927cd Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Wed, 23 Jan 2019 10:42:12 +0100
|
||||
Subject: Fix regression in QPlainTextEdit updating
|
||||
|
||||
It was incorrectly counting a block having more than one line as having
|
||||
changed visibility.
|
||||
|
||||
Fixes: QTBUG-69310
|
||||
Change-Id: I502cda1d3e8a4efb1c14122353cc0a4731d8581c
|
||||
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
||||
---
|
||||
src/widgets/widgets/qplaintextedit.cpp | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
|
||||
index d6f6a364a8..57f2dec8f7 100644
|
||||
--- a/src/widgets/widgets/qplaintextedit.cpp
|
||||
+++ b/src/widgets/widgets/qplaintextedit.cpp
|
||||
@@ -312,10 +312,11 @@ void QPlainTextDocumentLayout::documentChanged(int from, int charsRemoved, int c
|
||||
QTextBlock block = changeStartBlock;
|
||||
do {
|
||||
block.clearLayout();
|
||||
- const int lineCount = block.isVisible() ? 1 : 0;
|
||||
- if (block.lineCount() != lineCount) {
|
||||
+ if (block.isVisible()
|
||||
+ ? (block.lineCount() == 0)
|
||||
+ : (block.lineCount() > 0)) {
|
||||
blockVisibilityChanged = true;
|
||||
- block.setLineCount(lineCount);
|
||||
+ block.setLineCount(block.isVisible() ? 1 : 0);
|
||||
}
|
||||
if (block == changeEndBlock)
|
||||
break;
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Bornemann <joerg.bornemann@qt.io>
|
||||
Date: Fri, 06 Sep 2019 10:54:44 +0200
|
||||
Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
|
||||
|
||||
When Qt was configured with -libdir different from "lib", one could not
|
||||
build with CMake whenever a static lib was pulled in (e.g. uitools).
|
||||
|
||||
Do not hard-code "/lib" but use the correct variable also for static
|
||||
libraries.
|
||||
|
||||
Fixes: QTBUG-76255
|
||||
Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
|
||||
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
---
|
||||
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index d4fd057..f4a34d6 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -53,7 +53,11 @@
|
||||
set(_lib_deps)
|
||||
set(_link_flags)
|
||||
|
||||
- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
|
||||
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
+ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
|
||||
+!!ELSE
|
||||
+ set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
|
||||
+!!ENDIF
|
||||
|
||||
if(EXISTS \"${prl_file_location}\")
|
||||
file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
|
||||
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
From 0b57f15958f07ef12c8944d6db7a33a6fe9d9c59 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Mon, 23 Sep 2019 13:49:53 +0200
|
||||
Subject: Fix building with pulseaudio 13
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The function signature changed though the ABI stayed the same.
|
||||
|
||||
Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
|
||||
Fixes: QTBUG-77037
|
||||
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
|
||||
---
|
||||
chromium/media/audio/pulse/pulse.sigs | 16 ++++++++--------
|
||||
chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++
|
||||
2 files changed, 19 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/chromium/media/audio/pulse/pulse.sigs b/chromium/media/audio/pulse/pulse.sigs
|
||||
index 8b5888786a9..daaeb149c13 100644
|
||||
--- a/chromium/media/audio/pulse/pulse.sigs
|
||||
+++ b/chromium/media/audio/pulse/pulse.sigs
|
||||
@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
|
||||
pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
|
||||
pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
|
||||
pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
|
||||
-pa_context_state_t pa_context_get_state(pa_context* c);
|
||||
+pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
|
||||
pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
|
||||
pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
|
||||
void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
|
||||
-pa_operation_state_t pa_operation_get_state(pa_operation* o);
|
||||
+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
|
||||
void pa_context_unref(pa_context* c);
|
||||
void pa_operation_unref(pa_operation* o);
|
||||
int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
|
||||
@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
|
||||
int pa_stream_disconnect(pa_stream* s);
|
||||
int pa_stream_drop(pa_stream *p);
|
||||
pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
|
||||
-uint32_t pa_stream_get_device_index(pa_stream* s);
|
||||
+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
|
||||
int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
|
||||
-pa_stream_state_t pa_stream_get_state(pa_stream* p);
|
||||
+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
|
||||
pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
|
||||
pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
|
||||
pa_proplist* pa_proplist_new(void);
|
||||
-int pa_proplist_contains(pa_proplist* p, const char* key);
|
||||
+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
|
||||
void pa_proplist_free(pa_proplist* p);
|
||||
-const char* pa_proplist_gets(pa_proplist* p, const char* key);
|
||||
+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
|
||||
int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
|
||||
-size_t pa_stream_readable_size(pa_stream *p);
|
||||
+size_t pa_stream_readable_size(const_pa_stream_ptr p);
|
||||
int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
|
||||
void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
|
||||
void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
|
||||
int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
|
||||
void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
|
||||
void pa_stream_unref(pa_stream* s);
|
||||
-int pa_context_errno(pa_context *c);
|
||||
+int pa_context_errno(const_pa_context_ptr c);
|
||||
const char* pa_strerror(int error);
|
||||
pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
|
||||
diff --git a/chromium/media/audio/pulse/pulse_stub_header.fragment b/chromium/media/audio/pulse/pulse_stub_header.fragment
|
||||
index 2a2d3e7552b..cdaa841b29f 100644
|
||||
--- a/chromium/media/audio/pulse/pulse_stub_header.fragment
|
||||
+++ b/chromium/media/audio/pulse/pulse_stub_header.fragment
|
||||
@@ -5,4 +5,15 @@ extern "C" {
|
||||
|
||||
#include <pulse/pulseaudio.h>
|
||||
|
||||
+#if PA_MAJOR > 12
|
||||
+typedef const pa_context* const_pa_context_ptr;
|
||||
+typedef const pa_operation* const_pa_operation_ptr;
|
||||
+typedef const pa_proplist* const_pa_proplist_ptr;
|
||||
+typedef const pa_stream* const_pa_stream_ptr;
|
||||
+#else
|
||||
+typedef pa_context* const_pa_context_ptr;
|
||||
+typedef pa_operation* const_pa_operation_ptr;
|
||||
+typedef pa_proplist* const_pa_proplist_ptr;
|
||||
+typedef pa_stream* const_pa_stream_ptr;
|
||||
+#endif
|
||||
}
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
|
||||
index 04290a4ce1..27773d5762 100644
|
||||
--- a/src/widgets/kernel/qwidget.cpp
|
||||
+++ b/src/widgets/kernel/qwidget.cpp
|
||||
@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
|
||||
|
||||
if (changingAppFocusWidget) {
|
||||
QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
|
||||
- QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
|
||||
+ QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# Prevent these errors caused by using GCC8
|
||||
# (original patch taken from Fedora's chromium SRPM):
|
||||
#
|
||||
# make: *** [Makefile:1028: module-qtwebengine-make_first] Error 2
|
||||
# FAILED: obj/mojo/public/c/system/system/thunks.o
|
||||
# ../../3rdparty/chromium/mojo/public/c/system/buffer.h:38:42: error: static assertion failed: int64_t has weird alignment
|
||||
# ../../3rdparty/chromium/mojo/public/c/system/data_pipe.h:49:42: error: static assertion failed: int64_t has weird alignment
|
||||
# ../../3rdparty/chromium/mojo/public/c/system/message_pipe.h:47:42: error: static assertion failed: int64_t has weird alignment
|
||||
#
|
||||
--- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400
|
||||
+++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400
|
||||
@@ -18,7 +18,13 @@
|
||||
#endif
|
||||
|
||||
// Like the C++11 |alignof| operator.
|
||||
-#if __cplusplus >= 201103L
|
||||
+#if defined(__GNUC__) && __GNUC__ >= 8
|
||||
+// GCC 8 has changed the alignof operator to return the minimal alignment
|
||||
+// required by the target ABI, instead of the preferred alignment.
|
||||
+// This means that on 32-bit x86, it will return 4 instead of 8.
|
||||
+// Use __alignof__ instead to avoid this.
|
||||
+#define MOJO_ALIGNOF(type) __alignof__(type)
|
||||
+#elif __cplusplus >= 201103L
|
||||
#define MOJO_ALIGNOF(type) alignof(type)
|
||||
#elif defined(__GNUC__)
|
||||
#define MOJO_ALIGNOF(type) __alignof__(type)
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
|
||||
Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100)
|
||||
Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets
|
||||
X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2
|
||||
|
||||
WIP: Also do hide/show via WA_OutsideWSRange for native widgets
|
||||
|
||||
Task-number: QTBUG-48321
|
||||
Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
|
||||
---
|
||||
|
||||
diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
|
||||
index a006246..024005d 100644
|
||||
--- a/qtbase/src/widgets/kernel/qwidget.cpp
|
||||
+++ b/qtbase/src/widgets/kernel/qwidget.cpp
|
||||
@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
|
||||
|
||||
bool needsShow = false;
|
||||
|
||||
- if (q->isWindow()) {
|
||||
+ if (q->isWindow() || q->windowHandle()) {
|
||||
if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
|
||||
q->setAttribute(Qt::WA_OutsideWSRange, true);
|
||||
if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
Taken from: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117
|
||||
|
||||
From 0c1831178540462da31fd7a4b6d2e446bc84498b Mon Sep 17 00:00:00 2001
|
||||
From: Erik Kurzinger <ekurzinger@nvidia.com>
|
||||
Date: Thu, 13 Jun 2019 08:15:50 -0700
|
||||
Subject: Track swap interval in QXcbWindow
|
||||
|
||||
As per GLX_EXT_swap_control, the GLX swap interval is specified on a
|
||||
per-drawable basis. However, QGLXContext only tracks it per-context
|
||||
using the m_swapInterval member. If a new drawable is made current to a
|
||||
context, it is still necessary to call glXSwapIntervalEXT to change the
|
||||
swap interval, even if it has been previously called for the same
|
||||
context with a different drawable. However, currently,
|
||||
QGLXContext::makeCurrent doesn't do this if its m_swapInterval field
|
||||
matches the new swap interval. This change removes m_swapInterval from
|
||||
QGLXContext, instead tracking it in QXcbWindow. This still avoids
|
||||
unnecessary calls to glXSwapIntervalEXT, while ensuring the swap
|
||||
interval is always set for new window drawables.
|
||||
|
||||
Change-Id: Idc34101476c6af618059f6f3d8925dee743994a3
|
||||
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
||||
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
||||
---
|
||||
.../platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 6 +++---
|
||||
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h | 1 -
|
||||
src/plugins/platforms/xcb/qxcbwindow.h | 4 ++++
|
||||
3 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
index 4adf662152..f26f698e76 100644
|
||||
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
@@ -204,7 +204,6 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat
|
||||
, m_shareContext(0)
|
||||
, m_format(format)
|
||||
, m_isPBufferCurrent(false)
|
||||
- , m_swapInterval(-1)
|
||||
, m_ownsContext(nativeHandle.isNull())
|
||||
, m_getGraphicsResetStatus(0)
|
||||
, m_lost(false)
|
||||
@@ -567,9 +566,9 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface)
|
||||
|
||||
if (success && surfaceClass == QSurface::Window) {
|
||||
int interval = surface->format().swapInterval();
|
||||
+ QXcbWindow *window = static_cast<QXcbWindow *>(surface);
|
||||
QXcbScreen *screen = screenForPlatformSurface(surface);
|
||||
- if (interval >= 0 && m_swapInterval != interval && screen) {
|
||||
- m_swapInterval = interval;
|
||||
+ if (interval >= 0 && interval != window->swapInterval() && screen) {
|
||||
typedef void (*qt_glXSwapIntervalEXT)(Display *, GLXDrawable, int);
|
||||
typedef void (*qt_glXSwapIntervalMESA)(unsigned int);
|
||||
static qt_glXSwapIntervalEXT glXSwapIntervalEXT = 0;
|
||||
@@ -588,6 +587,7 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface)
|
||||
glXSwapIntervalEXT(m_display, glxDrawable, interval);
|
||||
else if (glXSwapIntervalMESA)
|
||||
glXSwapIntervalMESA(interval);
|
||||
+ window->setSwapInterval(interval);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
|
||||
index be9d3f5dcb..2a88fd6e59 100644
|
||||
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
|
||||
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
|
||||
@@ -87,7 +87,6 @@ private:
|
||||
GLXContext m_shareContext;
|
||||
QSurfaceFormat m_format;
|
||||
bool m_isPBufferCurrent;
|
||||
- int m_swapInterval;
|
||||
bool m_ownsContext;
|
||||
GLenum (APIENTRY * m_getGraphicsResetStatus)();
|
||||
bool m_lost;
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
index f98cd8a74d..8258cc2dfa 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
@@ -184,6 +184,9 @@ public:
|
||||
static void setWindowTitle(const QXcbConnection *conn, xcb_window_t window, const QString &title);
|
||||
static QString windowTitle(const QXcbConnection *conn, xcb_window_t window);
|
||||
|
||||
+ int swapInterval() const { return m_swapInterval; }
|
||||
+ void setSwapInterval(int swapInterval) { m_swapInterval = swapInterval; }
|
||||
+
|
||||
public Q_SLOTS:
|
||||
void updateSyncRequestCounter();
|
||||
|
||||
@@ -276,6 +279,7 @@ protected:
|
||||
SyncState m_syncState = NoSyncNeeded;
|
||||
|
||||
QXcbSyncWindowRequest *m_pendingSyncRequest = nullptr;
|
||||
+ int m_swapInterval = -1;
|
||||
};
|
||||
|
||||
class QXcbForeignWindow : public QXcbWindow
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
Taken from: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77
|
||||
|
||||
From cbdc9a7786278c31fdb6eb465f32d0374349c1ef Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Thu, 20 Jun 2019 09:36:46 -0700
|
||||
Subject: RCC: Change the default compression to Zlib
|
||||
|
||||
Codebases using QResource::isCompressed() and assuming it is Zlib break
|
||||
if zstd is enabled. So change the default back to Zlib until Qt 6.0.
|
||||
|
||||
[ChangeLog][Important Behavior Changes] RCC's default compression
|
||||
algorithm was changed back to Zlib, as it was in all previous releases
|
||||
until 5.13.0. The default will remain Zlib for all Qt 5.x releases but
|
||||
will change in Qt 6.0. To activate Zstd compression for your resources,
|
||||
either pass the --compress-algo=zstd option to the rcc tool or add the
|
||||
XML attribute compression-algorithm="zstd" to the <file> tags in the
|
||||
.qrc file.
|
||||
|
||||
Task-number: QTBUG-76521
|
||||
Change-Id: Ief874765cd7b43798de3fffd15a9f56fd9ad1ad4
|
||||
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
||||
---
|
||||
src/tools/rcc/rcc.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
|
||||
index 862e574f2d..011a7db810 100644
|
||||
--- a/src/tools/rcc/rcc.cpp
|
||||
+++ b/src/tools/rcc/rcc.cpp
|
||||
@@ -58,7 +58,7 @@ enum {
|
||||
CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70
|
||||
};
|
||||
|
||||
-#if QT_CONFIG(zstd)
|
||||
+#if QT_CONFIG(zstd) && QT_VERSION >= QT_VERSION_CHECK(6,0,0)
|
||||
# define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zstd
|
||||
#elif !defined(QT_NO_COMPRESS)
|
||||
# define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zlib
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
|
@ -118,32 +118,29 @@ else
|
|||
fi
|
||||
|
||||
# Fix path to mysql header:
|
||||
cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/qt5.mysql.h.diff.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
|
||||
# and for it breaks KWin compilation with:
|
||||
# /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
|
||||
# See also https://bugzilla.redhat.com/1704474
|
||||
cd qtbase
|
||||
cat $CWD/patches/qt5.qtbase_cmake_isystem_includes.patch \
|
||||
| patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/qt5.qtbase_cmake_isystem_includes.patch.gz | patch -p1 --verbose || exit 1
|
||||
cd - 1>/dev/null
|
||||
|
||||
# CVE-2020-0569 (fixed in 5.14.0):
|
||||
cd qtbase
|
||||
cat $CWD/patches/qt5.cve-2020-0569.patch \
|
||||
| patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/qt5.cve-2020-0569.patch.gz | patch -p1 --verbose || exit 1
|
||||
cd - 1>/dev/null
|
||||
|
||||
# CVE-2020-0570 (fixed in 5.14.1):
|
||||
cd qtbase
|
||||
cat $CWD/patches/qt5.cve-2020-0570.patch \
|
||||
| patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/qt5.cve-2020-0570.patch.gz | patch -p1 --verbose || exit 1
|
||||
cd - 1>/dev/null
|
||||
|
||||
if ! pkg-config --exists libpulse 2>/dev/null ; then
|
||||
# Forcibly disable pulseaudio in qtwebengine:
|
||||
cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/qt5.pulseaudio.diff.gz | patch -p1 --verbose || exit 1
|
||||
# Disable pulseaudio in Qt5:
|
||||
PACONF="-no-pulseaudio"
|
||||
else
|
||||
|
|
@ -210,12 +207,11 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
|
|||
make $NUMJOBS || make || exit 1
|
||||
make install INSTALL_ROOT=$PKG || exit 1
|
||||
|
||||
# Strip binaries the Slackware way:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Remove rpaths:
|
||||
for file in $(find . | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
|
||||
for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
|
||||
if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
|
||||
patchelf --remove-rpath $file
|
||||
fi
|
||||
|
|
@ -334,8 +330,7 @@ fi
|
|||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
cat $CWD/doinst.sh > $PKG/install/doinst.sh
|
||||
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-$BUILD.txz
|
||||
|
||||
|
|
|
|||
41
source/l/woff2/get-woff2.sh
Executable file
41
source/l/woff2/get-woff2.sh
Executable file
|
|
@ -0,0 +1,41 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2020 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.
|
||||
|
||||
# Clear download area:
|
||||
rm -rf woff2
|
||||
|
||||
# Clone repository:
|
||||
git clone https://github.com/google/woff2.git
|
||||
|
||||
HEADISAT="$( cd woff2 && git log -1 --format=%h )"
|
||||
DATE="$( cd woff2 && git log -1 --format=%ad --date=format:%Y%m%d )"
|
||||
|
||||
# Cleanup. We're not packing up the whole git repo.
|
||||
( cd woff2 && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
|
||||
mv woff2 woff2-${DATE}_${HEADISAT}
|
||||
tar cf woff2-${DATE}_${HEADISAT}.tar woff2-${DATE}_${HEADISAT}
|
||||
plzip -9 woff2-${DATE}_${HEADISAT}.tar
|
||||
rm -rf woff2-${DATE}_${HEADISAT}
|
||||
touch -d "$DATE" woff2-${DATE}_${HEADISAT}.tar.lz
|
||||
echo
|
||||
echo "woff2 branch $BRANCH with HEAD at $HEADISAT packaged as woff2-${DATE}_${HEADISAT}.tar.lz"
|
||||
echo
|
||||
19
source/l/woff2/slack-desc
Normal file
19
source/l/woff2/slack-desc
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description.
|
||||
# Line up the first '|' above the ':' following the base package name, and
|
||||
# the '|' on the right side marks the last column you can put a character in.
|
||||
# You must make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':' except on otherwise blank lines.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
woff2: woff2 (WOFF File Format 2.0 library)
|
||||
woff2:
|
||||
woff2: WOFF2 is the Web Open Font Format 2 reference implementation.
|
||||
woff2: See also: https://www.w3.org/TR/WOFF2/
|
||||
woff2:
|
||||
woff2: Homepage: https://github.com/google/woff2
|
||||
woff2:
|
||||
woff2:
|
||||
woff2:
|
||||
woff2:
|
||||
woff2:
|
||||
117
source/l/woff2/woff2.SlackBuild
Executable file
117
source/l/woff2/woff2.SlackBuild
Executable file
|
|
@ -0,0 +1,117 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2020 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.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=woff2
|
||||
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
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
|
||||
cd $TMP
|
||||
rm -rf $PKGNAM-$VERSION
|
||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||
cd $PKGNAM-$VERSION || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# Configure, build, and install:
|
||||
mkdir cmake-build
|
||||
cd cmake-build
|
||||
cmake \
|
||||
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
|
||||
-DLIB_SUFFIX="$LIBDIRSUFFIX" \
|
||||
-DDOC_INSTALL_DIR="doc" \
|
||||
-DMAN_INSTALL_DIR=/usr/man \
|
||||
.. || exit 1
|
||||
make $NUMJOBS || make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
cd ..
|
||||
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
CONTRIBUTING* LICENSE* README* \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||
371
source/n/samba/0000-use-gnutls-for-des-cbc.patch
Normal file
371
source/n/samba/0000-use-gnutls-for-des-cbc.patch
Normal file
|
|
@ -0,0 +1,371 @@
|
|||
From 21073bff847fbc41d3dab0a649fa400d8188fa16 Mon Sep 17 00:00:00 2001
|
||||
From: Isaac Boukris <iboukris@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 23:48:19 +0300
|
||||
Subject: [PATCH 1/2] smbdes: add des_crypt56_gnutls() using use DES-CBC with
|
||||
zeroed IV
|
||||
|
||||
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
|
||||
---
|
||||
libcli/auth/smbdes.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 47 insertions(+)
|
||||
|
||||
diff --git a/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
|
||||
index 6d9a6dc2ce8..37ede91ad22 100644
|
||||
--- a/libcli/auth/smbdes.c
|
||||
+++ b/libcli/auth/smbdes.c
|
||||
@@ -23,6 +23,9 @@
|
||||
#include "includes.h"
|
||||
#include "libcli/auth/libcli_auth.h"
|
||||
|
||||
+#include <gnutls/gnutls.h>
|
||||
+#include <gnutls/crypto.h>
|
||||
+
|
||||
/* NOTES:
|
||||
|
||||
This code makes no attempt to be fast! In fact, it is a very
|
||||
@@ -273,6 +276,50 @@ static void str_to_key(const uint8_t *str,uint8_t *key)
|
||||
}
|
||||
}
|
||||
|
||||
+static int des_crypt56_gnutls(uint8_t out[8], const uint8_t in[8],
|
||||
+ const uint8_t key_in[7], bool enc)
|
||||
+{
|
||||
+ static uint8_t iv8[8];
|
||||
+ gnutls_datum_t iv = { iv8, 8 };
|
||||
+ gnutls_datum_t key;
|
||||
+ gnutls_cipher_hd_t ctx;
|
||||
+ uint8_t key2[8];
|
||||
+ uint8_t outb[8];
|
||||
+ int ret;
|
||||
+
|
||||
+ memset(out, 0, 8);
|
||||
+
|
||||
+ str_to_key(key_in, key2);
|
||||
+
|
||||
+ key.data = key2;
|
||||
+ key.size = 8;
|
||||
+
|
||||
+ ret = gnutls_global_init();
|
||||
+ if (ret != 0) {
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ ret = gnutls_cipher_init(&ctx, GNUTLS_CIPHER_DES_CBC, &key, &iv);
|
||||
+ if (ret != 0) {
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ memcpy(outb, in, 8);
|
||||
+ if (enc) {
|
||||
+ ret = gnutls_cipher_encrypt(ctx, outb, 8);
|
||||
+ } else {
|
||||
+ ret = gnutls_cipher_decrypt(ctx, outb, 8);
|
||||
+ }
|
||||
+
|
||||
+ if (ret == 0) {
|
||||
+ memcpy(out, outb, 8);
|
||||
+ }
|
||||
+
|
||||
+ gnutls_cipher_deinit(ctx);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
basic des crypt using a 56 bit (7 byte) key
|
||||
*/
|
||||
--
|
||||
2.22.0
|
||||
|
||||
|
||||
From 6d6651213f391840e3004ec3b055f8f25be9b360 Mon Sep 17 00:00:00 2001
|
||||
From: Isaac Boukris <iboukris@gmail.com>
|
||||
Date: Mon, 21 Oct 2019 20:03:04 +0300
|
||||
Subject: [PATCH 2/2] smbdes: use the new des_crypt56_gnutls()
|
||||
|
||||
and remove builtin DES crypto.
|
||||
|
||||
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
|
||||
---
|
||||
libcli/auth/smbdes.c | 258 +------------------------------------------
|
||||
1 file changed, 1 insertion(+), 257 deletions(-)
|
||||
|
||||
diff --git a/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
|
||||
index 37ede91ad22..7de05b75303 100644
|
||||
--- a/libcli/auth/smbdes.c
|
||||
+++ b/libcli/auth/smbdes.c
|
||||
@@ -26,239 +26,6 @@
|
||||
#include <gnutls/gnutls.h>
|
||||
#include <gnutls/crypto.h>
|
||||
|
||||
-/* NOTES:
|
||||
-
|
||||
- This code makes no attempt to be fast! In fact, it is a very
|
||||
- slow implementation
|
||||
-
|
||||
- This code is NOT a complete DES implementation. It implements only
|
||||
- the minimum necessary for SMB authentication, as used by all SMB
|
||||
- products (including every copy of Microsoft Windows95 ever sold)
|
||||
-
|
||||
- In particular, it can only do a unchained forward DES pass. This
|
||||
- means it is not possible to use this code for encryption/decryption
|
||||
- of data, instead it is only useful as a "hash" algorithm.
|
||||
-
|
||||
- There is no entry point into this code that allows normal DES operation.
|
||||
-
|
||||
- I believe this means that this code does not come under ITAR
|
||||
- regulations but this is NOT a legal opinion. If you are concerned
|
||||
- about the applicability of ITAR regulations to this code then you
|
||||
- should confirm it for yourself (and maybe let me know if you come
|
||||
- up with a different answer to the one above)
|
||||
-*/
|
||||
-
|
||||
-
|
||||
-static const uint8_t perm1[56] = {57, 49, 41, 33, 25, 17, 9,
|
||||
- 1, 58, 50, 42, 34, 26, 18,
|
||||
- 10, 2, 59, 51, 43, 35, 27,
|
||||
- 19, 11, 3, 60, 52, 44, 36,
|
||||
- 63, 55, 47, 39, 31, 23, 15,
|
||||
- 7, 62, 54, 46, 38, 30, 22,
|
||||
- 14, 6, 61, 53, 45, 37, 29,
|
||||
- 21, 13, 5, 28, 20, 12, 4};
|
||||
-
|
||||
-static const uint8_t perm2[48] = {14, 17, 11, 24, 1, 5,
|
||||
- 3, 28, 15, 6, 21, 10,
|
||||
- 23, 19, 12, 4, 26, 8,
|
||||
- 16, 7, 27, 20, 13, 2,
|
||||
- 41, 52, 31, 37, 47, 55,
|
||||
- 30, 40, 51, 45, 33, 48,
|
||||
- 44, 49, 39, 56, 34, 53,
|
||||
- 46, 42, 50, 36, 29, 32};
|
||||
-
|
||||
-static const uint8_t perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2,
|
||||
- 60, 52, 44, 36, 28, 20, 12, 4,
|
||||
- 62, 54, 46, 38, 30, 22, 14, 6,
|
||||
- 64, 56, 48, 40, 32, 24, 16, 8,
|
||||
- 57, 49, 41, 33, 25, 17, 9, 1,
|
||||
- 59, 51, 43, 35, 27, 19, 11, 3,
|
||||
- 61, 53, 45, 37, 29, 21, 13, 5,
|
||||
- 63, 55, 47, 39, 31, 23, 15, 7};
|
||||
-
|
||||
-static const uint8_t perm4[48] = { 32, 1, 2, 3, 4, 5,
|
||||
- 4, 5, 6, 7, 8, 9,
|
||||
- 8, 9, 10, 11, 12, 13,
|
||||
- 12, 13, 14, 15, 16, 17,
|
||||
- 16, 17, 18, 19, 20, 21,
|
||||
- 20, 21, 22, 23, 24, 25,
|
||||
- 24, 25, 26, 27, 28, 29,
|
||||
- 28, 29, 30, 31, 32, 1};
|
||||
-
|
||||
-static const uint8_t perm5[32] = { 16, 7, 20, 21,
|
||||
- 29, 12, 28, 17,
|
||||
- 1, 15, 23, 26,
|
||||
- 5, 18, 31, 10,
|
||||
- 2, 8, 24, 14,
|
||||
- 32, 27, 3, 9,
|
||||
- 19, 13, 30, 6,
|
||||
- 22, 11, 4, 25};
|
||||
-
|
||||
-
|
||||
-static const uint8_t perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32,
|
||||
- 39, 7, 47, 15, 55, 23, 63, 31,
|
||||
- 38, 6, 46, 14, 54, 22, 62, 30,
|
||||
- 37, 5, 45, 13, 53, 21, 61, 29,
|
||||
- 36, 4, 44, 12, 52, 20, 60, 28,
|
||||
- 35, 3, 43, 11, 51, 19, 59, 27,
|
||||
- 34, 2, 42, 10, 50, 18, 58, 26,
|
||||
- 33, 1, 41, 9, 49, 17, 57, 25};
|
||||
-
|
||||
-
|
||||
-static const uint8_t sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1};
|
||||
-
|
||||
-static const uint8_t sbox[8][4][16] = {
|
||||
- {{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7},
|
||||
- {0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8},
|
||||
- {4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0},
|
||||
- {15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13}},
|
||||
-
|
||||
- {{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10},
|
||||
- {3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5},
|
||||
- {0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15},
|
||||
- {13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9}},
|
||||
-
|
||||
- {{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8},
|
||||
- {13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1},
|
||||
- {13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7},
|
||||
- {1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12}},
|
||||
-
|
||||
- {{7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15},
|
||||
- {13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9},
|
||||
- {10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4},
|
||||
- {3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14}},
|
||||
-
|
||||
- {{2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9},
|
||||
- {14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6},
|
||||
- {4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14},
|
||||
- {11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3}},
|
||||
-
|
||||
- {{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11},
|
||||
- {10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8},
|
||||
- {9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6},
|
||||
- {4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13}},
|
||||
-
|
||||
- {{4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1},
|
||||
- {13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6},
|
||||
- {1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2},
|
||||
- {6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12}},
|
||||
-
|
||||
- {{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7},
|
||||
- {1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2},
|
||||
- {7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8},
|
||||
- {2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}}};
|
||||
-
|
||||
-static void permute(char *out, const char *in, const uint8_t *p, int n)
|
||||
-{
|
||||
- int i;
|
||||
- for (i=0;i<n;i++)
|
||||
- out[i] = in[p[i]-1];
|
||||
-}
|
||||
-
|
||||
-static void lshift(char *d, int count, int n)
|
||||
-{
|
||||
- char out[64];
|
||||
- int i;
|
||||
- for (i=0;i<n;i++)
|
||||
- out[i] = d[(i+count)%n];
|
||||
- for (i=0;i<n;i++)
|
||||
- d[i] = out[i];
|
||||
-}
|
||||
-
|
||||
-static void concat(char *out, char *in1, char *in2, int l1, int l2)
|
||||
-{
|
||||
- while (l1--)
|
||||
- *out++ = *in1++;
|
||||
- while (l2--)
|
||||
- *out++ = *in2++;
|
||||
-}
|
||||
-
|
||||
-static void xor(char *out, char *in1, char *in2, int n)
|
||||
-{
|
||||
- int i;
|
||||
- for (i=0;i<n;i++)
|
||||
- out[i] = in1[i] ^ in2[i];
|
||||
-}
|
||||
-
|
||||
-static void dohash(char *out, char *in, char *key, int forw)
|
||||
-{
|
||||
- int i, j, k;
|
||||
- char pk1[56];
|
||||
- char c[28];
|
||||
- char d[28];
|
||||
- char cd[56];
|
||||
- char ki[16][48];
|
||||
- char pd1[64];
|
||||
- char l[32], r[32];
|
||||
- char rl[64];
|
||||
-
|
||||
- permute(pk1, key, perm1, 56);
|
||||
-
|
||||
- for (i=0;i<28;i++)
|
||||
- c[i] = pk1[i];
|
||||
- for (i=0;i<28;i++)
|
||||
- d[i] = pk1[i+28];
|
||||
-
|
||||
- for (i=0;i<16;i++) {
|
||||
- lshift(c, sc[i], 28);
|
||||
- lshift(d, sc[i], 28);
|
||||
-
|
||||
- concat(cd, c, d, 28, 28);
|
||||
- permute(ki[i], cd, perm2, 48);
|
||||
- }
|
||||
-
|
||||
- permute(pd1, in, perm3, 64);
|
||||
-
|
||||
- for (j=0;j<32;j++) {
|
||||
- l[j] = pd1[j];
|
||||
- r[j] = pd1[j+32];
|
||||
- }
|
||||
-
|
||||
- for (i=0;i<16;i++) {
|
||||
- char er[48];
|
||||
- char erk[48];
|
||||
- char b[8][6];
|
||||
- char cb[32];
|
||||
- char pcb[32];
|
||||
- char r2[32];
|
||||
-
|
||||
- permute(er, r, perm4, 48);
|
||||
-
|
||||
- xor(erk, er, ki[forw ? i : 15 - i], 48);
|
||||
-
|
||||
- for (j=0;j<8;j++)
|
||||
- for (k=0;k<6;k++)
|
||||
- b[j][k] = erk[j*6 + k];
|
||||
-
|
||||
- for (j=0;j<8;j++) {
|
||||
- int m, n;
|
||||
- m = (b[j][0]<<1) | b[j][5];
|
||||
-
|
||||
- n = (b[j][1]<<3) | (b[j][2]<<2) | (b[j][3]<<1) | b[j][4];
|
||||
-
|
||||
- for (k=0;k<4;k++)
|
||||
- b[j][k] = (sbox[j][m][n] & (1<<(3-k)))?1:0;
|
||||
- }
|
||||
-
|
||||
- for (j=0;j<8;j++)
|
||||
- for (k=0;k<4;k++)
|
||||
- cb[j*4+k] = b[j][k];
|
||||
- permute(pcb, cb, perm5, 32);
|
||||
-
|
||||
- xor(r2, l, pcb, 32);
|
||||
-
|
||||
- for (j=0;j<32;j++)
|
||||
- l[j] = r[j];
|
||||
-
|
||||
- for (j=0;j<32;j++)
|
||||
- r[j] = r2[j];
|
||||
- }
|
||||
-
|
||||
- concat(rl, r, l, 32, 32);
|
||||
-
|
||||
- permute(out, rl, perm6, 64);
|
||||
-}
|
||||
-
|
||||
static void str_to_key(const uint8_t *str,uint8_t *key)
|
||||
{
|
||||
int i;
|
||||
@@ -325,30 +92,7 @@ static int des_crypt56_gnutls(uint8_t out[8], const uint8_t in[8],
|
||||
*/
|
||||
void des_crypt56(uint8_t out[8], const uint8_t in[8], const uint8_t key[7], int forw)
|
||||
{
|
||||
- int i;
|
||||
- char outb[64];
|
||||
- char inb[64];
|
||||
- char keyb[64];
|
||||
- uint8_t key2[8];
|
||||
-
|
||||
- str_to_key(key, key2);
|
||||
-
|
||||
- for (i=0;i<64;i++) {
|
||||
- inb[i] = (in[i/8] & (1<<(7-(i%8)))) ? 1 : 0;
|
||||
- keyb[i] = (key2[i/8] & (1<<(7-(i%8)))) ? 1 : 0;
|
||||
- outb[i] = 0;
|
||||
- }
|
||||
-
|
||||
- dohash(outb, inb, keyb, forw);
|
||||
-
|
||||
- for (i=0;i<8;i++) {
|
||||
- out[i] = 0;
|
||||
- }
|
||||
-
|
||||
- for (i=0;i<64;i++) {
|
||||
- if (outb[i])
|
||||
- out[i/8] |= (1<<(7-(i%8)));
|
||||
- }
|
||||
+ (void)des_crypt56_gnutls(out, in, key, forw);
|
||||
}
|
||||
|
||||
void E_P16(const uint8_t *p14,uint8_t *p16)
|
||||
--
|
||||
2.22.0
|
||||
|
||||
314
source/n/samba/0001-handle-removal-des-enctypes-from-krb5.patch
Normal file
314
source/n/samba/0001-handle-removal-des-enctypes-from-krb5.patch
Normal file
|
|
@ -0,0 +1,314 @@
|
|||
From 3828e798da8e0b44356039dd927f0624d5d182f9 Mon Sep 17 00:00:00 2001
|
||||
From: Isaac Boukris <iboukris@gmail.com>
|
||||
Date: Wed, 6 Nov 2019 12:12:55 +0200
|
||||
Subject: [PATCH] Remove DES support if MIT Kerberos version does not support
|
||||
it
|
||||
|
||||
---
|
||||
source3/libads/kerberos_keytab.c | 2 -
|
||||
source3/passdb/machine_account_secrets.c | 36 ------------------
|
||||
source4/auth/kerberos/kerberos.h | 2 +-
|
||||
.../dsdb/samdb/ldb_modules/password_hash.c | 12 ++++++
|
||||
source4/kdc/db-glue.c | 4 +-
|
||||
source4/torture/rpc/remote_pac.c | 37 -------------------
|
||||
testprogs/blackbox/dbcheck-oldrelease.sh | 2 +-
|
||||
testprogs/blackbox/functionalprep.sh | 2 +-
|
||||
.../blackbox/test_export_keytab_heimdal.sh | 16 ++++----
|
||||
.../blackbox/upgradeprovision-oldrelease.sh | 2 +-
|
||||
10 files changed, 26 insertions(+), 89 deletions(-)
|
||||
|
||||
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
|
||||
index 97d5535041c..7d193e1a600 100644
|
||||
--- a/source3/libads/kerberos_keytab.c
|
||||
+++ b/source3/libads/kerberos_keytab.c
|
||||
@@ -240,8 +240,6 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *srvPrinc, bool update_ads)
|
||||
krb5_data password;
|
||||
krb5_kvno kvno;
|
||||
krb5_enctype enctypes[6] = {
|
||||
- ENCTYPE_DES_CBC_CRC,
|
||||
- ENCTYPE_DES_CBC_MD5,
|
||||
#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
|
||||
ENCTYPE_AES128_CTS_HMAC_SHA1_96,
|
||||
#endif
|
||||
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
|
||||
index dfc21f295a1..efba80f1474 100644
|
||||
--- a/source3/passdb/machine_account_secrets.c
|
||||
+++ b/source3/passdb/machine_account_secrets.c
|
||||
@@ -1031,7 +1031,6 @@ static int secrets_domain_info_kerberos_keys(struct secrets_domain_info1_passwor
|
||||
krb5_keyblock key;
|
||||
DATA_BLOB aes_256_b = data_blob_null;
|
||||
DATA_BLOB aes_128_b = data_blob_null;
|
||||
- DATA_BLOB des_md5_b = data_blob_null;
|
||||
bool ok;
|
||||
#endif /* HAVE_ADS */
|
||||
DATA_BLOB arc4_b = data_blob_null;
|
||||
@@ -1177,32 +1176,6 @@ static int secrets_domain_info_kerberos_keys(struct secrets_domain_info1_passwor
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
- krb5_ret = smb_krb5_create_key_from_string(krb5_ctx,
|
||||
- NULL,
|
||||
- &salt,
|
||||
- &cleartext_utf8,
|
||||
- ENCTYPE_DES_CBC_MD5,
|
||||
- &key);
|
||||
- if (krb5_ret != 0) {
|
||||
- DBG_ERR("generation of a des-cbc-md5 key failed: %s\n",
|
||||
- smb_get_krb5_error_message(krb5_ctx, krb5_ret, keys));
|
||||
- krb5_free_context(krb5_ctx);
|
||||
- TALLOC_FREE(keys);
|
||||
- TALLOC_FREE(salt_data);
|
||||
- return krb5_ret;
|
||||
- }
|
||||
- des_md5_b = data_blob_talloc(keys,
|
||||
- KRB5_KEY_DATA(&key),
|
||||
- KRB5_KEY_LENGTH(&key));
|
||||
- krb5_free_keyblock_contents(krb5_ctx, &key);
|
||||
- if (des_md5_b.data == NULL) {
|
||||
- DBG_ERR("data_blob_talloc failed for des-cbc-md5.\n");
|
||||
- krb5_free_context(krb5_ctx);
|
||||
- TALLOC_FREE(keys);
|
||||
- TALLOC_FREE(salt_data);
|
||||
- return ENOMEM;
|
||||
- }
|
||||
-
|
||||
krb5_free_context(krb5_ctx);
|
||||
no_kerberos:
|
||||
|
||||
@@ -1227,15 +1200,6 @@ no_kerberos:
|
||||
keys[idx].value = arc4_b;
|
||||
idx += 1;
|
||||
|
||||
-#ifdef HAVE_ADS
|
||||
- if (des_md5_b.length != 0) {
|
||||
- keys[idx].keytype = ENCTYPE_DES_CBC_MD5;
|
||||
- keys[idx].iteration_count = 4096;
|
||||
- keys[idx].value = des_md5_b;
|
||||
- idx += 1;
|
||||
- }
|
||||
-#endif /* HAVE_ADS */
|
||||
-
|
||||
p->salt_data = salt_data;
|
||||
p->default_iteration_count = 4096;
|
||||
p->num_keys = idx;
|
||||
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
|
||||
index 2ff9e3868af..1dd63acc838 100644
|
||||
--- a/source4/auth/kerberos/kerberos.h
|
||||
+++ b/source4/auth/kerberos/kerberos.h
|
||||
@@ -50,7 +50,7 @@ struct keytab_container {
|
||||
#define TOK_ID_GSS_GETMIC ((const uint8_t *)"\x01\x01")
|
||||
#define TOK_ID_GSS_WRAP ((const uint8_t *)"\x02\x01")
|
||||
|
||||
-#define ENC_ALL_TYPES (ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5 | \
|
||||
+#define ENC_ALL_TYPES (ENC_RC4_HMAC_MD5 | \
|
||||
ENC_HMAC_SHA1_96_AES128 | ENC_HMAC_SHA1_96_AES256)
|
||||
|
||||
#ifndef HAVE_KRB5_SET_DEFAULT_TGS_KTYPES
|
||||
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
|
||||
index 006e35c46d5..f16937c6cab 100644
|
||||
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
|
||||
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
|
||||
@@ -786,6 +786,7 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
|
||||
* create ENCTYPE_DES_CBC_MD5 key out of
|
||||
* the salt and the cleartext password
|
||||
*/
|
||||
+#ifdef SAMBA4_USES_HEIMDAL
|
||||
krb5_ret = smb_krb5_create_key_from_string(io->smb_krb5_context->krb5_context,
|
||||
NULL,
|
||||
&salt,
|
||||
@@ -804,6 +805,11 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
|
||||
KRB5_KEY_DATA(&key),
|
||||
KRB5_KEY_LENGTH(&key));
|
||||
krb5_free_keyblock_contents(io->smb_krb5_context->krb5_context, &key);
|
||||
+#else
|
||||
+ /* MIT has dropped support for DES enctypes, store a random key instead. */
|
||||
+ io->g.des_md5 = data_blob_talloc(io->ac, NULL, 8);
|
||||
+ generate_secret_buffer(io->g.des_md5.data, 8);
|
||||
+#endif
|
||||
if (!io->g.des_md5.data) {
|
||||
return ldb_oom(ldb);
|
||||
}
|
||||
@@ -812,6 +818,7 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
|
||||
* create ENCTYPE_DES_CBC_CRC key out of
|
||||
* the salt and the cleartext password
|
||||
*/
|
||||
+#ifdef SAMBA4_USES_HEIMDAL
|
||||
krb5_ret = smb_krb5_create_key_from_string(io->smb_krb5_context->krb5_context,
|
||||
NULL,
|
||||
&salt,
|
||||
@@ -830,6 +837,11 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
|
||||
KRB5_KEY_DATA(&key),
|
||||
KRB5_KEY_LENGTH(&key));
|
||||
krb5_free_keyblock_contents(io->smb_krb5_context->krb5_context, &key);
|
||||
+#else
|
||||
+ /* MIT has dropped support for DES enctypes, store a random key instead. */
|
||||
+ io->g.des_crc = data_blob_talloc(io->ac, NULL, 8);
|
||||
+ generate_secret_buffer(io->g.des_crc.data, 8);
|
||||
+#endif
|
||||
if (!io->g.des_crc.data) {
|
||||
return ldb_oom(ldb);
|
||||
}
|
||||
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
|
||||
index f62a633c6c7..023ae7b580d 100644
|
||||
--- a/source4/kdc/db-glue.c
|
||||
+++ b/source4/kdc/db-glue.c
|
||||
@@ -359,10 +359,10 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
|
||||
|
||||
/* If UF_USE_DES_KEY_ONLY has been set, then don't allow use of the newer enc types */
|
||||
if (userAccountControl & UF_USE_DES_KEY_ONLY) {
|
||||
- supported_enctypes = ENC_CRC32|ENC_RSA_MD5;
|
||||
+ supported_enctypes = 0;
|
||||
} else {
|
||||
/* Otherwise, add in the default enc types */
|
||||
- supported_enctypes |= ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5;
|
||||
+ supported_enctypes |= ENC_RC4_HMAC_MD5;
|
||||
}
|
||||
|
||||
/* Is this the krbtgt or a RODC krbtgt */
|
||||
diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
|
||||
index 7a5cda74b74..f12060e3c8f 100644
|
||||
--- a/source4/torture/rpc/remote_pac.c
|
||||
+++ b/source4/torture/rpc/remote_pac.c
|
||||
@@ -38,7 +38,6 @@
|
||||
|
||||
#define TEST_MACHINE_NAME_BDC "torturepacbdc"
|
||||
#define TEST_MACHINE_NAME_WKSTA "torturepacwksta"
|
||||
-#define TEST_MACHINE_NAME_WKSTA_DES "torturepacwkdes"
|
||||
#define TEST_MACHINE_NAME_S4U2SELF_BDC "tests4u2selfbdc"
|
||||
#define TEST_MACHINE_NAME_S4U2SELF_WKSTA "tests4u2selfwk"
|
||||
|
||||
@@ -581,39 +580,6 @@ static bool test_PACVerify_workstation_aes(struct torture_context *tctx,
|
||||
NETLOGON_NEG_AUTH2_ADS_FLAGS | NETLOGON_NEG_SUPPORTS_AES);
|
||||
}
|
||||
|
||||
-static bool test_PACVerify_workstation_des(struct torture_context *tctx,
|
||||
- struct dcerpc_pipe *p, struct cli_credentials *credentials, struct test_join *join_ctx)
|
||||
-{
|
||||
- struct samr_SetUserInfo r;
|
||||
- union samr_UserInfo user_info;
|
||||
- struct dcerpc_pipe *samr_pipe = torture_join_samr_pipe(join_ctx);
|
||||
- struct smb_krb5_context *smb_krb5_context;
|
||||
- krb5_error_code ret;
|
||||
-
|
||||
- ret = cli_credentials_get_krb5_context(popt_get_cmdline_credentials(),
|
||||
- tctx->lp_ctx, &smb_krb5_context);
|
||||
- torture_assert_int_equal(tctx, ret, 0, "cli_credentials_get_krb5_context() failed");
|
||||
-
|
||||
- if (smb_krb5_get_allowed_weak_crypto(smb_krb5_context->krb5_context) == FALSE) {
|
||||
- torture_skip(tctx, "Cannot test DES without [libdefaults] allow_weak_crypto = yes");
|
||||
- }
|
||||
-
|
||||
- /* Mark this workstation with DES-only */
|
||||
- user_info.info16.acct_flags = ACB_USE_DES_KEY_ONLY | ACB_WSTRUST;
|
||||
- r.in.user_handle = torture_join_samr_user_policy(join_ctx);
|
||||
- r.in.level = 16;
|
||||
- r.in.info = &user_info;
|
||||
-
|
||||
- torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetUserInfo_r(samr_pipe->binding_handle, tctx, &r),
|
||||
- "failed to set DES info account flags");
|
||||
- torture_assert_ntstatus_ok(tctx, r.out.result,
|
||||
- "failed to set DES into account flags");
|
||||
-
|
||||
- return test_PACVerify(tctx, p, credentials, SEC_CHAN_WKSTA,
|
||||
- TEST_MACHINE_NAME_WKSTA_DES,
|
||||
- NETLOGON_NEG_AUTH2_ADS_FLAGS);
|
||||
-}
|
||||
-
|
||||
#ifdef SAMBA4_USES_HEIMDAL
|
||||
static NTSTATUS check_primary_group_in_validation(TALLOC_CTX *mem_ctx,
|
||||
uint16_t validation_level,
|
||||
@@ -1000,9 +966,6 @@ struct torture_suite *torture_rpc_remote_pac(TALLOC_CTX *mem_ctx)
|
||||
&ndr_table_netlogon, TEST_MACHINE_NAME_WKSTA);
|
||||
torture_rpc_tcase_add_test_creds(tcase, "verify-sig-aes", test_PACVerify_workstation_aes);
|
||||
|
||||
- tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "netlogon-member-des",
|
||||
- &ndr_table_netlogon, TEST_MACHINE_NAME_WKSTA_DES);
|
||||
- torture_rpc_tcase_add_test_join(tcase, "verify-sig", test_PACVerify_workstation_des);
|
||||
#ifdef SAMBA4_USES_HEIMDAL
|
||||
tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "netr-bdc-arcfour",
|
||||
&ndr_table_netlogon, TEST_MACHINE_NAME_S4U2SELF_BDC);
|
||||
diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
|
||||
index 3d0ee2c165a..41c55178d4e 100755
|
||||
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
|
||||
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
|
||||
@@ -388,7 +388,7 @@ referenceprovision() {
|
||||
|
||||
ldapcmp() {
|
||||
if [ x$RELEASE = x"release-4-0-0" ]; then
|
||||
- $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName
|
||||
+ $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName,msDS-SupportedEncryptionTypes
|
||||
fi
|
||||
}
|
||||
|
||||
diff --git a/testprogs/blackbox/functionalprep.sh b/testprogs/blackbox/functionalprep.sh
|
||||
index 80e82252d45..1d37611ef7a 100755
|
||||
--- a/testprogs/blackbox/functionalprep.sh
|
||||
+++ b/testprogs/blackbox/functionalprep.sh
|
||||
@@ -61,7 +61,7 @@ provision_2012r2() {
|
||||
ldapcmp_ignore() {
|
||||
# At some point we will need to ignore, but right now, it should be perfect
|
||||
IGNORE_ATTRS=$1
|
||||
- $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/$2/private/sam.ldb tdb://$PREFIX_ABS/$3/private/sam.ldb --two --skip-missing-dn
|
||||
+ $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/$2/private/sam.ldb tdb://$PREFIX_ABS/$3/private/sam.ldb --two --skip-missing-dn --filter msDS-SupportedEncryptionTypes
|
||||
}
|
||||
|
||||
ldapcmp() {
|
||||
diff --git a/testprogs/blackbox/test_export_keytab_heimdal.sh b/testprogs/blackbox/test_export_keytab_heimdal.sh
|
||||
index cfa245fd4de..6a2595cd684 100755
|
||||
--- a/testprogs/blackbox/test_export_keytab_heimdal.sh
|
||||
+++ b/testprogs/blackbox/test_export_keytab_heimdal.sh
|
||||
@@ -43,7 +43,7 @@ test_keytab() {
|
||||
|
||||
echo "test: $testname"
|
||||
|
||||
- NKEYS=$($VALGRIND $samba4ktutil $keytab | grep -i "$principal" | egrep -c "des|aes|arcfour")
|
||||
+ NKEYS=$($VALGRIND $samba4ktutil $keytab | grep -i "$principal" | egrep -c "aes|arcfour")
|
||||
status=$?
|
||||
if [ x$status != x0 ]; then
|
||||
echo "failure: $testname"
|
||||
@@ -64,22 +64,22 @@ unc="//$SERVER/tmp"
|
||||
testit "create user locally" $VALGRIND $PYTHON $newuser nettestuser $USERPASS $@ || failed=`expr $failed + 1`
|
||||
|
||||
testit "dump keytab from domain" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "read keytab from domain" "$PREFIX/tmpkeytab" "$SERVER\\\$" 5
|
||||
+test_keytab "read keytab from domain" "$PREFIX/tmpkeytab" "$SERVER\\\$" 3
|
||||
testit "dump keytab from domain (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "read keytab from domain (2nd time)" "$PREFIX/tmpkeytab" "$SERVER\\\$" 5
|
||||
+test_keytab "read keytab from domain (2nd time)" "$PREFIX/tmpkeytab" "$SERVER\\\$" 3
|
||||
|
||||
testit "dump keytab from domain for cifs principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "read keytab from domain for cifs principal" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 5
|
||||
+test_keytab "read keytab from domain for cifs principal" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 3
|
||||
testit "dump keytab from domain for cifs principal (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "read keytab from domain for cifs principal (2nd time)" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 5
|
||||
+test_keytab "read keytab from domain for cifs principal (2nd time)" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 3
|
||||
|
||||
testit "dump keytab from domain for user principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-2" "nettestuser@$REALM" 5
|
||||
+test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-2" "nettestuser@$REALM" 3
|
||||
testit "dump keytab from domain for user principal (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser@$REALM $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "dump keytab from domain for user principal (2nd time)" "$PREFIX/tmpkeytab-2" "nettestuser@$REALM" 5
|
||||
+test_keytab "dump keytab from domain for user principal (2nd time)" "$PREFIX/tmpkeytab-2" "nettestuser@$REALM" 3
|
||||
|
||||
testit "dump keytab from domain for user principal with SPN as UPN" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-3 --principal=http/testupnspn.$DNSDOMAIN $@ || failed=`expr $failed + 1`
|
||||
-test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-3" "http/testupnspn.$DNSDOMAIN@$REALM" 5
|
||||
+test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-3" "http/testupnspn.$DNSDOMAIN@$REALM" 3
|
||||
|
||||
KRB5CCNAME="$PREFIX/tmpuserccache"
|
||||
export KRB5CCNAME
|
||||
diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh
|
||||
index 76276168011..208baa54a02 100755
|
||||
--- a/testprogs/blackbox/upgradeprovision-oldrelease.sh
|
||||
+++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh
|
||||
@@ -106,7 +106,7 @@ referenceprovision() {
|
||||
|
||||
ldapcmp() {
|
||||
if [ x$RELEASE != x"alpha13" ]; then
|
||||
- $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName
|
||||
+ $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName,msDS-SupportedEncryptionTypes
|
||||
fi
|
||||
}
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From 5a084994144704a6c146b94f8a22cf57ce08deab Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Bokovoy <ab@samba.org>
|
||||
Date: Mon, 7 Oct 2019 18:24:28 +0300
|
||||
Subject: [PATCH] samba-tool: create working private krb5.conf
|
||||
|
||||
DNS update tool uses private krb5.conf which should have enough details
|
||||
to authenticate with GSS-TSIG when running nsupdate.
|
||||
|
||||
Unfortunately, the configuration we provide is not enough. We set
|
||||
defaults to not lookup REALM via DNS but at the same time we don't
|
||||
provide any realm definition. As result, MIT Kerberos cannot actually
|
||||
find a working realm for Samba AD deployment because it cannot query DNS
|
||||
for a realm discovery or pick it up from the configuration.
|
||||
|
||||
Extend private krb5.conf with a realm definition that will allow MIT
|
||||
Kerberos to look up KDC over DNS.
|
||||
|
||||
Signed-off-by: Alexander Bokovoy <ab@samba.org>
|
||||
Reviewed-by: Andreas Schneider <asn@samba.org>
|
||||
---
|
||||
source4/setup/krb5.conf | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/source4/setup/krb5.conf b/source4/setup/krb5.conf
|
||||
index b1bf6cf907d..ad6f2818fb5 100644
|
||||
--- a/source4/setup/krb5.conf
|
||||
+++ b/source4/setup/krb5.conf
|
||||
@@ -2,3 +2,11 @@
|
||||
default_realm = ${REALM}
|
||||
dns_lookup_realm = false
|
||||
dns_lookup_kdc = true
|
||||
+
|
||||
+[realms]
|
||||
+${REALM} = {
|
||||
+ default_domain = ${DNSDOMAIN}
|
||||
+}
|
||||
+
|
||||
+[domain_realm]
|
||||
+ ${HOSTNAME} = ${REALM}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
|||
|
||||
PKGNAM=samba
|
||||
VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-2}
|
||||
BUILD=${BUILD:-3}
|
||||
|
||||
if [ -e $CWD/machine.conf ]; then
|
||||
. $CWD/machine.conf ]
|
||||
|
|
@ -104,6 +104,11 @@ find . \
|
|||
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
|
||||
PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib${LIBDIRSUFFIX}/security --with-system-mitkrb5 --with-experimental-mit-ad-dc"
|
||||
unset SHADOW_OPTIONS
|
||||
# Handle removal of ENCTYPE_DES_CBC_MD5 from krb5.
|
||||
# These patches are already upstreamed in the 4.12.0 RC.
|
||||
zcat $CWD/0000-use-gnutls-for-des-cbc.patch.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/0001-handle-removal-des-enctypes-from-krb5.patch.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/0002-samba-tool-create-working-private-krb5.conf.patch.gz | patch -p1 --verbose || exit 1
|
||||
else
|
||||
unset PAM_OPTIONS
|
||||
SHADOW_OPTIONS="--without-pam"
|
||||
|
|
|
|||
19
source/n/socat/slack-desc
Normal file
19
source/n/socat/slack-desc
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# up the first '|' above the ':' following the base package name, and the '|'
|
||||
# on the right side marks the last column you can put a character in. You must
|
||||
# make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':'.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
socat: socat (Multipurpose relay - SOcket CAT)
|
||||
socat:
|
||||
socat: Socat is a command line based utility that establishes two
|
||||
socat: bidirectional byte streams and transfers data between them. Because
|
||||
socat: the streams can be constructed from a large set of different types of
|
||||
socat: data sinks and sources, and because lots of address options may be
|
||||
socat: applied to the streams, socat can be used for many different purposes.
|
||||
socat:
|
||||
socat: Homepage: http://www.dest-unreach.org/socat
|
||||
socat:
|
||||
socat:
|
||||
138
source/n/socat/socat.SlackBuild
Executable file
138
source/n/socat/socat.SlackBuild
Executable file
|
|
@ -0,0 +1,138 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2020 Eric Hameleers, Eindhoven, NL
|
||||
# Copyright 2020 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.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=socat
|
||||
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
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
|
||||
cd $TMP
|
||||
rm -rf $PKGNAM-$VERSION
|
||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||
cd $PKGNAM-$VERSION || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# GNU readline support must be disabled since it is a GPL violation to also
|
||||
# link with OpenSSL, which is arguably more important here. It would be nice
|
||||
# to see editline support for this someday... or readline LGPLed.
|
||||
|
||||
# Configure, build, and install:
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
||||
--mandir=/usr/man \
|
||||
--infodir=/usr/info \
|
||||
--disable-readline \
|
||||
--build=$ARCH-slackware-linux || exit 1
|
||||
make $NUMJOBS || make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Compress manual pages:
|
||||
find $PKG/usr/man -type f -exec gzip -9 {} \+
|
||||
for i in $( find $PKG/usr/man -type l ) ; do
|
||||
ln -s $( readlink $i ).gz $i.gz
|
||||
rm $i
|
||||
done
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
BUGREPORTS* CHANGES* COPYING* DEVELOPMENT* EXAMPLES* FAQ* FILES* \
|
||||
PORTING* README* SECURITY* VERSION* \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
# If there's a CHANGES file, installing at least part of the recent history
|
||||
# is useful, but don't let it get totally out of control:
|
||||
if [ -r CHANGES ]; then
|
||||
DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
|
||||
cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
|
||||
touch -r CHANGES $DOCSDIR/CHANGES
|
||||
fi
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||
1
source/n/socat/socat.url
Normal file
1
source/n/socat/socat.url
Normal file
|
|
@ -0,0 +1 @@
|
|||
http://www.dest-unreach.org/socat/download/
|
||||
Loading…
Reference in a new issue