From 411a3ff8b6f0e77896ef6619fa5c63741c9b1c82 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 6 Nov 2021 15:51:38 +0100
Subject: [PATCH] cups: update to 2.4.1.

---
 .../cups/patches/cups-no-export-ssllibs.patch | 11 -----
 srcpkgs/cups/template                         | 47 ++++++-------------
 2 files changed, 15 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/cups/patches/cups-no-export-ssllibs.patch

diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
deleted file mode 100644
index bf618ce330bd..000000000000
--- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ b/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- dnl
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 66204733fa86..08ee465a02f2 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,14 +1,13 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3op2
+version=2.4.1
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
-hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
- gnutls-devel perl pkg-config poppler-utils"
-makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
- libusb-devel pam-devel poppler-devel tiff-devel
- $(vopt_if avahi avahi-libs-devel)
+hostmakedepends="$(vopt_if avahi avahi-libs-devel)
+ gnutls-devel pkg-config"
+makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
+ zlib-devel $(vopt_if avahi avahi-libs-devel)
  $(vopt_if gssapi 'mit-krb5-devel')"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
@@ -16,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
+checksum=c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
@@ -34,40 +33,24 @@ system_groups=lpadmin
 cups_pgroup=lp
 cups_homedir=/var/spool/cups
 
-pre_configure() {
-	aclocal -I config-scripts
-	autoconf -I config-scripts
-}
-
 do_configure() {
 	./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
-		--enable-acl --enable-dbus --enable-raw-printing \
-		--enable-threads --with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \
-		--with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \
-		--enable-libpaper --enable-pam --enable-ssl \
-		--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
-		--with-optim="${CFLAGS}" --disable-systemd --disable-launchd \
-		--without-rcdir --without-java --without-perl --without-php \
-		--without-python \
-		$(vopt_enable avahi) $(vopt_enable gssapi)
+		--enable-acl --with-logdir=/var/log/cups \
+		--docdir=/usr/share/cups/doc --with-rundir=/run/cups \
+		--with-cups-user=cups --with-cups-group=lp \
+		--with-system-groups="lpadmin sys root" --enable-relro \
+		--enable-libpaper --with-menudir=/usr/share/applications \
+		--with-xinetd=/etc/xinetd.d --with-optim="${CFLAGS}" \
+		--with-rcdir=no \
+		$(vopt_if avahi '--with-dnssd=avahi') $(vopt_enable gssapi)
 }
 
 post_install() {
-	# compress some driver files, adopted from Fedora
-	find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
 	# install some more configuration files that will get filled by cupsd
 	for f in printers classes client subscriptions; do
 		touch ${DESTDIR}/etc/cups/${f}.conf
 	done
 
-	# Remove files provided by cups-filters.
-	rm -f ${DESTDIR}/usr/share/cups/banners/*
-	rm -f ${DESTDIR}/usr/share/cups/data/testprint
-	# comment out all conversion rules which use any of the removed filters
-	perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \
-		${DESTDIR}/usr/share/cups/mime/mime.convs
-
 	# remove unnecessary PageLogFormat entry
 	vsed -i -e 's:PageLogFormat:#PageLogFormat:' ${DESTDIR}/etc/cups/cupsd.conf*
 
@@ -92,7 +75,7 @@ libcups_package() {
 }
 
 cups-devel_package() {
-	depends="zlib-devel libcups>=${version}_${revision}"
+	depends="libcups>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include