From ae60f3b29dbc1001e4f488b764d1f9fe500aae42 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 1 Oct 2024 20:45:33 +0200
Subject: [PATCH] print/cups: Update to 2.4.11

Security:	CVE-2024-47175
---
 print/cups/Makefile                  | 13 ++++++++-----
 print/cups/distinfo                  |  6 +++---
 print/cups/files/patch-cgi-bin_var.c | 11 -----------
 3 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 print/cups/files/patch-cgi-bin_var.c

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 180f54e36891..f8f782624020 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	cups
-DISTVERSION=	2.4.10
-PORTREVISION=	1
+DISTVERSION=	2.4.11
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/OpenPrinting/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
@@ -9,10 +8,14 @@ MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Common UNIX Printing System
 WWW=		https://github.com/OpenPrinting/cups
 
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=		APACHE20 CUPS
+LICENSE_COMB=		multi
+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE
+LICENSE_FILE_CUPS=	${WRKSRC}/NOTICE
+LICENSE_NAME_CUPS=	Apache License v2.0 with CUPS Exceptions
+LICENSE_PERMS_CUPS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		compiler:c++11-lang cpe gmake iconv localbase pkgconfig
+USES=		cpe gmake iconv localbase pkgconfig
 CPE_VENDOR=	linuxfoundation
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	cupsd
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 82c989e2bf8a..2227e31211b0 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718957749
-SHA256 (cups-2.4.10-source.tar.gz) = d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7
-SIZE (cups-2.4.10-source.tar.gz) = 8145236
+TIMESTAMP = 1727709578
+SHA256 (cups-2.4.11-source.tar.gz) = 9a88fe1da3a29a917c3fc67ce6eb3178399d68e1a548c6d86c70d9b13651fd71
+SIZE (cups-2.4.11-source.tar.gz) = 8147763
diff --git a/print/cups/files/patch-cgi-bin_var.c b/print/cups/files/patch-cgi-bin_var.c
deleted file mode 100644
index 60ec02c16ac3..000000000000
--- a/print/cups/files/patch-cgi-bin_var.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgi-bin/var.c.orig	2024-06-18 11:11:05 UTC
-+++ cgi-bin/var.c
-@@ -191,7 +191,7 @@ cgiGetCheckbox(const char *name)	/* I - Name of form f
-   int		ret;			/* Return value */
- 
- 
--  ret = value && !_cups_strcasecmp(value, "checkbox");
-+  ret = value && !_cups_strcasecmp(value, "on");
- 
-   if (!ret && value)
-   {