CVS commit: pkgsrc/print

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 14 08:43:31 UTC 2021

Modified Files:
        pkgsrc/print/cups: Makefile.common
        pkgsrc/print/cups-base: distinfo
        pkgsrc/print/cups-base/patches:
            patch-config-scripts_cups-directories.m4
        pkgsrc/print/libcups: Makefile

Log Message:
cups: update to 2.3.3op2.

CUPS 2.3.3op2 is the latest OpenPrinting CUPS security and bug fix
release. Changes include:

    Security: Fixed a buffer (read) overflow in the ippReadIO function
    (CVE-2020-10001)
    Clarified the documentation for the "Listen" directive (Issue #53)
    Fixed duplicate ColorModel entries for AirPrint printers (Issue 59)
    Fixed directory/permission defaults for Debian kfreebsd-based systems
    (Issue #60, Issue #61)
    Fixed crash bug in ppdOpen (Issue #64, Issue #78)
    Fixed regression in snprintf emulation function (Issue #67)
    The scheduler's systemd service file now waits for the nslcd service to start
    (Issue #69)
    The libusb-based USB backend now uses a simpler read timer implementation to
    avoid a regression in a previous change (Issue #72)
    The PPD caching code now only tracks the APPrinterIconPath value on macOS
    (Issue #73)
    Fixed segfault in help.cgi when searching in man pages (Issue #81)
    Root certificates were incorrectly stored in "~/.cups/ssl".


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/cups/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/cups-base/patches/patch-config-scripts_cups-directories.m4
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/libcups/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/cups/Makefile.common
diff -u pkgsrc/print/cups/Makefile.common:1.13 pkgsrc/print/cups/Makefile.common:1.14
--- pkgsrc/print/cups/Makefile.common:1.13      Mon Jan  4 14:32:17 2021
+++ pkgsrc/print/cups/Makefile.common   Sun Mar 14 08:43:31 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.13 2021/01/04 14:32:17 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.14 2021/03/14 08:43:31 wiz Exp $
 #
 # used by print/cups/Makefile
 # used by print/cups-base/Makefile
 # used by print/libcups/Makefile
 
-CUPS_VERS=     2.3.3op1
+CUPS_VERS=     2.3.3op2
 DISTNAME=      cups-${CUPS_VERS}-source
 CATEGORIES=    print
 

Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.26 pkgsrc/print/cups-base/distinfo:1.27
--- pkgsrc/print/cups-base/distinfo:1.26        Sat Feb  6 15:22:58 2021
+++ pkgsrc/print/cups-base/distinfo     Sun Mar 14 08:43:31 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2021/02/06 15:22:58 dbj Exp $
+$NetBSD: distinfo,v 1.27 2021/03/14 08:43:31 wiz Exp $
 
-SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9
-RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e
-SHA512 (cups-2.3.3op1-source.tar.gz) = 89949b4190288d5464f425cbff6b854e9da96ba3071e4e0d595ad581797b2db4724f49d884f3ea43e372ed4d0faec72839b0b7182cdde13b96f2824d619a4843
-Size (cups-2.3.3op1-source.tar.gz) = 7989156 bytes
+SHA1 (cups-2.3.3op2-source.tar.gz) = 23108e0f6ca7d8caa1a6a6224f5322e21ba0a27d
+RMD160 (cups-2.3.3op2-source.tar.gz) = a2ed690fab3575ede399a2f54f908b1a9dc32ced
+SHA512 (cups-2.3.3op2-source.tar.gz) = db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
+Size (cups-2.3.3op2-source.tar.gz) = 7993205 bytes
 SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
 SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
 SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717
@@ -14,7 +14,7 @@ SHA1 (patch-at) = 9517bff0bf2c892f0723a2
 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
 SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
 SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67
-SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d
+SHA1 (patch-config-scripts_cups-directories.m4) = ccc795b12064e15b8c325ef39e3b4adfabed407a
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003
 SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2
 SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df

Index: pkgsrc/print/cups-base/patches/patch-config-scripts_cups-directories.m4
diff -u pkgsrc/print/cups-base/patches/patch-config-scripts_cups-directories.m4:1.2 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-directories.m4:1.3
--- pkgsrc/print/cups-base/patches/patch-config-scripts_cups-directories.m4:1.2 Tue May 26 08:36:56 2020
+++ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-directories.m4     Sun Mar 14 08:43:31 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-config-scripts_cups-directories.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $
+$NetBSD: patch-config-scripts_cups-directories.m4,v 1.3 2021/03/14 08:43:31 wiz Exp $
 
 The '$' while loops expand the variables as long as possible so that no
 references to other variables occur. This is necessary because fontpath
@@ -9,7 +9,7 @@ loop.
 I'm also sure that this is not the Right Way to fix it, but at least it
 works.
 
---- config-scripts/cups-directories.m4.orig    2017-06-30 15:44:38.000000000 +0000
+--- config-scripts/cups-directories.m4.orig    2021-02-01 21:10:25.000000000 +0000
 +++ config-scripts/cups-directories.m4
 @@ -97,7 +97,7 @@ dnl Fix "libdir" variable...
  if test "$libdir" = "\${exec_prefix}/lib"; then
@@ -50,7 +50,7 @@ works.
  fi
  
  AC_SUBST(ICONDIR)
-@@ -194,7 +202,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
+@@ -194,7 +206,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
  if test "x$menudir" = x -a -d /usr/share/applications; then
        MENUDIR="/usr/share/applications"
  else
@@ -63,7 +63,7 @@ works.
  fi
  
  AC_SUBST(MENUDIR)
-@@ -209,7 +226,15 @@ else
+@@ -209,7 +225,15 @@ else
        CUPS_DOCROOT="$docdir"
  fi
  
@@ -134,9 +134,9 @@ works.
 +
 +if test x$serverbindir = x; then
  case "$host_os_name" in
-       *bsd* | darwin*)
-               # *BSD and Darwin (macOS)
-@@ -273,6 +315,10 @@ case "$host_os_name" in
+       *-gnu)
+               # GNUs
+@@ -278,6 +320,10 @@ case "$host_os_name" in
                CUPS_SERVERBIN="$exec_prefix/lib/cups"
                ;;
  esac
@@ -147,7 +147,7 @@ works.
  
  AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
  AC_SUBST(CUPS_SERVERBIN)
-@@ -280,7 +326,7 @@ AC_SUBST(INSTALL_SYSV)
+@@ -285,7 +331,7 @@ AC_SUBST(INSTALL_SYSV)
  
  # Configuration files
  CUPS_SERVERROOT="$sysconfdir/cups"

Index: pkgsrc/print/libcups/Makefile
diff -u pkgsrc/print/libcups/Makefile:1.9 pkgsrc/print/libcups/Makefile:1.10
--- pkgsrc/print/libcups/Makefile:1.9   Mon Jan  4 22:33:48 2021
+++ pkgsrc/print/libcups/Makefile       Sun Mar 14 08:43:31 2021
@@ -1,4 +1,4 @@
-#$NetBSD: Makefile,v 1.9 2021/01/04 22:33:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2021/03/14 08:43:31 wiz Exp $
 
 .include "../../print/cups/Makefile.common"