wok-next rev 19800

Up cups.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 25 21:14:27 2017 +0300 (2017-06-25)
parents e66e3386e562
children 541d3328c02a
files cups-dev/receipt cups-doc/receipt cups/receipt libcups/receipt poppler-qt4/receipt
line diff
     1.1 --- a/cups-dev/receipt	Sun Jun 25 17:25:22 2017 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,17 +0,0 @@
     1.4 -# SliTaz package receipt."
     1.5 -
     1.6 -PACKAGE="cups-dev"
     1.7 -VERSION="2.1.4"
     1.8 -CATEGORY="development"
     1.9 -SHORT_DESC="Common UNIX Printing System (development files)"
    1.10 -MAINTAINER="erjo@slitaz.org"
    1.11 -LICENSE="GPL2 LGPL2"
    1.12 -WEB_SITE="https://www.cups.org/"
    1.13 -
    1.14 -WANTED="cups"
    1.15 -DEPENDS="cups"
    1.16 -
    1.17 -genpkg_rules()
    1.18 -{
    1.19 -	copy cups-config *.h
    1.20 -}
     2.1 --- a/cups-doc/receipt	Sun Jun 25 17:25:22 2017 +0300
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,19 +0,0 @@
     2.4 -# SliTaz package receipt.
     2.5 -
     2.6 -PACKAGE="cups-doc"
     2.7 -VERSION="2.1.4"
     2.8 -CATEGORY="misc"
     2.9 -SHORT_DESC="Common UNIX Printing System (documentation)"
    2.10 -MAINTAINER="slaxemulator@gmail.com"
    2.11 -LICENSE="GPL2 LGPL2"
    2.12 -WEB_SITE="https://www.cups.org/"
    2.13 -
    2.14 -WANTED="cups"
    2.15 -
    2.16 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.17 -genpkg_rules()
    2.18 -{
    2.19 -	mkdir -p $fs/usr/share
    2.20 -	# We need the doc for CSS, images and help in the web interface.
    2.21 -	cp -a $install/usr/share/doc $fs/usr/share
    2.22 -}
     3.1 --- a/cups/receipt	Sun Jun 25 17:25:22 2017 +0300
     3.2 +++ b/cups/receipt	Sun Jun 25 21:14:27 2017 +0300
     3.3 @@ -1,25 +1,27 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="cups"
     3.8 -VERSION="2.1.4"
     3.9 +VERSION="2.2.2"
    3.10  CATEGORY="system-tools"
    3.11 -SHORT_DESC="Common UNIX Printing System."
    3.12 +SHORT_DESC="Common UNIX Printing System"
    3.13  MAINTAINER="erjo@slitaz.org"
    3.14  LICENSE="GPL2 LGPL2"
    3.15  WEB_SITE="https://www.cups.org/"
    3.16 -TAGS="printer printing"
    3.17  
    3.18 -TARBALL="$PACKAGE-$VERSION-source.tar.gz"
    3.19 -WGET_URL="https://github.com/apple/cups/releases/download/release-$VERSION/$TARBALL"
    3.20 +TARBALL="cups-$VERSION-source.tar.gz"
    3.21 +WGET_URL="https://github.com/apple/cups/releases/download/v$VERSION/$TARBALL"
    3.22  
    3.23 -DEPENDS="acl dbus libcups libgnutls libusb zlib"
    3.24 -BUILD_DEPENDS="automake libusb-dev zlib-dev dbus-dev gnutls-dev perl python \
    3.25 -acl-dev"
    3.26 -SPLIT="libcups cups-doc"
    3.27 +BUILD_DEPENDS="automake libusb-dev zlib-dev acl-dev dbus-dev gnutls-dev perl \
    3.28 +python"
    3.29 +SPLIT="libcups cups cups-doc cups-dev"
    3.30  
    3.31  # Rules to configure and make the package.
    3.32  compile_rules()
    3.33  {
    3.34 +	# gid 19 suggested by the BLFS is in use in SliTaz (by cdrom group),
    3.35 +	# using 23 instead
    3.36 +	addgroup -g 23 lpadmin &&
    3.37 +
    3.38  	sed -i 's:555:755:g;s:444:644:g' Makedefs.in &&
    3.39  	sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4 &&
    3.40  	sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &&
    3.41 @@ -37,46 +39,84 @@
    3.42  		--with-system-groups=lpadmin \
    3.43  		--with-docdir=/usr/share/doc/cups-$VERSION \
    3.44  		$CONFIGURE_ARGS &&
    3.45 -	make
    3.46 +	make &&
    3.47  	make BUILDROOT=$install install &&
    3.48 +
    3.49  	rm -rf $install/tmp &&
    3.50 +
    3.51  	ln -svnf ../doc/cups-$VERSION $install/usr/share/cups/doc-$VERSION
    3.52 +
    3.53  	echo "ServerName /var/run/cups/cups.sock" > $install/etc/cups/client.conf &&
    3.54  
    3.55  	sed -i 's|hostname:9100|&\n\n    parallel:/dev/usb/lp0|' \
    3.56  		$install/usr/share/cups/templates/choose-uri.tmpl &&
    3.57 -	sed -i 's|htmlview|browser|' $install/usr/share/applications/cups.desktop
    3.58 +	sed -i 's|htmlview|browser|' $install/usr/share/applications/cups.desktop &&
    3.59 +	sed -i 's|^#Group .*|Group lp|' $install/etc/cups/cups-files.conf &&
    3.60 +
    3.61 +	# Daemon script
    3.62 +	cp -a $stuff/etc $install &&
    3.63 +	chown -R root:root $install/etc &&
    3.64 +	# TazPanel link
    3.65 +	cp -a $stuff/var $install &&
    3.66 +	chown -R root:root $install/var &&
    3.67 +
    3.68 +	# Install ssl directory where to store the certs, solves some samba issues
    3.69 +	install -dm700 -g lp $install/etc/cups/ssl &&
    3.70 +
    3.71 +	# Install some more configuration files that will get filled by cupsd
    3.72 +	touch $install/etc/cups/printers.conf &&
    3.73 +	touch $install/etc/cups/classes.conf &&
    3.74 +	touch $install/etc/cups/subscriptions.conf &&
    3.75 +	chgrp -R lp $install/etc/cups &&
    3.76 +
    3.77 +	# Comment out unnecessary PageLogFormat entry
    3.78 +	sed -i -e 's:PageLogFormat:#PageLogFormat:' $install/etc/cups/cupsd.conf* &&
    3.79 +
    3.80 +	# Change files permissions to be accessible via web interface - will be
    3.81 +	# fixed in post_install
    3.82 +	chmod -c o+r $install/etc/cups/* $install/usr/sbin/cupsd \
    3.83 +	$install/usr/lib/cups/backend/ipp $install/usr/lib/cups/backend/lpd
    3.84  }
    3.85  
    3.86  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.87  genpkg_rules()
    3.88  {
    3.89 -	copy dbus-1/ bin/ sbin/ cups/ applications/ icons/ var/ *.so*
    3.90 -
    3.91 -	# -> cups-dev
    3.92 -	rm -f $fs/usr/bin/cups-config
    3.93 -	rm -rf $fs/usr/include
    3.94 -	# -> libcups
    3.95 -	rm -f $fs/usr/lib/libcups.so*
    3.96 -
    3.97 -	# Daemon script
    3.98 -	cp -a $stuff/etc $fs
    3.99 -	chown -R root:root $fs/etc/init.d
   3.100 -	sed -i 's|^#Group .*|Group lp|' $fs/etc/cups/cups-files.conf
   3.101 -
   3.102 -	# TazPanel link
   3.103 -	cp -a $stuff/var $fs
   3.104 -	chown -R root:root $fs/var/www
   3.105 -
   3.106 +	case $PACKAGE in
   3.107 +		libcups)
   3.108 +			copy libcups.so*
   3.109 +			CAT="system-tools|common libraries"
   3.110 +			TAGS="printer printing"
   3.111 +			DEPENDS="libgnutls zlib"
   3.112 +			;;
   3.113 +		cups)
   3.114 +			copy @std var/ # copy empty dirs in var/
   3.115 +			remove_already_packed
   3.116 +			DEPENDS="acl dbus libcups libgnutls libusb zlib"
   3.117 +			CONFIG_FILES="/etc/cups/"
   3.118 +			TAGS="printer printing"
   3.119 +			;;
   3.120 +		cups-doc)
   3.121 +			# We need the doc for CSS, images and help in the web interface.
   3.122 +			copy doc/
   3.123 +			CAT="docs|documentation"
   3.124 +			DEPENDS="cups"
   3.125 +			;;
   3.126 +		cups-dev)
   3.127 +			copy @dev
   3.128 +			;;
   3.129 +	esac
   3.130  }
   3.131  
   3.132 -post_install()
   3.133 -{
   3.134 -	# Start CUPS daemon and edit daemons.conf
   3.135 +post_install_cups() {
   3.136 +	# Start CUPS daemon
   3.137  	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
   3.138  		/etc/init.d/cupsd start || continue
   3.139  	fi
   3.140 +
   3.141 +	# Clean TazPanel menu cache
   3.142  	rm -f "$1"/var/cache/tazpanel/* 2>/dev/null
   3.143 +
   3.144 +	# Edit daemons.conf
   3.145  	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
   3.146  		cat >> "$1/etc/daemons.conf" <<EOT
   3.147  # CUPS printing daemon options.
   3.148 @@ -84,10 +124,17 @@
   3.149  
   3.150  EOT
   3.151  	fi
   3.152 +
   3.153 +	# Add lpadmin group
   3.154 +	addgroup -g 23 lpadmin
   3.155 +
   3.156 +	# Return permissions to previous state
   3.157 +	chmod 640 $1/etc/cups/*
   3.158 +	chmod 700 $1/usr/lib/cups/backend/ipp $1/usr/lib/cups/backend/lpd
   3.159 +	chmod 500 $1/usr/sbin/cupsd
   3.160  }
   3.161  
   3.162 -pre_remove()
   3.163 -{
   3.164 +pre_remove_cups() {
   3.165  	# Stop CUPS daemon before rm.
   3.166  	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
   3.167  	:
     4.1 --- a/libcups/receipt	Sun Jun 25 17:25:22 2017 +0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,19 +0,0 @@
     4.4 -# SliTaz package receipt.
     4.5 -
     4.6 -PACKAGE="libcups"
     4.7 -VERSION="2.1.4"
     4.8 -CATEGORY="system-tools"
     4.9 -SHORT_DESC="Common UNIX Printing System (common libraries)"
    4.10 -MAINTAINER="erjo@slitaz.org"
    4.11 -LICENSE="GPL2 LGPL2"
    4.12 -WEB_SITE="https://www.cups.org/"
    4.13 -TAGS="printer printing"
    4.14 -
    4.15 -WANTED="cups"
    4.16 -DEPENDS="libgnutls zlib"
    4.17 -
    4.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    4.19 -genpkg_rules()
    4.20 -{
    4.21 -	copy libcups.so*
    4.22 -}
     5.1 --- a/poppler-qt4/receipt	Sun Jun 25 17:25:22 2017 +0300
     5.2 +++ b/poppler-qt4/receipt	Sun Jun 25 21:14:27 2017 +0300
     5.3 @@ -8,7 +8,7 @@
     5.4  LICENSE="GPL2"
     5.5  WEB_SITE="https://poppler.freedesktop.org/"
     5.6  
     5.7 -TARBALL="$PACKAGE-$VERSION.tar.xz"
     5.8 +TARBALL="poppler-$VERSION.tar.xz"
     5.9  WGET_URL="http://poppler.freedesktop.org/$TARBALL"
    5.10  
    5.11  BUILD_DEPENDS="xorg-libXdamage expat-dev pkg-config jpeg-dev tiff-dev \