commit 7e3e04aee2caef6c82960aad53a61034c8405891 Author: Juergen Daubert <jue@jue.li> Date: Sun Feb 20 16:32:18 2022 +0100 cups: move rundir to /run/cups diff --git a/cups/.footprint b/cups/.footprint index 4eeac288d..0b63082b5 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -421,9 +421,6 @@ drwxrwx--- root/lp var/cache/cups/ drwxrwxr-x root/lp var/cache/cups/rss/ drwxr-xr-x root/root var/log/ drwxr-xr-x root/root var/log/cups/ -drwxr-xr-x root/root var/run/ -drwxr-xr-x root/root var/run/cups/ -drwx--x--x daemon/sys var/run/cups/certs/ drwxr-xr-x root/root var/spool/ drwx--x--- root/lp var/spool/cups/ drwxrwx--T root/lp var/spool/cups/tmp/ diff --git a/cups/.signature b/cups/.signature index 47a431741..b5b6ca34c 100644 --- a/cups/.signature +++ b/cups/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YTqCYIemBHzsrDcKqHdT0C//IWAma+48EFN1Skff+qL/nHqfomIjNacx9bI/PVNffAu1HulbqppnHDX6J2SwQ8= -SHA256 (Pkgfile) = ff6927d788b71c41c66457f145bc63ef722611f3d9c322ce169bd5fad1639698 -SHA256 (.footprint) = 4e61ecfae10fcfa983ab77366b5ea91def9bc9a8ed9a4a5340b3edbc497962a0 +RWSE3ohX2g5d/TKhJUE/PJwQwLYYKV5pI6QagA9ZOdbnddJ6C8ImllMYnDyKyE33jtxhGbzeZLcBxL5vaKNL/zYOtURq1XDADgc= +SHA256 (Pkgfile) = 29101f26070ec6ab9b433e9587771d542bd7f66637a5bd34118291a22dd4a93f +SHA256 (.footprint) = ea70a89b84a4ee614fb8fd9bad840768a4259b0f58d0ad2e439762bf9c4938bb SHA256 (cups-2.4.1-source.tar.gz) = c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 -SHA256 (cups.rc) = 61a1deceebcee0437e5c3f987621abf24642b6517961336ed4f26384ddab5639 +SHA256 (cups.rc) = 050ec2210c1d05bb0a1b659705c9cf2a6967a7eabb9f71100309f15124e49e9f SHA256 (cups.pam) = 46b6b6e42e77c82435c0680405a45c66a37ec3d727af6aa6f036dd1d60215479 diff --git a/cups/Pkgfile b/cups/Pkgfile index 1c75f659d..b0b80f4cf 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -6,7 +6,7 @@ name=cups version=2.4.1 -release=1 +release=2 source=(https://github.com/OpenPrinting/cups/releases/download/v$version/$name-$vers... cups.rc cups.pam) @@ -21,6 +21,7 @@ build() { --sysconfdir=/etc \ --libdir=/usr/lib \ --localstatedir=/var \ + --with-rundir=/run/cups \ --with-docdir=/usr/share/cups/doc \ --with-logdir=/var/log/cups \ --with-cups-user=daemon \ @@ -38,7 +39,8 @@ build() { rm -r $PKG/usr/share/cups/{banners,data} # cleanup - rm -rf $PKG/usr/share/{applications,icons} + rm -r $PKG/usr/share/{applications,icons} + rm -r $PKG/run chmod 0755 $PKG/var/{cache,spool} chmod -R +w $PKG diff --git a/cups/cups.rc b/cups/cups.rc index 0cb52ff11..c9a73506e 100644 --- a/cups/cups.rc +++ b/cups/cups.rc @@ -5,11 +5,12 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/cupsd -PID=/var/run/cups.pid +PID=/run/cups/cupsd.pid OPTS="-f" case $1 in start) + install -o root -g lp -m 0755 -d /run/cups $SSD --start -bm --pidfile $PID --exec $PROG -- $OPTS ;; stop)