diff --git a/ChangeLog.rss b/ChangeLog.rss index 16059848c..1e32c198d 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,24 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Sat, 21 May 2022 19:30:02 GMT - Sun, 22 May 2022 11:29:53 GMT + Thu, 26 May 2022 18:27:32 GMT + Fri, 27 May 2022 11:29:50 GMT maintain_current_git.sh v 1.17 + + Thu, 26 May 2022 18:27:32 GMT + Thu, 26 May 2022 18:27:32 GMT + https://git.slackware.nl/current/tag/?h=20220526182732 + 20220526182732 + + +patches/packages/cups-2.4.2-x86_64-1_slack15.0.txz: Upgraded. + Fixed certificate strings comparison for Local authorization. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-26691 + (* Security fix *) + ]]> + + Sat, 21 May 2022 19:30:02 GMT Sat, 21 May 2022 19:30:02 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 5619f2460..5690c5ee8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +Thu May 26 18:27:32 UTC 2022 +patches/packages/cups-2.4.2-x86_64-1_slack15.0.txz: Upgraded. + Fixed certificate strings comparison for Local authorization. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-26691 + (* Security fix *) ++--------------------------+ Sat May 21 19:30:02 UTC 2022 patches/packages/mariadb-10.5.16-x86_64-1_slack15.0.txz: Upgraded. This update fixes bugs and several security issues. diff --git a/FILELIST.TXT b/FILELIST.TXT index b841d03a6..84fce6978 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Sat May 21 19:32:35 UTC 2022 +Thu May 26 18:30:48 UTC 2022 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 2022-05-21 19:30 . +drwxr-xr-x 12 root root 4096 2022-05-26 18:27 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1136946 2022-05-21 01:39 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-05-21 01:39 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1136946 2022-05-21 19:32 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-05-21 19:32 ./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 1899428 2022-05-21 19:30 ./ChangeLog.txt +-rw-r--r-- 1 root root 1899729 2022-05-26 18:27 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./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 1484018 2022-05-21 01:39 ./FILELIST.TXT +-rw-r--r-- 1 root root 1484018 2022-05-21 19:32 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT @@ -737,13 +737,13 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./pasture/source/php/pear -rwxr-xr-x 1 root root 9448 2018-05-16 22:38 ./pasture/source/php/php.SlackBuild -rw-r--r-- 1 root root 775 2017-07-07 19:25 ./pasture/source/php/php.ini-development.diff.gz -rw-r--r-- 1 root root 830 2005-12-09 05:18 ./pasture/source/php/slack-desc -drwxr-xr-x 4 root root 4096 2022-05-21 19:32 ./patches --rw-r--r-- 1 root root 34342 2022-05-21 19:32 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-05-21 19:32 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 45957 2022-05-21 19:32 ./patches/FILE_LIST --rw-r--r-- 1 root root 11391446 2022-05-21 19:32 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 25507 2022-05-21 19:32 ./patches/PACKAGES.TXT -drwxr-xr-x 3 root root 12288 2022-05-21 19:32 ./patches/packages +drwxr-xr-x 4 root root 4096 2022-05-26 18:30 ./patches +-rw-r--r-- 1 root root 35042 2022-05-26 18:30 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-05-26 18:30 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 46892 2022-05-26 18:30 ./patches/FILE_LIST +-rw-r--r-- 1 root root 11399651 2022-05-26 18:30 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 26331 2022-05-26 18:30 ./patches/PACKAGES.TXT +drwxr-xr-x 3 root root 12288 2022-05-26 18:30 ./patches/packages -rw-r--r-- 1 root root 327 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txt -rw-r--r-- 1 root root 10716 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz -rw-r--r-- 1 root root 163 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz.asc @@ -762,6 +762,9 @@ drwxr-xr-x 3 root root 12288 2022-05-21 19:32 ./patches/packages -rw-r--r-- 1 root root 367 2022-04-03 19:25 ./patches/packages/ca-certificates-20220403-noarch-1_slack15.0.txt -rw-r--r-- 1 root root 131392 2022-04-03 19:25 ./patches/packages/ca-certificates-20220403-noarch-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-04-03 19:25 ./patches/packages/ca-certificates-20220403-noarch-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 642 2022-05-26 17:50 ./patches/packages/cups-2.4.2-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 1587868 2022-05-26 17:50 ./patches/packages/cups-2.4.2-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-05-26 17:50 ./patches/packages/cups-2.4.2-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 552 2022-05-11 18:30 ./patches/packages/curl-7.83.1-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 1293376 2022-05-11 18:30 ./patches/packages/curl-7.83.1-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-05-11 18:30 ./patches/packages/curl-7.83.1-x86_64-1_slack15.0.txz.asc @@ -871,7 +874,7 @@ drwxr-xr-x 2 root root 4096 2022-05-09 21:37 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 388 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 105204 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txz.asc -drwxr-xr-x 37 root root 4096 2022-05-21 19:09 ./patches/source +drwxr-xr-x 38 root root 4096 2022-05-26 18:15 ./patches/source drwxr-xr-x 2 root root 4096 2022-01-16 05:07 ./patches/source/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./patches/source/aaa_base/_aaa_base.tar.gz -rwxr-xr-x 1 root root 3894 2022-02-15 05:07 ./patches/source/aaa_base/aaa_base.SlackBuild @@ -932,6 +935,14 @@ drwxr-xr-x 2 root root 4096 2022-04-03 19:24 ./patches/source/ca-certifica -rw-r--r-- 1 root root 128 2012-09-11 21:12 ./patches/source/ca-certificates/setup.11.cacerts -rw-r--r-- 1 root root 829 2019-02-26 23:30 ./patches/source/ca-certificates/slack-desc -rw-r--r-- 1 root root 229 2019-02-26 20:33 ./patches/source/ca-certificates/update-ca-certificates.c_rehash.diff.gz +drwxr-xr-x 2 root root 4096 2022-05-26 16:49 ./patches/source/cups +-rw-r--r-- 1 root root 6207496 2022-05-26 06:17 ./patches/source/cups/cups-2.4.2.tar.lz +-rw-r--r-- 1 root root 199167 2004-01-03 18:49 ./patches/source/cups/cups-samba-5.0rc3.tar.gz +-rw-r--r-- 1 root root 33700 2006-04-19 23:55 ./patches/source/cups/cups-windows-6.0-source.tar.xz +-rwxr-xr-x 1 root root 6592 2022-05-26 17:49 ./patches/source/cups/cups.SlackBuild +-rw-r--r-- 1 root root 46 2021-06-29 19:51 ./patches/source/cups/cups.url +-rw-r--r-- 1 root root 454 2021-04-26 18:11 ./patches/source/cups/doinst.sh.gz +-rw-r--r-- 1 root root 1094 2018-11-29 19:15 ./patches/source/cups/slack-desc drwxr-xr-x 2 root root 4096 2022-05-11 18:28 ./patches/source/curl -rw-r--r-- 1 root root 2474940 2022-05-11 06:24 ./patches/source/curl/curl-7.83.1.tar.xz -rw-r--r-- 1 root root 488 2022-05-11 06:24 ./patches/source/curl/curl-7.83.1.tar.xz.asc @@ -2735,15 +2746,15 @@ drwxr-xr-x 2 root root 69632 2022-02-01 08:29 ./slackware64/kde -rw-r--r-- 1 root root 320 2022-01-08 22:41 ./slackware64/kde/knotifyconfig-5.90.0-x86_64-1.txt -rw-r--r-- 1 root root 81660 2022-01-08 22:41 ./slackware64/kde/knotifyconfig-5.90.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-08 22:41 ./slackware64/kde/knotifyconfig-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 345 2022-01-06 22:30 ./slackware64/kde/kolf-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 1262216 2022-01-06 22:30 ./slackware64/kde/kolf-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:30 ./slackware64/kde/kolf-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 199 2022-01-06 22:27 ./slackware64/kde/kollision-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 383432 2022-01-06 22:27 ./slackware64/kde/kollision-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:27 ./slackware64/kde/kollision-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 556 2022-01-06 22:13 ./slackware64/kde/kolourpaint-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 5856680 2022-01-06 22:13 ./slackware64/kde/kolourpaint-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:13 ./slackware64/kde/kolourpaint-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 345 2022-01-06 22:30 ./slackware64/kde/kolf-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 1262216 2022-01-06 22:30 ./slackware64/kde/kolf-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:30 ./slackware64/kde/kolf-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 199 2022-01-06 22:27 ./slackware64/kde/kollision-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 383432 2022-01-06 22:27 ./slackware64/kde/kollision-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:27 ./slackware64/kde/kollision-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 556 2022-01-06 22:13 ./slackware64/kde/kolourpaint-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 5856680 2022-01-06 22:13 ./slackware64/kde/kolourpaint-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:13 ./slackware64/kde/kolourpaint-21.12.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 178 2022-01-06 22:08 ./slackware64/kde/kompare-21.12.1-x86_64-1.txt -rw-r--r-- 1 root root 877888 2022-01-06 22:08 ./slackware64/kde/kompare-21.12.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-06 22:08 ./slackware64/kde/kompare-21.12.1-x86_64-1.txz.asc @@ -5495,15 +5506,15 @@ drwxr-xr-x 2 root root 65536 2022-02-01 04:47 ./slackware64/x -rw-r--r-- 1 root root 379 2021-02-13 13:05 ./slackware64/x/xcursor-themes-1.0.6-noarch-3.txt -rw-r--r-- 1 root root 323020 2021-02-13 13:05 ./slackware64/x/xcursor-themes-1.0.6-noarch-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:05 ./slackware64/x/xcursor-themes-1.0.6-noarch-3.txz.asc --rw-r--r-- 1 root root 373 2021-02-13 13:12 ./slackware64/x/xcursorgen-1.0.7-x86_64-3.txt --rw-r--r-- 1 root root 20028 2021-02-13 13:12 ./slackware64/x/xcursorgen-1.0.7-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:12 ./slackware64/x/xcursorgen-1.0.7-x86_64-3.txz.asc --rw-r--r-- 1 root root 254 2021-02-13 13:12 ./slackware64/x/xdbedizzy-1.1.0-x86_64-5.txt --rw-r--r-- 1 root root 17628 2021-02-13 13:12 ./slackware64/x/xdbedizzy-1.1.0-x86_64-5.txz --rw-r--r-- 1 root root 163 2021-02-13 13:12 ./slackware64/x/xdbedizzy-1.1.0-x86_64-5.txz.asc --rw-r--r-- 1 root root 638 2022-01-04 21:44 ./slackware64/x/xdg-desktop-portal-1.12.1-x86_64-1.txt --rw-r--r-- 1 root root 287160 2022-01-04 21:44 ./slackware64/x/xdg-desktop-portal-1.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-04 21:44 ./slackware64/x/xdg-desktop-portal-1.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 373 2021-02-13 13:12 ./slackware64/x/xcursorgen-1.0.7-x86_64-3.txt +-rw-r--r-- 1 root root 20028 2021-02-13 13:12 ./slackware64/x/xcursorgen-1.0.7-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:12 ./slackware64/x/xcursorgen-1.0.7-x86_64-3.txz.asc +-rw-r--r-- 1 root root 254 2021-02-13 13:12 ./slackware64/x/xdbedizzy-1.1.0-x86_64-5.txt +-rw-r--r-- 1 root root 17628 2021-02-13 13:12 ./slackware64/x/xdbedizzy-1.1.0-x86_64-5.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:12 ./slackware64/x/xdbedizzy-1.1.0-x86_64-5.txz.asc +-rw-r--r-- 1 root root 638 2022-01-04 21:44 ./slackware64/x/xdg-desktop-portal-1.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 287160 2022-01-04 21:44 ./slackware64/x/xdg-desktop-portal-1.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-04 21:44 ./slackware64/x/xdg-desktop-portal-1.12.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 475 2021-02-13 13:04 ./slackware64/x/xdg-user-dirs-0.17-x86_64-3.txt -rw-r--r-- 1 root root 45932 2021-02-13 13:04 ./slackware64/x/xdg-user-dirs-0.17-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:04 ./slackware64/x/xdg-user-dirs-0.17-x86_64-3.txz.asc @@ -15142,19 +15153,19 @@ drwxr-xr-x 2 root root 4096 2021-07-14 04:20 ./source/xap/gnuchess -rw-r--r-- 1 root root 224 2004-10-27 06:07 ./source/xap/gnuchess/eboard.desktop -rw-r--r-- 1 root root 221 2013-03-20 01:49 ./source/xap/gnuchess/eboard.ldl.diff.gz -rw-r--r-- 1 root root 336 2015-03-23 16:11 ./source/xap/gnuchess/eboard.png16.diff.gz --rw-r--r-- 1 root root 520118 2021-07-13 22:30 ./source/xap/gnuchess/gnuchess-6.2.9.tar.lz --rwxr-xr-x 1 root root 6414 2021-07-14 04:20 ./source/xap/gnuchess/gnuchess.SlackBuild --rw-r--r-- 1 root root 792 2018-02-27 06:13 ./source/xap/gnuchess/slack-desc --rw-r--r-- 1 root root 2731760 2016-08-01 03:55 ./source/xap/gnuchess/xboard-4.9.1.tar.xz --rw-r--r-- 1 root root 269 2015-03-20 18:35 ./source/xap/gnuchess/xboard.conf.diff.gz -drwxr-xr-x 2 root root 4096 2022-01-10 18:25 ./source/xap/gnuplot --rw-r--r-- 1 root root 4585685 2022-01-03 18:53 ./source/xap/gnuplot/gnuplot-5.4.3.tar.lz --rwxr-xr-x 1 root root 5047 2021-06-06 20:18 ./source/xap/gnuplot/gnuplot.SlackBuild --rw-r--r-- 1 root root 24 2018-06-05 04:25 ./source/xap/gnuplot/gnuplot.url --rw-r--r-- 1 root root 1099 2018-02-27 06:13 ./source/xap/gnuplot/slack-desc -drwxr-xr-x 2 root root 4096 2021-07-20 18:44 ./source/xap/gparted --rw-r--r-- 1 root root 121 2016-02-03 19:48 ./source/xap/gparted/doinst.sh.gz --rw-r--r-- 1 root root 2385590 2021-07-19 16:56 ./source/xap/gparted/gparted-1.3.1.tar.lz +-rw-r--r-- 1 root root 520118 2021-07-13 22:30 ./source/xap/gnuchess/gnuchess-6.2.9.tar.lz +-rwxr-xr-x 1 root root 6414 2021-07-14 04:20 ./source/xap/gnuchess/gnuchess.SlackBuild +-rw-r--r-- 1 root root 792 2018-02-27 06:13 ./source/xap/gnuchess/slack-desc +-rw-r--r-- 1 root root 2731760 2016-08-01 03:55 ./source/xap/gnuchess/xboard-4.9.1.tar.xz +-rw-r--r-- 1 root root 269 2015-03-20 18:35 ./source/xap/gnuchess/xboard.conf.diff.gz +drwxr-xr-x 2 root root 4096 2022-01-10 18:25 ./source/xap/gnuplot +-rw-r--r-- 1 root root 4585685 2022-01-03 18:53 ./source/xap/gnuplot/gnuplot-5.4.3.tar.lz +-rwxr-xr-x 1 root root 5047 2021-06-06 20:18 ./source/xap/gnuplot/gnuplot.SlackBuild +-rw-r--r-- 1 root root 24 2018-06-05 04:25 ./source/xap/gnuplot/gnuplot.url +-rw-r--r-- 1 root root 1099 2018-02-27 06:13 ./source/xap/gnuplot/slack-desc +drwxr-xr-x 2 root root 4096 2021-07-20 18:44 ./source/xap/gparted +-rw-r--r-- 1 root root 121 2016-02-03 19:48 ./source/xap/gparted/doinst.sh.gz +-rw-r--r-- 1 root root 2385590 2021-07-19 16:56 ./source/xap/gparted/gparted-1.3.1.tar.lz -rwxr-xr-x 1 root root 4124 2021-05-03 18:18 ./source/xap/gparted/gparted.SlackBuild -rw-r--r-- 1 root root 864 2018-02-27 06:13 ./source/xap/gparted/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/xap/gucharmap diff --git a/patches/packages/cups-2.4.2-x86_64-1_slack15.0.txt b/patches/packages/cups-2.4.2-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..f581115e7 --- /dev/null +++ b/patches/packages/cups-2.4.2-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +cups: cups (Common UNIX Printing System) +cups: +cups: The Common UNIX Printing System provides a portable printing layer for +cups: UNIX(R)-like operating systems. It has been developed by Easy Software +cups: Products to promote a standard printing solution for all UNIX vendors +cups: and users. CUPS uses the Internet Printing Protocol ("IPP") as the +cups: basis for managing print jobs and queues. The CUPS package includes +cups: System V and Berkeley command-line interfaces, a PostScript RIP +cups: package for supporting non-PostScript printer drivers, and tools for +cups: creating additional printer drivers and other CUPS services. +cups: diff --git a/patches/source/cups/cups.SlackBuild b/patches/source/cups/cups.SlackBuild new file mode 100755 index 000000000..1b128bfe1 --- /dev/null +++ b/patches/source/cups/cups.SlackBuild @@ -0,0 +1,210 @@ +#!/bin/bash + +# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2017, 2018, 2019, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# CUPS build script by volkerdi@slackware.com. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=cups +VERSION=${VERSION:-$(echo $PKGNAM-2*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1_slack15.0} + +# 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 + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-cups + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf cups-$VERSION +tar xvf $CWD/cups-$VERSION.tar.?z || exit 1 +cd cups-$VERSION || exit 1 + +sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure + +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--enable-pam" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--disable-pam" +fi + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-cdsassl=no \ + --docdir=/usr/doc \ + --mandir=/usr/man \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || exit 1 +make BUILDROOT=$PKG install || exit 1 + +if [ ! -z "$PAM_OPTIONS" ]; then + # Allow pam config files to be edited by root: + chmod 644 $PKG/etc/pam.d/* + # Make PAM file .new: + mv $PKG/etc/pam.d/cups $PKG/etc/pam.d/cups.new +fi + +# Remove files that overlap with the cups-filters package: +( cd $PKG + rm -f \ + usr/share/cups/banners/classified \ + usr/share/cups/banners/confidential \ + usr/share/cups/banners/secret \ + usr/share/cups/banners/standard \ + usr/share/cups/banners/topsecret \ + usr/share/cups/banners/unclassified \ + usr/share/cups/data/testprint +) + +# Hey, what's with the gigantic test files? Bloat is bad. +rm -f $PKG/usr/share/cups/ipptool/*.{pdf,ps,jpg} + +# I've added so many things like /etc/init.d/ to Slackware that CUPS +# is now installing init scripts to the Red Hat locations. We'll move +# them to the usual locations: +mkdir -p $PKG/etc/rc.d +# Handle this as a config file, and non-executable in a default install: +mv $PKG/etc/init.d/cups $PKG/etc/rc.d/rc.cups.new +chmod 644 $PKG/etc/rc.d/rc.cups.new +# Clear out the additions: +rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d + +# Move the dbus config file to the system directory +mkdir -p $PKG/usr/share/dbus-1/system.d/ +mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/ +rmdir --parents $PKG/etc/dbus-1/system.d/ + +# For full CUPS SMB support, you'll need to install the cups-samba +# package from the source in this directory. There's no easy way +# to add that to a package build, and the requests aren't pouring in, +# so you'll have to install it yourself. It's easy to do. + +# However, this will get you the most useful SMB support for free. +# Thanks to Boris Kurktchiev for the tip. :-) +( cd $PKG/usr/lib${LIBDIRSUFFIX}/cups/backend + if [ ! -e smb ]; then + ln -sf /usr/bin/smbspool smb + fi +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Adjust/expand docs: +( mkdir -p $PKG/usr/doc + mv $PKG/usr/share/doc/cups $PKG/usr/doc/cups-$VERSION + rmdir $PKG/usr/share/doc + cd $PKG/usr/doc + ln -sf cups-$VERSION cups ) + cp -a \ + CHANGES* CONTRIBUTING* CREDITS* DEVELOPING* INSTALL* LICENSE* NOTICE* README* SECURITY* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES.md ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGES.md | head -n 1000 > $DOCSDIR/CHANGES.md + touch -r CHANGES.md $DOCSDIR/CHANGES.md +fi + +# I'm sorry, but PDF files are almost as bloated and annoying as +# MS Word documents. We'll retain the HTML files in /usr/doc. +( cd $PKG/usr/doc + find . -name "*.pdf" -exec rm -f {} \+ ) + +# Handle .conf files with config() in the install script. +# Not .conf.default copies, though. +( cd $PKG/etc/cups + for file in *.conf ; do + if [ -f $file ]; then + mv $file $file.new + fi + done +) + +# Strip stuff: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add the doinst.sh that installs the .new conffiles: +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/cups-$VERSION-$ARCH-$BUILD.txz + diff --git a/patches/source/cups/cups.url b/patches/source/cups/cups.url new file mode 100644 index 000000000..8a1831e77 --- /dev/null +++ b/patches/source/cups/cups.url @@ -0,0 +1 @@ +https://github.com/openprinting/cups/releases diff --git a/patches/source/cups/doinst.sh b/patches/source/cups/doinst.sh new file mode 100644 index 000000000..b317ed95c --- /dev/null +++ b/patches/source/cups/doinst.sh @@ -0,0 +1,31 @@ +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... +} +for file in etc/cups/*.new ; do + config $file +done + +if [ -r etc/pam.d/cups.new ]; then + config etc/pam.d/cups.new +fi + +# Leave any new rc.cups with the same permissions as the old one: +# This is a kludge, but it's because there's no --reference option +# on busybox's 'chmod': +if [ -e etc/rc.d/rc.cups ]; then + if [ -x etc/rc.d/rc.cups ]; then + chmod 755 etc/rc.d/rc.cups.new + else + chmod 644 etc/rc.d/rc.cups.new + fi +fi +# Then config() it: +config etc/rc.d/rc.cups.new diff --git a/patches/source/cups/slack-desc b/patches/source/cups/slack-desc new file mode 100644 index 000000000..854ab9b5a --- /dev/null +++ b/patches/source/cups/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------------------------------------------------------| +cups: cups (Common UNIX Printing System) +cups: +cups: The Common UNIX Printing System provides a portable printing layer for +cups: UNIX(R)-like operating systems. It has been developed by Easy Software +cups: Products to promote a standard printing solution for all UNIX vendors +cups: and users. CUPS uses the Internet Printing Protocol ("IPP") as the +cups: basis for managing print jobs and queues. The CUPS package includes +cups: System V and Berkeley command-line interfaces, a PostScript RIP +cups: package for supporting non-PostScript printer drivers, and tools for +cups: creating additional printer drivers and other CUPS services. +cups: diff --git a/recompress.sh b/recompress.sh index 27dc6f9c2..cce834253 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1217,6 +1217,7 @@ gzip ./patches/source/polkit/0001-configure-fix-elogind-support.patch gzip ./patches/source/bind/doinst.sh gzip ./patches/source/pidgin/fix-gmain_h-compile-error.diff gzip ./patches/source/pidgin/doinst.sh +gzip ./patches/source/cups/doinst.sh gzip ./patches/source/httpd/httpd.runasapache.diff gzip ./patches/source/httpd/doinst.sh gzip ./patches/source/at/doinst.sh