From 996c3d726f4ce8599fdc11b4cd42098dca3f34d8 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Tue, 5 Jul 2022 16:15:32 +0300
Subject: [PATCH] cups rebuild

---
 hardware/printer/cups/actions.py | 15 +++++++--------
 hardware/printer/cups/pspec.xml  | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/hardware/printer/cups/actions.py b/hardware/printer/cups/actions.py
index f72c5d2039..8bfaa8e11f 100755
--- a/hardware/printer/cups/actions.py
+++ b/hardware/printer/cups/actions.py
@@ -9,6 +9,8 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
+Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
+
 def setup():
     #pisitools.flags.add("-fstack-protector-all", "-DLDAP_DEPRECATED=1")
     pisitools.dosed("config-scripts/cups-sharedlibs.m4", "( -shared )", " -Wl,--as-needed\\1")
@@ -27,7 +29,6 @@ def setup():
                --with-cupsd-file-perm=0755 \
                --with-log-file-perm=0600 \
                --enable-acl \
-               --enable-ssl=yes \
                --enable-libpaper \
                --enable-debug \
                --enable-gssapi \
@@ -35,19 +36,18 @@ def setup():
                --enable-pam=yes \
                --enable-relro \
                --enable-browsing \
-               --enable-threads \
                --enable-raw-printing \
-               --with-tls=no \
-               --disable-launchd \
+               --with-tls=gnutls \
                --disable-libusb \
                --with-rcdir=no \
-               --libdir=/usr/lib \
+               --libdir=%s \
+               --with-pkgconfpath=%s/pkgconfig \
                --with-logdir=/var/log/cups \
                KRB5CONFIG=/usr/bin/krb5-config \
                --localstatedir=/var \
                --with-rundir=/run/cups \
                --with-xinetd=/etc/xinetd.d \
-              ' % get.CFLAGS()
+              ' % (get.CFLAGS(), Libdir, Libdir)
 
     if get.buildTYPE() == "emul32":
         options += '  \
@@ -57,8 +57,7 @@ def setup():
                      --disable-gssapi \
                      --disable-dbus \
                      --bindir=/usr/bin32 \
-                     --sbindir=/usr/sbin32 \
-                     --libdir=/usr/lib32'
+                     --sbindir=/usr/sbin32'
 
     else:
         options += " --with-dnssd=yes"
diff --git a/hardware/printer/cups/pspec.xml b/hardware/printer/cups/pspec.xml
index f1eb44ff2e..d459c7b382 100755
--- a/hardware/printer/cups/pspec.xml
+++ b/hardware/printer/cups/pspec.xml
@@ -18,6 +18,7 @@
             <Dependency>acl-devel</Dependency>
             <Dependency>pam-devel</Dependency>
             <Dependency>dbus-devel</Dependency>
+            <Dependency>gnutls-devel</Dependency>
             <Dependency>libpcre-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>python-devel</Dependency>
@@ -75,6 +76,7 @@
             <Dependency>libgcc</Dependency>
             <Dependency>libpaper</Dependency>
             <Dependency>avahi</Dependency>
+            <Dependency>gnutls</Dependency>
             <Dependency>e2fsprogs</Dependency>
             <Dependency>avahi-libs</Dependency>
             <Dependency>mit-kerberos</Dependency>
@@ -118,11 +120,15 @@
         <Name>cups-devel</Name>
         <Summary>Development files for cups</Summary>
         <RuntimeDependencies>
+            <Dependency>avahi-devel</Dependency>
+            <Dependency>gnutls-devel</Dependency>
             <Dependency release="current">cups</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="executable">/usr/bin/cups-config</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
         </Files>
     </Package>
 
@@ -133,12 +139,14 @@
         <BuildType>emul32</BuildType>
         <BuildDependencies>            
             <Dependency>zlib-32bit</Dependency>
+            <Dependency>gnutls-32bit</Dependency>
             <Dependency>openssl-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>            
             <Dependency>zlib-32bit</Dependency>
             <Dependency>openssl-32bit</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>gnutls-32bit</Dependency>
             <Dependency release="current">cups</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -148,6 +156,13 @@
     </Package>
 
     <History>
+        <Update release="21">
+            <Date>2022-07-05</Date>
+            <Version>2.4.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="20">
             <Date>2022-05-26</Date>
             <Version>2.4.2</Version>