Merge branch 'OpenPrinting:master' into master

.github/workflows/codeql-analysis.yml

@@ -45,16 +45,16 @@ jobs:
         run: sudo apt-get install -y avahi-daemon cppcheck libavahi-client-dev libcups2-dev libcupsimage2-dev libgnutls28-dev libjpeg-dev libpam-dev libpng-dev libusb-1.0-0-dev zlib1g-dev
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql.yml
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

CHANGES.md

@@ -4,42 +4,43 @@ CHANGES - OpenPrinting CUPS 2.5b1 - (TBA)
 Changes in CUPS v2.5b1 (TBA)
 ----------------------------
 
-- Added additional check on socket if `revents` from `poll()` returns POLLHUP
-  together with POLLIN or POLLOUT in `httpAddrConnect2()` (Issue #839)
 - Added `cupsDNSSD` APIs.
 - Added `cupsConcatString` and `cupsCopyString` string APIs.
-- Added a new argument value for `lpstat` argument '-W' - `successful` -
-  to get successfully printed jobs (Issue #830)
-- Added new API for form, JSON, JWT, IPP, raster
+- Added new APIs for form, JSON, JWT, IPP, and raster setup.
 - Added OpenSSL support for `cupsHashData` (Issue #762)
 - Added warning if the device has to do IPP request for 'all,media-col-database'
   in separate requests (Issue #829)
+- Added a new argument value for `lpstat` argument '-W' - `successful` -
+  to get successfully printed jobs (Issue #830)
 - Added driver filter to web interface (Issue #848)
-- Building with TLS support is now required - CUPS supports OpenSSL, GNUTLS
-  and LibreSSL
-- Updated `cupsArray` APIs.
-- Fixed crash in `scan_ps()` if incoming argument is NULL (Issue #831)
+- Updated CUPS to require TLS support - OpenSSL, GNUTLS and LibreSSL are
+  supported.
+- Updated CUPS to require ZLIB.
+- Updated CUPS to require support for `poll` API.
+- Updated `cupsArray` APIs to support modern naming and types.
+- Updated `cups_enum_dests()` timeout for listing available IPP printers (Issue #751)
+- Updated `httpAddrConnect2()` to handle `POLLHUP` together with `POLLIN` or
+  `POLLOUT` (Issue #839)
+- Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error
+  handling (fixes CVE-2023-34241)
+- Fixed hanging of `lpstat` on Solaris (Issue #156)
 - Fixed Digest authentication support (Issue #260)
-- Fixed delays in lpd backend (Issue #741)
 - Fixed extensive looping in scheduler (Issue #604)
-- Fixed hanging of `lpstat` on IBM AIX (Issue #773)
-- Fixed hanging of `lpstat` on Solaris (Issue #156)
-- Fixed memory leak when creating color profiles (Issue #814)
-- Fixed memory leak when unloading a job (Issue #813)
+- Fixed printing multiple files on specific printers (Issue #643)
 - Fixed segfault in `cupsGetNamedDest()` when trying to get default printer, but
   the default printer is not set (Issue #719)
-- Fixed setting job state reasons for successful jobs (Issue #832)
-- Fixed RFC 1179 port reserving behavior in LPD backend (Issue #743)
-- Fixed printing multiple files on specific printers (Issue #643)
-- Fixed printing to stderr if we can't open cups-files.conf (Issue #777)
+- Fixed ready media support for iOS 17+ (Issue #738)
+- Fixed delays in lpd backend (Issue #741)
 - Fixed purging job files via `cancel -x` (Issue #742)
-- Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error
-  handling (fixes CVE-2023-34241)
+- Fixed RFC 1179 port reserving behavior in LPD backend (Issue #743)
 - Fixed a bug in the PPD command interpretation code (Issue #768)
-- Raised `cups_enum_dests()` timeout for listing available IPP printers (Issue #751)
-- Removed `HAVE_LIBZ` and `HAVE_POLL` defines, making CUPS to depend
-  on the functionality
-- Removed hash support for SHA2-512-224 and SHA2-512-256
+- Fixed hanging of `lpstat` on IBM AIX (Issue #773)
+- Fixed printing to stderr if we can't open cups-files.conf (Issue #777)
+- Fixed memory leak when unloading a job (Issue #813)
+- Fixed memory leak when creating color profiles (Issue #814)
+- Fixed crash in `scan_ps()` if incoming argument is NULL (Issue #831)
+- Fixed setting job state reasons for successful jobs (Issue #832)
+- Removed hash support for SHA2-512-224 and SHA2-512-256.
 - Removed `mantohtml` script for generating html pages (use
   `https://www.msweet.org/mantohtml/`)
 - Removed SSPI and Security.framework support (CDSA)

DEVELOPING.md

@@ -8,10 +8,10 @@ contributing to the CUPS project.
 How To Contact The Developers
 -----------------------------
 
-The Linux Foundation's "printing-architecture" mailing list is the primary means
-of asking questions and informally discussing issues and feature requests with
-the OpenPrinting developers.  To subscribe or see the mailing list archives, go
-to <https://lists.linuxfoundation.org/mailman/listinfo/printing-architecture>.
+The Linux "printing-architecture" mailing list is the primary means of asking
+questions and informally discussing issues and feature requests with the
+OpenPrinting developers.  To subscribe or see the mailing list archives, go
+to <https://subspace.kernel.org/lists.linux.dev.html>.
 
 
 Interfaces

README.md

@@ -34,7 +34,7 @@ for more information.
 > and iOS at <https://github.com/apple/cups>.
 
 [1]: https://support.apple.com/en-us/HT201311
-[2]: https://www.pwg.org/ipp/everywhere.html
+[2]: https://www.pwg.org/printers
 [3]: https://github.com/openprinting/cups-filters
 
 

backend/Makefile

@@ -171,6 +171,13 @@ uninstall:
 	-$(RMDIR) $(SERVERBIN)
 
 
+#
+# Run unit tests... (doesn't actually run these currently)
+#
+
+test:	unittests
+
+
 #
 # test1284
 #

cgi-bin/Makefile

@@ -141,6 +141,16 @@ uninstall:
 	-$(RMDIR) $(SERVERBIN)/cgi-bin
 
 
+#
+# Run unit tests...
+#
+
+test:	unittests
+	echo Testing CGI API...
+	./testcgi
+	echo Testing help index API...
+	./testhi
+
 #
 # libcupscgi.a
 #
@@ -211,8 +221,6 @@ testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcgi.o libcupscgi.a \
 		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-	echo Testing CGI API...
-	./testcgi
 
 
 #
@@ -224,8 +232,6 @@ testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhi.o libcupscgi.a \
 		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-	echo Testing help index API...
-	./testhi
 
 
 #