From 0b977787374349328a21af0deade30d534cf3978 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 18 May 2022 23:40:38 +0100 Subject: fixed gcc loader/linker errors --- repo/system/cups/cups-no-export-ssllibs.patch | 10 +++++ repo/system/cups/cups.xibuild | 51 +++++++++++++++++++++++++ repo/system/cups/default-config-no-gssapi.patch | 29 ++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 repo/system/cups/cups-no-export-ssllibs.patch create mode 100644 repo/system/cups/cups.xibuild create mode 100644 repo/system/cups/default-config-no-gssapi.patch (limited to 'repo/system/cups') diff --git a/repo/system/cups/cups-no-export-ssllibs.patch b/repo/system/cups/cups-no-export-ssllibs.patch new file mode 100644 index 0000000..652fd6a --- /dev/null +++ b/repo/system/cups/cups-no-export-ssllibs.patch @@ -0,0 +1,10 @@ +diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-tls.m4 +--- cups-1.6.2/config-scripts/cups-tls.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 ++++ cups-1.6.2/config-scripts/cups-tls.m4 2011-05-23 17:47:27.000000000 +0200 +@@ -107,5 +107,5 @@ + AC_SUBST([TLSFLAGS]) + AC_SUBST([TLSLIBS]) + +-EXPORT_TLSLIBS="$TLSLIBS" ++EXPORT_TLSLIBS="" + AC_SUBST([EXPORT_TLSLIBS]) diff --git a/repo/system/cups/cups.xibuild b/repo/system/cups/cups.xibuild new file mode 100644 index 0000000..4ae9845 --- /dev/null +++ b/repo/system/cups/cups.xibuild @@ -0,0 +1,51 @@ +#!/bin/sh + +NAME="cups" +DESC="The CUPS Printing System" + +MAKEDEPS="make " +DEPS="sbase dbus libusb musl openssl poppler " + +PKG_VER=2.4.1 +SOURCE="https://github.com/OpenPrinting/cups/archive/v$PKG_VER.tar.gz" +ADDITIONAL="default-config-no-gssapi.patch cups-no-export-ssllibs.patch " + +prepare () { + apply_patches +} + +build () { + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-menudir=/usr/share/applications \ + --with-icondir=/usr/share/icons \ + --with-logdir=/var/log/cups \ + --with-docdir=/usr/share/cups \ + --with-rundir=/run/cups \ + --with-cupsd-file-perm=0755 \ + --with-cups-user=lp \ + --with-cups-group=lp \ + --with-system-groups=lpadmin \ + --with-domainsocket=/run/cups/cups.sock \ + --enable-libusb \ + --without-rcdir \ + --without-php \ + --disable-pam \ + --enable-raw-printing \ + --enable-dbus \ + --with-dbusdir=/usr/share/dbus-1 \ + --enable-libpaper \ + --enable-ssl=yes \ + --enable-gnutls \ + --disable-launchd \ + --with-optim="$CFLAGS" + + make +} + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/cups/default-config-no-gssapi.patch b/repo/system/cups/default-config-no-gssapi.patch new file mode 100644 index 0000000..54c75bc --- /dev/null +++ b/repo/system/cups/default-config-no-gssapi.patch @@ -0,0 +1,29 @@ +Upstream: Not applicable (local configuration) +Reason: Sets config defaults for Alpine + +--- a/conf/cupsd.conf.in ++++ b/conf/cupsd.conf.in +@@ -154,12 +154,12 @@ + + # Job-related operations must be done by the owner or an administrator... + +- AuthType Negotiate ++ AuthType Default + Order deny,allow + + + +- AuthType Negotiate ++ AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + +@@ -180,7 +180,7 @@ + + # Only the owner or an administrator can cancel or authenticate a job... + +- AuthType Negotiate ++ AuthType Default + Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ + Order deny,allow + -- cgit v1.2.1