Rebuild package

.gitignore

@@ -0,0 +1,3 @@
+# Ignore BPM archives and signatures
+*.bpm
+*.bpm.sig

info.yml

@@ -1,20 +1,20 @@
 name: cups
 description: An open-source printing system
-version: 2.4.15
+version: 2.4.19
-revision: 1
+revision: 3
 url: https://openprinting.github.io/cups/
 license: Apache2 with LLVM-exception and BSD-3-Clause and Zlib and BSD-2-Clause
+maintainers:
+  - [email protected]
 architecture: any
 type: source
-keep:
-  - etc/cups/client.conf
-optional_depends:
-  - libusb
-  - xdg-utils
 make_depends:
   - acl
+  - avahi
+  - cups-filters
   - dbus
   - gnutls
+  - libpaper
   - libusb
   - pam
   - udev
@@ -22,23 +22,39 @@ downloads:
   - url: https://github.com/OpenPrinting/cups/releases/download/v${BPM_PKG_VERSION}/cups-${BPM_PKG_VERSION}-source.tar.gz
     extract_to: ${BPM_SOURCE}
     extract_strip_components: 1
-    checksum: eff0bbd48ff1abcbb8e46e28e85aefaffa391a1d9c4d8dc92ab3822a13008d7f
+    checksum: 820984b12a67f98705785aae2dd1347fe0ac097828001d4583ff64574aed6389
 split_packages:
   - name: cups
+    keep:
+      - etc/cups/client.conf
+      - etc/cups/cupsd.conf
+      - etc/cups/snmp.conf
+      - etc/cups/printers.conf
+      - etc/cups/classes.conf
+      - etc/cups/cups-files.conf
+      - etc/cups/subscriptions.conf
     depends:
       - acl
+      - avahi
+      - cups-filters
       - dbus
       - gcc-libs
       - glibc
       - gnutls
       - hicolor-icon-theme
       - libcups
+      - libpaper
       - sysusers
       - pam
       - udev
+    optional_depends:
+      - cups-browsed
+      - libusb
+      - xdg-utils
   - name: libcups
     description: Library and header files for the CUPS printing system
     depends:
+      - avahi
       - glibc
       - gnutls
       - zlib

post_update.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Exit if directory does not exist
+[ -d /etc/cups ] || exit 0
+
+# Fix ownership of files in /etc/cups
+[ `stat -c '%g' /etc/cups` != 209 ] && chown -R 0:209 /etc/cups
+
+# Ensure script exits cleanly
+exit 0

recipe.sh

@@ -1,4 +1,4 @@
-# This is the source.sh script. It is executed by BPM in a temporary directory when compiling a source package
+# This is the recipe.sh script. It is executed by BPM in a temporary directory when compiling a source package
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
@@ -7,7 +7,17 @@
 build() {
   sed -i 's#@CUPS_HTMLVIEW@#xdg-open#' desktop/cups.desktop.in
   
-  ./configure --libdir=/usr/lib --localstatedir=/var --disable-systemd --with-rundir=/run/cups
+  ./configure --libdir=/usr/lib       \
+              --localstatedir=/var    \
+              --with-rundir=/run/cups \
+              --with-cups-user=209    \
+              --with-cups-group=209   \
+              --with-optim="$CFLAGS" \
+              --with-tls=gnutls      \
+              --enable-pam           \
+              --enable-raw-printing  \
+              --enable-dbus=yes      \
+              --enable-relro
   make
 }
 
@@ -23,15 +33,21 @@ package_cups() {
   rm "$BPM_OUTPUT"/usr/bin/cups-config
 
   # Remove SysV files
-  rm -rf "$BPM_OUTPUT"/etc/rd*.d
+  rm -r "$BPM_OUTPUT"/etc/rc.d
-  rm -rf "$BPM_OUTPUT"/etc/init.d
+
+  # Fix unknown directive error
+  sed -i 's/^IdleExitTimeout/#&/' "$BPM_OUTPUT"/etc/cups/cupsd.conf
 
   # Create default cups client config
-  install -d "$BPM_OUTPUT"/etc/cups
+  echo "ServerName /run/cups/cups.sock" | install -Dm644 -g 209 /dev/stdin "$BPM_OUTPUT"/etc/cups/client.conf
-  echo "ServerName /run/cups/cups.sock" > "$BPM_OUTPUT"/etc/cups/client.conf
 
-  # Install sysusesrs
+  # Install sysusesrs and set user and group in config
   install -Dm644 "$BPM_WORKDIR"/sysusers "$BPM_OUTPUT"/usr/lib/sysusers.d/cups.conf
+  sed -i "s/#User 209/User 209/" "$BPM_OUTPUT"/etc/cups/cups-files.conf{,.default}
+  sed -i "s/#Group 209/Group 209/" "$BPM_OUTPUT"/etc/cups/cups-files.conf{,.default}
+
+  # Install pam configuration file
+  install -Dm644 "$BPM_WORKDIR"/cups-pam "$BPM_OUTPUT"/etc/pam.d/cups
 
   # Install ESVM service
   install -Dm644 "$BPM_WORKDIR"/cupsd.esv "$BPM_OUTPUT"/etc/esvm/services/cupsd.esv

source-files/cups-pam

@@ -0,0 +1,3 @@
+auth    include system-auth
+account include system-account
+session include system-session

source-files/sysusers

@@ -1 +1,2 @@
-u lp - "Print Service User" /var/spool/cups /bin/false
+u cups 209 "Cups helper user" /var/spool/cups /bin/false
+m cups lpadmin