cups: Bump to 2.4.2

packages/cups/build.sh

@@ -2,13 +2,15 @@ TERMUX_PKG_HOMEPAGE="https://www.cups.org/"
 TERMUX_PKG_DESCRIPTION="Common UNIX Printing System"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.3.6
-TERMUX_PKG_SRCURL=https://github.com/apple/cups/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=3a96912fc88f62c5d8ac9b251bf0652f1cbe7e69cde16919103aea39f31a1a84
-TERMUX_PKG_DEPENDS="gnutls, libc++, libcrypt, libiconv, zlib"
+TERMUX_PKG_VERSION=2.4.2
+TERMUX_PKG_SRCURL=https://github.com/OpenPrinting/cups/releases/download/v${TERMUX_PKG_VERSION}/cups-${TERMUX_PKG_VERSION}-source.tar.gz
+TERMUX_PKG_SHA256=f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908
+TERMUX_PKG_DEPENDS="libc++, libcrypt, libgnutls, libiconv, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libandroid-spawn"
 TERMUX_PKG_BUILD_IN_SRC=true
-
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--with-tls=gnutls
+"
 TERMUX_PKG_CONFFILES="
 etc/cups/cups-files.conf
 etc/cups/cupsd.conf

packages/cups/cups-scheduler-Makefile.patch

@@ -1,6 +1,6 @@
 --- src/scheduler/Makefile	2020-04-27 18:04:29.000000000 +0000
 +++ src-mod/scheduler/Makefile	2020-07-05 14:20:05.730000000 +0000
-@@ -163,48 +163,11 @@
+@@ -164,49 +164,11 @@
  	$(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
  	echo Creating $(CACHEDIR)...
  	$(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
@@ -31,22 +31,22 @@
  		echo Installing SMF manifest in $(SMFMANIFESTDIR)...;\
  		$(INSTALL_DIR) $(BUILDROOT)/$(SMFMANIFESTDIR); \
  		$(INSTALL_SCRIPT) cups.xml $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
--	fi
+ 	fi
 -	if test "x$(SYSTEMD_DIR)" != x; then \
 -		echo Installing systemd configuration files...; \
 -		$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
--		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
--		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
--	elif test "x$(XINETD)" != x; then \
+-		$(INSTALL_DATA) cups.path $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) cups.service $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) cups.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
+-		$(INSTALL_DATA) cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+-	fi
+-	if test "x$(XINETD)" != x; then \
 -		echo Installing xinetd configuration file for cups-lpd...; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
 -		$(INSTALL_DATA) cups-lpd.xinetd $(BUILDROOT)$(XINETD)/cups-lpd; \
 -	fi
 -
-+	fi	
  
  #
  # Install programs...

packages/cups/no-sbindir.patch

@@ -2,23 +2,23 @@ diff -uNr cups-2.3.3/config-scripts/cups-directories.m4 cups-2.3.3.mod/config-sc
 --- cups-2.3.3/config-scripts/cups-directories.m4	2020-04-27 21:04:29.000000000 +0300
 +++ cups-2.3.3.mod/config-scripts/cups-directories.m4	2020-07-24 16:44:23.353948751 +0300
 @@ -31,9 +31,7 @@
- AC_DEFINE_UNQUOTED(CUPS_BINDIR, "$bindir")
+ AC_DEFINE_UNQUOTED([CUPS_BINDIR], ["$bindir"], [Location of CUPS user programs.])
  
  dnl Fix "sbindir" variable...
--if test "$sbindir" = "\${exec_prefix}/sbin"; then
--	sbindir="$exec_prefix/sbin"
--fi
+-AS_IF([test "$sbindir" = "\${exec_prefix}/sbin"], [
+-    sbindir="$exec_prefix/sbin"
+-])
 +sbindir="$exec_prefix/bin"
  
- AC_DEFINE_UNQUOTED(CUPS_SBINDIR, "$sbindir")
+ AC_DEFINE_UNQUOTED([CUPS_SBINDIR], ["$sbindir"], [Location of CUPS admin programs.])
  
 diff -uNr cups-2.3.3/Makedefs.in cups-2.3.3.mod/Makedefs.in
 --- cups-2.3.3/Makedefs.in	2020-04-27 21:04:29.000000000 +0300
 +++ cups-2.3.3.mod/Makedefs.in	2020-07-24 16:43:17.017576910 +0300
 @@ -214,7 +214,7 @@
+ mandir		=	@mandir@
  oldincludedir	=	@oldincludedir@
  prefix		=	@prefix@
- privateinclude	=	@privateinclude@
 -sbindir		=	@sbindir@
 +sbindir		=	@bindir@
  sharedstatedir	=	@sharedstatedir@