Printer Driver Compatibility Survey (Spiral), Feb. 2025

app-admin/cups/autobuild/defines

@@ -26,4 +26,5 @@ RECONF=0
 # Note: Extra Provides for Spiral (Debian compatibility).
 PKGPROV="cups-bsd_spiral cups-client_spiral cups-common_spiral \
          cups-core-drivers_spiral cups-daemon_spiral cups-ipp-utils_spiral \
-         cups-ppdc_spiral cups-server-common_spiral"
+         cups-ppdc_spiral cups-server-common_spiral cupsys_spiral \
+         libcupsys2_spiral"

app-admin/cups/spec

@@ -1,4 +1,5 @@
 VER=2.4.11
+REL=1
 SRCS="git::commit=tags/v$VER::https://github.com/OpenPrinting/cups"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=380"

runtime-cryptography/beecrypt/autobuild/defines

@@ -0,0 +1,22 @@
+PKGNAME=beecrypt
+PKGSEC=libs
+PKGDEP="gcc-runtime"
+PKGDES="BeeCrypt cryptography library"
+
+# FIXME: Bindings are long since broken.
+#
+# rng-py.c:322:9: error: initialization of 'void (*)(void *)' from incompatible pointer type 'void (*)(PyObject *)' {aka 'void (*)(struct _object *)'} [-Wincompatible-pointer-types]
+#   322 |         (destructor) rng_free,          /* tp_free */
+#       |         ^
+# rng-py.c:322:9: note: (near initialization for 'rng_Type.tp_free')
+# make[3]: *** [Makefile:402: rng-py.lo] Error 1
+# make[3]: *** Waiting for unfinished jobs....
+# mpw-py.c:2341:9: error: initialization of 'void (*)(void *)' from incompatible pointer type 'void (*)(PyObject *)' {aka 'void (*)(struct _object *)'} [-Wincompatible-pointer-types]
+#  2341 |         (destructor) mpw_free,          /* tp_free */
+#       |         ^
+# mpw-py.c:2341:9: note: (near initialization for 'mpw_Type.tp_free')
+AUTOTOOLS_AFTER=(
+    '--with-python=no'
+)
+
+PKGPROV="libbeecrypt7_spiral libbeecrypt-dev_spiral"

runtime-cryptography/beecrypt/autobuild/patches/0001-UBUNTU-fix-wrong-debug-output-on-64-bit.patch

@@ -0,0 +1,156 @@
+From 01afc7f17b2a44adc02290aaac400778c080dfaf Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <[email protected]>
+Date: Sat, 17 Sep 2011 19:45:38 +0200
+Subject: [PATCH 1/4] UBUNTU: fix wrong debug output on 64 bit
+
+From Ubuntu: beecrypt 4.2.1-4
+
+Signed-off-by: Mingcong Bai <[email protected]>
+---
+ python/mpw-py.c | 30 +++++++++++++++---------------
+ python/rng-py.c |  4 ++--
+ 2 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/python/mpw-py.c b/python/mpw-py.c
+index a833bbf..edb872f 100644
+--- a/python/mpw-py.c
++++ b/python/mpw-py.c
+@@ -332,7 +332,7 @@ static void prtmpw(const char * msg, mpwObject * x)
+ 	/*@global stderr, fileSystem @*/
+ 	/*@modifies stderr, fileSystem @*/
+ {
+-fprintf(stderr, "%5.5s %p[%d]:\t", msg, MPW_DATA(x), MPW_SIZE(x)), mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x));
++fprintf(stderr, "%5.5s %p[%lu]:\t", msg, MPW_DATA(x), (long int)(MPW_SIZE(x))), mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x));
+ }
+
+ static size_t
+@@ -354,7 +354,7 @@ mpsizeinbase(size_t xsize, mpw* xdata, size_t base)
+ 	res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1;
+     }
+ if (_mpw_debug < -1)
+-fprintf(stderr, "*** mpsizeinbase(%p[%d], %d) res %u\n", xdata, xsize, base, (unsigned)res);
++fprintf(stderr, "*** mpsizeinbase(%p[%lu], %lu) res %u\n", xdata, (unsigned long)xsize, (unsigned long)base, (unsigned)res);
+     return res;
+ }
+
+@@ -408,7 +408,7 @@ mpstr(char * t, size_t nt, size_t size, mpw* data, mpw base)
+     size_t result;
+
+ if (_mpw_debug < -1)
+-fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, data, size, base), mpfprintln(stderr, size, data);
++fprintf(stderr, "*** mpstr(%p[%lu], %p[%lu], %d):\t", t, (unsigned long)nt, data, (unsigned long)size, base), mpfprintln(stderr, size, data);
+
+     mpsetx(asize, adata, size, data);
+
+@@ -418,8 +418,8 @@ fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, data, size, base), mp
+ 	mpndivmod(zdata, asize, adata, 1, &base, wksp);
+
+ if (_mpw_debug < -1) {
+-fprintf(stderr, "    a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize, adata);
+-fprintf(stderr, "    z %p[%d]:\t", zdata, asize+1), mpfprintln(stderr, asize+1, zdata);
++fprintf(stderr, "    a %p[%lu]:\t", adata, (unsigned long)asize), mpfprintln(stderr, asize, adata);
++fprintf(stderr, "    z %p[%lu]:\t", zdata, (unsigned long)(asize+1)), mpfprintln(stderr, asize+1, zdata);
+ }
+ 	result = zdata[asize];
+ 	t[nt] = bchars[result];
+@@ -461,7 +461,7 @@ mpw_format(mpwObject * z, size_t base, int addL)
+     }
+
+ if (_mpw_debug < -1)
+-fprintf(stderr, "*** mpw_format(%p,%d,%d):\t", z, base, addL), mpfprintln(stderr, zsize, zdata);
++fprintf(stderr, "*** mpw_format(%p,%lu,%d):\t", z, (unsigned long)base, addL), mpfprintln(stderr, zsize, zdata);
+
+     assert(base >= 2 && base <= 36);
+
+@@ -812,7 +812,7 @@ static void mpnpow_w(mpnumber* n, size_t xsize, const mpw* xdata,
+     size = MP_ROUND_B2W(15 * xbits);
+
+ if (_mpw_debug < 0)
+-fprintf(stderr, "*** pbits %d xbits %d nsize %d size %d\n", pbits, xbits, nsize, size);
++fprintf(stderr, "*** pbits %lu xbits %lu nsize %lu size %lu\n", (unsigned long)pbits, (unsigned long)xbits, (unsigned long)nsize, (unsigned long)size);
+     mpnsize(n, nsize);
+
+     /* 1. Precompute odd powers of x (up to 2**K). */
+@@ -1588,7 +1588,7 @@ fprintf(stderr, "sub ++: borrow\n");
+     }
+
+ if (_mpw_debug)
+-fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** mpw_%s %p[%lu]\t", fname, MPW_DATA(z), (unsigned long)MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+ exit:
+     mpbfree(&b);
+@@ -1667,7 +1667,7 @@ prtmpw("c", m);
+     z = mpw_FromMPW(zsize, zdata, 1);
+
+ if (_mpw_debug < 0)
+-fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** mpw_%s %p[%lu]\t", fname, MPW_DATA(z), (unsigned long)(MPW_SIZE(z))), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+ exit:
+     mpbfree(&b);
+@@ -1949,9 +1949,9 @@ mpw_divmod(PyObject * v, PyObject * w)
+     mpndivmod(zdata, asize, adata, bsize, bdata, wksp);
+
+ if (_mpw_debug < 0) {
+-fprintf(stderr, "    a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize, adata);
+-fprintf(stderr, "    b %p[%d]:\t", bdata, bsize), mpfprintln(stderr, bsize, bdata);
+-fprintf(stderr, "    z %p[%d]:\t", zdata, zsize), mpfprintln(stderr, zsize, zdata);
++fprintf(stderr, "    a %p[%lu]:\t", adata, (unsigned long)asize), mpfprintln(stderr, asize, adata);
++fprintf(stderr, "    b %p[%lu]:\t", bdata, (unsigned long)bsize), mpfprintln(stderr, bsize, bdata);
++fprintf(stderr, "    z %p[%lu]:\t", zdata, (unsigned long)zsize), mpfprintln(stderr, zsize, zdata);
+ }
+
+     zsize -= bsize;
+@@ -2026,7 +2026,7 @@ mpw_neg(mpwObject * a)
+     }
+
+ if (z != NULL && _mpw_debug)
+-fprintf(stderr, "*** mpw_neg %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** mpw_neg %p[%lu]\t", MPW_DATA(z), (unsigned long)(MPW_SIZE(z))), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+     return (PyObject *)z;
+ }
+@@ -2044,7 +2044,7 @@ mpw_pos(mpwObject * a)
+ 	z = mpw_Copy(a);
+
+ if (z != NULL && _mpw_debug)
+-fprintf(stderr, "*** mpw_pos %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** mpw_pos %p[%lu]\t", MPW_DATA(z), (unsigned long)MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+     return (PyObject *)z;
+ }
+@@ -2061,7 +2061,7 @@ mpw_abs(mpwObject * a)
+ 	z = (mpwObject *)mpw_pos(a);
+
+ if (z != NULL && _mpw_debug)
+-fprintf(stderr, "*** mpw_abs %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** mpw_abs %p[%lu]\t", MPW_DATA(z), (unsigned long)(MPW_SIZE(z))), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+     return (PyObject *)z;
+ }
+diff --git a/python/rng-py.c b/python/rng-py.c
+index 6252ede..a59d2d7 100644
+--- a/python/rng-py.c
++++ b/python/rng-py.c
+@@ -199,7 +199,7 @@ rng_Next(rngObject * s, PyObject * args)
+     }
+
+ if (_rng_debug)
+-fprintf(stderr, "*** rng_Next(%p) %p[%d]\t", s, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** rng_Next(%p) %p[%lu]\t", s, MPW_DATA(z), (unsigned long)(MPW_SIZE(z))), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+     return (PyObject *)z;
+ }
+@@ -236,7 +236,7 @@ rng_Prime(rngObject * s, PyObject * args)
+
+     z = mpw_FromMPW(b->size, b->modl, 1);
+ if (z != NULL && _rng_debug)
+-fprintf(stderr, "*** rng_Prime(%p) %p[%d]\t", s, MPW_DATA(z), MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
++fprintf(stderr, "*** rng_Prime(%p) %p[%lu]\t", s, MPW_DATA(z), (unsigned long)(MPW_SIZE(z))), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+
+     return (PyObject *)z;
+ }
+-- 
+2.48.1
+

runtime-cryptography/beecrypt/autobuild/patches/0002-FEDORA-Fixes-for-C99-conformance-issues.patch

@@ -0,0 +1,82 @@
+From d7b6b953c7cf26d52999b827034ab48395e42a9c Mon Sep 17 00:00:00 2001
+From: Mingcong Bai <[email protected]>
+Date: Thu, 13 Feb 2025 18:31:02 +0800
+Subject: [PATCH 2/4] FEDORA: Fixes for C99 conformance issues
+
+https://fedoraproject.org/wiki/Toolchain/PortingToModernC
+
+Signed-off-by: Peter Fordham <[email protected]>
+
+Link: https://src.fedoraproject.org/rpms/beecrypt/blob/c063d876b3ac038ba1a624cd9dc0b96bff4ebef0/f/beecrypt-4.2.1-autoconf-c99.patch
+Signed-off-by: Mingcong Bai <[email protected]>
+---
+ acinclude.m4 | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 7df3867..2e0a41c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -320,6 +320,9 @@ EOF
+             #if HAVE_FCNTL_H
+             # include <fcntl.h>
+             #endif
++            #if HAVE_TIME_H
++            # include <time.h>
++            #endif
+             #if HAVE_STRING_H
+             # include <string.h>
+             #endif
+@@ -338,7 +341,7 @@ EOF
+               int i, rc, fd = open("conftest.aio", O_RDONLY);
+
+               if (fd < 0)
+-                exit(1);
++                return 1;
+
+               memset(&a, 0, sizeof(struct aiocb));
+
+@@ -355,7 +358,7 @@ EOF
+               if (aio_read(&a) < 0)
+               {
+                 perror("aio_read");
+-                exit(1);
++                return 1;
+               }
+               if (aio_suspend(&a_list, 1, &a_timeout) < 0)
+               {
+@@ -368,25 +371,25 @@ EOF
+                   if (aio_suspend(&a_list, 1, &a_timeout) < 0)
+                   {
+                     perror("aio_suspend");
+-                    exit(1);
++                    return 1;
+                   }
+                 }
+                 else
+                 {
+                   perror("aio_suspend");
+-                  exit(1);
++                  return 1;
+                 }
+                 #else
+-                exit(1);
++                return 1;
+                 #endif
+               }
+               if (aio_error(&a) < 0)
+-                exit(1);
++                return 1;
+
+               if (aio_return(&a) < 0)
+-                exit(1);
++                return 1;
+
+-              exit(0);
++              return 0;
+           ]])],[bc_cv_working_aio=yes],[bc_cv_working_aio=no],[
+             case $target_os in
+               linux* | solaris*)
+-- 
+2.48.1
+

runtime-cryptography/beecrypt/autobuild/patches/0003-FEDORA-Fixes-for-C99-conformance-issues.patch

@@ -0,0 +1,30 @@
+From e11d52fbe0e19caec16ccedb32a991bdf0e7e197 Mon Sep 17 00:00:00 2001
+From: Mingcong Bai <[email protected]>
+Date: Thu, 13 Feb 2025 18:33:23 +0800
+Subject: [PATCH 3/4] FEDORA: Fixes for C99 conformance issues
+
+https://fedoraproject.org/wiki/Toolchain/PortingToModernC
+
+Signed-off-by: Peter Fordham <[email protected]>
+
+Link: https://src.fedoraproject.org/rpms/beecrypt/blob/c063d876b3ac038ba1a624cd9dc0b96bff4ebef0/f/beecrypt-4.2.1-c99.patch
+Signed-off-by: Mingcong Bai <[email protected]>
+---
+ blockmode.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/blockmode.c b/blockmode.c
+index 46d1fde..9998c23 100644
+--- a/blockmode.c
++++ b/blockmode.c
+@@ -29,6 +29,7 @@
+ # include "config.h"
+ #endif
+
++#include "beecrypt/endianness.h"
+ #include "beecrypt/blockmode.h"
+
+ int blockEncryptECB(const blockCipher* bc, blockCipherParam* bp, uint32_t* dst, const uint32_t* src, unsigned int nblocks)
+-- 
+2.48.1
+

runtime-cryptography/beecrypt/autobuild/patches/0004-FEDORA-disable-broken-C-bindings.patch

@@ -0,0 +1,36 @@
+From 3496d35fb4f94538c860e035a7d9920a8925e11b Mon Sep 17 00:00:00 2001
+From: Mingcong Bai <[email protected]>
+Date: Thu, 13 Feb 2025 18:37:54 +0800
+Subject: [PATCH 4/4] FEDORA: disable broken C++ bindings
+
+Patch by Robert Scheck <[email protected]> for beecrypt >= 4.2.1 to
+avoid linking against libstdc++. This patch is based on an old by Florian
+La Roche <[email protected]> and Panu Matilainen <[email protected]>.
+
+For further information see Red Hat Bugzilla for bug ID #165080.
+
+Signed-off-by: Robert Scheck <[email protected]>
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=165080
+Link: https://src.fedoraproject.org/rpms/beecrypt/blob/7d7dad0a6ecb5aea44fce515f6931a941d6397ff/f/beecrypt-4.2.1-no-c++.patch
+Signed-off-by: Mingcong Bai <[email protected]>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b7e7869..b08bec8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,7 +62,7 @@ BEECRYPT_OBJECTS = aes.lo base64.lo beecrypt.lo blockmode.lo blockpad.lo blowfis
+
+ lib_LTLIBRARIES = libbeecrypt.la
+
+-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx
++libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c # cppglue.cxx
+ libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
+ libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS)
+ libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
+-- 
+2.48.1
+

runtime-cryptography/beecrypt/spec

@@ -0,0 +1,4 @@
+VER=4.2.1
+SRCS="tbl::https://sourceforge.net/projects/beecrypt/files/beecrypt/$VER/beecrypt-$VER.tar.gz/download"
+CHKSUMS="sha256::286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
+CHKUPDATE="anitya::id=174"

runtime-imaging/jbigkit/autobuild/build

@@ -1,20 +1,27 @@
-unset CPPFLAGS
+abinfo "Building jbigkit ..."
+make \
+    CC="gcc ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 
-make CC="gcc ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+abinfo "Installing runtime libraries ..."
+install -Dvm755 "$SRCDIR"/libjbig/libjbig*.so* \
+    -t "$PKGDIR"/usr/lib/
 
-install -D -m644 libjbig/libjbig.a "$PKGDIR"/usr/lib/libjbig.a
-install -D -m644 libjbig/libjbig85.a "$PKGDIR"/usr/lib/libjbig85.a
-install -D -m644 libjbig/jbig.h "$PKGDIR"/usr/include/jbig.h
-install -D -m644 libjbig/jbig_ar.h "$PKGDIR"/usr/include/jbig_ar.h
-install -D -m644 libjbig/jbig85.h "$PKGDIR"/usr/include/jbig85.h
+abinfo "Installing headers ..."
+install -Dvm644 \
+    "$SRCDIR"/libjbig/jbig.h \
+    "$SRCDIR"/libjbig/jbig_ar.h \
+    "$SRCDIR"/libjbig/jbig85.h \
+    -t "$PKGDIR"/usr/include/
 
-install -d -m755 "$PKGDIR"/usr/share/man/man1
-install -d -m755 "$PKGDIR"/usr/share/man/man5
-install -m644 pbmtools/*.1* "$PKGDIR"/usr/share/man/man1
-install -m644 pbmtools/*.5* "$PKGDIR"/usr/share/man/man5
-
-install -D -m755 pbmtools/jbgtopbm "$PKGDIR"/usr/bin/jbgtopbm
-install -D -m755 pbmtools/pbmtojbg "$PKGDIR"/usr/bin/pbmtojbg
-install -D -m755 pbmtools/jbgtopbm85 "$PKGDIR"/usr/bin/jbgtopbm85
-install -D -m755 pbmtools/pbmtojbg85 "$PKGDIR"/usr/bin/pbmtojbg85
+abinfo "Installing man pages ..."
+install -Dvm644 "$SRCDIR"/pbmtools/*.1* \
+    -t "$PKGDIR"/usr/share/man/man1/
+install -Dvm644 "$SRCDIR"/pbmtools/*.5* \
+    -t "$PKGDIR"/usr/share/man/man5/
 
+abinfo "Installing executables ..."
+for i in jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85; do
+    abinfo "Installing executable: $i ..."
+    install -Dvm755 "$SRCDIR"/pbmtools/$i \
+        "$PKGDIR"/usr/bin/$i
+done