cups: Update to 2.3.6

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/cups/cups.nm b/cups/cups.nm
index 6f99c515a3d31c97c8c8a4b8cb6f5eec5e33674d..43b3c782b4802b27f28169108a970fb4bb084473 100644 (file)
--- a/cups/cups.nm
+++ b/cups/cups.nm
@@ -4,20 +4,20 @@
 ###############################################################################
 
 name       = cups
-version    = 2.2.4
+version    = 2.3.6
 release    = 1
 
 groups     = Applications/Printing
-url        = http://cups.org/software.php
+url        = https://cups.org/software.php
 license    = GPLv2+
-summary    = The common UNIX printing system.
+summary    = The common UNIX printing system
 
 description
        CUPS is the standards-based, open source printing system developed
        by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems.
 end
 
-source_dl  = https://github.com/apple/cups/releases/download/v%{version}/
+source_dl  = https://github.com/apple/cups/archive/refs/tags/v%{version}.tar.gz#/
 sources    = %{thisapp}-source.tar.gz
 
 build
@@ -26,6 +26,7 @@ build
                automake
                avahi-devel
                cyrus-sasl-devel
+               dbus-devel
                gcc-c++
                gnutls-devel
                libacl-devel
@@ -36,14 +37,11 @@ build
                libtiff-devel
                libusb-devel
                openldap-devel
-               openssl-devel
                pam-devel
                systemd-devel
                zlib-devel
        end
 
-       CFLAGS += -DLDAP_DEPRECATED=1
-
        configure_options += \
                --localedir=%{datadir}/locale \
                --with-cupsd-file-perm=0755 \
@@ -59,39 +57,12 @@ build
                --enable-webif \
                --with-xinetd=no
 
-       prepare_cmds
-               aclocal -I config-scripts
-               autoconf -I config-scripts
-       end
-
        install
                make install BUILDROOT=%{BUILDROOT}
 
-               # Remove sysvinit scripts
-               rm -vfr %{BUILDROOT}/etc/init.d/cups %{BUILDROOT}/etc/rc*.d
-
                # Install default config file.
                mkdir -pv %{BUILDROOT}/etc/cups
                cp -vf %{DIR_APP}/conf/cupsd.conf %{BUILDROOT}/etc/cups/
-
-               # Rename systemd service files.
-               mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.path \
-                       %{BUILDROOT}%{unitdir}/cups.path
-               mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.service \
-                       %{BUILDROOT}%{unitdir}/cups.service
-               mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.socket \
-                       %{BUILDROOT}%{unitdir}/cups.socket
-               mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd.socket \
-                       %{BUILDROOT}%{unitdir}/cups-lpd.socket
-               mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd@.service \
-                       %{BUILDROOT}%{unitdir}/cups-lpd@.service
-
-               sed -i -e "s,org.cups.cupsd,cups,g" \
-                       %{BUILDROOT}%{unitdir}/cups.service
-
-               # Fix permissions
-               chown root:lp %{BUILDROOT}%{localstatedir}/run/cups
-               chmod 0755 %{BUILDROOT}%{localstatedir}/run/cups
        end
 end
 

diff --git a/cups/systemd/cups.service b/cups/systemd/cups.service
deleted file mode 100644 (file)
index dfb87b8..0000000
--- a/cups/systemd/cups.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=CUPS scheduler
-Requires=printer.target
-After=syslog.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/cupsd.pid
-ExecStartPre=/usr/sbin/cupsd -t
-ExecStart=/usr/sbin/cupsd
-ExecStartPost=/sbin/udevadm trigger --subsystem-match=usb --attr-match=bInterfaceClass=07 --attr-match=bInterfaceSubClass=01 --action=add
-ExecStartPost=/sbin/udevadm trigger --subsystem-match=usb --property-match=DEVNAME="/dev/usb/lp*" --action=add
-
-[Install]
-WantedBy=multi-user.target