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 @@
acl-devel
pam-devel
dbus-devel
+ gnutls-devel
libpcre-devel
zlib-devel
python-devel
@@ -75,6 +76,7 @@
libgcc
libpaper
avahi
+ gnutls
e2fsprogs
avahi-libs
mit-kerberos
@@ -118,11 +120,15 @@
cups-devel
Development files for cups
+ avahi-devel
+ gnutls-devel
cups
/usr/include
/usr/bin/cups-config
+ /usr/lib/pkgconfig
+ /usr/lib32/pkgconfig
@@ -133,12 +139,14 @@
emul32
zlib-32bit
+ gnutls-32bit
openssl-32bit
zlib-32bit
openssl-32bit
libgcc
+ gnutls-32bit
cups
@@ -148,6 +156,13 @@
+
+ 2022-07-05
+ 2.4.2
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2022-05-26
2.4.2