From c29dcfa2dd2e7467ea3b6b757880348884d8790d Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 3 Dec 2021 20:07:20 +0000 Subject: Fri Dec 3 20:07:20 UTC 2021 ap/rpm-4.16.1.3-x86_64-4.txz: Rebuilt. Patched to handle non-compliant RPMs created by install4j. Thanks to alienBOB. d/poke-1.4-x86_64-1.txz: Upgraded. l/enchant-2.3.2-x86_64-1.txz: Upgraded. l/freetype-2.11.1-x86_64-1.txz: Upgraded. l/glib2-2.70.2-x86_64-1.txz: Upgraded. n/lynx-2.9.0dev.10-x86_64-1.txz: Upgraded. extra/php8/php8-8.1.0-x86_64-1.txz: Removed. extra/php80/php80-8.0.13-x86_64-1.txz: Added. extra/php81/php81-8.1.0-x86_64-1.txz: Added. --- ChangeLog.rss | 39 ++- ChangeLog.txt | 27 ++ FILELIST.TXT | 250 ++++++++------- extra/source/php8/doinst.sh | 29 -- extra/source/php8/fetch-php.sh | 2 - extra/source/php8/mod_php.conf.example | 29 -- extra/source/php8/php-fpm.conf.diff | 19 -- extra/source/php8/php.imap.api.diff | 71 ----- extra/source/php8/php.ini-development.diff | 62 ---- extra/source/php8/php8.SlackBuild | 340 --------------------- extra/source/php8/slack-desc | 19 -- extra/source/php80/doinst.sh | 29 ++ extra/source/php80/fetch-php.sh | 2 + extra/source/php80/mod_php.conf.example | 29 ++ extra/source/php80/php-fpm.conf.diff | 19 ++ extra/source/php80/php.imap.api.diff | 71 +++++ extra/source/php80/php.ini-development.diff | 62 ++++ extra/source/php80/php80.SlackBuild | 340 +++++++++++++++++++++ extra/source/php80/slack-desc | 19 ++ extra/source/php81/doinst.sh | 29 ++ extra/source/php81/fetch-php.sh | 2 + extra/source/php81/mod_php.conf.example | 29 ++ extra/source/php81/php-fpm.conf.diff | 19 ++ extra/source/php81/php.imap.api.diff | 71 +++++ extra/source/php81/php.ini-development.diff | 62 ++++ extra/source/php81/php81.SlackBuild | 340 +++++++++++++++++++++ extra/source/php81/slack-desc | 19 ++ recompress.sh | 14 +- source/ap/rpm/1688.patch | 87 ++++++ source/ap/rpm/rpm.SlackBuild | 5 +- source/ap/rpm/rpm.install4j.compat.diff | 53 ++++ .../6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch | 42 --- source/l/freetype/freetype.SlackBuild | 7 +- source/n/lynx/lynx.SlackBuild | 4 +- 34 files changed, 1496 insertions(+), 745 deletions(-) delete mode 100644 extra/source/php8/doinst.sh delete mode 100755 extra/source/php8/fetch-php.sh delete mode 100644 extra/source/php8/mod_php.conf.example delete mode 100644 extra/source/php8/php-fpm.conf.diff delete mode 100644 extra/source/php8/php.imap.api.diff delete mode 100644 extra/source/php8/php.ini-development.diff delete mode 100755 extra/source/php8/php8.SlackBuild delete mode 100644 extra/source/php8/slack-desc create mode 100644 extra/source/php80/doinst.sh create mode 100755 extra/source/php80/fetch-php.sh create mode 100644 extra/source/php80/mod_php.conf.example create mode 100644 extra/source/php80/php-fpm.conf.diff create mode 100644 extra/source/php80/php.imap.api.diff create mode 100644 extra/source/php80/php.ini-development.diff create mode 100755 extra/source/php80/php80.SlackBuild create mode 100644 extra/source/php80/slack-desc create mode 100644 extra/source/php81/doinst.sh create mode 100755 extra/source/php81/fetch-php.sh create mode 100644 extra/source/php81/mod_php.conf.example create mode 100644 extra/source/php81/php-fpm.conf.diff create mode 100644 extra/source/php81/php.imap.api.diff create mode 100644 extra/source/php81/php.ini-development.diff create mode 100755 extra/source/php81/php81.SlackBuild create mode 100644 extra/source/php81/slack-desc create mode 100644 source/ap/rpm/1688.patch create mode 100644 source/ap/rpm/rpm.install4j.compat.diff delete mode 100644 source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 3649fef12..610aeb1df 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,29 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Thu, 2 Dec 2021 19:14:20 GMT - Fri, 3 Dec 2021 07:59:49 GMT + Fri, 3 Dec 2021 20:07:20 GMT + Sat, 4 Dec 2021 07:59:47 GMT maintain_current_git.sh v 1.13 + + Fri, 3 Dec 2021 20:07:20 GMT + Fri, 3 Dec 2021 20:07:20 GMT + https://git.slackware.nl/current/tag/?h=20211203200720 + 20211203200720 + + +ap/rpm-4.16.1.3-x86_64-4.txz: Rebuilt. + Patched to handle non-compliant RPMs created by install4j. Thanks to alienBOB. +d/poke-1.4-x86_64-1.txz: Upgraded. +l/enchant-2.3.2-x86_64-1.txz: Upgraded. +l/freetype-2.11.1-x86_64-1.txz: Upgraded. +l/glib2-2.70.2-x86_64-1.txz: Upgraded. +n/lynx-2.9.0dev.10-x86_64-1.txz: Upgraded. +extra/php8/php8-8.1.0-x86_64-1.txz: Removed. +extra/php80/php80-8.0.13-x86_64-1.txz: Added. +extra/php81/php81-8.1.0-x86_64-1.txz: Added. + ]]> + + Thu, 2 Dec 2021 19:14:20 GMT Thu, 2 Dec 2021 19:14:20 GMT @@ -24,6 +44,21 @@ d/strace-5.15-x86_64-1.txz: Upgraded. l/mozilla-nss-3.73-x86_64-1.txz: Upgraded. Everything linked to NSS/NSPR was rebuild tested here. + This update fixes a critical security issue: + NSS (Network Security Services) versions prior to 3.73 or 3.68.1 ESR are + vulnerable to a heap overflow when handling DER-encoded DSA or RSA-PSS + signatures. Applications using NSS for handling signatures encoded within + CMS, S/MIME, PKCS #7, or PKCS #12 are likely to be impacted. Applications + using NSS for certificate validation or other TLS, X.509, OCSP or CRL + functionality may be impacted, depending on how they configure NSS. + Note: This vulnerability does NOT impact Mozilla Firefox. However, email + clients and PDF viewers that use NSS for signature verification, such as + Thunderbird, LibreOffice, Evolution and Evince are believed to be impacted. + Thanks to Tavis Ormandy of Google Project Zero. + For more information, see: + https://www.mozilla.org/en-US/security/advisories/mfsa2021-51/ + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-43527 + (* Security fix *) l/qt5-5.15.3_20211130_014c375b-x86_64-1.txz: Upgraded. ]]> diff --git a/ChangeLog.txt b/ChangeLog.txt index e4da27e68..fee49f098 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,7 +1,34 @@ +Fri Dec 3 20:07:20 UTC 2021 +ap/rpm-4.16.1.3-x86_64-4.txz: Rebuilt. + Patched to handle non-compliant RPMs created by install4j. Thanks to alienBOB. +d/poke-1.4-x86_64-1.txz: Upgraded. +l/enchant-2.3.2-x86_64-1.txz: Upgraded. +l/freetype-2.11.1-x86_64-1.txz: Upgraded. +l/glib2-2.70.2-x86_64-1.txz: Upgraded. +n/lynx-2.9.0dev.10-x86_64-1.txz: Upgraded. +extra/php8/php8-8.1.0-x86_64-1.txz: Removed. +extra/php80/php80-8.0.13-x86_64-1.txz: Added. +extra/php81/php81-8.1.0-x86_64-1.txz: Added. ++--------------------------+ Thu Dec 2 19:14:20 UTC 2021 d/strace-5.15-x86_64-1.txz: Upgraded. l/mozilla-nss-3.73-x86_64-1.txz: Upgraded. Everything linked to NSS/NSPR was rebuild tested here. + This update fixes a critical security issue: + NSS (Network Security Services) versions prior to 3.73 or 3.68.1 ESR are + vulnerable to a heap overflow when handling DER-encoded DSA or RSA-PSS + signatures. Applications using NSS for handling signatures encoded within + CMS, S/MIME, PKCS #7, or PKCS #12 are likely to be impacted. Applications + using NSS for certificate validation or other TLS, X.509, OCSP or CRL + functionality may be impacted, depending on how they configure NSS. + Note: This vulnerability does NOT impact Mozilla Firefox. However, email + clients and PDF viewers that use NSS for signature verification, such as + Thunderbird, LibreOffice, Evolution and Evince are believed to be impacted. + Thanks to Tavis Ormandy of Google Project Zero. + For more information, see: + https://www.mozilla.org/en-US/security/advisories/mfsa2021-51/ + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-43527 + (* Security fix *) l/qt5-5.15.3_20211130_014c375b-x86_64-1.txz: Upgraded. +--------------------------+ Wed Dec 1 19:44:13 UTC 2021 diff --git a/FILELIST.TXT b/FILELIST.TXT index c9d82e53a..7bd337db0 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Thu Dec 2 19:19:13 UTC 2021 +Fri Dec 3 20:13:20 UTC 2021 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 2021-12-02 19:14 . +drwxr-xr-x 12 root root 4096 2021-12-03 20:07 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 15590 2021-08-07 23:14 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1088639 2021-12-01 19:48 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-12-01 19:48 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1088639 2021-12-02 19:19 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-12-02 19:19 ./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 1780324 2021-12-02 19:14 ./ChangeLog.txt +-rw-r--r-- 1 root root 1781796 2021-12-03 20:07 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2021-12-01 19:42 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2021-12-01 19:42 ./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 1417099 2021-12-01 19:48 ./FILELIST.TXT +-rw-r--r-- 1 root root 1417099 2021-12-02 19:19 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 863078 2021-12-02 19:18 ./PACKAGES.TXT +-rw-r--r-- 1 root root 863079 2021-12-03 20:12 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3629 2021-12-01 19:30 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -39,12 +39,12 @@ drwxr-xr-x 2 root root 4096 2021-12-01 19:42 ./EFI/BOOT -rw-r--r-- 1 root root 17294 2008-12-08 18:13 ./SPEAK_INSTALL.TXT -rw-r--r-- 1 root root 57627 2021-04-11 19:48 ./Slackware-HOWTO -rw-r--r-- 1 root root 6672 2021-02-08 05:11 ./UPGRADE.TXT -drwxr-xr-x 17 root root 4096 2021-11-29 19:34 ./extra --rw-r--r-- 1 root root 47956 2021-11-29 19:34 ./extra/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-11-29 19:34 ./extra/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 59553 2021-11-29 19:34 ./extra/FILE_LIST --rw-r--r-- 1 root root 268110 2021-11-29 19:34 ./extra/MANIFEST.bz2 --rw-r--r-- 1 root root 35366 2021-11-29 19:34 ./extra/PACKAGES.TXT +drwxr-xr-x 18 root root 4096 2021-12-03 20:12 ./extra +-rw-r--r-- 1 root root 48856 2021-12-03 20:12 ./extra/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-12-03 20:12 ./extra/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 60786 2021-12-03 20:11 ./extra/FILE_LIST +-rw-r--r-- 1 root root 402004 2021-12-03 20:11 ./extra/MANIFEST.bz2 +-rw-r--r-- 1 root root 35902 2021-12-03 20:12 ./extra/PACKAGES.TXT -rw-r--r-- 1 root root 149 2002-02-09 00:18 ./extra/README.TXT drwxr-xr-x 2 root root 20480 2020-05-26 20:38 ./extra/aspell-word-lists -rw-r--r-- 1 root root 171 2016-06-06 20:10 ./extra/aspell-word-lists/aspell-af-0.50_0-x86_64-5.txt @@ -348,10 +348,14 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./extra/google-chrome -rwxr-xr-x 1 root root 4168 2019-09-18 22:18 ./extra/google-chrome/google-chrome.SlackBuild -rw-r--r-- 1 root root 840 2018-02-27 06:13 ./extra/google-chrome/slack-desc lrwxrwxrwx 1 root root 11 2012-07-30 20:41 ./extra/java -> source/java -drwxr-xr-x 2 root root 4096 2021-11-29 19:34 ./extra/php8 --rw-r--r-- 1 root root 357 2021-11-29 19:11 ./extra/php8/php8-8.1.0-x86_64-1.txt --rw-r--r-- 1 root root 6251912 2021-11-29 19:11 ./extra/php8/php8-8.1.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-11-29 19:11 ./extra/php8/php8-8.1.0-x86_64-1.txz.asc +drwxr-xr-x 2 root root 4096 2021-12-03 20:11 ./extra/php80 +-rw-r--r-- 1 root root 369 2021-12-03 19:11 ./extra/php80/php80-8.0.13-x86_64-1.txt +-rw-r--r-- 1 root root 6144884 2021-12-03 19:11 ./extra/php80/php80-8.0.13-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 19:11 ./extra/php80/php80-8.0.13-x86_64-1.txz.asc +drwxr-xr-x 2 root root 4096 2021-12-03 20:11 ./extra/php81 +-rw-r--r-- 1 root root 369 2021-12-03 19:12 ./extra/php81/php81-8.1.0-x86_64-1.txt +-rw-r--r-- 1 root root 6253588 2021-12-03 19:12 ./extra/php81/php81-8.1.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 19:12 ./extra/php81/php81-8.1.0-x86_64-1.txz.asc drwxr-xr-x 2 root root 4096 2021-09-01 18:41 ./extra/sendmail -rw-r--r-- 1 root root 146 2017-11-15 00:39 ./extra/sendmail/README -rw-r--r-- 1 root root 503 2021-09-01 18:13 ./extra/sendmail/sendmail-8.17.1-x86_64-2.txt @@ -360,7 +364,7 @@ drwxr-xr-x 2 root root 4096 2021-09-01 18:41 ./extra/sendmail -rw-r--r-- 1 root root 586 2021-09-01 18:13 ./extra/sendmail/sendmail-cf-8.17.1-noarch-2.txt -rw-r--r-- 1 root root 118948 2021-09-01 18:13 ./extra/sendmail/sendmail-cf-8.17.1-noarch-2.txz -rw-r--r-- 1 root root 163 2021-09-01 18:13 ./extra/sendmail/sendmail-cf-8.17.1-noarch-2.txz.asc -drwxr-xr-x 15 root root 4096 2021-11-22 19:33 ./extra/source +drwxr-xr-x 16 root root 4096 2021-12-03 19:10 ./extra/source lrwxrwxrwx 1 root root 21 2021-04-29 18:18 ./extra/source/alpine -> ../../source/n/alpine drwxr-xr-x 4 root root 4096 2018-11-09 05:59 ./extra/source/aspell-word-lists -rwxr-xr-x 1 root root 3531 2020-05-26 20:06 ./extra/source/aspell-word-lists/aspell-dict.SlackBuild @@ -557,17 +561,28 @@ drwxr-xr-x 2 root root 4096 2012-07-30 18:44 ./extra/source/java/profile.d -rwxr-xr-x 1 root root 80 2019-07-30 16:57 ./extra/source/java/profile.d/jre.sh -rw-r--r-- 1 root root 817 2018-02-27 06:13 ./extra/source/java/slack-desc.jdk -rw-r--r-- 1 root root 861 2018-02-27 06:13 ./extra/source/java/slack-desc.jre -drwxr-xr-x 2 root root 4096 2021-11-29 19:06 ./extra/source/php8 --rw-r--r-- 1 root root 432 2020-12-21 16:28 ./extra/source/php8/doinst.sh.gz --rwxr-xr-x 1 root root 118 2021-11-29 19:05 ./extra/source/php8/fetch-php.sh --rw-r--r-- 1 root root 1020 2021-02-19 20:43 ./extra/source/php8/mod_php.conf.example --rw-r--r-- 1 root root 11737524 2021-11-23 19:50 ./extra/source/php8/php-8.1.0.tar.xz --rw-r--r-- 1 root root 833 2021-11-23 19:50 ./extra/source/php8/php-8.1.0.tar.xz.asc --rw-r--r-- 1 root root 387 2017-11-28 02:08 ./extra/source/php8/php-fpm.conf.diff.gz --rw-r--r-- 1 root root 605 2020-03-17 21:22 ./extra/source/php8/php.imap.api.diff.gz --rw-r--r-- 1 root root 806 2021-11-29 19:09 ./extra/source/php8/php.ini-development.diff.gz --rwxr-xr-x 1 root root 10630 2021-09-24 18:00 ./extra/source/php8/php8.SlackBuild --rw-r--r-- 1 root root 809 2021-02-19 19:05 ./extra/source/php8/slack-desc +drwxr-xr-x 2 root root 4096 2021-12-03 05:21 ./extra/source/php80 +-rw-r--r-- 1 root root 432 2020-12-21 16:28 ./extra/source/php80/doinst.sh.gz +-rwxr-xr-x 1 root root 120 2021-12-03 05:21 ./extra/source/php80/fetch-php.sh +-rw-r--r-- 1 root root 1020 2021-02-19 20:43 ./extra/source/php80/mod_php.conf.example +-rw-r--r-- 1 root root 10854284 2021-11-16 21:00 ./extra/source/php80/php-8.0.13.tar.xz +-rw-r--r-- 1 root root 858 2021-11-16 21:00 ./extra/source/php80/php-8.0.13.tar.xz.asc +-rw-r--r-- 1 root root 387 2017-11-28 02:08 ./extra/source/php80/php-fpm.conf.diff.gz +-rw-r--r-- 1 root root 605 2020-03-17 21:22 ./extra/source/php80/php.imap.api.diff.gz +-rw-r--r-- 1 root root 805 2020-05-12 19:14 ./extra/source/php80/php.ini-development.diff.gz +-rwxr-xr-x 1 root root 10631 2021-12-03 05:20 ./extra/source/php80/php80.SlackBuild +-rw-r--r-- 1 root root 822 2021-12-03 05:20 ./extra/source/php80/slack-desc +drwxr-xr-x 2 root root 4096 2021-12-03 05:18 ./extra/source/php81 +-rw-r--r-- 1 root root 432 2020-12-21 16:28 ./extra/source/php81/doinst.sh.gz +-rwxr-xr-x 1 root root 118 2021-11-29 19:05 ./extra/source/php81/fetch-php.sh +-rw-r--r-- 1 root root 1020 2021-02-19 20:43 ./extra/source/php81/mod_php.conf.example +-rw-r--r-- 1 root root 11737524 2021-11-23 19:50 ./extra/source/php81/php-8.1.0.tar.xz +-rw-r--r-- 1 root root 833 2021-11-23 19:50 ./extra/source/php81/php-8.1.0.tar.xz.asc +-rw-r--r-- 1 root root 387 2017-11-28 02:08 ./extra/source/php81/php-fpm.conf.diff.gz +-rw-r--r-- 1 root root 605 2020-03-17 21:22 ./extra/source/php81/php.imap.api.diff.gz +-rw-r--r-- 1 root root 806 2021-11-29 19:09 ./extra/source/php81/php.ini-development.diff.gz +-rwxr-xr-x 1 root root 10631 2021-12-03 05:18 ./extra/source/php81/php81.SlackBuild +-rw-r--r-- 1 root root 822 2021-12-03 05:18 ./extra/source/php81/slack-desc drwxr-xr-x 2 root root 4096 2021-09-01 18:12 ./extra/source/sendmail -rw-r--r-- 1 root root 799 2008-04-12 05:48 ./extra/source/sendmail/Build.gz -rwxr-xr-x 1 root root 5883 2021-09-01 18:12 ./extra/source/sendmail/SlackBuild-sendmail @@ -717,11 +732,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 17 root root 4096 2021-12-02 19:18 ./slackware64 --rw-r--r-- 1 root root 336950 2021-12-02 19:18 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-12-02 19:18 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 417923 2021-12-02 19:18 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4188240 2021-12-02 19:18 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2021-12-03 20:13 ./slackware64 +-rw-r--r-- 1 root root 336953 2021-12-03 20:13 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-12-03 20:13 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 417926 2021-12-03 20:12 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4187687 2021-12-03 20:12 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 32768 2021-12-01 19:47 ./slackware64/a -rw-r--r-- 1 root root 327 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txt @@ -1104,7 +1119,7 @@ drwxr-xr-x 2 root root 32768 2021-12-01 19:47 ./slackware64/a -rw-r--r-- 1 root root 540 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txt -rw-r--r-- 1 root root 56160 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz.asc -drwxr-xr-x 2 root root 20480 2021-11-30 19:22 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2021-12-03 20:12 ./slackware64/ap -rw-r--r-- 1 root root 291 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txt -rw-r--r-- 1 root root 703580 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txz -rw-r--r-- 1 root root 163 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txz.asc @@ -1286,9 +1301,9 @@ drwxr-xr-x 2 root root 20480 2021-11-30 19:22 ./slackware64/ap -rw-r--r-- 1 root root 364 2021-02-13 11:42 ./slackware64/ap/radeontool-1.6.3-x86_64-4.txt -rw-r--r-- 1 root root 59984 2021-02-13 11:42 ./slackware64/ap/radeontool-1.6.3-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:42 ./slackware64/ap/radeontool-1.6.3-x86_64-4.txz.asc --rw-r--r-- 1 root root 491 2021-11-03 01:03 ./slackware64/ap/rpm-4.16.1.3-x86_64-3.txt --rw-r--r-- 1 root root 894372 2021-11-03 01:03 ./slackware64/ap/rpm-4.16.1.3-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-11-03 01:03 ./slackware64/ap/rpm-4.16.1.3-x86_64-3.txz.asc +-rw-r--r-- 1 root root 491 2021-12-03 20:05 ./slackware64/ap/rpm-4.16.1.3-x86_64-4.txt +-rw-r--r-- 1 root root 893516 2021-12-03 20:05 ./slackware64/ap/rpm-4.16.1.3-x86_64-4.txz +-rw-r--r-- 1 root root 163 2021-12-03 20:05 ./slackware64/ap/rpm-4.16.1.3-x86_64-4.txz.asc -rw-r--r-- 1 root root 268 2021-02-13 11:42 ./slackware64/ap/rzip-2.1-x86_64-4.txt -rw-r--r-- 1 root root 20312 2021-02-13 11:42 ./slackware64/ap/rzip-2.1-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:42 ./slackware64/ap/rzip-2.1-x86_64-4.txz.asc @@ -1359,7 +1374,7 @@ drwxr-xr-x 2 root root 20480 2021-11-30 19:22 ./slackware64/ap -rw-r--r-- 1 root root 506 2021-02-13 11:48 ./slackware64/ap/zsh-5.8-x86_64-3.txt -rw-r--r-- 1 root root 3056824 2021-02-13 11:48 ./slackware64/ap/zsh-5.8-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 11:48 ./slackware64/ap/zsh-5.8-x86_64-3.txz.asc -drwxr-xr-x 2 root root 20480 2021-12-02 19:18 ./slackware64/d +drwxr-xr-x 2 root root 20480 2021-12-03 20:12 ./slackware64/d -rw-r--r-- 1 root root 360 2021-11-03 00:42 ./slackware64/d/Cython-0.29.24-x86_64-3.txt -rw-r--r-- 1 root root 2395660 2021-11-03 00:42 ./slackware64/d/Cython-0.29.24-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-11-03 00:42 ./slackware64/d/Cython-0.29.24-x86_64-3.txz.asc @@ -1520,9 +1535,9 @@ drwxr-xr-x 2 root root 20480 2021-12-02 19:18 ./slackware64/d -rw-r--r-- 1 root root 337 2021-02-13 10:44 ./slackware64/d/pmake-1.111-x86_64-7.txt -rw-r--r-- 1 root root 120656 2021-02-13 10:44 ./slackware64/d/pmake-1.111-x86_64-7.txz -rw-r--r-- 1 root root 163 2021-02-13 10:44 ./slackware64/d/pmake-1.111-x86_64-7.txz.asc --rw-r--r-- 1 root root 398 2021-06-05 17:57 ./slackware64/d/poke-1.3-x86_64-1.txt --rw-r--r-- 1 root root 604676 2021-06-05 17:57 ./slackware64/d/poke-1.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-06-05 17:57 ./slackware64/d/poke-1.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 398 2021-12-03 19:06 ./slackware64/d/poke-1.4-x86_64-1.txt +-rw-r--r-- 1 root root 605104 2021-12-03 19:06 ./slackware64/d/poke-1.4-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 19:06 ./slackware64/d/poke-1.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 270 2021-11-03 00:42 ./slackware64/d/python-pip-21.3.1-x86_64-2.txt -rw-r--r-- 1 root root 1809344 2021-11-03 00:42 ./slackware64/d/python-pip-21.3.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2021-11-03 00:42 ./slackware64/d/python-pip-21.3.1-x86_64-2.txz.asc @@ -2712,20 +2727,20 @@ drwxr-xr-x 2 root root 86016 2021-11-30 19:22 ./slackware64/kde -rw-r--r-- 1 root root 296 2021-11-04 18:45 ./slackware64/kde/zeroconf-ioslave-21.08.3-x86_64-1.txt -rw-r--r-- 1 root root 50068 2021-11-04 18:45 ./slackware64/kde/zeroconf-ioslave-21.08.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-11-04 18:45 ./slackware64/kde/zeroconf-ioslave-21.08.3-x86_64-1.txz.asc -drwxr-xr-x 2 root root 81920 2021-12-02 19:18 ./slackware64/l --rw-r--r-- 1 root root 329 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txt --rw-r--r-- 1 root root 928148 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz --rw-r--r-- 1 root root 163 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz.asc --rw-r--r-- 1 root root 551 2021-02-13 05:56 ./slackware64/l/LibRaw-0.20.2-x86_64-3.txt --rw-r--r-- 1 root root 395128 2021-02-13 05:56 ./slackware64/l/LibRaw-0.20.2-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 05:56 ./slackware64/l/LibRaw-0.20.2-x86_64-3.txz.asc --rw-r--r-- 1 root root 569 2021-11-03 00:44 ./slackware64/l/M2Crypto-0.38.0-x86_64-3.txt --rw-r--r-- 1 root root 1139324 2021-11-03 00:44 ./slackware64/l/M2Crypto-0.38.0-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-11-03 00:44 ./slackware64/l/M2Crypto-0.38.0-x86_64-3.txz.asc --rw-r--r-- 1 root root 477 2021-11-24 18:56 ./slackware64/l/Mako-1.1.6-x86_64-1.txt --rw-r--r-- 1 root root 111144 2021-11-24 18:56 ./slackware64/l/Mako-1.1.6-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-11-24 18:56 ./slackware64/l/Mako-1.1.6-x86_64-1.txz.asc --rw-r--r-- 1 root root 290 2021-11-03 00:48 ./slackware64/l/PyQt5-5.15.2-x86_64-5.txt +drwxr-xr-x 2 root root 81920 2021-12-03 20:12 ./slackware64/l +-rw-r--r-- 1 root root 329 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txt +-rw-r--r-- 1 root root 928148 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz +-rw-r--r-- 1 root root 163 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz.asc +-rw-r--r-- 1 root root 551 2021-02-13 05:56 ./slackware64/l/LibRaw-0.20.2-x86_64-3.txt +-rw-r--r-- 1 root root 395128 2021-02-13 05:56 ./slackware64/l/LibRaw-0.20.2-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 05:56 ./slackware64/l/LibRaw-0.20.2-x86_64-3.txz.asc +-rw-r--r-- 1 root root 569 2021-11-03 00:44 ./slackware64/l/M2Crypto-0.38.0-x86_64-3.txt +-rw-r--r-- 1 root root 1139324 2021-11-03 00:44 ./slackware64/l/M2Crypto-0.38.0-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-11-03 00:44 ./slackware64/l/M2Crypto-0.38.0-x86_64-3.txz.asc +-rw-r--r-- 1 root root 477 2021-11-24 18:56 ./slackware64/l/Mako-1.1.6-x86_64-1.txt +-rw-r--r-- 1 root root 111144 2021-11-24 18:56 ./slackware64/l/Mako-1.1.6-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-11-24 18:56 ./slackware64/l/Mako-1.1.6-x86_64-1.txz.asc +-rw-r--r-- 1 root root 290 2021-11-03 00:48 ./slackware64/l/PyQt5-5.15.2-x86_64-5.txt -rw-r--r-- 1 root root 6034688 2021-11-03 00:48 ./slackware64/l/PyQt5-5.15.2-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-11-03 00:48 ./slackware64/l/PyQt5-5.15.2-x86_64-5.txz.asc -rw-r--r-- 1 root root 667 2021-11-03 00:49 ./slackware64/l/QScintilla-2.11.6-x86_64-5.txt @@ -2872,9 +2887,9 @@ drwxr-xr-x 2 root root 81920 2021-12-02 19:18 ./slackware64/l -rw-r--r-- 1 root root 527 2021-11-11 16:19 ./slackware64/l/elfutils-0.186-x86_64-1.txt -rw-r--r-- 1 root root 878564 2021-11-11 16:19 ./slackware64/l/elfutils-0.186-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-11-11 16:19 ./slackware64/l/elfutils-0.186-x86_64-1.txz.asc --rw-r--r-- 1 root root 343 2021-08-11 18:05 ./slackware64/l/enchant-2.3.1-x86_64-1.txt --rw-r--r-- 1 root root 52324 2021-08-11 18:05 ./slackware64/l/enchant-2.3.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-08-11 18:05 ./slackware64/l/enchant-2.3.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 343 2021-12-03 18:57 ./slackware64/l/enchant-2.3.2-x86_64-1.txt +-rw-r--r-- 1 root root 52656 2021-12-03 18:57 ./slackware64/l/enchant-2.3.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 18:57 ./slackware64/l/enchant-2.3.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 504 2021-02-13 06:26 ./slackware64/l/esound-0.2.41-x86_64-5.txt -rw-r--r-- 1 root root 100980 2021-02-13 06:26 ./slackware64/l/esound-0.2.41-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-02-13 06:26 ./slackware64/l/esound-0.2.41-x86_64-5.txz.asc @@ -2902,9 +2917,9 @@ drwxr-xr-x 2 root root 81920 2021-12-02 19:18 ./slackware64/l -rw-r--r-- 1 root root 477 2021-10-12 20:21 ./slackware64/l/freecell-solver-6.6.0-x86_64-1.txt -rw-r--r-- 1 root root 189420 2021-10-12 20:21 ./slackware64/l/freecell-solver-6.6.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-10-12 20:21 ./slackware64/l/freecell-solver-6.6.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 492 2021-08-21 18:45 ./slackware64/l/freetype-2.11.0-x86_64-2.txt --rw-r--r-- 1 root root 606060 2021-08-21 18:45 ./slackware64/l/freetype-2.11.0-x86_64-2.txz --rw-r--r-- 1 root root 163 2021-08-21 18:45 ./slackware64/l/freetype-2.11.0-x86_64-2.txz.asc +-rw-r--r-- 1 root root 492 2021-12-03 19:00 ./slackware64/l/freetype-2.11.1-x86_64-1.txt +-rw-r--r-- 1 root root 567556 2021-12-03 19:00 ./slackware64/l/freetype-2.11.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 19:00 ./slackware64/l/freetype-2.11.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 611 2021-02-13 06:30 ./slackware64/l/frei0r-plugins-1.7.0-x86_64-3.txt -rw-r--r-- 1 root root 317280 2021-02-13 06:30 ./slackware64/l/frei0r-plugins-1.7.0-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 06:30 ./slackware64/l/frei0r-plugins-1.7.0-x86_64-3.txz.asc @@ -2959,9 +2974,9 @@ drwxr-xr-x 2 root root 81920 2021-12-02 19:18 ./slackware64/l -rw-r--r-- 1 root root 300 2021-09-27 06:04 ./slackware64/l/glib-networking-2.70.0-x86_64-1.txt -rw-r--r-- 1 root root 136340 2021-09-27 06:04 ./slackware64/l/glib-networking-2.70.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-09-27 06:04 ./slackware64/l/glib-networking-2.70.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 407 2021-10-28 17:04 ./slackware64/l/glib2-2.70.1-x86_64-1.txt --rw-r--r-- 1 root root 4028520 2021-10-28 17:04 ./slackware64/l/glib2-2.70.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-10-28 17:04 ./slackware64/l/glib2-2.70.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 407 2021-12-03 19:04 ./slackware64/l/glib2-2.70.2-x86_64-1.txt +-rw-r--r-- 1 root root 4037656 2021-12-03 19:04 ./slackware64/l/glib2-2.70.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 19:04 ./slackware64/l/glib2-2.70.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 313 2021-08-17 20:04 ./slackware64/l/glibc-2.33-x86_64-4.txt -rw-r--r-- 1 root root 5270616 2021-08-17 20:04 ./slackware64/l/glibc-2.33-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-08-17 20:04 ./slackware64/l/glibc-2.33-x86_64-4.txz.asc @@ -3849,7 +3864,7 @@ drwxr-xr-x 2 root root 81920 2021-12-02 19:18 ./slackware64/l -rw-r--r-- 1 root root 463 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txt -rw-r--r-- 1 root root 458040 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 32768 2021-11-26 19:36 ./slackware64/n +drwxr-xr-x 2 root root 32768 2021-12-03 20:12 ./slackware64/n -rw-r--r-- 1 root root 357 2021-11-26 19:25 ./slackware64/n/ModemManager-1.18.4-x86_64-1.txt -rw-r--r-- 1 root root 2127700 2021-11-26 19:25 ./slackware64/n/ModemManager-1.18.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-11-26 19:25 ./slackware64/n/ModemManager-1.18.4-x86_64-1.txz.asc @@ -4062,9 +4077,9 @@ drwxr-xr-x 2 root root 32768 2021-11-26 19:36 ./slackware64/n -rw-r--r-- 1 root root 445 2021-10-03 22:52 ./slackware64/n/links-2.25-x86_64-1.txt -rw-r--r-- 1 root root 2964340 2021-10-03 22:52 ./slackware64/n/links-2.25-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-10-03 22:52 ./slackware64/n/links-2.25-x86_64-1.txz.asc --rw-r--r-- 1 root root 530 2021-09-25 18:34 ./slackware64/n/lynx-2.9.0dev.9-x86_64-1.txt --rw-r--r-- 1 root root 1597424 2021-09-25 18:34 ./slackware64/n/lynx-2.9.0dev.9-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-09-25 18:34 ./slackware64/n/lynx-2.9.0dev.9-x86_64-1.txz.asc +-rw-r--r-- 1 root root 530 2021-12-03 19:03 ./slackware64/n/lynx-2.9.0dev.10-x86_64-1.txt +-rw-r--r-- 1 root root 1593364 2021-12-03 19:03 ./slackware64/n/lynx-2.9.0dev.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-03 19:03 ./slackware64/n/lynx-2.9.0dev.10-x86_64-1.txz.asc -rw-r--r-- 1 root root 11712 2021-09-13 04:43 ./slackware64/n/maketag -rw-r--r-- 1 root root 11712 2021-09-13 04:43 ./slackware64/n/maketag.ez -rw-r--r-- 1 root root 401 2021-02-13 12:12 ./slackware64/n/mcabber-1.1.2-x86_64-3.txt @@ -5501,16 +5516,16 @@ drwxr-xr-x 2 root root 12288 2021-11-26 19:35 ./slackware64/xfce -rw-r--r-- 1 root root 163 2021-09-18 19:52 ./slackware64/xfce/thunar-4.16.10-x86_64-1.txz.asc -rw-r--r-- 1 root root 336 2021-02-13 13:51 ./slackware64/xfce/thunar-volman-4.16.0-x86_64-3.txt -rw-r--r-- 1 root root 124948 2021-02-13 13:51 ./slackware64/xfce/thunar-volman-4.16.0-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:51 ./slackware64/xfce/thunar-volman-4.16.0-x86_64-3.txz.asc --rw-r--r-- 1 root root 509 2021-02-13 13:51 ./slackware64/xfce/tumbler-4.16.0-x86_64-3.txt --rw-r--r-- 1 root root 173316 2021-02-13 13:51 ./slackware64/xfce/tumbler-4.16.0-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:51 ./slackware64/xfce/tumbler-4.16.0-x86_64-3.txz.asc --rw-r--r-- 1 root root 468 2021-02-13 13:51 ./slackware64/xfce/xfce4-appfinder-4.16.1-x86_64-3.txt --rw-r--r-- 1 root root 158224 2021-02-13 13:51 ./slackware64/xfce/xfce4-appfinder-4.16.1-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:51 ./slackware64/xfce/xfce4-appfinder-4.16.1-x86_64-3.txz.asc --rw-r--r-- 1 root root 531 2021-05-05 17:07 ./slackware64/xfce/xfce4-clipman-plugin-1.6.2-x86_64-1.txt --rw-r--r-- 1 root root 163844 2021-05-05 17:07 ./slackware64/xfce/xfce4-clipman-plugin-1.6.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-05-05 17:07 ./slackware64/xfce/xfce4-clipman-plugin-1.6.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 163 2021-02-13 13:51 ./slackware64/xfce/thunar-volman-4.16.0-x86_64-3.txz.asc +-rw-r--r-- 1 root root 509 2021-02-13 13:51 ./slackware64/xfce/tumbler-4.16.0-x86_64-3.txt +-rw-r--r-- 1 root root 173316 2021-02-13 13:51 ./slackware64/xfce/tumbler-4.16.0-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:51 ./slackware64/xfce/tumbler-4.16.0-x86_64-3.txz.asc +-rw-r--r-- 1 root root 468 2021-02-13 13:51 ./slackware64/xfce/xfce4-appfinder-4.16.1-x86_64-3.txt +-rw-r--r-- 1 root root 158224 2021-02-13 13:51 ./slackware64/xfce/xfce4-appfinder-4.16.1-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:51 ./slackware64/xfce/xfce4-appfinder-4.16.1-x86_64-3.txz.asc +-rw-r--r-- 1 root root 531 2021-05-05 17:07 ./slackware64/xfce/xfce4-clipman-plugin-1.6.2-x86_64-1.txt +-rw-r--r-- 1 root root 163844 2021-05-05 17:07 ./slackware64/xfce/xfce4-clipman-plugin-1.6.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-05-05 17:07 ./slackware64/xfce/xfce4-clipman-plugin-1.6.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 357 2021-02-13 13:52 ./slackware64/xfce/xfce4-dev-tools-4.16.0-x86_64-3.txt -rw-r--r-- 1 root root 37692 2021-02-13 13:52 ./slackware64/xfce/xfce4-dev-tools-4.16.0-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:52 ./slackware64/xfce/xfce4-dev-tools-4.16.0-x86_64-3.txz.asc @@ -5577,11 +5592,11 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y -rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2021-12-02 19:19 ./source --rw-r--r-- 1 root root 579614 2021-12-02 19:19 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-12-02 19:19 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 807014 2021-12-02 19:19 ./source/FILE_LIST --rw-r--r-- 1 root root 23330140 2021-12-02 19:19 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2021-12-03 20:13 ./source +-rw-r--r-- 1 root root 579644 2021-12-03 20:13 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-12-03 20:13 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 807062 2021-12-03 20:13 ./source/FILE_LIST +-rw-r--r-- 1 root root 23347209 2021-12-03 20:13 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 122 root root 4096 2021-11-11 20:15 ./source/a -rw-r--r-- 1 root root 1591 2021-04-06 18:09 ./source/a/FTBFSlog @@ -6663,7 +6678,7 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/zoo -rw-r--r-- 1 root root 173607 1994-12-30 20:19 ./source/a/zoo/zoo-2.10.tar.gz -rwxr-xr-x 1 root root 3143 2021-02-13 05:31 ./source/a/zoo/zoo.SlackBuild -rw-r--r-- 1 root root 14136 2010-05-22 09:49 ./source/a/zoo/zoo_2.10-22.debian.tar.gz -drwxr-xr-x 85 root root 4096 2021-11-29 18:54 ./source/ap +drwxr-xr-x 85 root root 4096 2021-12-03 19:36 ./source/ap -rw-r--r-- 1 root root 976 2021-04-03 17:43 ./source/ap/FTBFSlog drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/a2ps -rw-r--r-- 1 root root 1521 2017-10-01 17:59 ./source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch.gz @@ -7047,11 +7062,13 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/radeontool -rw-r--r-- 1 root root 305656 2012-03-21 18:29 ./source/ap/radeontool/radeontool-1.6.3.tar.xz -rwxr-xr-x 1 root root 3288 2021-02-13 05:31 ./source/ap/radeontool/radeontool.SlackBuild -rw-r--r-- 1 root root 818 2018-02-27 06:12 ./source/ap/radeontool/slack-desc -drwxr-xr-x 2 root root 4096 2021-11-02 19:02 ./source/ap/rpm +drwxr-xr-x 2 root root 4096 2021-11-30 18:48 ./source/ap/rpm +-rw-r--r-- 1 root root 3659 2021-11-30 18:42 ./source/ap/rpm/1688.patch -rw-r--r-- 1 root root 133 2009-11-27 18:09 ./source/ap/rpm/Packages.gz -rw-r--r-- 1 root root 132 2009-11-27 18:09 ./source/ap/rpm/doinst.sh.gz -rw-r--r-- 1 root root 3398008 2021-03-22 10:08 ./source/ap/rpm/rpm-4.16.1.3.tar.lz --rwxr-xr-x 1 root root 5422 2021-11-02 19:02 ./source/ap/rpm/rpm.SlackBuild +-rwxr-xr-x 1 root root 5545 2021-11-30 18:40 ./source/ap/rpm/rpm.SlackBuild +-rw-r--r-- 1 root root 671 2021-11-30 18:48 ./source/ap/rpm/rpm.install4j.compat.diff.gz -rw-r--r-- 1 root root 28 2019-09-28 18:42 ./source/ap/rpm/rpm.url -rw-r--r-- 1 root root 943 2018-02-27 06:12 ./source/ap/rpm/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/rzip @@ -7588,8 +7605,8 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/d/pmake -rw-r--r-- 1 root root 38071 2007-02-09 20:45 ./source/d/pmake/pmake.txt.gz -rw-r--r-- 1 root root 26675 2005-07-07 09:32 ./source/d/pmake/pmake_1.111-1.diff.gz -rw-r--r-- 1 root root 790 2018-02-27 06:49 ./source/d/pmake/slack-desc -drwxr-xr-x 2 root root 4096 2021-06-05 17:57 ./source/d/poke --rw-r--r-- 1 root root 2976530 2021-06-05 11:13 ./source/d/poke/poke-1.3.tar.lz +drwxr-xr-x 2 root root 4096 2021-12-03 19:05 ./source/d/poke +-rw-r--r-- 1 root root 2978263 2021-12-02 22:38 ./source/d/poke/poke-1.4.tar.lz -rwxr-xr-x 1 root root 4522 2021-02-27 04:46 ./source/d/poke/poke.SlackBuild -rw-r--r-- 1 root root 850 2021-02-27 04:48 ./source/d/poke/slack-desc drwxr-xr-x 2 root root 4096 2021-11-02 19:02 ./source/d/python-pip @@ -9903,8 +9920,8 @@ drwxr-xr-x 2 root root 4096 2021-11-11 16:19 ./source/l/elfutils -rw-r--r-- 1 root root 8611054 2021-11-10 22:28 ./source/l/elfutils/elfutils-0.186.tar.lz -rwxr-xr-x 1 root root 4678 2021-05-11 18:27 ./source/l/elfutils/elfutils.SlackBuild -rw-r--r-- 1 root root 983 2020-11-01 18:17 ./source/l/elfutils/slack-desc -drwxr-xr-x 2 root root 4096 2021-08-11 18:05 ./source/l/enchant --rw-r--r-- 1 root root 551040 2021-08-10 09:25 ./source/l/enchant/enchant-2.3.1.tar.lz +drwxr-xr-x 2 root root 4096 2021-12-03 18:56 ./source/l/enchant +-rw-r--r-- 1 root root 550681 2021-12-03 15:58 ./source/l/enchant/enchant-2.3.2.tar.lz -rwxr-xr-x 1 root root 3962 2021-06-29 18:50 ./source/l/enchant/enchant.SlackBuild -rw-r--r-- 1 root root 35 2020-10-28 22:18 ./source/l/enchant/enchant.url -rw-r--r-- 1 root root 798 2020-10-28 22:17 ./source/l/enchant/slack-desc @@ -9960,12 +9977,11 @@ drwxr-xr-x 2 root root 4096 2021-10-12 20:21 ./source/l/freecell-solver -rwxr-xr-- 1 root root 4176 2021-10-12 20:21 ./source/l/freecell-solver/freecell-solver.SlackBuild -rw-r--r-- 1 root root 46 2021-10-12 20:21 ./source/l/freecell-solver/freecell-solver.url -rw-r--r-- 1 root root 943 2020-11-12 19:25 ./source/l/freecell-solver/slack-desc -drwxr-xr-x 2 root root 4096 2021-08-21 18:45 ./source/l/freetype --rw-r--r-- 1 root root 707 2021-08-21 18:43 ./source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch.gz +drwxr-xr-x 2 root root 4096 2021-12-03 18:59 ./source/l/freetype -rw-r--r-- 1 root root 283 2017-04-26 22:01 ./source/l/freetype/doinst.sh.gz --rw-r--r-- 1 root root 2256640 2021-07-19 16:21 ./source/l/freetype/freetype-2.11.0.tar.xz --rw-r--r-- 1 root root 195 2021-07-19 16:22 ./source/l/freetype/freetype-2.11.0.tar.xz.sig --rwxr-xr-x 1 root root 5903 2021-08-21 18:44 ./source/l/freetype/freetype.SlackBuild +-rw-r--r-- 1 root root 2270728 2021-12-02 12:39 ./source/l/freetype/freetype-2.11.1.tar.xz +-rw-r--r-- 1 root root 195 2021-12-02 12:39 ./source/l/freetype/freetype-2.11.1.tar.xz.sig +-rwxr-xr-x 1 root root 5783 2021-12-03 19:00 ./source/l/freetype/freetype.SlackBuild -rw-r--r-- 1 root root 288 2017-04-26 21:14 ./source/l/freetype/freetype.compile.both.subpixel.hinting.methods.diff.gz -rw-r--r-- 1 root root 463 2017-04-27 20:13 ./source/l/freetype/freetype.csh.gz -rw-r--r-- 1 root root 462 2017-04-27 20:13 ./source/l/freetype/freetype.sh.gz @@ -10079,9 +10095,9 @@ drwxr-xr-x 2 root root 4096 2021-09-27 06:04 ./source/l/glib-networking -rw-r--r-- 1 root root 346080 2001-03-15 14:59 ./source/l/glib/glib-1.2.10.tar.bz2 -rwxr-xr-x 1 root root 5498 2021-02-13 05:31 ./source/l/glib/glib.SlackBuild -rw-r--r-- 1 root root 754 2018-02-27 06:12 ./source/l/glib/slack-desc -drwxr-xr-x 2 root root 4096 2021-10-28 17:00 ./source/l/glib2 +drwxr-xr-x 2 root root 4096 2021-12-03 19:00 ./source/l/glib2 -rw-r--r-- 1 root root 516 2011-11-06 22:03 ./source/l/glib2/doinst.sh.gz --rw-r--r-- 1 root root 4797752 2021-10-28 12:56 ./source/l/glib2/glib-2.70.1.tar.xz +-rw-r--r-- 1 root root 4822356 2021-12-03 10:10 ./source/l/glib2/glib-2.70.2.tar.xz -rwxr-xr-x 1 root root 5287 2021-09-27 05:52 ./source/l/glib2/glib2.SlackBuild -rw-r--r-- 1 root root 913 2021-09-02 23:31 ./source/l/glib2/libglib2.csh -rw-r--r-- 1 root root 909 2021-09-01 17:51 ./source/l/glib2/libglib2.sh @@ -11970,22 +11986,22 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/gpa -rw-r--r-- 1 root root 737 2018-02-27 06:13 ./source/n/gpa/slack-desc drwxr-xr-x 2 root root 4096 2021-11-02 19:02 ./source/n/gpgme -rw-r--r-- 1 root root 1268978 2021-06-24 17:31 ./source/n/gpgme/gpgme-1.16.0.tar.lz --rwxr-xr-x 1 root root 3913 2021-11-02 19:02 ./source/n/gpgme/gpgme.SlackBuild --rw-r--r-- 1 root root 990 2018-02-27 06:13 ./source/n/gpgme/slack-desc -drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/htdig --rw-r--r-- 1 root root 274 2007-04-07 22:58 ./source/n/htdig/doinst.sh.gz --rw-r--r-- 1 root root 3347 2007-04-07 22:30 ./source/n/htdig/htdig-3.2.0b6.diff.gz --rw-r--r-- 1 root root 2498246 2004-07-13 14:21 ./source/n/htdig/htdig-3.2.0b6.tar.bz2 --rwxr-xr-x 1 root root 4788 2021-02-13 05:32 ./source/n/htdig/htdig.SlackBuild --rw-r--r-- 1 root root 288 2007-05-02 18:02 ./source/n/htdig/htdig.conf.diff.gz --rw-r--r-- 1 root root 887 2018-02-27 06:13 ./source/n/htdig/slack-desc -drwxr-xr-x 2 root root 4096 2021-10-08 03:10 ./source/n/httpd --rw-r--r-- 1 root root 931 2018-09-24 18:58 ./source/n/httpd/doinst.sh.gz --rw-r--r-- 1 root root 7653609 2021-10-07 15:17 ./source/n/httpd/httpd-2.4.51.tar.bz2 --rw-r--r-- 1 root root 874 2021-10-07 15:17 ./source/n/httpd/httpd-2.4.51.tar.bz2.asc --rwxr-xr-x 1 root root 9105 2021-06-03 18:29 ./source/n/httpd/httpd.SlackBuild --rw-r--r-- 1 root root 260 2012-04-13 02:17 ./source/n/httpd/httpd.runasapache.diff.gz --rw-r--r-- 1 root root 112 2021-10-08 03:10 ./source/n/httpd/httpd.url +-rwxr-xr-x 1 root root 3913 2021-11-02 19:02 ./source/n/gpgme/gpgme.SlackBuild +-rw-r--r-- 1 root root 990 2018-02-27 06:13 ./source/n/gpgme/slack-desc +drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/htdig +-rw-r--r-- 1 root root 274 2007-04-07 22:58 ./source/n/htdig/doinst.sh.gz +-rw-r--r-- 1 root root 3347 2007-04-07 22:30 ./source/n/htdig/htdig-3.2.0b6.diff.gz +-rw-r--r-- 1 root root 2498246 2004-07-13 14:21 ./source/n/htdig/htdig-3.2.0b6.tar.bz2 +-rwxr-xr-x 1 root root 4788 2021-02-13 05:32 ./source/n/htdig/htdig.SlackBuild +-rw-r--r-- 1 root root 288 2007-05-02 18:02 ./source/n/htdig/htdig.conf.diff.gz +-rw-r--r-- 1 root root 887 2018-02-27 06:13 ./source/n/htdig/slack-desc +drwxr-xr-x 2 root root 4096 2021-10-08 03:10 ./source/n/httpd +-rw-r--r-- 1 root root 931 2018-09-24 18:58 ./source/n/httpd/doinst.sh.gz +-rw-r--r-- 1 root root 7653609 2021-10-07 15:17 ./source/n/httpd/httpd-2.4.51.tar.bz2 +-rw-r--r-- 1 root root 874 2021-10-07 15:17 ./source/n/httpd/httpd-2.4.51.tar.bz2.asc +-rwxr-xr-x 1 root root 9105 2021-06-03 18:29 ./source/n/httpd/httpd.SlackBuild +-rw-r--r-- 1 root root 260 2012-04-13 02:17 ./source/n/httpd/httpd.runasapache.diff.gz +-rw-r--r-- 1 root root 112 2021-10-08 03:10 ./source/n/httpd/httpd.url -rw-r--r-- 1 root root 171 2021-05-23 19:15 ./source/n/httpd/logrotate.httpd -rw-r--r-- 1 root root 1083 2018-03-20 18:37 ./source/n/httpd/rc.httpd -rw-r--r-- 1 root root 966 2018-02-27 06:13 ./source/n/httpd/slack-desc @@ -12167,13 +12183,13 @@ drwxr-xr-x 2 root root 4096 2021-10-03 22:51 ./source/n/links -rwxr-xr-x 1 root root 3962 2021-03-18 18:37 ./source/n/links/links.SlackBuild -rw-r--r-- 1 root root 36 2018-05-16 20:42 ./source/n/links/links.url -rw-r--r-- 1 root root 898 2018-02-27 06:13 ./source/n/links/slack-desc -drwxr-xr-x 2 root root 4096 2021-09-25 18:27 ./source/n/lynx +drwxr-xr-x 2 root root 4096 2021-12-03 19:02 ./source/n/lynx -rw-r--r-- 1 root root 264 2017-05-29 19:39 ./source/n/lynx/doinst.sh.gz -rw-r--r-- 1 root root 1124 2018-02-19 16:18 ./source/n/lynx/lynx-CVE-2008-4690.patch.gz --rwxr-xr-x 1 root root 4955 2021-09-25 18:21 ./source/n/lynx/lynx.SlackBuild +-rwxr-xr-x 1 root root 4957 2021-12-03 19:02 ./source/n/lynx/lynx.SlackBuild -rw-r--r-- 1 root root 517 2021-09-25 18:27 ./source/n/lynx/lynx.cfg.diff.gz -rw-r--r-- 1 root root 46 2020-08-06 18:28 ./source/n/lynx/lynx.url --rw-r--r-- 1 root root 2252554 2021-08-07 14:33 ./source/n/lynx/lynx2.9.0dev.9.tar.lz +-rw-r--r-- 1 root root 2253792 2021-10-24 22:18 ./source/n/lynx/lynx2.9.0dev.10.tar.lz -rw-r--r-- 1 root root 982 2021-09-25 18:18 ./source/n/lynx/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/mcabber -rw-r--r-- 1 root root 527531 2020-09-19 14:28 ./source/n/mcabber/mcabber-1.1.2.tar.lz diff --git a/extra/source/php8/doinst.sh b/extra/source/php8/doinst.sh deleted file mode 100644 index dc5726e50..000000000 --- a/extra/source/php8/doinst.sh +++ /dev/null @@ -1,29 +0,0 @@ -if [ "`cat etc/httpd/mod_php.conf 2> /dev/null`" = "" ]; then - cp -a etc/httpd/mod_php.conf.new etc/httpd/mod_php.conf -fi - -config() { - NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -# Keep same perms on rc.php-fpm.new: -if [ -e etc/rc.d/rc.php-fpm ]; then - cp -a etc/rc.d/rc.php-fpm etc/rc.d/rc.php-fpm.new.incoming - cat etc/rc.d/rc.php-fpm.new > etc/rc.d/rc.php-fpm.new.incoming - mv etc/rc.d/rc.php-fpm.new.incoming etc/rc.d/rc.php-fpm.new -fi -config etc/rc.d/rc.php-fpm.new -cp -a etc/php.ini-production etc/php.ini.new -config etc/php.ini.new -cp -a etc/php-fpm.conf.default etc/php-fpm.conf.new -config etc/php-fpm.conf.new -cp -a etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf.new -config etc/php-fpm.d/www.conf.new -config etc/httpd/mod_php.conf.new diff --git a/extra/source/php8/fetch-php.sh b/extra/source/php8/fetch-php.sh deleted file mode 100755 index cbd7847a4..000000000 --- a/extra/source/php8/fetch-php.sh +++ /dev/null @@ -1,2 +0,0 @@ -lftpget http://us.php.net/distributions/php-8.1.0.tar.xz.asc -lftpget http://us.php.net/distributions/php-8.1.0.tar.xz diff --git a/extra/source/php8/mod_php.conf.example b/extra/source/php8/mod_php.conf.example deleted file mode 100644 index 6ca1d3a87..000000000 --- a/extra/source/php8/mod_php.conf.example +++ /dev/null @@ -1,29 +0,0 @@ -# -# mod_php - PHP Hypertext Preprocessor module -# - -# Load the PHP module: -LoadModule php_module lib/httpd/modules/libphp.so - -# Tell Apache to feed all *.php files through PHP. If you'd like to -# parse PHP embedded in files with different extensions, comment out -# these lines and see the example below. - - SetHandler application/x-httpd-php - - -# Tell Apache to feed all *.php, *.html, and *.htm files through -# the PHP module. Add or subtract extensions here as desired. Please -# note that running pages through PHP for no reason can be both slow -# and insecure, so be sure to know what you're doing. It's a convenient -# shortcut, but probably isn't suitible for high-traffic sites if you -# write any of your pages in straight HTML. -# -# SetHandler application/x-httpd-php -# - -# This will display PHP files in colored syntax form. Use with caution. -# -# SetHandler application/x-httpd-php-source -# - diff --git a/extra/source/php8/php-fpm.conf.diff b/extra/source/php8/php-fpm.conf.diff deleted file mode 100644 index 03b0f5033..000000000 --- a/extra/source/php8/php-fpm.conf.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./sapi/fpm/php-fpm.conf.in.orig 2017-11-21 21:02:19.000000000 -0600 -+++ ./sapi/fpm/php-fpm.conf.in 2017-11-27 20:07:58.533458347 -0600 -@@ -14,14 +14,14 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = run/php-fpm.pid - - ; Error log file - ; If it's set to "syslog", log is sent to syslogd instead of being written - ; into a local file. - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: log/php-fpm.log --;error_log = log/php-fpm.log -+error_log = log/php-fpm.log - - ; syslog_facility is used to specify what type of program is logging the - ; message. This lets syslogd specify that messages from different facilities diff --git a/extra/source/php8/php.imap.api.diff b/extra/source/php8/php.imap.api.diff deleted file mode 100644 index b767e1558..000000000 --- a/extra/source/php8/php.imap.api.diff +++ /dev/null @@ -1,71 +0,0 @@ ---- ./ext/imap/php_imap.c.orig 2020-03-17 05:40:25.000000000 -0500 -+++ ./ext/imap/php_imap.c 2020-03-17 16:20:15.600685744 -0500 -@@ -5081,7 +5081,7 @@ - php debugger? */ - } - --PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial) -+PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char **pwd, long trial) - { - - if (*mb->user) { -@@ -5089,7 +5089,13 @@ - } else { - strlcpy (user, IMAPG(imap_user), MAILTMPLEN); - } -- strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); -+ *pwd = cpystr(IMAPG(imap_password)); /* alpine-2.22 c-client.a */ -+} -+ -+/* alpine-2.22 c-client.a workaround */ -+PHP_IMAP_EXPORT void mm_login_method(NETMBX *mb, char *user, void *pwd, long trial, char *method) -+{ -+ pwd = NULL; - } - - PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream) ---- ./ext/imap/config.m4.orig 2020-03-17 05:40:25.000000000 -0500 -+++ ./ext/imap/config.m4 2020-03-17 16:20:15.588685745 -0500 -@@ -34,6 +34,7 @@ - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} -@@ -262,6 +263,7 @@ - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} ---- ./configure.orig 2020-03-17 05:40:20.000000000 -0500 -+++ ./configure 2020-03-17 16:22:03.768679101 -0500 -@@ -39870,6 +39870,7 @@ - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} -@@ -39937,6 +39938,8 @@ - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} -@@ -40078,6 +40081,7 @@ - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} diff --git a/extra/source/php8/php.ini-development.diff b/extra/source/php8/php.ini-development.diff deleted file mode 100644 index 4240941e0..000000000 --- a/extra/source/php8/php.ini-development.diff +++ /dev/null @@ -1,62 +0,0 @@ ---- ./php.ini-development.orig 2021-11-23 12:56:11.000000000 -0600 -+++ ./php.ini-development 2021-11-29 13:08:24.467109377 -0600 -@@ -905,7 +905,50 @@ - ; 'extension='php_.dll') is supported for legacy reasons and may be - ; deprecated in a future PHP major version. So, when it is possible, please - ; move to the new ('extension=) syntax. -+ -+; These are the extensions that are available for use on this PHP build. -+; If you do NOT need any of these extensions, you should comment them out. -+; That will probably increase both your security and performance. - ; -+extension=bcmath -+extension=bz2 -+extension=calendar -+extension=ctype -+extension=curl -+extension=dba -+extension=dom -+extension=enchant -+extension=exif -+extension=ftp -+extension=gd -+extension=gettext -+extension=gmp -+extension=iconv -+extension=intl -+extension=ldap -+extension=mbstring -+extension=mysqlnd -+extension=mysqli -+extension=odbc -+extension=openssl -+zend_extension=opcache -+extension=pdo -+extension=pdo_mysql -+extension=pdo_sqlite -+extension=pdo_odbc -+extension=pspell -+extension=shmop -+extension=snmp -+extension=soap -+extension=sqlite3 -+extension=tidy -+extension=tokenizer -+extension=xmlreader -+extension=xmlrpc -+extension=xsl -+extension=zip -+extension=zlib -+ - ; Notes for Windows environments : - ; - ; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -@@ -1350,7 +1393,7 @@ - ; where MODE is the octal representation of the mode. Note that this - ; does not overwrite the process's umask. - ; https://php.net/session.save-path --;session.save_path = "/tmp" -+session.save_path = "/var/lib/php" - - ; Whether to use strict session mode. - ; Strict session mode does not accept an uninitialized session ID, and diff --git a/extra/source/php8/php8.SlackBuild b/extra/source/php8/php8.SlackBuild deleted file mode 100755 index 65e29cb5a..000000000 --- a/extra/source/php8/php8.SlackBuild +++ /dev/null @@ -1,340 +0,0 @@ -#!/bin/bash - -# Build and package mod_php on Slackware. -# by: David Cantrell -# Modified for PHP 4-5 by volkerdi@slackware.com -# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019, 2020, 2021 Patrick 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=php -VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -ALPINE=2.25 -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -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) "} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-php8/ -rm -rf $PKG -mkdir -p $TMP $PKG - -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# Look for Kerberos on the machine and in any precompiled c-client.a: -if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then - # Remove the c-client library if it doesn't contain Kerberos support: - if ! grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then - rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client - fi -else - # Remove the c-client library if it contains Kerberos support: - if grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then - rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client - fi -fi - -# we need to compile alpine to get c-client.a for IMAP support: -IMAPLIBDIR=/usr/local/lib${LIBDIRSUFFIX}/c-client -if [ -r $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a ]; then - echo "Using IMAP library:" - ls -l $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a - sleep 5 -else - ( cd $CWD/../alpine ; VERSION=${ALPINE} ; ./alpine.SlackBuild || exit 1 ) || exit 1 - ( cd $TMP/alpine-${ALPINE}/imap/c-client - strip -g c-client.a - mkdir -p $IMAPLIBDIR/lib${LIBDIRSUFFIX} - cp c-client.a $IMAPLIBDIR/lib${LIBDIRSUFFIX} - mkdir -p $IMAPLIBDIR/include - cp *.h $IMAPLIBDIR/include - ) -fi - -# Set Kerberos build option: -if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then - KRB5_OPTION="--with-kerberos" -else - unset KRB5_OPTION -fi - -mkdir -p $PKG/etc/httpd -mkdir -p $PKG/etc/php.d -# A trick from DaMouse to enable building php into $PKG. -# We'll remove this later on. -cat /etc/httpd/original/httpd.conf > $PKG/etc/httpd/httpd.conf -if [ ! -e /etc/httpd/original/httpd.conf ]; then - echo "FATAL: no /etc/httpd/original/httpd.conf found." - exit 1 -fi - -cd $TMP -rm -rf php-$VERSION -tar xvf $CWD/php-$VERSION.tar.xz || exit 1 -cd php-$VERSION || exit 1 - -# cleanup: -find . -name "*.orig" -delete - -if [ "$ARCH" = "s390" ]; then - zcat $CWD/php.configure.s390.diff.gz | patch -p1 || exit -fi - -# Fixup perms/owners: -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 {} \+ - -find . -name "*.h" -exec chmod 644 {} \+ - -# Sometimes they ship a few of these: -find . -name "*.orig" -exec rm {} \+ - -# Patch ini files: -zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1 -zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1 - -# Fix for imap API change: -zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1 - -# Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build -# and adapt phpize accordingly: -sed -i "s|build$|php/build|" scripts/Makefile.frag -sed -i "s|build\"$|php/build\"|" scripts/phpize.in - -# NOTE: Added -DU_USING_ICU_NAMESPACE=1 to CXXFLAGS, which should be a temporary -# requirement. See the link below: -# http://site.icu-project.org/download/61#TOC-Migration-Issues - -# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise. - -# Generic "kitchen sink" configure function, with as many things as possible (and -# maybe then some ;-) compiled as shared extensions: -EXTENSION_DIR=/usr/lib${LIBDIRSUFFIX}/php/extensions \ -CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \ -CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-libdir=lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --datarootdir=/usr/share \ - --datadir=/usr/share \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --with-apxs2=/usr/bin/apxs \ - --enable-fpm \ - --with-fpm-user=apache \ - --with-fpm-group=apache \ - --enable-maintainer-zts \ - --enable-pcntl \ - --enable-mbregex \ - --enable-tokenizer=shared \ - --with-config-file-scan-dir=/etc/php.d \ - --with-config-file-path=/etc \ - --with-layout=PHP \ - --disable-sigchild \ - --with-libxml \ - --with-xmlrpc=shared \ - --with-expat \ - --enable-simplexml \ - --enable-xmlreader=shared \ - --enable-dom=shared \ - --enable-filter \ - --disable-debug \ - --with-openssl=shared \ - $KRB5_OPTION \ - --with-external-pcre \ - --with-zlib=shared,/usr \ - --enable-bcmath=shared \ - --with-bz2=shared,/usr \ - --enable-calendar=shared \ - --enable-ctype=shared \ - --with-curl=shared \ - --enable-dba=shared \ - --with-gdbm=/usr \ - --with-db4=/usr \ - --enable-exif=shared \ - --enable-ftp=shared \ - --enable-gd=shared \ - --with-external-gd \ - --with-jpeg \ - --with-xpm \ - --with-gettext=shared,/usr \ - --with-gmp=shared,/usr \ - --with-iconv=shared \ - --with-imap-ssl=/usr \ - --with-imap=$IMAPLIBDIR \ - --with-ldap=shared \ - --enable-mbstring=shared \ - --enable-mysqlnd=shared \ - --with-mysqli=shared,mysqlnd \ - --with-mysql-sock=/var/run/mysql/mysql.sock \ - --with-iodbc=shared,/usr \ - --enable-pdo=shared \ - --with-pdo-mysql=shared,mysqlnd \ - --with-pdo-sqlite=shared,/usr \ - --with-pdo-odbc=shared,iODBC,/usr \ - --with-pspell=shared,/usr \ - --with-enchant=shared,/usr \ - --enable-shmop=shared \ - --with-snmp=shared,/usr \ - --enable-soap=shared \ - --enable-sockets \ - --with-sqlite3=shared \ - --enable-sysvmsg \ - --enable-sysvsem \ - --enable-sysvshm \ - --with-xsl=shared,/usr \ - --with-zip=shared \ - --with-tsrm-pthreads \ - --enable-intl=shared \ - --enable-opcache \ - --enable-shared=yes \ - --enable-static=no \ - --with-gnu-ld \ - --with-pic \ - --enable-phpdbg \ - --with-sodium \ - --with-password-argon2 \ - --without-readline \ - --with-libedit \ - --with-pear \ - --with-tidy=shared \ - --build=$ARCH-slackware-linux || exit 1 - -# I am told this option is worse than nothing. :-) -# --enable-safe-mode -# -# I would recommend *against* and will take no responbility for turning on -# "safe" mode. - -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Don't include the c-client library in php-config output: -sed -i "s| -L/usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}||g" $PKG/usr/bin/php-config -sed -i "s| -lc-client||g" $PKG/usr/bin/php-config - -mkdir -p $PKG/etc/{rc.d,php-fpm.d} -cp sapi/fpm/init.d.php-fpm $PKG/etc/rc.d/rc.php-fpm.new -chmod 644 $PKG/etc/rc.d/rc.php-fpm.new - -# PHP (used to) install Pear with some strange permissions. -chmod 755 $PKG/usr/bin/pear - -# PHP sometimes puts junk in the root directory: -( cd $PKG - rm -rf .channels .depdb .depdblock .filemap .lock .registry -) - -# We do not package static extension libraries: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions/*.a - -# Fix $PKG/usr/lib/php perms: -( cd $PKG/usr/lib${LIBDIRSUFFIX}/php - 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 {} \+ -) - -mkdir -p $PKG/usr/doc/php-$VERSION -cp -a \ - CODING_STANDARDS* CONTRIBUTING* EXTENSIONS* LICENSE* NEWS* README* UPGRADING* \ - $PKG/usr/doc/php-$VERSION - -mkdir -p $PKG/etc/httpd -cat $CWD/mod_php.conf.example | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" > $PKG/etc/httpd/mod_php.conf.new -chmod 644 $PKG/etc/httpd/* -chown root:root $PKG/etc/httpd/* - -cp -a php.ini-development php.ini-production $PKG/etc -chmod 755 $PKG/etc/php.d $PKG/etc/php-fpm.d $PKG/etc/httpd -chown root:root $PKG/etc/* - -# This can go now. -rm -f $PKG/etc/httpd/httpd* - -# Session directory for PHP: -mkdir -p $PKG/var/lib/php -chmod 770 $PKG/var/lib/php -chown root:apache $PKG/var/lib/php - -# Strip ELF objects. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -gzip -9 $PKG/usr/man/man?/*.? - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -#if [ -d "$IMAPLIBDIR" ]; then -# ( cd $IMAPLIBDIR && rm -rf * ) -# rmdir $IMAPLIBDIR -#fi - -cd $PKG -/sbin/makepkg -l y -c n $TMP/php8-$VERSION-$ARCH-$BUILD.txz diff --git a/extra/source/php8/slack-desc b/extra/source/php8/slack-desc deleted file mode 100644 index fbb35e6d1..000000000 --- a/extra/source/php8/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -php8: php8 (HTML-embedded scripting language) -php8: -php8: PHP is an HTML-embedded scripting language. It shares syntax -php8: characteristics with C, Java, and Perl. The primary objective behind -php8: this language is to make a fast and easy-to-use scripting language -php8: for dynamic web sites. -php8: -php8: Homepage: https://www.php.net/ -php8: -php8: -php8: diff --git a/extra/source/php80/doinst.sh b/extra/source/php80/doinst.sh new file mode 100644 index 000000000..dc5726e50 --- /dev/null +++ b/extra/source/php80/doinst.sh @@ -0,0 +1,29 @@ +if [ "`cat etc/httpd/mod_php.conf 2> /dev/null`" = "" ]; then + cp -a etc/httpd/mod_php.conf.new etc/httpd/mod_php.conf +fi + +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +# Keep same perms on rc.php-fpm.new: +if [ -e etc/rc.d/rc.php-fpm ]; then + cp -a etc/rc.d/rc.php-fpm etc/rc.d/rc.php-fpm.new.incoming + cat etc/rc.d/rc.php-fpm.new > etc/rc.d/rc.php-fpm.new.incoming + mv etc/rc.d/rc.php-fpm.new.incoming etc/rc.d/rc.php-fpm.new +fi +config etc/rc.d/rc.php-fpm.new +cp -a etc/php.ini-production etc/php.ini.new +config etc/php.ini.new +cp -a etc/php-fpm.conf.default etc/php-fpm.conf.new +config etc/php-fpm.conf.new +cp -a etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf.new +config etc/php-fpm.d/www.conf.new +config etc/httpd/mod_php.conf.new diff --git a/extra/source/php80/fetch-php.sh b/extra/source/php80/fetch-php.sh new file mode 100755 index 000000000..8f26da55c --- /dev/null +++ b/extra/source/php80/fetch-php.sh @@ -0,0 +1,2 @@ +lftpget http://us.php.net/distributions/php-8.0.13.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.0.13.tar.xz diff --git a/extra/source/php80/mod_php.conf.example b/extra/source/php80/mod_php.conf.example new file mode 100644 index 000000000..6ca1d3a87 --- /dev/null +++ b/extra/source/php80/mod_php.conf.example @@ -0,0 +1,29 @@ +# +# mod_php - PHP Hypertext Preprocessor module +# + +# Load the PHP module: +LoadModule php_module lib/httpd/modules/libphp.so + +# Tell Apache to feed all *.php files through PHP. If you'd like to +# parse PHP embedded in files with different extensions, comment out +# these lines and see the example below. + + SetHandler application/x-httpd-php + + +# Tell Apache to feed all *.php, *.html, and *.htm files through +# the PHP module. Add or subtract extensions here as desired. Please +# note that running pages through PHP for no reason can be both slow +# and insecure, so be sure to know what you're doing. It's a convenient +# shortcut, but probably isn't suitible for high-traffic sites if you +# write any of your pages in straight HTML. +# +# SetHandler application/x-httpd-php +# + +# This will display PHP files in colored syntax form. Use with caution. +# +# SetHandler application/x-httpd-php-source +# + diff --git a/extra/source/php80/php-fpm.conf.diff b/extra/source/php80/php-fpm.conf.diff new file mode 100644 index 000000000..03b0f5033 --- /dev/null +++ b/extra/source/php80/php-fpm.conf.diff @@ -0,0 +1,19 @@ +--- ./sapi/fpm/php-fpm.conf.in.orig 2017-11-21 21:02:19.000000000 -0600 ++++ ./sapi/fpm/php-fpm.conf.in 2017-11-27 20:07:58.533458347 -0600 +@@ -14,14 +14,14 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written + ; into a local file. + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = log/php-fpm.log + + ; syslog_facility is used to specify what type of program is logging the + ; message. This lets syslogd specify that messages from different facilities diff --git a/extra/source/php80/php.imap.api.diff b/extra/source/php80/php.imap.api.diff new file mode 100644 index 000000000..b767e1558 --- /dev/null +++ b/extra/source/php80/php.imap.api.diff @@ -0,0 +1,71 @@ +--- ./ext/imap/php_imap.c.orig 2020-03-17 05:40:25.000000000 -0500 ++++ ./ext/imap/php_imap.c 2020-03-17 16:20:15.600685744 -0500 +@@ -5081,7 +5081,7 @@ + php debugger? */ + } + +-PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial) ++PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char **pwd, long trial) + { + + if (*mb->user) { +@@ -5089,7 +5089,13 @@ + } else { + strlcpy (user, IMAPG(imap_user), MAILTMPLEN); + } +- strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); ++ *pwd = cpystr(IMAPG(imap_password)); /* alpine-2.22 c-client.a */ ++} ++ ++/* alpine-2.22 c-client.a workaround */ ++PHP_IMAP_EXPORT void mm_login_method(NETMBX *mb, char *user, void *pwd, long trial, char *method) ++{ ++ pwd = NULL; + } + + PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream) +--- ./ext/imap/config.m4.orig 2020-03-17 05:40:25.000000000 -0500 ++++ ./ext/imap/config.m4 2020-03-17 16:20:15.588685745 -0500 +@@ -34,6 +34,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +@@ -262,6 +263,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +--- ./configure.orig 2020-03-17 05:40:20.000000000 -0500 ++++ ./configure 2020-03-17 16:22:03.768679101 -0500 +@@ -39870,6 +39870,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +@@ -39937,6 +39938,8 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +@@ -40078,6 +40081,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} diff --git a/extra/source/php80/php.ini-development.diff b/extra/source/php80/php.ini-development.diff new file mode 100644 index 000000000..ce12f5a4b --- /dev/null +++ b/extra/source/php80/php.ini-development.diff @@ -0,0 +1,62 @@ +--- ./php.ini-development.orig 2020-05-12 03:09:16.000000000 -0500 ++++ ./php.ini-development 2020-05-12 14:14:32.901530776 -0500 +@@ -899,7 +899,50 @@ + ; 'extension='php_.dll') is supported for legacy reasons and may be + ; deprecated in a future PHP major version. So, when it is possible, please + ; move to the new ('extension=) syntax. ++ ++; These are the extensions that are available for use on this PHP build. ++; If you do NOT need any of these extensions, you should comment them out. ++; That will probably increase both your security and performance. + ; ++extension=bcmath ++extension=bz2 ++extension=calendar ++extension=ctype ++extension=curl ++extension=dba ++extension=dom ++extension=enchant ++extension=exif ++extension=ftp ++extension=gd ++extension=gettext ++extension=gmp ++extension=iconv ++extension=intl ++extension=ldap ++extension=mbstring ++extension=mysqlnd ++extension=mysqli ++extension=odbc ++extension=openssl ++zend_extension=opcache ++extension=pdo ++extension=pdo_mysql ++extension=pdo_sqlite ++extension=pdo_odbc ++extension=pspell ++extension=shmop ++extension=snmp ++extension=soap ++extension=sqlite3 ++extension=tidy ++extension=tokenizer ++extension=xmlreader ++extension=xmlrpc ++extension=xsl ++extension=zip ++extension=zlib ++ + ; Notes for Windows environments : + ; + ; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) +@@ -1335,7 +1378,7 @@ + ; where MODE is the octal representation of the mode. Note that this + ; does not overwrite the process's umask. + ; http://php.net/session.save-path +-;session.save_path = "/tmp" ++session.save_path = "/var/lib/php" + + ; Whether to use strict session mode. + ; Strict session mode does not accept an uninitialized session ID, and diff --git a/extra/source/php80/php80.SlackBuild b/extra/source/php80/php80.SlackBuild new file mode 100755 index 000000000..b618d497e --- /dev/null +++ b/extra/source/php80/php80.SlackBuild @@ -0,0 +1,340 @@ +#!/bin/bash + +# Build and package mod_php on Slackware. +# by: David Cantrell +# Modified for PHP 4-5 by volkerdi@slackware.com +# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019, 2020, 2021 Patrick 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=php +VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +ALPINE=2.25 +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +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) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-php8/ +rm -rf $PKG +mkdir -p $TMP $PKG + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# Look for Kerberos on the machine and in any precompiled c-client.a: +if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then + # Remove the c-client library if it doesn't contain Kerberos support: + if ! grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then + rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client + fi +else + # Remove the c-client library if it contains Kerberos support: + if grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then + rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client + fi +fi + +# we need to compile alpine to get c-client.a for IMAP support: +IMAPLIBDIR=/usr/local/lib${LIBDIRSUFFIX}/c-client +if [ -r $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a ]; then + echo "Using IMAP library:" + ls -l $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a + sleep 5 +else + ( cd $CWD/../alpine ; VERSION=${ALPINE} ; ./alpine.SlackBuild || exit 1 ) || exit 1 + ( cd $TMP/alpine-${ALPINE}/imap/c-client + strip -g c-client.a + mkdir -p $IMAPLIBDIR/lib${LIBDIRSUFFIX} + cp c-client.a $IMAPLIBDIR/lib${LIBDIRSUFFIX} + mkdir -p $IMAPLIBDIR/include + cp *.h $IMAPLIBDIR/include + ) +fi + +# Set Kerberos build option: +if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then + KRB5_OPTION="--with-kerberos" +else + unset KRB5_OPTION +fi + +mkdir -p $PKG/etc/httpd +mkdir -p $PKG/etc/php.d +# A trick from DaMouse to enable building php into $PKG. +# We'll remove this later on. +cat /etc/httpd/original/httpd.conf > $PKG/etc/httpd/httpd.conf +if [ ! -e /etc/httpd/original/httpd.conf ]; then + echo "FATAL: no /etc/httpd/original/httpd.conf found." + exit 1 +fi + +cd $TMP +rm -rf php-$VERSION +tar xvf $CWD/php-$VERSION.tar.xz || exit 1 +cd php-$VERSION || exit 1 + +# cleanup: +find . -name "*.orig" -delete + +if [ "$ARCH" = "s390" ]; then + zcat $CWD/php.configure.s390.diff.gz | patch -p1 || exit +fi + +# Fixup perms/owners: +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 {} \+ + +find . -name "*.h" -exec chmod 644 {} \+ + +# Sometimes they ship a few of these: +find . -name "*.orig" -exec rm {} \+ + +# Patch ini files: +zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1 +zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1 + +# Fix for imap API change: +zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1 + +# Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build +# and adapt phpize accordingly: +sed -i "s|build$|php/build|" scripts/Makefile.frag +sed -i "s|build\"$|php/build\"|" scripts/phpize.in + +# NOTE: Added -DU_USING_ICU_NAMESPACE=1 to CXXFLAGS, which should be a temporary +# requirement. See the link below: +# http://site.icu-project.org/download/61#TOC-Migration-Issues + +# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise. + +# Generic "kitchen sink" configure function, with as many things as possible (and +# maybe then some ;-) compiled as shared extensions: +EXTENSION_DIR=/usr/lib${LIBDIRSUFFIX}/php/extensions \ +CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \ +CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-libdir=lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --datarootdir=/usr/share \ + --datadir=/usr/share \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --with-apxs2=/usr/bin/apxs \ + --enable-fpm \ + --with-fpm-user=apache \ + --with-fpm-group=apache \ + --enable-maintainer-zts \ + --enable-pcntl \ + --enable-mbregex \ + --enable-tokenizer=shared \ + --with-config-file-scan-dir=/etc/php.d \ + --with-config-file-path=/etc \ + --with-layout=PHP \ + --disable-sigchild \ + --with-libxml \ + --with-xmlrpc=shared \ + --with-expat \ + --enable-simplexml \ + --enable-xmlreader=shared \ + --enable-dom=shared \ + --enable-filter \ + --disable-debug \ + --with-openssl=shared \ + $KRB5_OPTION \ + --with-external-pcre \ + --with-zlib=shared,/usr \ + --enable-bcmath=shared \ + --with-bz2=shared,/usr \ + --enable-calendar=shared \ + --enable-ctype=shared \ + --with-curl=shared \ + --enable-dba=shared \ + --with-gdbm=/usr \ + --with-db4=/usr \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd=shared \ + --with-external-gd \ + --with-jpeg \ + --with-xpm \ + --with-gettext=shared,/usr \ + --with-gmp=shared,/usr \ + --with-iconv=shared \ + --with-imap-ssl=/usr \ + --with-imap=$IMAPLIBDIR \ + --with-ldap=shared \ + --enable-mbstring=shared \ + --enable-mysqlnd=shared \ + --with-mysqli=shared,mysqlnd \ + --with-mysql-sock=/var/run/mysql/mysql.sock \ + --with-iodbc=shared,/usr \ + --enable-pdo=shared \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-sqlite=shared,/usr \ + --with-pdo-odbc=shared,iODBC,/usr \ + --with-pspell=shared,/usr \ + --with-enchant=shared,/usr \ + --enable-shmop=shared \ + --with-snmp=shared,/usr \ + --enable-soap=shared \ + --enable-sockets \ + --with-sqlite3=shared \ + --enable-sysvmsg \ + --enable-sysvsem \ + --enable-sysvshm \ + --with-xsl=shared,/usr \ + --with-zip=shared \ + --with-tsrm-pthreads \ + --enable-intl=shared \ + --enable-opcache \ + --enable-shared=yes \ + --enable-static=no \ + --with-gnu-ld \ + --with-pic \ + --enable-phpdbg \ + --with-sodium \ + --with-password-argon2 \ + --without-readline \ + --with-libedit \ + --with-pear \ + --with-tidy=shared \ + --build=$ARCH-slackware-linux || exit 1 + +# I am told this option is worse than nothing. :-) +# --enable-safe-mode +# +# I would recommend *against* and will take no responbility for turning on +# "safe" mode. + +make $NUMJOBS || make || exit 1 +make install INSTALL_ROOT=$PKG || exit 1 + +# Don't include the c-client library in php-config output: +sed -i "s| -L/usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}||g" $PKG/usr/bin/php-config +sed -i "s| -lc-client||g" $PKG/usr/bin/php-config + +mkdir -p $PKG/etc/{rc.d,php-fpm.d} +cp sapi/fpm/init.d.php-fpm $PKG/etc/rc.d/rc.php-fpm.new +chmod 644 $PKG/etc/rc.d/rc.php-fpm.new + +# PHP (used to) install Pear with some strange permissions. +chmod 755 $PKG/usr/bin/pear + +# PHP sometimes puts junk in the root directory: +( cd $PKG + rm -rf .channels .depdb .depdblock .filemap .lock .registry +) + +# We do not package static extension libraries: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions/*.a + +# Fix $PKG/usr/lib/php perms: +( cd $PKG/usr/lib${LIBDIRSUFFIX}/php + 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 {} \+ +) + +mkdir -p $PKG/usr/doc/php-$VERSION +cp -a \ + CODING_STANDARDS* CONTRIBUTING* EXTENSIONS* LICENSE* NEWS* README* UPGRADING* \ + $PKG/usr/doc/php-$VERSION + +mkdir -p $PKG/etc/httpd +cat $CWD/mod_php.conf.example | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" > $PKG/etc/httpd/mod_php.conf.new +chmod 644 $PKG/etc/httpd/* +chown root:root $PKG/etc/httpd/* + +cp -a php.ini-development php.ini-production $PKG/etc +chmod 755 $PKG/etc/php.d $PKG/etc/php-fpm.d $PKG/etc/httpd +chown root:root $PKG/etc/* + +# This can go now. +rm -f $PKG/etc/httpd/httpd* + +# Session directory for PHP: +mkdir -p $PKG/var/lib/php +chmod 770 $PKG/var/lib/php +chown root:apache $PKG/var/lib/php + +# Strip ELF objects. +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +gzip -9 $PKG/usr/man/man?/*.? + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +#if [ -d "$IMAPLIBDIR" ]; then +# ( cd $IMAPLIBDIR && rm -rf * ) +# rmdir $IMAPLIBDIR +#fi + +cd $PKG +/sbin/makepkg -l y -c n $TMP/php80-$VERSION-$ARCH-$BUILD.txz diff --git a/extra/source/php80/slack-desc b/extra/source/php80/slack-desc new file mode 100644 index 000000000..f6868ad4b --- /dev/null +++ b/extra/source/php80/slack-desc @@ -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------------------------------------------------------| +php80: php80 (HTML-embedded scripting language) +php80: +php80: PHP is an HTML-embedded scripting language. It shares syntax +php80: characteristics with C, Java, and Perl. The primary objective behind +php80: this language is to make a fast and easy-to-use scripting language +php80: for dynamic web sites. +php80: +php80: Homepage: https://www.php.net/ +php80: +php80: +php80: diff --git a/extra/source/php81/doinst.sh b/extra/source/php81/doinst.sh new file mode 100644 index 000000000..dc5726e50 --- /dev/null +++ b/extra/source/php81/doinst.sh @@ -0,0 +1,29 @@ +if [ "`cat etc/httpd/mod_php.conf 2> /dev/null`" = "" ]; then + cp -a etc/httpd/mod_php.conf.new etc/httpd/mod_php.conf +fi + +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +# Keep same perms on rc.php-fpm.new: +if [ -e etc/rc.d/rc.php-fpm ]; then + cp -a etc/rc.d/rc.php-fpm etc/rc.d/rc.php-fpm.new.incoming + cat etc/rc.d/rc.php-fpm.new > etc/rc.d/rc.php-fpm.new.incoming + mv etc/rc.d/rc.php-fpm.new.incoming etc/rc.d/rc.php-fpm.new +fi +config etc/rc.d/rc.php-fpm.new +cp -a etc/php.ini-production etc/php.ini.new +config etc/php.ini.new +cp -a etc/php-fpm.conf.default etc/php-fpm.conf.new +config etc/php-fpm.conf.new +cp -a etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf.new +config etc/php-fpm.d/www.conf.new +config etc/httpd/mod_php.conf.new diff --git a/extra/source/php81/fetch-php.sh b/extra/source/php81/fetch-php.sh new file mode 100755 index 000000000..cbd7847a4 --- /dev/null +++ b/extra/source/php81/fetch-php.sh @@ -0,0 +1,2 @@ +lftpget http://us.php.net/distributions/php-8.1.0.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.1.0.tar.xz diff --git a/extra/source/php81/mod_php.conf.example b/extra/source/php81/mod_php.conf.example new file mode 100644 index 000000000..6ca1d3a87 --- /dev/null +++ b/extra/source/php81/mod_php.conf.example @@ -0,0 +1,29 @@ +# +# mod_php - PHP Hypertext Preprocessor module +# + +# Load the PHP module: +LoadModule php_module lib/httpd/modules/libphp.so + +# Tell Apache to feed all *.php files through PHP. If you'd like to +# parse PHP embedded in files with different extensions, comment out +# these lines and see the example below. + + SetHandler application/x-httpd-php + + +# Tell Apache to feed all *.php, *.html, and *.htm files through +# the PHP module. Add or subtract extensions here as desired. Please +# note that running pages through PHP for no reason can be both slow +# and insecure, so be sure to know what you're doing. It's a convenient +# shortcut, but probably isn't suitible for high-traffic sites if you +# write any of your pages in straight HTML. +# +# SetHandler application/x-httpd-php +# + +# This will display PHP files in colored syntax form. Use with caution. +# +# SetHandler application/x-httpd-php-source +# + diff --git a/extra/source/php81/php-fpm.conf.diff b/extra/source/php81/php-fpm.conf.diff new file mode 100644 index 000000000..03b0f5033 --- /dev/null +++ b/extra/source/php81/php-fpm.conf.diff @@ -0,0 +1,19 @@ +--- ./sapi/fpm/php-fpm.conf.in.orig 2017-11-21 21:02:19.000000000 -0600 ++++ ./sapi/fpm/php-fpm.conf.in 2017-11-27 20:07:58.533458347 -0600 +@@ -14,14 +14,14 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written + ; into a local file. + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = log/php-fpm.log + + ; syslog_facility is used to specify what type of program is logging the + ; message. This lets syslogd specify that messages from different facilities diff --git a/extra/source/php81/php.imap.api.diff b/extra/source/php81/php.imap.api.diff new file mode 100644 index 000000000..b767e1558 --- /dev/null +++ b/extra/source/php81/php.imap.api.diff @@ -0,0 +1,71 @@ +--- ./ext/imap/php_imap.c.orig 2020-03-17 05:40:25.000000000 -0500 ++++ ./ext/imap/php_imap.c 2020-03-17 16:20:15.600685744 -0500 +@@ -5081,7 +5081,7 @@ + php debugger? */ + } + +-PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial) ++PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char **pwd, long trial) + { + + if (*mb->user) { +@@ -5089,7 +5089,13 @@ + } else { + strlcpy (user, IMAPG(imap_user), MAILTMPLEN); + } +- strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); ++ *pwd = cpystr(IMAPG(imap_password)); /* alpine-2.22 c-client.a */ ++} ++ ++/* alpine-2.22 c-client.a workaround */ ++PHP_IMAP_EXPORT void mm_login_method(NETMBX *mb, char *user, void *pwd, long trial, char *method) ++{ ++ pwd = NULL; + } + + PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream) +--- ./ext/imap/config.m4.orig 2020-03-17 05:40:25.000000000 -0500 ++++ ./ext/imap/config.m4 2020-03-17 16:20:15.588685745 -0500 +@@ -34,6 +34,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +@@ -262,6 +263,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +--- ./configure.orig 2020-03-17 05:40:20.000000000 -0500 ++++ ./configure 2020-03-17 16:22:03.768679101 -0500 +@@ -39870,6 +39870,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +@@ -39937,6 +39938,8 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} +@@ -40078,6 +40081,7 @@ + PHP_IMAP_EXPORT void mm_nocritical(void){} + PHP_IMAP_EXPORT void mm_notify(void){} + PHP_IMAP_EXPORT void mm_login(void){} ++ PHP_IMAP_EXPORT void mm_login_method(void){} + PHP_IMAP_EXPORT void mm_diskerror(void){} + PHP_IMAP_EXPORT void mm_status(void){} + PHP_IMAP_EXPORT void mm_lsub(void){} diff --git a/extra/source/php81/php.ini-development.diff b/extra/source/php81/php.ini-development.diff new file mode 100644 index 000000000..4240941e0 --- /dev/null +++ b/extra/source/php81/php.ini-development.diff @@ -0,0 +1,62 @@ +--- ./php.ini-development.orig 2021-11-23 12:56:11.000000000 -0600 ++++ ./php.ini-development 2021-11-29 13:08:24.467109377 -0600 +@@ -905,7 +905,50 @@ + ; 'extension='php_.dll') is supported for legacy reasons and may be + ; deprecated in a future PHP major version. So, when it is possible, please + ; move to the new ('extension=) syntax. ++ ++; These are the extensions that are available for use on this PHP build. ++; If you do NOT need any of these extensions, you should comment them out. ++; That will probably increase both your security and performance. + ; ++extension=bcmath ++extension=bz2 ++extension=calendar ++extension=ctype ++extension=curl ++extension=dba ++extension=dom ++extension=enchant ++extension=exif ++extension=ftp ++extension=gd ++extension=gettext ++extension=gmp ++extension=iconv ++extension=intl ++extension=ldap ++extension=mbstring ++extension=mysqlnd ++extension=mysqli ++extension=odbc ++extension=openssl ++zend_extension=opcache ++extension=pdo ++extension=pdo_mysql ++extension=pdo_sqlite ++extension=pdo_odbc ++extension=pspell ++extension=shmop ++extension=snmp ++extension=soap ++extension=sqlite3 ++extension=tidy ++extension=tokenizer ++extension=xmlreader ++extension=xmlrpc ++extension=xsl ++extension=zip ++extension=zlib ++ + ; Notes for Windows environments : + ; + ; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) +@@ -1350,7 +1393,7 @@ + ; where MODE is the octal representation of the mode. Note that this + ; does not overwrite the process's umask. + ; https://php.net/session.save-path +-;session.save_path = "/tmp" ++session.save_path = "/var/lib/php" + + ; Whether to use strict session mode. + ; Strict session mode does not accept an uninitialized session ID, and diff --git a/extra/source/php81/php81.SlackBuild b/extra/source/php81/php81.SlackBuild new file mode 100755 index 000000000..ddfac67e6 --- /dev/null +++ b/extra/source/php81/php81.SlackBuild @@ -0,0 +1,340 @@ +#!/bin/bash + +# Build and package mod_php on Slackware. +# by: David Cantrell +# Modified for PHP 4-5 by volkerdi@slackware.com +# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019, 2020, 2021 Patrick 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=php +VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +ALPINE=2.25 +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +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) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-php8/ +rm -rf $PKG +mkdir -p $TMP $PKG + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# Look for Kerberos on the machine and in any precompiled c-client.a: +if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then + # Remove the c-client library if it doesn't contain Kerberos support: + if ! grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then + rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client + fi +else + # Remove the c-client library if it contains Kerberos support: + if grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then + rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client + fi +fi + +# we need to compile alpine to get c-client.a for IMAP support: +IMAPLIBDIR=/usr/local/lib${LIBDIRSUFFIX}/c-client +if [ -r $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a ]; then + echo "Using IMAP library:" + ls -l $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a + sleep 5 +else + ( cd $CWD/../alpine ; VERSION=${ALPINE} ; ./alpine.SlackBuild || exit 1 ) || exit 1 + ( cd $TMP/alpine-${ALPINE}/imap/c-client + strip -g c-client.a + mkdir -p $IMAPLIBDIR/lib${LIBDIRSUFFIX} + cp c-client.a $IMAPLIBDIR/lib${LIBDIRSUFFIX} + mkdir -p $IMAPLIBDIR/include + cp *.h $IMAPLIBDIR/include + ) +fi + +# Set Kerberos build option: +if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then + KRB5_OPTION="--with-kerberos" +else + unset KRB5_OPTION +fi + +mkdir -p $PKG/etc/httpd +mkdir -p $PKG/etc/php.d +# A trick from DaMouse to enable building php into $PKG. +# We'll remove this later on. +cat /etc/httpd/original/httpd.conf > $PKG/etc/httpd/httpd.conf +if [ ! -e /etc/httpd/original/httpd.conf ]; then + echo "FATAL: no /etc/httpd/original/httpd.conf found." + exit 1 +fi + +cd $TMP +rm -rf php-$VERSION +tar xvf $CWD/php-$VERSION.tar.xz || exit 1 +cd php-$VERSION || exit 1 + +# cleanup: +find . -name "*.orig" -delete + +if [ "$ARCH" = "s390" ]; then + zcat $CWD/php.configure.s390.diff.gz | patch -p1 || exit +fi + +# Fixup perms/owners: +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 {} \+ + +find . -name "*.h" -exec chmod 644 {} \+ + +# Sometimes they ship a few of these: +find . -name "*.orig" -exec rm {} \+ + +# Patch ini files: +zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1 +zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1 + +# Fix for imap API change: +zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1 + +# Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build +# and adapt phpize accordingly: +sed -i "s|build$|php/build|" scripts/Makefile.frag +sed -i "s|build\"$|php/build\"|" scripts/phpize.in + +# NOTE: Added -DU_USING_ICU_NAMESPACE=1 to CXXFLAGS, which should be a temporary +# requirement. See the link below: +# http://site.icu-project.org/download/61#TOC-Migration-Issues + +# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise. + +# Generic "kitchen sink" configure function, with as many things as possible (and +# maybe then some ;-) compiled as shared extensions: +EXTENSION_DIR=/usr/lib${LIBDIRSUFFIX}/php/extensions \ +CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \ +CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-libdir=lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --datarootdir=/usr/share \ + --datadir=/usr/share \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --with-apxs2=/usr/bin/apxs \ + --enable-fpm \ + --with-fpm-user=apache \ + --with-fpm-group=apache \ + --enable-maintainer-zts \ + --enable-pcntl \ + --enable-mbregex \ + --enable-tokenizer=shared \ + --with-config-file-scan-dir=/etc/php.d \ + --with-config-file-path=/etc \ + --with-layout=PHP \ + --disable-sigchild \ + --with-libxml \ + --with-xmlrpc=shared \ + --with-expat \ + --enable-simplexml \ + --enable-xmlreader=shared \ + --enable-dom=shared \ + --enable-filter \ + --disable-debug \ + --with-openssl=shared \ + $KRB5_OPTION \ + --with-external-pcre \ + --with-zlib=shared,/usr \ + --enable-bcmath=shared \ + --with-bz2=shared,/usr \ + --enable-calendar=shared \ + --enable-ctype=shared \ + --with-curl=shared \ + --enable-dba=shared \ + --with-gdbm=/usr \ + --with-db4=/usr \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd=shared \ + --with-external-gd \ + --with-jpeg \ + --with-xpm \ + --with-gettext=shared,/usr \ + --with-gmp=shared,/usr \ + --with-iconv=shared \ + --with-imap-ssl=/usr \ + --with-imap=$IMAPLIBDIR \ + --with-ldap=shared \ + --enable-mbstring=shared \ + --enable-mysqlnd=shared \ + --with-mysqli=shared,mysqlnd \ + --with-mysql-sock=/var/run/mysql/mysql.sock \ + --with-iodbc=shared,/usr \ + --enable-pdo=shared \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-sqlite=shared,/usr \ + --with-pdo-odbc=shared,iODBC,/usr \ + --with-pspell=shared,/usr \ + --with-enchant=shared,/usr \ + --enable-shmop=shared \ + --with-snmp=shared,/usr \ + --enable-soap=shared \ + --enable-sockets \ + --with-sqlite3=shared \ + --enable-sysvmsg \ + --enable-sysvsem \ + --enable-sysvshm \ + --with-xsl=shared,/usr \ + --with-zip=shared \ + --with-tsrm-pthreads \ + --enable-intl=shared \ + --enable-opcache \ + --enable-shared=yes \ + --enable-static=no \ + --with-gnu-ld \ + --with-pic \ + --enable-phpdbg \ + --with-sodium \ + --with-password-argon2 \ + --without-readline \ + --with-libedit \ + --with-pear \ + --with-tidy=shared \ + --build=$ARCH-slackware-linux || exit 1 + +# I am told this option is worse than nothing. :-) +# --enable-safe-mode +# +# I would recommend *against* and will take no responbility for turning on +# "safe" mode. + +make $NUMJOBS || make || exit 1 +make install INSTALL_ROOT=$PKG || exit 1 + +# Don't include the c-client library in php-config output: +sed -i "s| -L/usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}||g" $PKG/usr/bin/php-config +sed -i "s| -lc-client||g" $PKG/usr/bin/php-config + +mkdir -p $PKG/etc/{rc.d,php-fpm.d} +cp sapi/fpm/init.d.php-fpm $PKG/etc/rc.d/rc.php-fpm.new +chmod 644 $PKG/etc/rc.d/rc.php-fpm.new + +# PHP (used to) install Pear with some strange permissions. +chmod 755 $PKG/usr/bin/pear + +# PHP sometimes puts junk in the root directory: +( cd $PKG + rm -rf .channels .depdb .depdblock .filemap .lock .registry +) + +# We do not package static extension libraries: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions/*.a + +# Fix $PKG/usr/lib/php perms: +( cd $PKG/usr/lib${LIBDIRSUFFIX}/php + 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 {} \+ +) + +mkdir -p $PKG/usr/doc/php-$VERSION +cp -a \ + CODING_STANDARDS* CONTRIBUTING* EXTENSIONS* LICENSE* NEWS* README* UPGRADING* \ + $PKG/usr/doc/php-$VERSION + +mkdir -p $PKG/etc/httpd +cat $CWD/mod_php.conf.example | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" > $PKG/etc/httpd/mod_php.conf.new +chmod 644 $PKG/etc/httpd/* +chown root:root $PKG/etc/httpd/* + +cp -a php.ini-development php.ini-production $PKG/etc +chmod 755 $PKG/etc/php.d $PKG/etc/php-fpm.d $PKG/etc/httpd +chown root:root $PKG/etc/* + +# This can go now. +rm -f $PKG/etc/httpd/httpd* + +# Session directory for PHP: +mkdir -p $PKG/var/lib/php +chmod 770 $PKG/var/lib/php +chown root:apache $PKG/var/lib/php + +# Strip ELF objects. +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +gzip -9 $PKG/usr/man/man?/*.? + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +#if [ -d "$IMAPLIBDIR" ]; then +# ( cd $IMAPLIBDIR && rm -rf * ) +# rmdir $IMAPLIBDIR +#fi + +cd $PKG +/sbin/makepkg -l y -c n $TMP/php81-$VERSION-$ARCH-$BUILD.txz diff --git a/extra/source/php81/slack-desc b/extra/source/php81/slack-desc new file mode 100644 index 000000000..7188f1cfb --- /dev/null +++ b/extra/source/php81/slack-desc @@ -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------------------------------------------------------| +php81: php81 (HTML-embedded scripting language) +php81: +php81: PHP is an HTML-embedded scripting language. It shares syntax +php81: characteristics with C, Java, and Perl. The primary objective behind +php81: this language is to make a fast and easy-to-use scripting language +php81: for dynamic web sites. +php81: +php81: Homepage: https://www.php.net/ +php81: +php81: +php81: diff --git a/recompress.sh b/recompress.sh index edb24551b..97f2e6d2f 100755 --- a/recompress.sh +++ b/recompress.sh @@ -3,6 +3,10 @@ # Run this script in the root directory of the repository to re-compress # all patches and scripts that were un-compressed to make a better git commit: # +gzip ./extra/source/php80/php-fpm.conf.diff +gzip ./extra/source/php80/doinst.sh +gzip ./extra/source/php80/php.imap.api.diff +gzip ./extra/source/php80/php.ini-development.diff gzip ./extra/source/xv/xv-3.10a.patch gzip ./extra/source/xv/xv-libpng-1.5.patch gzip ./extra/source/xv/xv.prefix_x86_64.diff @@ -26,11 +30,11 @@ gzip ./extra/source/tigervnc/patches/xorg-server/0001-Always-install-vbe-and-int gzip ./extra/source/tigervnc/patches/vncserver.xinitrc.diff gzip ./extra/source/tigervnc/patches/xserver120.patch gzip ./extra/source/tigervnc/doinst.sh +gzip ./extra/source/php81/php-fpm.conf.diff +gzip ./extra/source/php81/doinst.sh +gzip ./extra/source/php81/php.imap.api.diff +gzip ./extra/source/php81/php.ini-development.diff gzip ./extra/source/bash-completion/fixup-sh-script-completions.diff -gzip ./extra/source/php8/php-fpm.conf.diff -gzip ./extra/source/php8/doinst.sh -gzip ./extra/source/php8/php.imap.api.diff -gzip ./extra/source/php8/php.ini-development.diff gzip ./source/d/clisp/clisp.link.libgnu.whole-archive.diff gzip ./source/d/clisp/clisp.c_data.compact_empty_buckets.diff gzip ./source/d/python3/python.sysconfig.py.x86_64.diff @@ -693,6 +697,7 @@ gzip ./source/ap/screen/45suppress_remap.patch gzip ./source/ap/screen/doinst.sh gzip ./source/ap/groff/groff.man.mdoc.local gzip ./source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch +gzip ./source/ap/rpm/rpm.install4j.compat.diff gzip ./source/ap/rpm/doinst.sh gzip ./source/ap/rpm/Packages gzip ./source/ap/man-db/doinst.sh @@ -840,7 +845,6 @@ gzip ./source/l/freetype/freetype.sh gzip ./source/l/freetype/freetype.compile.both.subpixel.hinting.methods.diff gzip ./source/l/freetype/freetype.subpixel.rendering.diff gzip ./source/l/freetype/doinst.sh -gzip ./source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch gzip ./source/l/freetype/freetype.csh gzip ./source/l/gcr/doinst.sh gzip ./source/l/gcr/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff diff --git a/source/ap/rpm/1688.patch b/source/ap/rpm/1688.patch new file mode 100644 index 000000000..255605b0a --- /dev/null +++ b/source/ap/rpm/1688.patch @@ -0,0 +1,87 @@ +From 05fbec89be5a3f582b51b8ca39030346b12cf1f6 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen +Date: Tue, 25 May 2021 14:07:18 +0300 +Subject: [PATCH] Fix regression reading rpm v3 and other rare packages (#1635) + +Commit d6a86b5e69e46cc283b1e06c92343319beb42e21 introduced far stricter +checks on what tags are allowed in signature and main headers than rpm +had previously seen, and unsurprisingly this introduced some regressions +on less common cases: + +- On rpm v3 packages and some newer 3rd party created packages (such as + install4j < 9.0.2), RPMTAG_ARCHIVESIZE resides in the main header + to begin with +- In rpm 4.13 - 4.14, file IMA signatures were incorrectly placed in + the main header. + +As a quirk, permit the existence of RPMTAG_ARCHIVESIZE, +RPMTAG_FILESIGNATURES and RPMTAG_FILESIGNATURELENGTH in the main header +too provided that the corresponding signature tag is not there (so +they can reside in either but not both headers). + +Initial workaround patch by Demi Marie Obenour. + +Fixes: #1635 +--- + lib/package.c | 39 ++++++++++++++++++++++----------------- + 1 file changed, 22 insertions(+), 17 deletions(-) + +diff --git a/lib/package.c b/lib/package.c +index 7e6174690b..4b6b164979 100644 +--- a/lib/package.c ++++ b/lib/package.c +@@ -35,23 +35,24 @@ struct taglate_s { + rpmTagVal stag; + rpmTagVal xtag; + rpm_count_t count; ++ int quirk; + } const xlateTags[] = { +- { RPMSIGTAG_SIZE, RPMTAG_SIGSIZE, 1 }, +- { RPMSIGTAG_PGP, RPMTAG_SIGPGP, 0 }, +- { RPMSIGTAG_MD5, RPMTAG_SIGMD5, 16 }, +- { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 }, +- /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */ +- { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 }, +- { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 }, +- { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 }, +- { RPMSIGTAG_VERITYSIGNATURES, RPMTAG_VERITYSIGNATURES, 0 }, +- { RPMSIGTAG_VERITYSIGNATUREALGO, RPMTAG_VERITYSIGNATUREALGO, 1 }, +- { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 }, +- { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 }, +- { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 }, +- { RPMSIGTAG_RSA, RPMTAG_RSAHEADER, 0 }, +- { RPMSIGTAG_LONGSIZE, RPMTAG_LONGSIGSIZE, 1 }, +- { RPMSIGTAG_LONGARCHIVESIZE, RPMTAG_LONGARCHIVESIZE, 1 }, ++ { RPMSIGTAG_SIZE, RPMTAG_SIGSIZE, 1, 0 }, ++ { RPMSIGTAG_PGP, RPMTAG_SIGPGP, 0, 0 }, ++ { RPMSIGTAG_MD5, RPMTAG_SIGMD5, 16, 0 }, ++ { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0, 0 }, ++ /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0, 0 }, */ /* long obsolete, dont use */ ++ { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1, 1 }, ++ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0, 1 }, ++ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1, 1 }, ++ { RPMSIGTAG_VERITYSIGNATURES, RPMTAG_VERITYSIGNATURES, 0, 0 }, ++ { RPMSIGTAG_VERITYSIGNATUREALGO, RPMTAG_VERITYSIGNATUREALGO, 1, 0 }, ++ { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1, 0 }, ++ { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1, 0 }, ++ { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0, 0 }, ++ { RPMSIGTAG_RSA, RPMTAG_RSAHEADER, 0, 0 }, ++ { RPMSIGTAG_LONGSIZE, RPMTAG_LONGSIGSIZE, 1, 0 }, ++ { RPMSIGTAG_LONGARCHIVESIZE, RPMTAG_LONGARCHIVESIZE, 1, 0 }, + { 0 } + }; + +@@ -69,8 +70,12 @@ rpmTagVal headerMergeLegacySigs(Header h, Header sigh, char **msg) + + for (xl = xlateTags; xl->stag; xl++) { + /* There mustn't be one in the main header */ +- if (headerIsEntry(h, xl->xtag)) ++ if (headerIsEntry(h, xl->xtag)) { ++ /* Some tags may exist in either header, but never both */ ++ if (xl->quirk && !headerIsEntry(sigh, xl->stag)) ++ continue; + goto exit; ++ } + } + + rpmtdReset(&td); diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild index ff61a2e20..45d4ad48c 100755 --- a/source/ap/rpm/rpm.SlackBuild +++ b/source/ap/rpm/rpm.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rpm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -95,6 +95,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix for non-compliant RPMs created by install4j: +zcat $CWD/rpm.install4j.compat.diff.gz | patch -p1 --verbose || exit 1 + # We need to do this since there's a bugfix for python3.10 detection in # the latest automake: autoreconf -vif diff --git a/source/ap/rpm/rpm.install4j.compat.diff b/source/ap/rpm/rpm.install4j.compat.diff new file mode 100644 index 000000000..1ceba1634 --- /dev/null +++ b/source/ap/rpm/rpm.install4j.compat.diff @@ -0,0 +1,53 @@ +--- ./lib/package.c.orig 2021-03-22 05:05:07.312635983 -0500 ++++ ./lib/package.c 2021-11-30 12:48:31.637122803 -0600 +@@ -35,21 +35,22 @@ + rpmTagVal stag; + rpmTagVal xtag; + rpm_count_t count; ++ int quirk; + } const xlateTags[] = { +- { RPMSIGTAG_SIZE, RPMTAG_SIGSIZE, 1 }, +- { RPMSIGTAG_PGP, RPMTAG_SIGPGP, 0 }, +- { RPMSIGTAG_MD5, RPMTAG_SIGMD5, 16 }, +- { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 }, +- /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */ +- { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 }, +- { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 }, +- { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 }, +- { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 }, +- { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 }, +- { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 }, +- { RPMSIGTAG_RSA, RPMTAG_RSAHEADER, 0 }, +- { RPMSIGTAG_LONGSIZE, RPMTAG_LONGSIGSIZE, 1 }, +- { RPMSIGTAG_LONGARCHIVESIZE, RPMTAG_LONGARCHIVESIZE, 1 }, ++ { RPMSIGTAG_SIZE, RPMTAG_SIGSIZE, 1, 0 }, ++ { RPMSIGTAG_PGP, RPMTAG_SIGPGP, 0, 0 }, ++ { RPMSIGTAG_MD5, RPMTAG_SIGMD5, 16, 0 }, ++ { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0, 0 }, ++ /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0, 0 }, */ /* long obsolete, dont use */ ++ { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1, 1 }, ++ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0, 1 }, ++ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1, 1 }, ++ { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1, 0 }, ++ { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1, 0 }, ++ { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0, 0 }, ++ { RPMSIGTAG_RSA, RPMTAG_RSAHEADER, 0, 0 }, ++ { RPMSIGTAG_LONGSIZE, RPMTAG_LONGSIGSIZE, 1, 0 }, ++ { RPMSIGTAG_LONGARCHIVESIZE, RPMTAG_LONGARCHIVESIZE, 1, 0 }, + { 0 } + }; + +@@ -67,8 +68,12 @@ + + for (xl = xlateTags; xl->stag; xl++) { + /* There mustn't be one in the main header */ +- if (headerIsEntry(h, xl->xtag)) ++ if (headerIsEntry(h, xl->xtag)) { ++ /* Some tags may exist in either header, but never both */ ++ if (xl->quirk && !headerIsEntry(sigh, xl->stag)) ++ continue; + goto exit; ++ } + } + + rpmtdReset(&td); diff --git a/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch b/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch deleted file mode 100644 index b91780f14..000000000 --- a/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov -Date: Fri, 20 Aug 2021 16:01:32 -0400 -Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs. - -Fixes #1076. - -* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when -rendering a bitmap glyph. ---- - src/base/ftobjs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c -index 342ac4a27..7b40c6421 100644 ---- a/src/base/ftobjs.c -+++ b/src/base/ftobjs.c -@@ -4703,7 +4703,7 @@ - else - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - -- error = FT_ERR( Unimplemented_Feature ); -+ error = FT_ERR( Cannot_Render_Glyph ); - while ( renderer ) - { - error = renderer->render( renderer, slot, render_mode, NULL ); -@@ -4719,6 +4719,11 @@ - /* format. */ - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - } -+ -+ /* it is not an error if we cannot render a bitmat glyph */ -+ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) && -+ slot->format == FT_GLYPH_FORMAT_BITMAP ) -+ error = FT_Err_Ok; - } - } - --- -GitLab - - diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 4c9fdb9cb..298d47970 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freetype VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,9 +91,6 @@ find . \ # scripts in /etc/profile.d/. zcat $CWD/freetype.compile.both.subpixel.hinting.methods.diff.gz | patch -p1 --verbose || exit 1 -# Fix bitmap font rendering: -zcat $CWD/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -151,7 +148,7 @@ cp -a \ ChangeLog LICENSE* README* \ $PKG/usr/doc/freetype-$VERSION # too much -rm -rf $PKG/usr/doc/freetype-$VERSION/docs/reference $PKG/usr/doc/freetype-2.11.0/docs/oldlogs +rm -rf $PKG/usr/doc/freetype-$VERSION/docs/reference $PKG/usr/doc/freetype-$VERSION/docs/oldlogs # If there's a ChangeLog file, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/n/lynx/lynx.SlackBuild b/source/n/lynx/lynx.SlackBuild index 0c8159873..a3622e04d 100755 --- a/source/n/lynx/lynx.SlackBuild +++ b/source/n/lynx/lynx.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lynx -PKGVER=2.9.0dev.9 -DIRVER=2.9.0dev.9 +PKGVER=2.9.0dev.10 +DIRVER=2.9.0dev.10 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -- cgit v1.2.3