[pkgsrc/trunk]: pkgsrc/print/cups Update print/cups to 2.2.4

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/cups Update print/cups to 2.2.4
From: leot <leot%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:46:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/de3359061cef
branches:  trunk
changeset: 367525:de3359061cef
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun Sep 03 11:30:54 2017 +0000

description:
Update print/cups to 2.2.4

pkgsrc changes:
- Pass --with-exe-file-perm=0755 to configure in order to be able to strip
  executables and shared objects (the cups' default is 0555 and that's also
  inconsistent with pkgsrc's BINMODE)

Changes:
CHANGES IN CUPS V2.2.4
----------------------
- The scheduler did not remove old job files (Issue #4987)
- cupsEnumDests did not return early when all printers had been discovered
  (Issue #4989)
- The CUPS build system now supports cross-compilation (Issue #4897)
- Added a new CUPS Programming Manual to replace the aging API documentation.
- Added the `cupsAddIntegerOption` and `cupsGetIntegerOption` functions
  (Issue #4992)
- The `cupsGetDests` and `cupsCreateJob` functions now support Bonjour printers
  (Issue #4993)
- Added a USB quirk rule for Lexmark E260dn printers (Issue #4994)
- Fixed a potential buffer overflow in the `cupstestppd` utility (Issue #4996)
- IPP Everywhere improvements (Issue #4998)
- Fixed the "cancel all jobs" function in the web interface for several
  languages (Issue #4999)
- Fixed issues with local queues (Issue #5003, Issue #5008, Issue #5009)
- The `lpstat` command now supports a `-e` option to enumerate local printers
  (either previously added or on the network) that can be accessed
  (Issue #5005)
- The `lp` and `lpr` commands now support printing to network printers that
  haven't yet been added (Issue #5006)
- Fixed a typo in the mime.types file.
- Fixed a bug in the Spanish web interface template (Issue #5016)
- The `cupsEnumDests*` and `cupsGetDest*` functions now report the value of the
  "printer-is-temporary" Printer Status attribute (Issue #5028)
- Added Chinese localization (Issue #5029)
- The `cupsCheckDestSupported` function did not support `NULL` values
  (Issue #5031)
- Fixed some issues in the RPM spec file (Issue #5032)
- The `cupsConnectDest` function now supports the `CUPS_DEST_FLAGS_DEVICE` flag
  for explicitly connecting to the device (printer) associated with the
  destination.
- The `SSLOptions` directive in "client.conf" and "cupsd.conf" now supports
  `DenyCBC` and `DenyTLS1.0` options (Issue #5037)

diffstat:

 print/cups/Makefile                                         |   8 +-
 print/cups/PLIST                                            |  11 +--
 print/cups/distinfo                                         |  24 ++++----
 print/cups/patches/patch-ae                                 |  22 ++++----
 print/cups/patches/patch-config-scripts_cups-compiler.m4    |  14 ++--
 print/cups/patches/patch-config-scripts_cups-directories.m4 |  14 ++--
 print/cups/patches/patch-config-scripts_cups-gssapi.m4      |   8 +-
 print/cups/patches/patch-config-scripts_cups-manpages.m4    |  22 ++++----
 print/cups/patches/patch-config-scripts_cups-sharedlibs.m4  |  24 ++++----
 print/cups/patches/patch-scheduler-main.c                   |  32 ++++++------
 10 files changed, 88 insertions(+), 91 deletions(-)

diffs (truncated from 474 to 300 lines):

diff -r d483a9f82b0e -r de3359061cef print/cups/Makefile
--- a/print/cups/Makefile       Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/Makefile       Sun Sep 03 11:30:54 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.249 2017/08/20 23:55:54 jlam Exp $
+# $NetBSD: Makefile,v 1.250 2017/09/03 11:30:54 leot Exp $
 
-DISTNAME=      cups-2.2.3-source
+DISTNAME=      cups-2.2.4-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=apple/}
 
@@ -32,6 +31,7 @@
 CONFIGURE_ARGS+=       --with-cups-user=${CUPS_USER}
 CONFIGURE_ARGS+=       --with-cups-group=${CUPS_GROUP}
 CONFIGURE_ARGS+=       --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
+CONFIGURE_ARGS+=       --with-exe-file-perm=0755
 CONFIGURE_ARGS+=       --enable-libpaper
 CONFIGURE_ARGS+=       --enable-libtool
 CONFIGURE_ARGS+=       --enable-ssl
@@ -145,7 +145,7 @@
        ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
 
 post-install:
-       set -e; for file in LICENSE.txt README.txt; do                  \
+       set -e; for file in LICENSE.txt README.md; do                   \
                ${INSTALL_DATA} ${WRKSRC}/$${file}                      \
                     ${DESTDIR}${DOCDIR}/$${file}; \
        done
diff -r d483a9f82b0e -r de3359061cef print/cups/PLIST
--- a/print/cups/PLIST  Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/PLIST  Sun Sep 03 11:30:54 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.58 2016/12/30 07:08:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.59 2017/09/03 11:30:54 leot Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -612,7 +612,7 @@
 share/cups/templates/users.tmpl
 ${PLIST.libusb}share/cups/usb/org.cups.usb-quirks
 share/doc/cups/LICENSE.txt
-share/doc/cups/README.txt
+share/doc/cups/README.md
 share/doc/cups/apple-touch-icon.png
 share/doc/cups/cups-printable.css
 share/doc/cups/cups.css
@@ -620,15 +620,11 @@
 share/doc/cups/es/index.html
 share/doc/cups/help/accounting.html
 share/doc/cups/help/api-admin.html
-share/doc/cups/help/api-array.html
-share/doc/cups/help/api-cups.html
-share/doc/cups/help/api-filedir.html
 share/doc/cups/help/api-filter.html
-share/doc/cups/help/api-httpipp.html
-share/doc/cups/help/api-overview.html
 share/doc/cups/help/api-ppd.html
 share/doc/cups/help/api-raster.html
 share/doc/cups/help/cgi.html
+share/doc/cups/help/cupspm.html
 share/doc/cups/help/encryption.html
 share/doc/cups/help/glossary.html
 share/doc/cups/help/kerberos.html
@@ -729,3 +725,4 @@
 share/locale/ja/cups_ja.po
 share/locale/pt_BR/cups_pt_BR.po
 share/locale/ru/cups_ru.po
+share/locale/zh_CN/cups_zh_CN.po
diff -r d483a9f82b0e -r de3359061cef print/cups/distinfo
--- a/print/cups/distinfo       Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/distinfo       Sun Sep 03 11:30:54 2017 +0000
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.123 2017/07/27 08:54:26 wiz Exp $
+$NetBSD: distinfo,v 1.124 2017/09/03 11:30:54 leot Exp $
 
-SHA1 (cups-2.2.3-source.tar.gz) = 149e9ded0744b7545630c62b6a347e747928e0f7
-RMD160 (cups-2.2.3-source.tar.gz) = 3eb91fbd20bee081e08af64ddfa23a45f2bfa7b2
-SHA512 (cups-2.2.3-source.tar.gz) = 0f3e2aa8e514dad056b4878b0657491d35796b62021092cd5dd480b67a8423fc0fdb822ccb4bc72a454c3ced20c160c8631d44c182c87a3993b882df904aaec7
-Size (cups-2.2.3-source.tar.gz) = 9497368 bytes
-SHA1 (patch-ae) = 04f314bbbb05538b67a0f68adc241a09e836a4e2
+SHA1 (cups-2.2.4-source.tar.gz) = 964a6c54e0542f11a4b22bba19bd66ded0c53785
+RMD160 (cups-2.2.4-source.tar.gz) = e97524690a808fd061a2ea758d9ab3099a6c9da5
+SHA512 (cups-2.2.4-source.tar.gz) = 132e1896c5b8466e0c38decbb1210b420f1fa811a761150abdf07112bab290d51883f58a9a441fdc51e7094d94036288d564d6f39e9ee65e9c298e00088469d3
+Size (cups-2.2.4-source.tar.gz) = 9984475 bytes
+SHA1 (patch-ae) = 119a1f2d3db75ac0e77515194fe53616b5c26aa5
 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
 SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
 SHA1 (patch-conf-cups-files.conf.in) = 327cc8b62e606389542870aa6619ade10377b044
 SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
-SHA1 (patch-config-scripts_cups-compiler.m4) = 6b825d05163a91ee3092a68a3b0abc173a378026
-SHA1 (patch-config-scripts_cups-directories.m4) = 1daa2b6237d3675665f273678271b7b522905c8d
-SHA1 (patch-config-scripts_cups-gssapi.m4) = 0f7e4c35473e6117d2fe103750eda820b6fade55
-SHA1 (patch-config-scripts_cups-manpages.m4) = cc920bf46555aab5610e91de4ca1f69916f5b79a
-SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 5b95da8f91de0aaab8b3f826ce0a2662cee3f63a
+SHA1 (patch-config-scripts_cups-compiler.m4) = 6a717af7983f15606fbc703bb4e853b5084ec919
+SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e
+SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354
+SHA1 (patch-config-scripts_cups-manpages.m4) = 5cc943738df29f11fc366557938b82c1e9162344
+SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 70dafb798a2839beb81c4cb93ed4f1926ee78164
 SHA1 (patch-configure.ac) = 0e48669372badc477db7d6f26c8180062f4e78de
 SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
 SHA1 (patch-doc-help-man-cups-files.conf.html) = fcd3d06c00b0a85b6c0790235ccb68685252ea68
@@ -22,7 +22,7 @@
 SHA1 (patch-ppdc_Makefile) = 575ab7d75bebf086cde52956679164c9f01fd37e
 SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc
 SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee
-SHA1 (patch-scheduler-main.c) = 11f97cf9db4319fcff614a1b01d47d8e84ace4d9
+SHA1 (patch-scheduler-main.c) = 599053cb4384f739f27d1ec49fdfe11ca6e450d4
 SHA1 (patch-scheduler_auth.c) = ca675a6e903d4b41cd69a0cab27180653e11f501
 SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf
 SHA1 (patch-test_ippfind.c) = 6db56b9b1b9a26d5c40336af4dc6cde98abd9c19
diff -r d483a9f82b0e -r de3359061cef print/cups/patches/patch-ae
--- a/print/cups/patches/patch-ae       Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/patches/patch-ae       Sun Sep 03 11:30:54 2017 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.33 2015/12/02 21:14:16 leot Exp $
+$NetBSD: patch-ae,v 1.34 2017/09/03 11:30:54 leot Exp $
 
 For proper libtool usage split CC into CC_COMPILE and CC with libtool
 mode options compile/link respectively.
 
 Same for CXX.
 
---- Makedefs.in.orig   2015-02-17 13:10:19.000000000 +0000
+--- Makedefs.in.orig   2017-06-30 15:44:38.000000000 +0000
 +++ Makedefs.in
-@@ -19,9 +19,11 @@
+@@ -17,9 +17,11 @@
  
  AR            =       @AR@
  AWK           =       @AWK@
@@ -21,23 +21,23 @@
  DSO           =       @DSO@
  DSOXX         =       @DSOXX@
  GZIP          =       @GZIP@
-@@ -40,12 +42,12 @@ SHELL              =       /bin/sh
+@@ -38,12 +40,12 @@ SHELL              =       /bin/sh
  # Installation programs...
  #
  
--INSTALL_BIN   =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_BIN   =       $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 -INSTALL_COMPDATA =    $(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN   =       $(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_BIN   =       $(LIBTOOL) --mode=install $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 +INSTALL_COMPDATA =    $(INSTALL) -c -m 444
  INSTALL_CONFIG        =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
  INSTALL_DATA  =       $(INSTALL) -c -m 444
  INSTALL_DIR   =       $(INSTALL) -d
--INSTALL_LIB   =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_LIB   =       $(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@
+-INSTALL_LIB   =       $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_LIB   =       $(LIBTOOL) --mode=install $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
  INSTALL_MAN   =       $(INSTALL) -c -m 444
- INSTALL_SCRIPT        =       $(INSTALL) -c -m 555
+ INSTALL_SCRIPT        =       $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
  
-@@ -135,7 +137,7 @@ CXXLIBS            =       @CXXLIBS@
+@@ -141,7 +143,7 @@ CXXLIBS            =       @CXXLIBS@
  DBUS_NOTIFIER =       @DBUS_NOTIFIER@
  DBUS_NOTIFIERLIBS =   @DBUS_NOTIFIERLIBS@
  DNSSD_BACKEND =       @DNSSD_BACKEND@
@@ -46,7 +46,7 @@
  DSOLIBS               =       @DSOLIBS@ $(COMMONLIBS)
  DNSSDLIBS     =       @DNSSDLIBS@
  IPPFIND_BIN   =       @IPPFIND_BIN@
-@@ -246,11 +248,11 @@ USBQUIRKS        =       @USBQUIRKS@
+@@ -252,11 +254,11 @@ USBQUIRKS        =       @USBQUIRKS@
  
  .c.o:
        echo Compiling $<...
diff -r d483a9f82b0e -r de3359061cef print/cups/patches/patch-config-scripts_cups-compiler.m4
--- a/print/cups/patches/patch-config-scripts_cups-compiler.m4  Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/patches/patch-config-scripts_cups-compiler.m4  Sun Sep 03 11:30:54 2017 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.3 2017/05/25 12:11:55 jperkin Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.4 2017/09/03 11:30:54 leot Exp $
 
 Some builds of gcc seem to support this for compiling but then fail during
 linking with undefined reference to `__stack_chk_fail_local'
 
 PIE needs to be tested with linking.
 
---- config-scripts/cups-compiler.m4.orig       2017-03-28 18:26:53.000000000 +0000
+--- config-scripts/cups-compiler.m4.orig       2017-06-30 15:44:38.000000000 +0000
 +++ config-scripts/cups-compiler.m4
-@@ -111,12 +111,13 @@ if test -n "$GCC"; then
+@@ -115,12 +115,13 @@ if test -n "$GCC"; then
        AC_MSG_CHECKING(whether compiler supports -fstack-protector)
        OLDCFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fstack-protector"
@@ -22,16 +22,16 @@
                fi
                AC_MSG_RESULT(yes),
                AC_MSG_RESULT(no))
-@@ -133,7 +134,7 @@ if test -n "$GCC"; then
-               case "$uname" in
-                       Darwin*)
+@@ -137,7 +138,7 @@ if test -n "$GCC"; then
+               case "$host_os_name" in
+                       darwin*)
                                CFLAGS="$CFLAGS -fPIE -Wl,-pie"
 -                              AC_TRY_COMPILE(,,[
 +                              AC_TRY_LINK(,,[
                                        PIEFLAGS="-fPIE -Wl,-pie"
                                        AC_MSG_RESULT(yes)],
                                        AC_MSG_RESULT(no))
-@@ -141,7 +142,7 @@ if test -n "$GCC"; then
+@@ -145,7 +146,7 @@ if test -n "$GCC"; then
  
                        *)
                                CFLAGS="$CFLAGS -fPIE -pie"
diff -r d483a9f82b0e -r de3359061cef print/cups/patches/patch-config-scripts_cups-directories.m4
--- a/print/cups/patches/patch-config-scripts_cups-directories.m4       Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/patches/patch-config-scripts_cups-directories.m4       Sun Sep 03 11:30:54 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-config-scripts_cups-directories.m4,v 1.3 2016/09/30 14:10:55 wiz Exp $
+$NetBSD: patch-config-scripts_cups-directories.m4,v 1.4 2017/09/03 11:30:54 leot 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,12 +9,12 @@
 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    2016-09-13 23:39:47.000000000 +0000
+--- config-scripts/cups-directories.m4.orig    2017-06-30 15:44:38.000000000 +0000
 +++ config-scripts/cups-directories.m4
 @@ -101,7 +101,7 @@ dnl Fix "libdir" variable...
  if test "$libdir" = "\${exec_prefix}/lib"; then
-       case "$uname" in
-               Linux*)
+       case "$host_os_name" in
+               linux*)
 -                      if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
 +                      if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot && false; then
                                libdir="$exec_prefix/lib64"
@@ -133,10 +133,10 @@
 +AC_ARG_WITH(serverbindir, [  --with-serverbindir     set path for server helper programs],serverbindir="$withval",serverbindir="")
 +
 +if test x$serverbindir = x; then
- case "$uname" in
-       *BSD* | Darwin*)
+ case "$host_os_name" in
+       *bsd* | darwin*)
                # *BSD and Darwin (macOS)
-@@ -277,6 +319,10 @@ case "$uname" in
+@@ -277,6 +319,10 @@ case "$host_os_name" in
                CUPS_SERVERBIN="$exec_prefix/lib/cups"
                ;;
  esac
diff -r d483a9f82b0e -r de3359061cef print/cups/patches/patch-config-scripts_cups-gssapi.m4
--- a/print/cups/patches/patch-config-scripts_cups-gssapi.m4    Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/patches/patch-config-scripts_cups-gssapi.m4    Sun Sep 03 11:30:54 2017 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.5 2015/12/02 21:14:16 leot Exp $
+$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.6 2017/09/03 11:30:54 leot Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
---- config-scripts/cups-gssapi.m4.orig 2014-06-10 13:54:53.000000000 +0000
+--- config-scripts/cups-gssapi.m4.orig 2017-06-30 15:44:38.000000000 +0000
 +++ config-scripts/cups-gssapi.m4
-@@ -36,19 +36,18 @@ if test x$enable_gssapi != xno; then
+@@ -34,19 +34,18 @@ if test x$enable_gssapi != xno; then
                                        AC_MSG_RESULT(no)
                                fi
                                ;;
--                      SunOS*)
+-                      sunos*)
 -                              # Solaris has a non-standard krb5-config, don't use it!
 -                              AC_CHECK_LIB(gss, gss_display_status,
 -                                      AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
diff -r d483a9f82b0e -r de3359061cef print/cups/patches/patch-config-scripts_cups-manpages.m4
--- a/print/cups/patches/patch-config-scripts_cups-manpages.m4  Sun Sep 03 11:29:10 2017 +0000
+++ b/print/cups/patches/patch-config-scripts_cups-manpages.m4  Sun Sep 03 11:30:54 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.4 2017/01/21 11:57:10 leot Exp $
+$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.5 2017/09/03 11:30:54 leot Exp $
 
 Add '--with-manext' configure option.
 
---- config-scripts/cups-manpages.m4.orig       2017-01-17 19:27:22.000000000 +0000
+--- config-scripts/cups-manpages.m4.orig       2017-06-30 15:44:38.000000000 +0000
 +++ config-scripts/cups-manpages.m4
 @@ -11,6 +11,8 @@ dnl which should have been included with
  dnl missing or damaged, see the license at "http://www.cups.org/";.
@@ -17,18 +17,18 @@
  AC_SUBST(PMANDIR)
  
  dnl Setup manpage extensions...
--case "$uname" in
+-case "$host_os_name" in
 +if test x$manext = x; then
-+      case "$uname" in
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated print/cups to 2.2.4
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/ocaml-batteries Updated package to latest versio...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated print/cups to 2.2.4
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/ocaml-batteries Updated package to latest versio...
Indexes:
Home | Main Index | Thread Index | Old Index