Sat Jun 9 16:57:58 UTC 201820180609165758

ap/cups-2.2.8-x86_64-2.txz:  Rebuilt.
  Applied upstream patch to fix high CPU usage in some situations.

6 files changed, 109 insertions, 27 deletions

diff --git a/ChangeLog.rss b/ChangeLog.rss
index 9fa34f369..ef486bced 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,22 @@
       <description>Tracking Slackware development in git.</description>
       <language>en-us</language>
       <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
-      <pubDate>Fri,  8 Jun 2018 20:37:06 GMT</pubDate>
-      <lastBuildDate>Fri,  8 Jun 2018 23:06:18 GMT</lastBuildDate>
+      <pubDate>Sat,  9 Jun 2018 16:57:58 GMT</pubDate>
+      <lastBuildDate>Sun, 10 Jun 2018 06:58:02 GMT</lastBuildDate>
       <generator>maintain_current_git.sh v 1.8</generator>
       <item>
+         <title>Sat,  9 Jun 2018 16:57:58 GMT</title>
+         <pubDate>Sat,  9 Jun 2018 16:57:58 GMT</pubDate>
+         <link>https://git.slackware.nl/current/tag/?h=20180609165758</link>
+         <guid isPermaLink="false">20180609165758</guid>
+         <description>
+           <![CDATA[<pre>
+ap/cups-2.2.8-x86_64-2.txz:  Rebuilt.
+  Applied upstream patch to fix high CPU usage in some situations.
+           </pre>]]>
+         </description>
+      </item>
+      <item>
          <title>Fri,  8 Jun 2018 20:37:06 GMT</title>
          <pubDate>Fri,  8 Jun 2018 20:37:06 GMT</pubDate>
          <link>https://git.slackware.nl/current/tag/?h=20180608203706</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index ec92c260d..ac1539f26 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+Sat Jun  9 16:57:58 UTC 2018
+ap/cups-2.2.8-x86_64-2.txz:  Rebuilt.
+  Applied upstream patch to fix high CPU usage in some situations.
++--------------------------+
 Fri Jun  8 20:37:06 UTC 2018
 a/glibc-solibs-2.27-x86_64-3.txz:  Rebuilt.
 a/pkgtools-15.0-noarch-16.txz:  Rebuilt.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index d829de3b4..b6d6e0eaa 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Fri Jun  8 21:02:44 UTC 2018
+Sat Jun  9 17:08:27 UTC 2018
 
 Here is the file list for this directory.  If you are using a 
 mirror site and find missing or extra files in the disk 
 subdirectories, please have the archive administrator refresh
 the mirror.
 
-drwxr-xr-x 12 root root      4096 2018-06-08 20:37 .
+drwxr-xr-x 12 root root      4096 2018-06-09 16:57 .
 -rw-r--r--  1 root root     10064 2016-06-30 18:39 ./ANNOUNCE.14_2
 -rw-r--r--  1 root root     11329 2018-01-08 02:48 ./CHANGES_AND_HINTS.TXT
--rw-r--r--  1 root root    894609 2018-06-06 22:37 ./CHECKSUMS.md5
--rw-r--r--  1 root root       163 2018-06-06 22:37 ./CHECKSUMS.md5.asc
+-rw-r--r--  1 root root    894521 2018-06-08 21:03 ./CHECKSUMS.md5
+-rw-r--r--  1 root root       163 2018-06-08 21:03 ./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    410362 2018-06-08 20:37 ./ChangeLog.txt
+-rw-r--r--  1 root root    410525 2018-06-09 16:57 ./ChangeLog.txt
 drwxr-xr-x  3 root root      4096 2013-03-20 22:17 ./EFI
 drwxr-xr-x  2 root root      4096 2018-06-06 20:39 ./EFI/BOOT
 -rw-r--r--  1 root root   1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x  2 root root      4096 2018-06-06 20:39 ./EFI/BOOT
 -rwxr-xr-x  1 root root      2494 2018-02-24 20:49 ./EFI/BOOT/make-grub.sh
 -rw-r--r--  1 root root     10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
 -rw-r--r--  1 root root      1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r--  1 root root   1177681 2018-06-06 22:36 ./FILELIST.TXT
+-rw-r--r--  1 root root   1177578 2018-06-08 21:02 ./FILELIST.TXT
 -rw-r--r--  1 root root      1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r--  1 root root    724907 2018-06-08 21:01 ./PACKAGES.TXT
+-rw-r--r--  1 root root    724907 2018-06-09 17:06 ./PACKAGES.TXT
 -rw-r--r--  1 root root      8564 2016-06-28 21:33 ./README.TXT
 -rw-r--r--  1 root root      3634 2018-06-06 20:17 ./README.initrd
 -rw-r--r--  1 root root     34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -748,11 +748,11 @@ drwxr-xr-x  2 root root      4096 2012-09-20 18:06 ./patches
 -rw-r--r--  1 root root       575 2012-09-20 18:06 ./patches/FILE_LIST
 -rw-r--r--  1 root root        14 2012-09-20 18:06 ./patches/MANIFEST.bz2
 -rw-r--r--  1 root root       224 2012-09-20 18:06 ./patches/PACKAGES.TXT
-drwxr-xr-x 18 root root      4096 2018-06-08 21:01 ./slackware64
--rw-r--r--  1 root root    288025 2018-06-08 21:01 ./slackware64/CHECKSUMS.md5
--rw-r--r--  1 root root       163 2018-06-08 21:01 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r--  1 root root    358846 2018-06-08 20:58 ./slackware64/FILE_LIST
--rw-r--r--  1 root root   3617757 2018-06-08 20:59 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root      4096 2018-06-09 17:06 ./slackware64
+-rw-r--r--  1 root root    288025 2018-06-09 17:06 ./slackware64/CHECKSUMS.md5
+-rw-r--r--  1 root root       163 2018-06-09 17:06 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root    358846 2018-06-09 17:04 ./slackware64/FILE_LIST
+-rw-r--r--  1 root root   3609373 2018-06-09 17:05 ./slackware64/MANIFEST.bz2
 lrwxrwxrwx  1 root root        15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
 drwxr-xr-x  2 root root     20480 2018-06-08 20:58 ./slackware64/a
 -rw-r--r--  1 root root       327 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txt
@@ -1096,7 +1096,7 @@ drwxr-xr-x  2 root root     20480 2018-06-08 20:58 ./slackware64/a
 -rw-r--r--  1 root root       540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt
 -rw-r--r--  1 root root     56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz
 -rw-r--r--  1 root root       163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc
-drwxr-xr-x  2 root root     20480 2018-06-08 20:58 ./slackware64/ap
+drwxr-xr-x  2 root root     20480 2018-06-09 17:04 ./slackware64/ap
 -rw-r--r--  1 root root       291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt
 -rw-r--r--  1 root root    694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz
 -rw-r--r--  1 root root       163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc
@@ -1130,9 +1130,9 @@ drwxr-xr-x  2 root root     20480 2018-06-08 20:58 ./slackware64/ap
 -rw-r--r--  1 root root       531 2018-04-13 13:17 ./slackware64/ap/cgmanager-0.41-x86_64-4.txt
 -rw-r--r--  1 root root    114300 2018-04-13 13:17 ./slackware64/ap/cgmanager-0.41-x86_64-4.txz
 -rw-r--r--  1 root root       163 2018-04-13 13:17 ./slackware64/ap/cgmanager-0.41-x86_64-4.txz.asc
--rw-r--r--  1 root root       642 2018-06-05 20:50 ./slackware64/ap/cups-2.2.8-x86_64-1.txt
--rw-r--r--  1 root root   1425400 2018-06-05 20:50 ./slackware64/ap/cups-2.2.8-x86_64-1.txz
--rw-r--r--  1 root root       163 2018-06-05 20:50 ./slackware64/ap/cups-2.2.8-x86_64-1.txz.asc
+-rw-r--r--  1 root root       642 2018-06-09 16:43 ./slackware64/ap/cups-2.2.8-x86_64-2.txt
+-rw-r--r--  1 root root   1425056 2018-06-09 16:43 ./slackware64/ap/cups-2.2.8-x86_64-2.txz
+-rw-r--r--  1 root root       163 2018-06-09 16:43 ./slackware64/ap/cups-2.2.8-x86_64-2.txz.asc
 -rw-r--r--  1 root root       416 2018-05-22 04:24 ./slackware64/ap/cups-filters-1.20.3-x86_64-2.txt
 -rw-r--r--  1 root root    748108 2018-05-22 04:24 ./slackware64/ap/cups-filters-1.20.3-x86_64-2.txz
 -rw-r--r--  1 root root       163 2018-05-22 04:24 ./slackware64/ap/cups-filters-1.20.3-x86_64-2.txz.asc
@@ -4927,11 +4927,11 @@ drwxr-xr-x   2 root root     4096 2018-04-18 08:35 ./slackware64/y
 -rw-r--r--   1 root root     1147 2018-03-01 07:55 ./slackware64/y/maketag
 -rw-r--r--   1 root root     1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
 -rw-r--r--   1 root root       14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x  19 root root     4096 2018-06-08 21:02 ./source
--rw-r--r--   1 root root   451323 2018-06-08 21:02 ./source/CHECKSUMS.md5
--rw-r--r--   1 root root      163 2018-06-08 21:02 ./source/CHECKSUMS.md5.asc
--rw-r--r--   1 root root   638727 2018-06-08 21:02 ./source/FILE_LIST
--rw-r--r--   1 root root 14758311 2018-06-08 21:02 ./source/MANIFEST.bz2
+drwxr-xr-x  19 root root     4096 2018-06-09 17:08 ./source
+-rw-r--r--   1 root root   451417 2018-06-09 17:08 ./source/CHECKSUMS.md5
+-rw-r--r--   1 root root      163 2018-06-09 17:08 ./source/CHECKSUMS.md5.asc
+-rw-r--r--   1 root root   638839 2018-06-09 17:07 ./source/FILE_LIST
+-rw-r--r--   1 root root 14762500 2018-06-09 17:07 ./source/MANIFEST.bz2
 -rw-r--r--   1 root root     1314 2006-10-02 04:40 ./source/README.TXT
 drwxr-xr-x 108 root root     4096 2018-05-24 18:00 ./source/a
 -rw-r--r--   1 root root      567 2018-03-13 18:43 ./source/a/FTBFSlog
@@ -5864,18 +5864,19 @@ drwxr-xr-x   2 root root      4096 2015-11-21 23:21 ./source/ap/cgmanager/config
 -rw-r--r--   1 root root      1306 2017-11-18 17:55 ./source/ap/cgmanager/config/rc.cgproxy
 -rw-r--r--   1 root root       334 2015-11-20 01:59 ./source/ap/cgmanager/doinst.sh.gz
 -rw-r--r--   1 root root       988 2018-02-27 06:13 ./source/ap/cgmanager/slack-desc
-drwxr-xr-x   2 root root      4096 2018-06-05 20:49 ./source/ap/cups
+drwxr-xr-x   2 root root      4096 2018-06-09 16:41 ./source/ap/cups
 drwxr-xr-x   2 root root      4096 2018-05-22 03:57 ./source/ap/cups-filters
 -rw-r--r--   1 root root   1469468 2018-04-12 13:26 ./source/ap/cups-filters/cups-filters-1.20.3.tar.xz
 -rwxr-xr-x   1 root root      4409 2018-05-22 03:57 ./source/ap/cups-filters/cups-filters.SlackBuild
 -rw-r--r--   1 root root        51 2014-07-21 02:53 ./source/ap/cups-filters/cups-filters.url
 -rw-r--r--   1 root root       339 2018-01-08 22:54 ./source/ap/cups-filters/doinst.sh.gz
 -rw-r--r--   1 root root       908 2018-02-27 06:12 ./source/ap/cups-filters/slack-desc
+-rw-r--r--   1 root root       865 2018-06-09 15:50 ./source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch.gz
 -rw-r--r--   1 root root   8380565 2018-06-05 16:15 ./source/ap/cups/cups-2.2.8-source.tar.lz
 -rw-r--r--   1 root root       525 2013-10-10 20:50 ./source/ap/cups/cups-blacklist-usblp.conf
 -rw-r--r--   1 root root    199167 2004-01-03 18:49 ./source/ap/cups/cups-samba-5.0rc3.tar.gz
 -rw-r--r--   1 root root     33700 2006-04-19 23:55 ./source/ap/cups/cups-windows-6.0-source.tar.xz
--rwxr-xr-x   1 root root      7621 2018-06-05 20:49 ./source/ap/cups/cups.SlackBuild
+-rwxr-xr-x   1 root root      7754 2018-06-09 16:41 ./source/ap/cups/cups.SlackBuild
 -rw-r--r--   1 root root        80 2018-06-05 20:48 ./source/ap/cups/cups.url
 -rw-r--r--   1 root root       565 2010-05-17 07:39 ./source/ap/cups/doinst.sh.gz
 -rw-r--r--   1 root root      1094 2018-02-27 06:12 ./source/ap/cups/slack-desc
@@ -12452,7 +12453,7 @@ drwxr-xr-x   2 root root      4096 2018-04-23 17:20 ./source/xfce/xfce4-clipman-
 drwxr-xr-x   2 root root      4096 2018-04-23 17:20 ./source/xfce/xfce4-dev-tools
 -rw-r--r--   1 root root       820 2018-02-27 06:13 ./source/xfce/xfce4-dev-tools/slack-desc
 -rw-r--r--   1 root root    254756 2015-02-28 14:35 ./source/xfce/xfce4-dev-tools/xfce4-dev-tools-4.12.0.tar.xz
--rwxr-xr-x   1 root root      4592 2018-04-23 17:20 ./source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
+-rwxr-xr-x 1 root root     4592 2018-04-23 17:20 ./source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
 drwxr-xr-x 2 root root     4096 2018-04-23 17:20 ./source/xfce/xfce4-notifyd
 -rw-r--r-- 1 root root      174 2009-02-26 05:47 ./source/xfce/xfce4-notifyd/doinst.sh.gz
 -rw-r--r-- 1 root root      839 2018-03-01 19:39 ./source/xfce/xfce4-notifyd/slack-desc
diff --git a/recompress.sh b/recompress.sh
index 6fcb63343..8ca1ec495 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -1053,6 +1053,7 @@ gzip ./source/ap/dash/doinst.sh
 gzip ./source/ap/dash/dash-0.5.7-format-security.patch
 gzip ./source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch
 gzip ./source/ap/cups/doinst.sh
+gzip ./source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch
 gzip ./source/ap/linuxdoc-tools/doinst.sh
 gzip ./source/t/texlive/doinst.sh
 gzip ./source/t/xfig/xfig.fig.ad.diff
diff --git a/source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch b/source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch
new file mode 100644
index 000000000..7f60ed254
--- /dev/null
+++ b/source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch
@@ -0,0 +1,61 @@
+From 455c52a027ab3548953372a0b7bdb0008420e9ba Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 8 Jun 2018 22:29:50 +0200
+Subject: [PATCH] Fix validation rejecting all NAME and TEXT attrs
+
+When the UTF-8 validation loop finishes successfully, `*ptr` points at
+the `'\0'` at the end of the string. The code misinterpreted this as a
+control character (`*ptr < ' '`) and failed the validation.
+
+Fixes https://github.com/apple/cups/issues/5325
+---
+ cups/ipp.c | 24 ++++++++++--------------
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/cups/ipp.c b/cups/ipp.c
+index 95d53cc44..204c71fcd 100644
+--- a/cups/ipp.c
++++ b/cups/ipp.c
+@@ -5030,15 +5030,13 @@ ippValidateAttribute(
+ 	    else if (*ptr & 0x80)
+ 	      break;
+ 	    else if ((*ptr < ' ' && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') || *ptr == 0x7f)
+-	      break;
++		{
++		  ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
++		  return (0);
++		}
+ 	  }
+ 
+-	  if (*ptr < ' ' || *ptr == 0x7f)
+-	  {
+-	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
+-	    return (0);
+-	  }
+-	  else if (*ptr)
++	  if (*ptr)
+ 	  {
+ 	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
+ 	    return (0);
+@@ -5088,15 +5086,13 @@ ippValidateAttribute(
+ 	    else if (*ptr & 0x80)
+ 	      break;
+ 	    else if (*ptr < ' ' || *ptr == 0x7f)
+-	      break;
++		{
++		  ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
++		  return (0);
++		}
+ 	  }
+ 
+-	  if (*ptr < ' ' || *ptr == 0x7f)
+-	  {
+-	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
+-	    return (0);
+-	  }
+-	  else if (*ptr)
++	  if (*ptr)
+ 	  {
+ 	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
+ 	    return (0);
+
diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild
index fe8fd16c3..44cd7c674 100755
--- a/source/ap/cups/cups.SlackBuild
+++ b/source/ap/cups/cups.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups
 VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -81,6 +81,9 @@ cd cups-$VERSION || exit 1
 
 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure
 
+# Upstream patch to fix high CPU usage:
+zcat $CWD/455c52a027ab3548953372a0b7bdb0008420e9ba.patch.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \