lfs/BMLFS
1
0
Fork 0
mirror of https://github.com/dslm4515/BMLFS.git synced 2025-07-25 17:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded CUPS from 2.4.1 to 2.4.2

Browse Source
This commit is contained in:
dslm4515
2023-03-26 19:07:09 -05:00
parent c0a16a2e1b
commit 4b2656f2d1
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build-scripts/cups.build
View File

@ -1,7 +1,7 @@
#! /bin/bash
# CUPS
# Source: https://github.com/OpenPrinting/cups/releases/download/v2.4.1/cups-2.4.1-source.tar.gz
# Source: https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz
#
# $BUILD = Directory to temporarily install
# $PKGS = Directory to store built packages
@ -12,26 +12,24 @@
# Optional: Avahi, libpaper, MIIT Kerberos, OpenJDK, PHP, Python2
# Optional: Gutenprint(post-install)
#patch -Np1 -i ../patches/cups-alpine/cups-no-export-ssllibs.patch
patch -Np1 -i ../patches/cups-alpine/default-config-no-gssapi.patch
#patch -Np1 -i ../patches/cups-alpine/cups-nostrip.patch
patch -Np1 -i ../patches/cups-chimera/cups-tlslibs-no-export.patch
sudo -S useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp &&
sudo -S groupadd -g 19 lpadmin &&
sed -i '/stat.h/a #include <asm-generic/ioctls.h>' tools/ipptool.c &&
#sed -i '/stat.h/a #include <asm-generic/ioctls.h>' tools/ipptool.c &&
CC=gcc CXX=g++ \
./configure --libdir=/usr/lib \
--disable-systemd \
--without-systemd \
--with-rcdir=/tmp/cupsinit \
--with-system-groups=lpadmin \
--with-docdir=/usr/share/cups/doc-2.4.1 $BUILDTRUPLE &&
--with-docdir=/usr/share/cups/doc-2.4.2 $BUILDTRUPLE &&
read -p "Compile?" && make -j2 &&
sudo -S make DESTDIR=$BUILD install &&
#sudo -S rm -rf /tmp/cupsinit &&
sudo -S mkdir -pv ${BUILD}/usr/share/doc &&
sudo -S ln -svnf ../cups/doc-2.4.1 ${BUILD}/usr/share/doc/cups-2.4.1 &&
sudo -S ln -svnf ../cups/doc-2.4.2 ${BUILD}/usr/share/doc/cups-2.4.2 &&
echo "ServerName /run/cups/cups.sock" > /tmp/client.conf &&
sudo -S mkdir -pv ${BUILD}/etc/cups &&
sudo -S mv -v /tmp/client.conf ${BUILD}/etc/cups/client.conf &&
@ -66,14 +64,14 @@ EOF
sudo -S mv -v /tmp/slack-desc install/ &&
sudo -S rm -rvf usr/share/cups/banners/* \
usr/share/cups/data/testprint &&
sudo -S makepkg -l y -c n $PKGS/cups-2.4.1-$(uname -m)-mlfs.txz &&
sudo -S makepkg -l y -c n $PKGS/cups-2.4.2-$PSUFFIX &&
cp -v install/doinst.sh /tmp/ &&
cat >> /tmp/doinst.sh << "EOF"
useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp
groupadd -g 19 lpadmin
EOF
sudo -S mv -v /tmp/doinst.sh install/ &&
sudo -S makepkg -l y -c n $PKGS/cups-2.4.1-$(uname -m)-mlfs.txz &&
sudo -S makepkg -l y -c n $PKGS/cups-2.4.2-$PSUFFIX &&
cd /BMAN
cat > /tmp/slack-desc << "EOF"
cups-doc: Manuals for CUPS (Common UNIX Printing System)
@ -85,6 +83,6 @@ cups-doc: PostScript and raster printers
cups-doc:
EOF
sudo -S mv -v /tmp/slack-desc install/ &&
sudo -S makepkg -l y -c n $PKGS/cups-doc-2.4.1-noarch-mlfs.txz
sudo -S makepkg -l y -c n $PKGS/cups-doc-2.4.2-$NOPUSFFIX
sudo -S rm -rf /BMAN/*
sudo -S rm -rf ${BUILD}/*

11
patches/cups-chimera/cups-tlslibs-no-export.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/configure
+++ b/configure
@@ -9952,7 +9952,7 @@ fi
-EXPORT_TLSLIBS="$TLSLIBS"
+EXPORT_TLSLIBS=""