Browse Source

[trunk] -> [extra] 'cups-2.3.0-4' add

master
artoo 3 months ago
parent
commit
f6e5128dfa
Signed by: artoo <artoo@artixlinux.org> GPG Key ID: 3292CD0BB0DB310B
4 changed files with 154 additions and 72 deletions
  1. +40
    -36
      cups/repos/extra-x86_64/PKGBUILD
  2. +37
    -0
      cups/repos/extra-x86_64/cups-systemd-socket.patch
  3. +40
    -36
      cups/trunk/PKGBUILD
  4. +37
    -0
      cups/trunk/cups-systemd-socket.patch

+ 40
- 36
cups/repos/extra-x86_64/PKGBUILD View File

@@ -3,7 +3,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=2.3.0
pkgrel=3
pkgrel=4
arch=('x86_64')
license=('Apache' 'custom')
url="https://www.cups.org/"
@@ -33,16 +33,18 @@ validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <m

prepare() {

cd ${pkgbase}-${pkgver}
cd "${pkgbase}"-${pkgver}

# improve build and linking
# Do not export SSL libs in cups-config
patch -Np1 -i ${srcdir}/cups-no-export-ssllibs.patch
patch -Np1 -i "${srcdir}"/cups-no-export-ssllibs.patch
# move /var/run -> /run for pid file
patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch

# bug fixes

# FS#56818 - https://github.com/apple/cups/issues/5236
patch -Np1 -i ${srcdir}/guid.patch
patch -Np1 -i "${srcdir}"/guid.patch

# set MaxLogSize to 0 to prevent using cups internal log rotation
sed -i -e '5i\ ' conf/cupsd.conf.in
@@ -55,7 +57,7 @@ prepare() {
}

build() {
cd ${pkgbase}-${pkgver}
cd "${pkgbase}"-${pkgver}

# use fixed cups user (id 209) since sysusers adds "lp" group without a fixed id
./configure --prefix=/usr \
@@ -73,6 +75,7 @@ build() {
--enable-dbus=yes \
--with-dbusdir=/usr/share/dbus-1 \
--enable-ssl=yes \
--enable-relro \
--enable-threads \
--enable-avahi\
--enable-libpaper \
@@ -83,7 +86,7 @@ build() {
}

check() {
cd ${pkgbase}-${pkgver}
cd "${pkgbase}"-${pkgver}
#make -k check || /bin/true
}

@@ -92,10 +95,10 @@ pkgdesc="The CUPS Printing System - client libraries and headers"
depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')

cd ${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-headers install-libs
make BUILDROOT="${pkgdir}" install-headers install-libs
# put this into the libs pkg to make other software find the libs(no pkg-config file included)
mkdir -p ${pkgdir}/usr/bin
install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
mkdir -p "${pkgdir}"/usr/bin
install -m755 "${srcdir}"/"${pkgbase}"-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config

# add license + exception
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
@@ -115,57 +118,58 @@ backup=(etc/cups/cupsd.conf
depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc'
'dbus' 'eudev' 'libpaper' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support'
'colord: for ICC color profile support')
'colord: for ICC color profile support'
'logrotate: for logfile rotation support')

cd ${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-data install-exec
cd "${pkgbase}"-${pkgver}
make BUILDROOT="${pkgdir}" install-data install-exec

# this one we ship in the libcups pkg
rm -f ${pkgdir}/usr/bin/cups-config
rm -f "${pkgdir}"/usr/bin/cups-config

# kill the sysv stuff
rm -rf ${pkgdir}/etc/rc*.d
rm -rf ${pkgdir}/etc/init.d
install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
rm -rf "${pkgdir}"/etc/rc*.d
rm -rf "${pkgdir}"/etc/init.d
install -D -m644 ../cups.logrotate "${pkgdir}"/etc/logrotate.d/cups
install -D -m644 ../cups.pam "${pkgdir}"/etc/pam.d/cups

# fix perms on /var/spool and /etc
chmod 755 ${pkgdir}/var/spool
chmod 755 ${pkgdir}/etc
chmod 755 "${pkgdir}"/var/spool
chmod 755 "${pkgdir}"/etc

# use cups group FS#36769
install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
sed -i "s:#User 209:User 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
sed -i "s:#Group 209:Group 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
sed -i "s:#User 209:User 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
sed -i "s:#Group 209:Group 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}

# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g 209 ${pkgdir}/etc/cups/ssl
install -dm700 -g 209 "${pkgdir}"/etc/cups/ssl
# remove directory from package, it will be recreated at each server start
rm -rf ${pkgdir}/run
rm -rf "${pkgdir}"/run

# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
touch ${pkgdir}/etc/cups/classes.conf
touch ${pkgdir}/etc/cups/subscriptions.conf
chgrp -R 209 ${pkgdir}/etc/cups
touch "${pkgdir}"/etc/cups/printers.conf
touch "${pkgdir}"/etc/cups/classes.conf
touch "${pkgdir}"/etc/cups/subscriptions.conf
chgrp -R 209 "${pkgdir}"/etc/cups

# fix dbus policy location - --with-dbusdir doens't work
install -dm755 ${pkgdir}/usr/share/dbus-1/system.d
mv ${pkgdir}/etc/dbus-1/system.d/cups.conf ${pkgdir}/usr/share/dbus-1/system.d
rm -rf ${pkgdir}/etc/dbus-1
install -dm755 "${pkgdir}"/usr/share/dbus-1/system.d
mv "${pkgdir}"/etc/dbus-1/system.d/cups.conf "${pkgdir}"/usr/share/dbus-1/system.d
rm -rf "${pkgdir}"/etc/dbus-1

# fix .desktop file
sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' "${pkgdir}"/usr/share/applications/cups.desktop

# compress some driver files, adopted from Fedora
find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
find "${pkgdir}"/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f

# remove client.conf man page
rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
rm -f "${pkgdir}"/usr/share/man/man5/client.conf.5

# comment out all conversion rules which use any of the removed filters that are now part of cups-filters
perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' "$pkgdir"/usr/share/cups/mime/mime.convs

# comment out unnecessary PageLogFormat entry
sed -i -e 's:PageLogFormat:#PageLogFormat:' $pkgdir/etc/cups/cupsd.conf*
sed -i -e 's:PageLogFormat:#PageLogFormat:' "$pkgdir"/etc/cups/cupsd.conf*
}

+ 37
- 0
cups/repos/extra-x86_64/cups-systemd-socket.patch View File

@@ -0,0 +1,37 @@
diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
--- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
+++ cups-2.0.2/scheduler/main.c 2015-02-10 13:40:24.295545063 +0100
@@ -690,8 +690,15 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_ONDEMAND)
if (OnDemand)
+ {
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
- else
+# ifdef HAVE_SYSTEMD
+ sd_notifyf(0, "READY=1\n"
+ "STATUS=Scheduler is running...\n"
+ "MAINPID=%lu",
+ (unsigned long) getpid());
+# endif /* HAVE_SYSTEMD */
+ } else
#endif /* HAVE_ONDEMAND */
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
--- cups-2.3.0/scheduler/org.cups.cupsd.service.in 2019-08-23 17:19:38.000000000 +0200
+++ cups-2.3.0/scheduler/org.cups.cupsd.service.in.new 2019-08-25 20:20:25.805339727 +0200
@@ -1,11 +1,11 @@
[Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)
-After=sssd.service
+After=sssd.service network.target
[Service]
ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
Restart=on-failure
[Install]

+ 40
- 36
cups/trunk/PKGBUILD View File

@@ -3,7 +3,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=2.3.0
pkgrel=3
pkgrel=4
arch=('x86_64')
license=('Apache' 'custom')
url="https://www.cups.org/"
@@ -33,16 +33,18 @@ validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <m

prepare() {

cd ${pkgbase}-${pkgver}
cd "${pkgbase}"-${pkgver}

# improve build and linking
# Do not export SSL libs in cups-config
patch -Np1 -i ${srcdir}/cups-no-export-ssllibs.patch
patch -Np1 -i "${srcdir}"/cups-no-export-ssllibs.patch
# move /var/run -> /run for pid file
patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch

# bug fixes

# FS#56818 - https://github.com/apple/cups/issues/5236
patch -Np1 -i ${srcdir}/guid.patch
patch -Np1 -i "${srcdir}"/guid.patch

# set MaxLogSize to 0 to prevent using cups internal log rotation
sed -i -e '5i\ ' conf/cupsd.conf.in
@@ -55,7 +57,7 @@ prepare() {
}

build() {
cd ${pkgbase}-${pkgver}
cd "${pkgbase}"-${pkgver}

# use fixed cups user (id 209) since sysusers adds "lp" group without a fixed id
./configure --prefix=/usr \
@@ -73,6 +75,7 @@ build() {
--enable-dbus=yes \
--with-dbusdir=/usr/share/dbus-1 \
--enable-ssl=yes \
--enable-relro \
--enable-threads \
--enable-avahi\
--enable-libpaper \
@@ -83,7 +86,7 @@ build() {
}

check() {
cd ${pkgbase}-${pkgver}
cd "${pkgbase}"-${pkgver}
#make -k check || /bin/true
}

@@ -92,10 +95,10 @@ pkgdesc="The CUPS Printing System - client libraries and headers"
depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')

cd ${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-headers install-libs
make BUILDROOT="${pkgdir}" install-headers install-libs
# put this into the libs pkg to make other software find the libs(no pkg-config file included)
mkdir -p ${pkgdir}/usr/bin
install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
mkdir -p "${pkgdir}"/usr/bin
install -m755 "${srcdir}"/"${pkgbase}"-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config

# add license + exception
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
@@ -115,57 +118,58 @@ backup=(etc/cups/cupsd.conf
depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc'
'dbus' 'eudev' 'libpaper' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support'
'colord: for ICC color profile support')
'colord: for ICC color profile support'
'logrotate: for logfile rotation support')

cd ${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-data install-exec
cd "${pkgbase}"-${pkgver}
make BUILDROOT="${pkgdir}" install-data install-exec

# this one we ship in the libcups pkg
rm -f ${pkgdir}/usr/bin/cups-config
rm -f "${pkgdir}"/usr/bin/cups-config

# kill the sysv stuff
rm -rf ${pkgdir}/etc/rc*.d
rm -rf ${pkgdir}/etc/init.d
install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
rm -rf "${pkgdir}"/etc/rc*.d
rm -rf "${pkgdir}"/etc/init.d
install -D -m644 ../cups.logrotate "${pkgdir}"/etc/logrotate.d/cups
install -D -m644 ../cups.pam "${pkgdir}"/etc/pam.d/cups

# fix perms on /var/spool and /etc
chmod 755 ${pkgdir}/var/spool
chmod 755 ${pkgdir}/etc
chmod 755 "${pkgdir}"/var/spool
chmod 755 "${pkgdir}"/etc

# use cups group FS#36769
install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
sed -i "s:#User 209:User 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
sed -i "s:#Group 209:Group 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
sed -i "s:#User 209:User 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
sed -i "s:#Group 209:Group 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}

# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g 209 ${pkgdir}/etc/cups/ssl
install -dm700 -g 209 "${pkgdir}"/etc/cups/ssl
# remove directory from package, it will be recreated at each server start
rm -rf ${pkgdir}/run
rm -rf "${pkgdir}"/run

# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
touch ${pkgdir}/etc/cups/classes.conf
touch ${pkgdir}/etc/cups/subscriptions.conf
chgrp -R 209 ${pkgdir}/etc/cups
touch "${pkgdir}"/etc/cups/printers.conf
touch "${pkgdir}"/etc/cups/classes.conf
touch "${pkgdir}"/etc/cups/subscriptions.conf
chgrp -R 209 "${pkgdir}"/etc/cups

# fix dbus policy location - --with-dbusdir doens't work
install -dm755 ${pkgdir}/usr/share/dbus-1/system.d
mv ${pkgdir}/etc/dbus-1/system.d/cups.conf ${pkgdir}/usr/share/dbus-1/system.d
rm -rf ${pkgdir}/etc/dbus-1
install -dm755 "${pkgdir}"/usr/share/dbus-1/system.d
mv "${pkgdir}"/etc/dbus-1/system.d/cups.conf "${pkgdir}"/usr/share/dbus-1/system.d
rm -rf "${pkgdir}"/etc/dbus-1

# fix .desktop file
sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' "${pkgdir}"/usr/share/applications/cups.desktop

# compress some driver files, adopted from Fedora
find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
find "${pkgdir}"/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f

# remove client.conf man page
rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
rm -f "${pkgdir}"/usr/share/man/man5/client.conf.5

# comment out all conversion rules which use any of the removed filters that are now part of cups-filters
perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' "$pkgdir"/usr/share/cups/mime/mime.convs

# comment out unnecessary PageLogFormat entry
sed -i -e 's:PageLogFormat:#PageLogFormat:' $pkgdir/etc/cups/cupsd.conf*
sed -i -e 's:PageLogFormat:#PageLogFormat:' "$pkgdir"/etc/cups/cupsd.conf*
}

+ 37
- 0
cups/trunk/cups-systemd-socket.patch View File

@@ -0,0 +1,37 @@
diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
--- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
+++ cups-2.0.2/scheduler/main.c 2015-02-10 13:40:24.295545063 +0100
@@ -690,8 +690,15 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_ONDEMAND)
if (OnDemand)
+ {
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
- else
+# ifdef HAVE_SYSTEMD
+ sd_notifyf(0, "READY=1\n"
+ "STATUS=Scheduler is running...\n"
+ "MAINPID=%lu",
+ (unsigned long) getpid());
+# endif /* HAVE_SYSTEMD */
+ } else
#endif /* HAVE_ONDEMAND */
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
--- cups-2.3.0/scheduler/org.cups.cupsd.service.in 2019-08-23 17:19:38.000000000 +0200
+++ cups-2.3.0/scheduler/org.cups.cupsd.service.in.new 2019-08-25 20:20:25.805339727 +0200
@@ -1,11 +1,11 @@
[Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)
-After=sssd.service
+After=sssd.service network.target
[Service]
ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
Restart=on-failure
[Install]

Loading…
Cancel
Save