Wed Jun 6 22:19:01 UTC 201820180606221901

a/bash-4.4.023-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20180604_1fa9ce3-noarch-1.txz:  Upgraded.
a/kernel-generic-4.14.48-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.48-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.48-x86_64-1.txz:  Upgraded.
ap/cups-2.2.8-x86_64-1.txz:  Upgraded.
ap/ghostscript-fonts-std-8.11-noarch-3.txz:  Rebuilt.
  Rebuilt this and many other font packages or packages with build scripts
  that call mkfontdir or mkfontscale to suppress any error messages caused
  by collisions if another package installation is writing files to the
  same font directories when those utilities are run. In that case, the
  other package will also be running mkfontdir/mkfontscale after the files
  are installed, so any issues will be cleaned up then. Last one out turn
  off the lights, so to speak.
ap/sqlite-3.24.0-x86_64-1.txz:  Upgraded.
ap/terminus-font-4.40-noarch-3.txz:  Rebuilt.
d/kernel-headers-4.14.48-x86-1.txz:  Upgraded.
d/rust-1.26.2-x86_64-1.txz:  Upgraded.
k/kernel-source-4.14.48-noarch-1.txz:  Upgraded.
l/elfutils-0.171-x86_64-1.txz:  Upgraded.
l/harfbuzz-1.7.7-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.37.3-x86_64-1.txz:  Upgraded.
l/readline-7.0.005-x86_64-1.txz:  Upgraded.
x/dejavu-fonts-ttf-2.37-noarch-4.txz:  Rebuilt.
x/font-adobe-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-adobe-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-adobe-utopia-100dpi-1.0.4-noarch-3.txz:  Rebuilt.
x/font-adobe-utopia-75dpi-1.0.4-noarch-3.txz:  Rebuilt.
x/font-adobe-utopia-type1-1.0.4-noarch-3.txz:  Rebuilt.
x/font-arabic-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-lucidatypewriter-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-lucidatypewriter-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-ttf-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bh-type1-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bitstream-100dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bitstream-75dpi-1.0.3-noarch-3.txz:  Rebuilt.
x/font-bitstream-speedo-1.0.2-noarch-3.txz:  Rebuilt.
x/font-bitstream-type1-1.0.3-noarch-3.txz:  Rebuilt.
x/font-cronyx-cyrillic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-cursor-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-daewoo-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-dec-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-ibm-type1-1.0.3-noarch-3.txz:  Rebuilt.
x/font-isas-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-jis-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-micro-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-cyrillic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-ethiopic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-meltho-1.0.3-noarch-3.txz:  Rebuilt.
x/font-misc-misc-1.1.2-noarch-3.txz:  Rebuilt.
x/font-mutt-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-schumacher-misc-1.1.2-noarch-3.txz:  Rebuilt.
x/font-screen-cyrillic-1.0.4-noarch-3.txz:  Rebuilt.
x/font-sony-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-sun-misc-1.0.3-noarch-3.txz:  Rebuilt.
x/font-winitzki-cyrillic-1.0.3-noarch-3.txz:  Rebuilt.
x/font-xfree86-type1-1.0.4-noarch-3.txz:  Rebuilt.
x/liberation-fonts-ttf-2.00.1-noarch-3.txz:  Rebuilt.
x/libinput-1.11.0-x86_64-1.txz:  Upgraded.
x/sazanami-fonts-ttf-20040629-noarch-3.txz:  Rebuilt.
x/sinhala_lklug-font-ttf-20060929-noarch-3.txz:  Rebuilt.
x/tibmachuni-font-ttf-1.901b-noarch-3.txz:  Rebuilt.
x/ttf-indic-fonts-0.5.14-noarch-3.txz:  Rebuilt.
x/ttf-tlwg-0.6.4-noarch-3.txz:  Rebuilt.
x/urw-core35-fonts-otf-20170801_91edd6e_git-noarch-2.txz:  Rebuilt.
x/wqy-zenhei-font-ttf-0.8.38_1-noarch-6.txz:  Rebuilt.
xap/mozilla-firefox-60.0.2-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/security/known-vulnerabilities/firefox.html
  (* Security fix *)
xap/x3270-3.3.12ga7-x86_64-5.txz:  Rebuilt.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

3 files changed, 2 insertions, 164 deletions

diff --git a/source/ap/cups/3cd7b5e053f8100da1ca8d8daf93976cca3516ef.patch b/source/ap/cups/3cd7b5e053f8100da1ca8d8daf93976cca3516ef.patch
deleted file mode 100644
index 84ac77ed..00000000
--- a/source/ap/cups/3cd7b5e053f8100da1ca8d8daf93976cca3516ef.patch
+++ /dev/null
@@ -1,159 +0,0 @@
---- ./scheduler/auth.c.orig	2018-03-22 22:48:36.000000000 -0500
-+++ ./scheduler/auth.c	2018-03-28 23:26:32.100862569 -0500
-@@ -71,9 +71,6 @@
- static int		compare_locations(cupsd_location_t *a,
- 			                  cupsd_location_t *b);
- static cupsd_authmask_t	*copy_authmask(cupsd_authmask_t *am, void *data);
--#if !HAVE_LIBPAM
--static char		*cups_crypt(const char *pw, const char *salt);
--#endif /* !HAVE_LIBPAM */
- static void		free_authmask(cupsd_authmask_t *am, void *data);
- #if HAVE_LIBPAM
- static int		pam_func(int, const struct pam_message **,
-@@ -694,14 +691,14 @@
- 	    * client...
- 	    */
- 
--	    pass = cups_crypt(password, pw->pw_passwd);
-+	    pass = crypt(password, pw->pw_passwd);
- 
- 	    if (!pass || strcmp(pw->pw_passwd, pass))
- 	    {
- #  ifdef HAVE_SHADOW_H
- 	      if (spw)
- 	      {
--		pass = cups_crypt(password, spw->sp_pwdp);
-+		pass = crypt(password, spw->sp_pwdp);
- 
- 		if (pass == NULL || strcmp(spw->sp_pwdp, pass))
- 		{
-@@ -1995,129 +1992,6 @@
- }
- 
- 
--#if !HAVE_LIBPAM
--/*
-- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
-- *                  as needed.
-- */
--
--static char *				/* O - Encrypted password */
--cups_crypt(const char *pw,		/* I - Password string */
--           const char *salt)		/* I - Salt (key) string */
--{
--  if (!strncmp(salt, "$1$", 3))
--  {
--   /*
--    * Use MD5 passwords without the benefit of PAM; this is for
--    * Slackware Linux, and the algorithm was taken from the
--    * old shadow-19990827/lib/md5crypt.c source code... :(
--    */
--
--    int			i;		/* Looping var */
--    unsigned long	n;		/* Output number */
--    int			pwlen;		/* Length of password string */
--    const char		*salt_end;	/* End of "salt" data for MD5 */
--    char		*ptr;		/* Pointer into result string */
--    _cups_md5_state_t	state;		/* Primary MD5 state info */
--    _cups_md5_state_t	state2;		/* Secondary MD5 state info */
--    unsigned char	digest[16];	/* MD5 digest result */
--    static char		result[120];	/* Final password string */
--
--
--   /*
--    * Get the salt data between dollar signs, e.g. $1$saltdata$md5.
--    * Get a maximum of 8 characters of salt data after $1$...
--    */
--
--    for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++)
--      if (*salt_end == '$')
--        break;
--
--   /*
--    * Compute the MD5 sum we need...
--    */
--
--    pwlen = strlen(pw);
--
--    _cupsMD5Init(&state);
--    _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--    _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt);
--
--    _cupsMD5Init(&state2);
--    _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
--    _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3);
--    _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
--    _cupsMD5Finish(&state2, digest);
--
--    for (i = pwlen; i > 0; i -= 16)
--      _cupsMD5Append(&state, digest, i > 16 ? 16 : i);
--
--    for (i = pwlen; i > 0; i >>= 1)
--      _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1);
--
--    _cupsMD5Finish(&state, digest);
--
--    for (i = 0; i < 1000; i ++)
--    {
--      _cupsMD5Init(&state);
--
--      if (i & 1)
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--      else
--        _cupsMD5Append(&state, digest, 16);
--
--      if (i % 3)
--        _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3);
--
--      if (i % 7)
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--
--      if (i & 1)
--        _cupsMD5Append(&state, digest, 16);
--      else
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--
--      _cupsMD5Finish(&state, digest);
--    }
--
--   /*
--    * Copy the final sum to the result string and return...
--    */
--
--    memcpy(result, salt, (size_t)(salt_end - salt));
--    ptr = result + (salt_end - salt);
--    *ptr++ = '$';
--
--    for (i = 0; i < 5; i ++, ptr += 4)
--    {
--      n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8);
--
--      if (i < 4)
--        n |= (unsigned)digest[i + 12];
--      else
--        n |= (unsigned)digest[5];
--
--      to64(ptr, n, 4);
--    }
--
--    to64(ptr, (unsigned)digest[11], 2);
--    ptr += 2;
--    *ptr = '\0';
--
--    return (result);
--  }
--  else
--  {
--   /*
--    * Use the standard crypt() function...
--    */
--
--    return (crypt(pw, salt));
--  }
--}
--#endif /* !HAVE_LIBPAM */
--
--
- /*
-  * 'free_authmask()' - Free function for auth masks.
-  */
diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild
index 0cb5680e..fe8fd16c 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:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -79,9 +79,6 @@ rm -rf cups-$VERSION
 tar xvf $CWD/cups-$VERSION-source.tar.?z || exit 1
 cd cups-$VERSION || exit 1
 
-# Fix building without PAM:
-zcat $CWD/3cd7b5e053f8100da1ca8d8daf93976cca3516ef.patch.gz | patch -p1 --verbose || exit 1
-
 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/source/ap/cups/cups.url b/source/ap/cups/cups.url
index 73e1dab3..1b693d7e 100644
--- a/source/ap/cups/cups.url
+++ b/source/ap/cups/cups.url
@@ -1 +1 @@
-https://github.com/apple/cups/releases/download/v2.2.7/cups-2.2.7-source.tar.gz
+https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz