Skip to content

Commit

Permalink
cups: update to 2.3.3op2.
Browse files Browse the repository at this point in the history
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".
  • Loading branch information
0-wiz-0 committed Mar 14, 2021
1 parent ac6a991 commit 1e82e33
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions print/cups-base/distinfo
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,7 +14,7 @@ SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
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
Expand Down
16 changes: 8 additions & 8 deletions print/cups-base/patches/patch-config-scripts_cups-directories.m4
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -63,7 +63,7 @@ works.
fi
AC_SUBST(MENUDIR)
@@ -209,7 +226,15 @@ else
@@ -209,7 +225,15 @@ else
CUPS_DOCROOT="$docdir"
fi
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions print/cups/Makefile.common
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion print/libcups/Makefile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down

0 comments on commit 1e82e33

Please sign in to comment.