From 2dcb85951ab794e242ea4d008345fdacf56b7c0e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 28 Apr 2024 11:05:06 +0000
Subject: [PATCH] extra/cups to 2.4.8-1

---
 extra/cups/.SRCINFO        | 72 ++++++++++++++++++++++++++++++++++++++
 extra/cups/.nvchecker.toml |  5 +++
 extra/cups/PKGBUILD        | 13 ++++---
 3 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 extra/cups/.SRCINFO
 create mode 100644 extra/cups/.nvchecker.toml

diff --git a/extra/cups/.SRCINFO b/extra/cups/.SRCINFO
new file mode 100644
index 000000000..6321619f1
--- /dev/null
+++ b/extra/cups/.SRCINFO
@@ -0,0 +1,72 @@
+pkgbase = cups
+	pkgver = 2.4.8
+	pkgrel = 1
+	epoch = 1
+	url = https://openprinting.github.io/cups/
+	arch = x86_64
+	license = Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND Zlib AND BSD-2-Clause
+	makedepends = acl
+	makedepends = pam
+	makedepends = gnutls
+	makedepends = cups-filters
+	makedepends = colord
+	makedepends = libusb
+	makedepends = avahi
+	makedepends = systemd
+	makedepends = libpaper
+	source = https://github.com/OpenPrinting/cups/releases/download/v2.4.8/cups-2.4.8-source.tar.gz
+	source = https://github.com/OpenPrinting/cups/releases/download/v2.4.8/cups-2.4.8-source.tar.gz.sig
+	source = cups.logrotate
+	source = cups.pam
+	source = cups.sysusers
+	source = cups-2.4.0-statedir.patch
+	source = cups-freebind.patch
+	source = guid.patch
+	validpgpkeys = 7082A0A50A2E92640F3880E0E4522DCC9B246FF7
+	sha256sums = 75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0
+	sha256sums = SKIP
+	sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
+	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
+	sha256sums = 06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2
+	sha256sums = f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7
+	sha256sums = 3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d
+	sha256sums = 0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474
+
+pkgname = libcups
+	pkgdesc = OpenPrinting CUPS - client libraries and headers
+	depends = gnutls
+	depends = avahi
+	depends = glibc
+	depends = zlib
+	depends = sh
+
+pkgname = cups
+	pkgdesc = OpenPrinting CUPS - daemon package
+	install = cups.install
+	depends = acl
+	depends = pam
+	depends = libcups>=2.4.8
+	depends = cups-filters
+	depends = dbus
+	depends = systemd
+	depends = systemd-libs
+	depends = libpaper
+	depends = hicolor-icon-theme
+	depends = glibc
+	depends = gcc-libs
+	depends = avahi
+	depends = gnutls
+	optdepends = cups-browsed: to browse the network for remote CUPS queues and IPP network printers
+	optdepends = libusb: for usb printer backend
+	optdepends = ipp-usb: allows to send HTTP requests via a USB connection on devices without Ethernet or WiFi connections
+	optdepends = xdg-utils: xdg .desktop file support
+	optdepends = colord: for ICC color profile support
+	optdepends = logrotate: for logfile rotation support
+	backup = etc/cups/cupsd.conf
+	backup = etc/cups/snmp.conf
+	backup = etc/cups/printers.conf
+	backup = etc/cups/classes.conf
+	backup = etc/cups/cups-files.conf
+	backup = etc/cups/subscriptions.conf
+	backup = etc/logrotate.d/cups
+	backup = etc/pam.d/cups
diff --git a/extra/cups/.nvchecker.toml b/extra/cups/.nvchecker.toml
new file mode 100644
index 000000000..7ad431866
--- /dev/null
+++ b/extra/cups/.nvchecker.toml
@@ -0,0 +1,5 @@
+[cups]
+source = "github"
+github = "OpenPrinting/cups"
+use_max_tag = true
+prefix = "v"
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 4139d77e1..e0b75835c 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 epoch=1
 arch=('x86_64')
 options=(!distcc)
-license=('Apache' 'custom')
+license=('Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND Zlib AND BSD-2-Clause')
 url="https://openprinting.github.io/cups/"
 makedepends=('acl' 'pam' 'gnutls' 'cups-filters' 'colord' 
              'libusb' 'avahi'  'systemd' 'libpaper')
@@ -24,7 +24,7 @@ source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-$
         cups-freebind.patch
         guid.patch
 )
-sha256sums=('dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c'
+sha256sums=('75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0'
             'SKIP'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -97,7 +97,7 @@ build() {
 
 package_libcups() {
 pkgdesc="OpenPrinting CUPS - client libraries and headers"
-depends=('gnutls' 'avahi' 'glibc' 'zlib')
+depends=('gnutls' 'avahi' 'glibc' 'zlib' 'sh')
 
   cd ${pkgbase}-${pkgver}
   make BUILDROOT="${pkgdir}" install-headers install-libs
@@ -179,4 +179,7 @@ optdepends=('cups-browsed: to browse the network for remote CUPS queues and IPP
 
   # no more xinetd support
   rm -rf "${pkgdir}"/etc/xinetd.d
+
+  # add license + exception
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
 }