CVS commit: pkgsrc/print/cups-filters

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Aug 16 01:09:56 UTC 2025

Modified Files:
        pkgsrc/print/cups-filters: Makefile PLIST distinfo
Removed Files:
        pkgsrc/print/cups-filters: buildlink3.mk options.mk
        pkgsrc/print/cups-filters/patches: patch-Makefile.in
            patch-filter_gstoraster.c patch-filter_mupdftoraster.c
            patch-fontembed_test__pdf.c patch-fontembed_test__ps.c
            patch-utils_cups-browsed.c

Log Message:
print/cups-filters: Update to 2.0.1

* Use new dependencies.
* Remove buildlink3.mk. If something uses header files, readd it.

Changelog:
cups-filters 2.0.1

Bug fix release, mainly fixes on the build system, but also on the serial backend

    serial backend: Fixed bug in conversion of comments
    (Pull request #548)
    pclmtoraster: Properly set CFLAGS
    As this is a C program, set pclmtoraster_CFLAGS, not pclmtoraster_CXXFLAGS (Pull request #588).
    configure: Remove == bashism
    (Pull request #567)
    configure.ac: Remove Avahi check
    cups-filters does not use Avahi (Pull request #558)

cups-filters 2.0.0

Final 2.0.0 release with a last fix

    universal: Enable application/vnd.cups-postscript as input
    There are filters which produce this MIME type (such as hpps of HPLIP), and if someone uses such driver on a client and the server has an IPP Everywhere/driverless printer, the job fails (Pull 
request #534, requires libcupsfilters 2.0.0).

cups-filters 2.0rc2

Security vulnerability fix and general security and code clean-up of the beh (Backend Error Handler) backend:

    beh backend: Use execv() instead of system() - CVE-2023-24805
    With execv() command line arguments are passed as separate strings and not the full command line in a single string. This prevents arbitrary command execution by escaping the quoting of the 
arguments in a job with forged job title.
    beh backend: Extra checks against odd/forged input - CVE-2023-24805
        Do not allow / in the scheme of the URI (= backend executable name), to assure that only backends inside /usr/lib/cups/backend/ are used.
        Pre-define scheme buffer to empty string, to be defined for case of URI being NULL.
        URI must have :, to split off scheme, otherwise error.
        Check return value of snprintf() to create call path for the backend, to error out on truncation of a too long scheme or on complete failure due to a completely odd scheme.
    beh backend: Further improvements - CVE-2023-24805
        Use strncat() instead of strncpy() for getting scheme from URI, the latter does not require setting terminating zero byte in case of truncation.
        Also exclude . or .. as scheme, as directories are not valid CUPS backends.
        Do not use fprintf() in sigterm_handler(), to not interfere with a fprintf() which could be running in the main process when sigterm_handler() is triggered.
        Use static volatile int for global variable job_canceled.
    parallel backend: Added missing #include lines

cups-filters 2.0rc1

Release Candidate: Fixes for bugs found by Coverity check run, plus some more fixes.

    foomatic-rip: Fix a SIGPIPE error when calling gs (Pull request #517)
    Ubuntu's autopkgtest for foo2zjs shows foo2zjs's testsuite failing with cups-filters 2.0beta3 on ppc64el. This is cause by a timing issue in foomatic-rip which is fixed now.
    Coverity check done by Zdenek Dohnal for the inclusion of cups-filters 2.x in Fedora and Red Hat. Zdenek has fixed all the issues: Missing free(), files not closed, potential string overflows, 
... Thanks a lot! (Pull request #510).
    Dropped all C++ references and obsolete C standards (Pull requests #504 and #513)
    With no C++ compiler needed, there is no need for any checks or setting for C++ in configure.ac.
    configure.ac: Change deprecated AC_PROG_LIBTOOL for LT_INIT (Pull request #508)

cups-filters 2.0b3

Fixes of bugs found while packaging for distros, mainly in the build system and the source code documentation

    texttopdf: Do not include fontconfig.h in the CUPS filter wrapper
    Build system: Do not explicitly check for libpoppler-cpp
    The cups-filters package does not contain any code using libpoppler-cpp, therefore we let ./configure not check for it.
    COPYING, NOTICE: Simplification for autotools-generated files
    autotools-generated files can be included under the license of the upstream code, and FSF copyright added to upstream copyright list. Simplified COPYING appropriately.
    Makefile.am: Include LICENSE in distribution tarball
    Add templates for issue reports on GitHub. This makes a selection screen appear when clicking "New Issue" in the web UI, to select whether the issue is a regular bug, a feature request, or a 
security vulnerability.

cups-filters 2.0b2

Second beta release approaching cups-filters 2.0.0: Corrected installation path for include files for the *.drv files, tons of fixes in source code documentation and build system

    Corrected installation path for *.h files for *.drv files. The ppdc (and underlying functions) of libppd searches for include files in /usr/share/ppdc and not in /usr/share/cups/ppdc any more.
    configure.ac: Remove unnecessary AVAHI_GLIB_... definitions.
    Makefile.am: Include NOTICE in distribution tarball
    configure.ac: Added foreign to the AM_INIT_AUTOMAKE() call. Makes automake not require a file named README.
    Cleaned up .gitignore
    Tons of fixes in the source code documentation: README.md, INSTALL, DEVELOPING.md, CONTRIBUTING.md, COPYING, NOTICE, ... Adapted to the cups-filters component, added links.

cups-filters 2.0b1

First beta release approaching cups-filters 2.0.0, for retro-fitting the filter functions of libcupsfilters and libppd into classic CUPS (2.x) environments.

    Converted nearly all filters to filter functions, only exceptions are rastertoescpx, rastertopclx, commandtoescpx, commandtopclx, and foomatic-rip. The latter is deeply involved with Foomatic 
PPDs and the others are legacy printer drivers. The filter functions are mainly in libcupsfilters, the ones which generate PostScript are in libppd.
    Replaced all the filters converted to filter functions by simple wrapper executables using ppdFilterCUPSWrapper() of libppd for backward compatibility with CUPS 2.x.
    Added new streaming mode triggered by the boolean "filter-streaming-mode" option. In this mode a filter (function) is supposed to avoid everything which prevents the job data from streaming, as 
loading the whole job (or good part of it) into a temporary file or into memory, interpreting PDF, pre-checking input file type or zero-page jobs, ... This is mainly to be used by Printer 
Applications when they do raster printing in streaming mode, to run with lowest resources possible. Currently foomatic-rip, ghostscript, and pdftopdf got a streaming mode. For the former two 
PostScript (not PDF) is assumed as input and no zero-page-job check is done, in the latter all QPDF processing (page management, page size adjustment, ...) is skipped and only JCL according to the 
PPD added.
    The CUPS filter imagetops uses the ppdFilterImageToPS() filter function of libppd now.
    driverless, driverless-fax: Added IPP Fax Out support. Now printer setup tools list an additional fax "driver". A fax queue is created by selecting this driver. Jobs have to be sent with "-o 
phone=12345" to supply the destination phone number (Pull request #280, #293, #296, #302, #304, #305, #306, #309, Issue #298, #308).
    sys5ippprinter: Removed sys5ippprinter, as CUPS does not support System V interface scripts any more. This first approach of PPD-less printing was also not actually made use of.
    urftopdf: Removed as we require CUPS 2.2.2+ now which supports Apple Raster by itself.
    Build system, README.md: Require CUPS 2.2.2+. Removed now unneeded ./configure switches for use of the urftopdf filter for old CUPS versions.
    Sample PPDs: Renamed source directory from ppd/ to ppdfiles/.
    Build system: Remove '-D_PPD_DEPRECATED=""' from the compiling command lines of the source files which use libcups. The flag is not supported any more for longer times already and all the 
PPD-related functions deprecated by CUPS have moved into libppd now.
    Build system: Add files in .gitignore that are generated by "autogen.sh", "configure", and "make" (Pull request #336).


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 pkgsrc/print/cups-filters/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/cups-filters/PLIST
cvs rdiff -u -r1.33 -r0 pkgsrc/print/cups-filters/buildlink3.mk
cvs rdiff -u -r1.81 -r1.82 pkgsrc/print/cups-filters/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/print/cups-filters/options.mk
cvs rdiff -u -r1.8 -r0 pkgsrc/print/cups-filters/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/print/cups-filters/patches/patch-filter_gstoraster.c \
    pkgsrc/print/cups-filters/patches/patch-filter_mupdftoraster.c \
    pkgsrc/print/cups-filters/patches/patch-fontembed_test__pdf.c \
    pkgsrc/print/cups-filters/patches/patch-fontembed_test__ps.c
cvs rdiff -u -r1.7 -r0 \
    pkgsrc/print/cups-filters/patches/patch-utils_cups-browsed.c

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-filters/Makefile
diff -u pkgsrc/print/cups-filters/Makefile:1.194 pkgsrc/print/cups-filters/Makefile:1.195
--- pkgsrc/print/cups-filters/Makefile:1.194    Sun Jul 13 08:17:39 2025
+++ pkgsrc/print/cups-filters/Makefile  Sat Aug 16 01:09:55 2025
@@ -1,103 +1,46 @@
-# $NetBSD: Makefile,v 1.194 2025/07/13 08:17:39 wiz Exp $
+# $NetBSD: Makefile,v 1.195 2025/08/16 01:09:55 ryoon Exp $
 
-DISTNAME=      cups-filters-1.28.16
-PKGREVISION=   21
+DISTNAME=      cups-filters-2.0.1
 CATEGORIES=    print
-MASTER_SITES=  http://openprinting.org/download/cups-filters/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenPrinting/}
+GITHUB_PROJECT=        cups-filters
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://wiki.linuxfoundation.org/openprinting/cups-filters
 COMMENT=       Backends, filters, and other software for cups
-LICENSE=       gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND mit
+LICENSE=       apache-2.0 # with gnu-gpl-v2 and gnu-lgpl-v2 exception
 
 # https://github.com/OpenPrinting/cups-filters/issues/411
-DEPENDS+=      dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 DEPENDS+=      poppler-utils-[0-9]*:../../print/poppler-utils
 
 # qpdf's include/qpdf/QPDF.hh uses std::string_view
-USE_LANGUAGES=         c c++17
+USE_LANGUAGES=         c c++
+USE_CXX_FEATURES=      c++17
 USE_LIBTOOL=           yes
-USE_TOOLS+=            bash:run pkg-config gmake gdbus-codegen
+USE_TOOLS+=            bash:run pkg-config gmake
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --disable-braille
-CONFIGURE_ARGS+=       --disable-ldap
 CONFIGURE_ARGS+=       --disable-mutool
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --with-apple-raster-filter=rastertopdf
 CONFIGURE_ARGS+=       --with-gs-path=${PREFIX}/bin/gs
 CONFIGURE_ARGS+=       --with-pdftops-path=${PREFIX}/bin/pdftops
 CONFIGURE_ARGS+=       --with-shell=${TOOLS_PATH.bash}
-CONFIGURE_ARGS+=       --with-test_font_path=${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf
-
-LDFLAGS.SunOS+=                -lresolv
-
-PKGCONFIG_OVERRIDE+=   libcupsfilters.pc.in
-PKGCONFIG_OVERRIDE+=   libfontembed.pc.in
-
-CONFLICTS+=    cups<1.6
-
-REPLACE_BASH+= filter/braille/drivers/generic/brftoembosser.in
-REPLACE_BASH+= filter/braille/drivers/index/imageubrltoindexv3.in
-REPLACE_BASH+= filter/braille/drivers/index/imageubrltoindexv4.in
-REPLACE_BASH+= filter/braille/drivers/index/textbrftoindexv3.in
-REPLACE_BASH+= filter/braille/filters/brftopagedbrf.in
-REPLACE_BASH+= filter/braille/filters/imagetobrf.in
-REPLACE_BASH+= filter/braille/filters/texttobrf.in
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CFLAGS+=       -framework IOKit
-.endif
-
-CPPFLAGS.SunOS+=       -D_POSIX_PTHREAD_SEMANTICS
 
 BUILD_DEFS+=           VARBASE
 
-RCD_SCRIPTS=           cups-browsed
-CONF_FILES+=           ${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf
-
-TEST_TARGET=           check
-
-post-extract:
-       ${CP} ${FILESDIR}/cups-browsed-daemonize.sh ${WRKSRC}
+.include "../../mk/bsd.prefs.mk"
 
-SUBST_CLASSES+=                        daemonize
-SUBST_STAGE.daemonize=         pre-configure
-SUBST_MESSAGE.daemonize=       Customizing daemonizing script
-SUBST_FILES.daemonize=         cups-browsed-daemonize.sh
-SUBST_VARS.daemonize=          PREFIX VARBASE
-
-INSTALLATION_DIRS+=            share/examples/cups-filters
-
-post-install:
-       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/cups/cups-browsed.conf \
-               ${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf
-       # backends that need root access should not have world read and execute permissions
-       ${CHMOD} go-rwx ${DESTDIR}${PREFIX}/libexec/cups/backend/parallel
-       ${CHMOD} go-rwx ${DESTDIR}${PREFIX}/libexec/cups/backend/serial
-       ${INSTALL_SCRIPT} ${WRKSRC}/cups-browsed-daemonize.sh ${DESTDIR}${PREFIX}/libexec/cups-browsed
-
-.include "options.mk"
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/cups-base/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
-.include "../../print/ijs/buildlink3.mk"
+.include "../../print/libcupsfilters/buildlink3.mk"
+.include "../../print/libppd/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler+=        poppler>=23.12.0
-.include "../../print/poppler/buildlink3.mk"
-.include "../../print/poppler-includes/buildlink3.mk"
-.include "../../print/qpdf/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/cups-filters/PLIST
diff -u pkgsrc/print/cups-filters/PLIST:1.25 pkgsrc/print/cups-filters/PLIST:1.26
--- pkgsrc/print/cups-filters/PLIST:1.25        Sat Aug 21 17:08:01 2021
+++ pkgsrc/print/cups-filters/PLIST     Sat Aug 16 01:09:55 2025
@@ -1,29 +1,10 @@
-@comment $NetBSD: PLIST,v 1.25 2021/08/21 17:08:01 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.26 2025/08/16 01:09:55 ryoon Exp $
 bin/driverless
 bin/driverless-fax
 bin/foomatic-rip
-include/cupsfilters/colord.h
-include/cupsfilters/colormanager.h
-include/cupsfilters/driver.h
-include/cupsfilters/image.h
-include/cupsfilters/ipp.h
-include/cupsfilters/pdftoippprinter.h
-include/cupsfilters/ppdgenerator.h
-include/cupsfilters/raster.h
-include/fontembed/bitset.h
-include/fontembed/embed.h
-include/fontembed/fontfile.h
-include/fontembed/iofn.h
-include/fontembed/sfnt.h
-lib/libcupsfilters.la
-lib/libfontembed.la
-lib/pkgconfig/libcupsfilters.pc
-lib/pkgconfig/libfontembed.pc
-libexec/cups-browsed
 libexec/cups/backend/beh
 libexec/cups/backend/driverless
 libexec/cups/backend/driverless-fax
-libexec/cups/backend/implicitclass
 libexec/cups/backend/parallel
 libexec/cups/backend/serial
 libexec/cups/driver/driverless
@@ -38,64 +19,43 @@ libexec/cups/filter/gstoraster
 libexec/cups/filter/imagetopdf
 libexec/cups/filter/imagetops
 libexec/cups/filter/imagetoraster
+libexec/cups/filter/pclmtoraster
 libexec/cups/filter/pdftopdf
 libexec/cups/filter/pdftops
 libexec/cups/filter/pdftoraster
+libexec/cups/filter/pwgtopclm
+libexec/cups/filter/pwgtopdf
+libexec/cups/filter/pwgtoraster
 libexec/cups/filter/rastertoescpx
-libexec/cups/filter/rastertopclm
 libexec/cups/filter/rastertopclx
-libexec/cups/filter/rastertopdf
 libexec/cups/filter/rastertops
-libexec/cups/filter/sys5ippprinter
 libexec/cups/filter/texttopdf
 libexec/cups/filter/texttops
 libexec/cups/filter/texttotext
+libexec/cups/filter/universal
 man/man1/driverless.1
 man/man1/foomatic-rip.1
-man/man5/cups-browsed.conf.5
-man/man8/cups-browsed.8
-sbin/cups-browsed
-share/cups/banners/classified
-share/cups/banners/confidential
-share/cups/banners/form
-share/cups/banners/secret
-share/cups/banners/standard
-share/cups/banners/topsecret
-share/cups/banners/unclassified
-share/cups/charsets/pdf.utf-8
-share/cups/charsets/pdf.utf-8.heavy
-share/cups/charsets/pdf.utf-8.simple
-share/cups/data/classified.pdf
-share/cups/data/confidential.pdf
-share/cups/data/default-testpage.pdf
-share/cups/data/default.pdf
-share/cups/data/form_english.pdf
-share/cups/data/form_english_in.odt
-share/cups/data/form_russian.pdf
-share/cups/data/form_russian_in.odt
-share/cups/data/secret.pdf
-share/cups/data/standard.pdf
-share/cups/data/testprint
-share/cups/data/topsecret.pdf
-share/cups/data/unclassified.pdf
 share/cups/drv/cupsfilters.drv
-share/cups/mime/cupsfilters-ghostscript.convs
-share/cups/mime/cupsfilters-poppler.convs
+share/cups/mime/cupsfilters-universal-postscript.convs
+share/cups/mime/cupsfilters-universal.convs
 share/cups/mime/cupsfilters.convs
 share/cups/mime/cupsfilters.types
-share/cups/ppdc/escp.h
-share/cups/ppdc/pcl.h
 share/doc/cups-filters/ABOUT-NLS
 share/doc/cups-filters/AUTHORS
+share/doc/cups-filters/CHANGES-1.x.md
+share/doc/cups-filters/CHANGES.md
+share/doc/cups-filters/CONTRIBUTING.md
 share/doc/cups-filters/COPYING
+share/doc/cups-filters/DEVELOPING.md
 share/doc/cups-filters/INSTALL
-share/doc/cups-filters/NEWS
-share/doc/cups-filters/README
-share/examples/cups-filters/cups-browsed.conf
+share/doc/cups-filters/LICENSE
+share/doc/cups-filters/NOTICE
+share/doc/cups-filters/README.md
 share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd
 share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd
 share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
 share/ppd/cupsfilters/Ricoh-PDF_Printer-PDF.ppd
 share/ppd/cupsfilters/pxlcolor.ppd
 share/ppd/cupsfilters/pxlmono.ppd
-@pkgdir etc/cups
+share/ppdc/escp.h
+share/ppdc/pcl.h

Index: pkgsrc/print/cups-filters/distinfo
diff -u pkgsrc/print/cups-filters/distinfo:1.81 pkgsrc/print/cups-filters/distinfo:1.82
--- pkgsrc/print/cups-filters/distinfo:1.81     Sun May  7 13:16:26 2023
+++ pkgsrc/print/cups-filters/distinfo  Sat Aug 16 01:09:55 2025
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.81 2023/05/07 13:16:26 wiz Exp $
+$NetBSD: distinfo,v 1.82 2025/08/16 01:09:55 ryoon Exp $
 
-BLAKE2s (cups-filters-1.28.16.tar.xz) = 1b4857225f93eed2f10624fa0654730c4a7c356a5ee2b5cbf6f616e4d5dc30aa
-SHA512 (cups-filters-1.28.16.tar.xz) = 0369f96a8ae5e33bf75c8765947d5ad7285b3532e9d9b0ded7e206798834c9ade3a2ac3f1d16e0fdd43346f2bc7852c541130e935cbb20f9c1239a53118d1239
-Size (cups-filters-1.28.16.tar.xz) = 1512496 bytes
-SHA1 (patch-Makefile.in) = 440497f8f2e02c452ce3bfa660ab3ba62ec40de8
-SHA1 (patch-filter_gstoraster.c) = 4eef8d91d8ca26a5a874e29885b836e9670d9e5d
-SHA1 (patch-filter_mupdftoraster.c) = 81a06cbb3be9a7fd3e797a2effa5ef0aecfc2621
-SHA1 (patch-fontembed_test__pdf.c) = 5ffb13a59ed4d860a3ae4355e364059973715290
-SHA1 (patch-fontembed_test__ps.c) = 70f9ab9c8f74ab96abe04cda926a7116386d5f2e
-SHA1 (patch-utils_cups-browsed.c) = 7aca6e830eebe8dde48e23f04b5d3b5a4820b208
+BLAKE2s (cups-filters-2.0.1.tar.xz) = e664634e48d19ef991cc7b6001619a02657773791227134e600f83193003ea9a
+SHA512 (cups-filters-2.0.1.tar.xz) = e80783a03722228fdd67ab5041082d1c2ad9c5c5d59a60ac1aee51a4600b2e9c0c90b78f6fdbc2c7928c2bf2bb634df7c1ec5db23de65e867a0498372f7a2c00
+Size (cups-filters-2.0.1.tar.xz) = 447288 bytes