wok-next rev 21572

updated cups (2.2.2 -> 2.3.3)
author Hans-G?nter Theisgen
date Mon Jun 22 17:06:55 2020 +0100 (2020-06-22)
parents 8846e17e0e43
children e067a18b0552
files cups/receipt
line diff
     1.1 --- a/cups/receipt	Mon Jun 22 16:52:21 2020 +0100
     1.2 +++ b/cups/receipt	Mon Jun 22 17:06:55 2020 +0100
     1.3 @@ -1,21 +1,23 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="cups"
     1.7 -VERSION="2.2.2"
     1.8 +VERSION="2.3.3"
     1.9  CATEGORY="system-tools"
    1.10 +TAGS="printer printing"
    1.11  SHORT_DESC="Common UNIX Printing System"
    1.12 -MAINTAINER="devel@slitaz.org"
    1.13 +MAINTAINER="maintainer@slitaz.org"
    1.14  LICENSE="GPL2 LGPL2"
    1.15  WEB_SITE="https://www.cups.org/"
    1.16  
    1.17  TARBALL="cups-$VERSION-source.tar.gz"
    1.18  WGET_URL="https://github.com/apple/cups/releases/download/v$VERSION/$TARBALL"
    1.19  
    1.20 -BUILD_DEPENDS="automake libusb-dev zlib-dev acl-dev dbus-dev gnutls-dev perl \
    1.21 -python pam pam-dev"
    1.22 +BUILD_DEPENDS="acl-dev automake dbus-dev gnutls-dev libusb-dev pam pam-dev
    1.23 +	perl python zlib-dev"
    1.24  SPLIT="libcups $PACKAGE $PACKAGE-pam:pam $PACKAGE-doc $PACKAGE-dev"
    1.25  
    1.26 -compile_rules() {
    1.27 +compile_rules()
    1.28 +{
    1.29  	case $SET in
    1.30  		'')  SET_ARGS='--disable-pam';;
    1.31  		pam) SET_ARGS='--enable-pam';;
    1.32 @@ -25,22 +27,22 @@
    1.33  	# using 23 instead
    1.34  	addgroup -g 23 lpadmin
    1.35  
    1.36 -	sed -i 's:555:755:g;s:444:644:g' Makedefs.in
    1.37 -	sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4
    1.38 -	sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4
    1.39 +	sed -i 's:555:755:g;s:444:644:g'	Makedefs.in
    1.40 +	sed -i '/MAN.EXT/s:.gz::g'	configure config-scripts/cups-manpages.m4
    1.41 +	sed -i '/LIBGCRYPTCONFIG/d'	config-scripts/cups-ssl.m4
    1.42  
    1.43  	aclocal  -I config-scripts
    1.44  	autoconf -I config-scripts
    1.45  
    1.46  	cp -a $src $src-pam
    1.47  
    1.48 -	CC=gcc \
    1.49 -	./configure \
    1.50 -		--libdir=/usr/lib \
    1.51 -		--disable-systemd \
    1.52 -		--with-rcdir=/tmp/cupsinit \
    1.53 -		--with-system-groups=lpadmin \
    1.54 -		--with-docdir=/usr/share/doc/cups-$VERSION \
    1.55 +	CC=gcc							\
    1.56 +	./configure						\
    1.57 +		--libdir=/usr/lib				\
    1.58 +		--disable-systemd				\
    1.59 +		--with-rcdir=/tmp/cupsinit			\
    1.60 +		--with-system-groups=lpadmin			\
    1.61 +		--with-docdir=/usr/share/doc/cups-$VERSION	\
    1.62  		$SET_ARGS \
    1.63  		$CONFIGURE_ARGS &&
    1.64  	make &&
    1.65 @@ -54,59 +56,61 @@
    1.66  
    1.67  	sed -i 's|hostname:9100|&\n\n    parallel:/dev/usb/lp0|' \
    1.68  		$install/usr/share/cups/templates/choose-uri.tmpl
    1.69 -	sed -i 's|htmlview|browser|'    $install/usr/share/applications/cups.desktop
    1.70 -	sed -i 's|^#Group .*|Group lp|' $install/etc/cups/cups-files.conf
    1.71 +	sed -i 's|htmlview|browser|' \
    1.72 +		$install/usr/share/applications/cups.desktop
    1.73 +	sed -i 's|^#Group .*|Group lp|' \
    1.74 +		$install/etc/cups/cups-files.conf
    1.75  
    1.76  	# Daemon script
    1.77 -	cp -a $stuff/etc $install
    1.78 -	chown -R root:root $install/etc
    1.79 +	cp -a $stuff/etc		$install
    1.80 +	chown -R root:root	$install/etc
    1.81 +
    1.82  	# TazPanel link
    1.83 -	cp -a $stuff/var $install
    1.84 -	chown -R root:root $install/var
    1.85 +	cp -a $stuff/var		$install
    1.86 +	chown -R root:root	$install/var
    1.87  
    1.88  	# Install ssl directory where to store the certs, solves some samba issues
    1.89 -	install -dm700 -g lp $install/etc/cups/ssl
    1.90 +	install -dm700 -g lp	$install/etc/cups/ssl
    1.91  
    1.92  	# Install some more configuration files that will get filled by cupsd
    1.93 -	touch $install/etc/cups/printers.conf
    1.94 -	touch $install/etc/cups/classes.conf
    1.95 -	touch $install/etc/cups/subscriptions.conf
    1.96 -	chgrp -R lp $install/etc/cups
    1.97 +	touch		$install/etc/cups/printers.conf
    1.98 +	touch		$install/etc/cups/classes.conf
    1.99 +	touch		$install/etc/cups/subscriptions.conf
   1.100 +	chgrp -R lp	$install/etc/cups
   1.101  
   1.102  	# Comment out unnecessary PageLogFormat entry
   1.103 -	sed -i -e 's:PageLogFormat:#PageLogFormat:' $install/etc/cups/cupsd.conf*
   1.104 +	sed -i -e 's:PageLogFormat:#PageLogFormat:' \
   1.105 +		$install/etc/cups/cupsd.conf*
   1.106  
   1.107 -	# Change files permissions to be accessible via web interface - will be
   1.108 +	# Change file permissions to be accessible via web interface - will be
   1.109  	# fixed in post_install
   1.110 -	chmod -c o+r \
   1.111 -		$install/etc/cups/* \
   1.112 -		$install/usr/sbin/cupsd \
   1.113 -		$install/usr/lib/cups/backend/ipp \
   1.114 +	chmod -c o+r					\
   1.115 +		$install/etc/cups/*			\
   1.116 +		$install/usr/sbin/cupsd			\
   1.117 +		$install/usr/lib/cups/backend/ipp		\
   1.118  		$install/usr/lib/cups/backend/lpd
   1.119  }
   1.120  
   1.121 -genpkg_rules() {
   1.122 +genpkg_rules()
   1.123 +{
   1.124  	case $PACKAGE in
   1.125  		libcups)
   1.126  			copy libcups.so*
   1.127  			CAT="system-tools|common libraries"
   1.128 -			TAGS="printer printing"
   1.129  			DEPENDS="libgnutls zlib"
   1.130  			;;
   1.131  		cups)
   1.132  			copy @std @rm
   1.133  			DEPENDS="acl dbus libcups libgnutls libusb zlib"
   1.134  			CONFIG_FILES="/etc/cups/"
   1.135 -			TAGS="printer printing"
   1.136  			;;
   1.137  		cups-pam)
   1.138  			copy @std
   1.139  			rm -f $fs/usr/lib/libcups.so*
   1.140  			CAT="system-tools|with PAM support"
   1.141 -			DEPENDS="acl dbus libcups libgnutls libusb zlib pam"
   1.142 +			DEPENDS="acl dbus libcups libgnutls libusb pam zlib"
   1.143  			PROVIDE="cups:pam"
   1.144  			CONFIG_FILES="/etc/cups/"
   1.145 -			TAGS="printer printing"
   1.146  			;;
   1.147  		cups-doc)
   1.148  			# We need the doc for CSS, images and help in the web interface.
   1.149 @@ -121,9 +125,11 @@
   1.150  	esac
   1.151  }
   1.152  
   1.153 -post_install_cups() {
   1.154 +post_install_cups()
   1.155 +{
   1.156  	# Start CUPS daemon
   1.157 -	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
   1.158 +	if [ -z "$1" -a ! -s /aufs-umount.sh ]
   1.159 +	  then
   1.160  		/etc/init.d/cupsd start || continue
   1.161  	fi
   1.162  
   1.163 @@ -131,7 +137,8 @@
   1.164  	rm -f "$1"/var/cache/tazpanel/* 2>/dev/null
   1.165  
   1.166  	# Edit daemons.conf
   1.167 -	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
   1.168 +	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"
   1.169 +	  then
   1.170  		cat >> "$1/etc/daemons.conf" <<EOT
   1.171  # CUPS printing daemon options.
   1.172  CUPSD_OPTIONS=""
   1.173 @@ -144,19 +151,23 @@
   1.174  
   1.175  	# Return permissions to previous state
   1.176  	chmod 640 $1/etc/cups/*
   1.177 -	chmod 700 $1/usr/lib/cups/backend/ipp $1/usr/lib/cups/backend/lpd
   1.178 +	chmod 700 $1/usr/lib/cups/backend/ipp
   1.179 +	chmod 700 $1/usr/lib/cups/backend/lpd
   1.180  	chmod 500 $1/usr/sbin/cupsd
   1.181  }
   1.182  
   1.183 -pre_remove_cups() {
   1.184 +pre_remove_cups()
   1.185 +{
   1.186  	# Stop CUPS daemon before rm.
   1.187  	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
   1.188  	:
   1.189  }
   1.190  
   1.191 -post_install_cups_pam() {
   1.192 +post_install_cups_pam()
   1.193 +{
   1.194  	# Start CUPS daemon
   1.195 -	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
   1.196 +	if [ -z "$1" -a ! -s /aufs-umount.sh ]
   1.197 +	  then
   1.198  		/etc/init.d/cupsd start || continue
   1.199  	fi
   1.200  
   1.201 @@ -164,7 +175,8 @@
   1.202  	rm -f "$1"/var/cache/tazpanel/* 2>/dev/null
   1.203  
   1.204  	# Edit daemons.conf
   1.205 -	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
   1.206 +	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"
   1.207 +	  then
   1.208  		cat >> "$1/etc/daemons.conf" <<EOT
   1.209  # CUPS printing daemon options.
   1.210  CUPSD_OPTIONS=""
   1.211 @@ -177,11 +189,13 @@
   1.212  
   1.213  	# Return permissions to previous state
   1.214  	chmod 640 $1/etc/cups/*
   1.215 -	chmod 700 $1/usr/lib/cups/backend/ipp $1/usr/lib/cups/backend/lpd
   1.216 +	chmod 700 $1/usr/lib/cups/backend/ipp
   1.217 +	chmod 700 $1/usr/lib/cups/backend/lpd
   1.218  	chmod 500 $1/usr/sbin/cupsd
   1.219  }
   1.220  
   1.221 -pre_remove_cups_pam() {
   1.222 +pre_remove_cups_pam()
   1.223 +{
   1.224  	# Stop CUPS daemon before rm.
   1.225  	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
   1.226  	: