wok rev 22620

updated cups, cups-dev, cups-doc, cups-pam and libcups (2.0.2 -> 2.3.1)
author Hans-G?nter Theisgen
date Sun Jan 12 14:31:51 2020 +0100 (17 months ago)
parents 8d95e2627925
children e1a067a8ee4c
files cups-dev/receipt cups-doc/receipt cups-pam/receipt cups/receipt libcups/receipt
line diff
     1.1 --- a/cups-dev/receipt	Sun Jan 12 11:14:55 2020 +0100
     1.2 +++ b/cups-dev/receipt	Sun Jan 12 14:31:51 2020 +0100
     1.3 @@ -1,19 +1,20 @@
     1.4  # SliTaz package receipt."
     1.5  
     1.6  PACKAGE="cups-dev"
     1.7 -VERSION="2.0.2"
     1.8 +VERSION="2.3.1"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Common UNIX Printing System dev files."
    1.11 +SHORT_DESC="Common UNIX Printing System - development files."
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="GPL2 LGPL2"
    1.14 -WANTED="cups"
    1.15  WEB_SITE="https://www.cups.org/"
    1.16  
    1.17  DEPENDS="cups"
    1.18 +WANTED="cups"
    1.19  
    1.20  genpkg_rules()
    1.21  {
    1.22  	mkdir -p $fs/usr/lib
    1.23 -	cp -a $install/usr/include $fs/usr
    1.24 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.25 +
    1.26 +	cp -a $install/usr/include	$fs/usr
    1.27 +	cp -a $install/usr/lib/*.*a	$fs/usr/lib
    1.28  }
     2.1 --- a/cups-doc/receipt	Sun Jan 12 11:14:55 2020 +0100
     2.2 +++ b/cups-doc/receipt	Sun Jan 12 14:31:51 2020 +0100
     2.3 @@ -1,12 +1,13 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="cups-doc"
     2.7 -VERSION="2.0.2"
     2.8 +VERSION="2.3.1"
     2.9  CATEGORY="misc"
    2.10 -SHORT_DESC="Docs for cups"
    2.11 +SHORT_DESC="Documentation for cups."
    2.12  MAINTAINER="slaxemulator@gmail.com"
    2.13  LICENSE="GPL2 LGPL2"
    2.14  WEB_SITE="https://www.cups.org/"
    2.15 +
    2.16  WANTED="cups"
    2.17  
    2.18  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.19 @@ -14,5 +15,5 @@
    2.20  {
    2.21  	mkdir -p $fs/usr/share
    2.22  	# We need the doc for CSS, images and help in the web interface.
    2.23 -	cp -a $install/usr/share/doc $fs/usr/share
    2.24 +	cp -a $install/usr/share/doc	$fs/usr/share
    2.25  }
     3.1 --- a/cups-pam/receipt	Sun Jan 12 11:14:55 2020 +0100
     3.2 +++ b/cups-pam/receipt	Sun Jan 12 14:31:51 2020 +0100
     3.3 @@ -1,82 +1,98 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="cups-pam"
     3.7 -VERSION="2.0.2"
     3.8 +VERSION="2.3.1"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="Common UNIX Printing System with PAM support."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12  LICENSE="GPL2 LGPL2"
    3.13 +WEB_SITE="https://www.cups.org/"
    3.14 +
    3.15  SOURCE="cups"
    3.16 -TARBALL="$SOURCE-$VERSION-source.tar.bz2"
    3.17 -WEB_SITE="https://www.cups.org/"
    3.18 -WGET_URL="https://www.cups.org/software/$VERSION/$TARBALL"
    3.19 +TARBALL="$SOURCE-$VERSION-source.tar.gz"
    3.20 +WGET_URL="https://github.com/apple/$SOURCE/releases/download/v$VERSION/$TARBALL"
    3.21 +
    3.22  PROVIDE="cups:pam"
    3.23 -
    3.24 -DEPENDS="libssl cups-doc dbus pam libcomerr libkrb5 cups-filters libcups"
    3.25 -BUILD_DEPENDS="openssl-dev gnutls-dev dbus-dev jpeg-dev libpng-dev tiff-dev \
    3.26 -pam libcomerr-dev pam-dev acl-dev libgcrypt-dev libgnutls"
    3.27 +DEPENDS="cups-doc cups-filters dbus libcomerr libcups libkrb5 libssl pam"
    3.28 +BUILD_DEPENDS="acl-dev dbus-dev gnutls-dev jpeg-dev libcomerr-dev 
    3.29 +	libgcrypt-dev libgnutls libpng-dev openssl-dev pam pam-dev tiff-dev"
    3.30  
    3.31  # Rules to configure and make the package.
    3.32  compile_rules()
    3.33  {
    3.34 -	patch -Np1 -i ${WOK}/cups/stuff/install-sh.u
    3.35 -	./configure \
    3.36 -		--prefix=/usr \
    3.37 -		--sysconfdir=/etc \
    3.38 -		--localstatedir=/var \
    3.39 -		--mandir=/usr/share/man \
    3.40 -		--enable-static \
    3.41 -		--enable-pam \
    3.42 -		--disable-ldap \
    3.43 -		--with-cups-user=nobody \
    3.44 -		--with-cups-group=nogroup \
    3.45 -		--with-languages="de es fr pt_BR ru" \
    3.46 +#	patch -Np1 -i ${WOK}/cups/stuff/install-sh.u
    3.47 +
    3.48 +	export	LDFLAGS="$LDFLAGS -lrt"
    3.49 +
    3.50 +	# Set list of wanted locales in LOCALE_PACK
    3.51 +	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    3.52 +
    3.53 +	# <= 2.0.2 unrecognised
    3.54 +	#	--disable-ldap
    3.55 +
    3.56 +	./configure				\
    3.57 +		--prefix=/usr			\
    3.58 +		--sysconfdir=/etc		\
    3.59 +		--localstatedir=/var		\
    3.60 +		--mandir=/usr/share/man		\
    3.61 +		--enable-static			\
    3.62 +		--enable-pam			\
    3.63 +		--disable-ldap			\
    3.64 +		--with-cups-user=nobody		\
    3.65 +		--with-cups-group=nogroup	\
    3.66 +		--with-languages="$LOCALE_PACK"	\
    3.67  		$CONFIGURE_ARGS &&
    3.68  	make &&
    3.69  	make BUILDROOT=$DESTDIR install
    3.70 -	cp -f $WOK/cups/stuff/cups.desktop $install/usr/share/applications/cups.desktop
    3.71 +
    3.72 +	cp -f $WOK/cups/stuff/cups.desktop \
    3.73 +		$install/usr/share/applications/cups.desktop
    3.74  }
    3.75  
    3.76  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.77  genpkg_rules()
    3.78  {
    3.79 -	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
    3.80 +	mkdir -p $fs/etc
    3.81 +	mkdir -p $fs/usr/lib
    3.82 +	mkdir -p $fs/usr/share
    3.83  
    3.84 -	cp -a $install/etc/cups $fs/etc
    3.85 -	cp -a $install/etc/dbus* $fs/etc
    3.86 -	cp -a $install/usr/bin $fs/usr
    3.87 -	cp -a $install/usr/sbin $fs/usr
    3.88 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.89 -	cp -a $install/usr/lib/cups $fs/usr/lib
    3.90 -	cp -a $install/usr/share/cups $fs/usr/share
    3.91 -	cp -a $install/usr/share/icons $fs/usr/share
    3.92 -	cp -a $install/var $fs
    3.93 +	cp -a $install/etc/cups		$fs/etc
    3.94 +	cp -a $install/etc/dbus*	$fs/etc
    3.95 +	cp -a $install/usr/bin		$fs/usr
    3.96 +	cp -a $install/usr/sbin		$fs/usr
    3.97 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    3.98 +	cp -a $install/usr/lib/cups	$fs/usr/lib
    3.99 +	cp -a $install/usr/share/cups	$fs/usr/share
   3.100 +	cp -a $install/usr/share/icons	$fs/usr/share
   3.101 +	cp -a $install/var		$fs
   3.102  
   3.103  	# Remove files provided by cups-filters
   3.104 -	rm -f $fs/usr/share/cups/banners/*
   3.105 -	rm -f $fs/usr/share/cups/data/testprint
   3.106 +	rm -f				$fs/usr/share/cups/banners/*
   3.107 +	rm -f				$fs/usr/share/cups/data/testprint
   3.108  
   3.109  	# Remove files provided by libcups
   3.110 -	rm -f $fs/usr/lib/libcups.so*
   3.111 +	rm -f				$fs/usr/lib/libcups.so*
   3.112  
   3.113  	# PAM conf
   3.114 -	cp -a $stuff/etc $fs
   3.115 +	cp -a $stuff/etc		$fs
   3.116  
   3.117  	# Daemon script
   3.118 -	cp -a $WOK/cups/stuff/etc $fs
   3.119 +	cp -a $WOK/cups/stuff/etc	$fs
   3.120  
   3.121  	# TazPanel link
   3.122 -	cp -a $WOK/cups/stuff/var $fs
   3.123 +	cp -a $WOK/cups/stuff/var	$fs
   3.124  
   3.125  }
   3.126  
   3.127  post_install()
   3.128  {
   3.129  	# Start CUPS daemon and edit daemons.conf
   3.130 -	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
   3.131 +	if [ -z "$1" -a ! -s /aufs-umount.sh ]
   3.132 +	  then
   3.133  		/etc/init.d/cupsd start || continue
   3.134  	fi
   3.135 -	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
   3.136 +	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"
   3.137 +	  then
   3.138  		cat >> "$1/etc/daemons.conf" <<EOT
   3.139  # CUPS printing daemon options.
   3.140  CUPSD_OPTIONS=""
   3.141 @@ -87,7 +103,7 @@
   3.142  
   3.143  pre_remove()
   3.144  {
   3.145 -	# Stop CUPS daemon before rm.
   3.146 +	# Stop CUPS daemon before remove.
   3.147  	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
   3.148  	:
   3.149  }
     4.1 --- a/cups/receipt	Sun Jan 12 11:14:55 2020 +0100
     4.2 +++ b/cups/receipt	Sun Jan 12 14:31:51 2020 +0100
     4.3 @@ -1,77 +1,90 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="cups"
     4.7 -VERSION="2.0.2"
     4.8 +VERSION="2.3.1"
     4.9  CATEGORY="system-tools"
    4.10 +TAGS="printer printing"
    4.11  SHORT_DESC="Common UNIX Printing System."
    4.12  MAINTAINER="erjo@slitaz.org"
    4.13  LICENSE="GPL2 LGPL2"
    4.14 -TARBALL="$PACKAGE-$VERSION-source.tar.bz2"
    4.15  WEB_SITE="https://www.cups.org/"
    4.16 -WGET_URL="https://www.cups.org/software/$VERSION/$TARBALL"
    4.17 -TAGS="printer printing"
    4.18  
    4.19 -DEPENDS="libssl dbus libcomerr cups-doc libkrb5 libusb-compat poppler-apps \
    4.20 -cups-filters libcups"
    4.21 -BUILD_DEPENDS="libgcrypt-dev gnutls-dev dbus-dev jpeg-dev libpng-dev \
    4.22 -tiff-dev zlib-dev libtasn1-dev openssl-dev libusb-compat-dev php-dev \
    4.23 -acl-dev poppler-apps libgnutls"
    4.24 +TARBALL="$PACKAGE-$VERSION-source.tar.gz"
    4.25 +WGET_URL="https://github.com/apple/$PACKAGE/releases/download/v$VERSION/$TARBALL"
    4.26 +
    4.27 +DEPENDS="cups-doc cups-filters dbus libcomerr libcups libkrb5 libssl 
    4.28 +	libusb-compat poppler-apps"
    4.29 +BUILD_DEPENDS="acl-dev dbus-dev gnutls-dev jpeg-dev libgcrypt-dev 
    4.30 +	libgnutls libpng-dev libtasn1-dev libusb-compat-dev openssl-dev 
    4.31 +	php-dev poppler-apps tiff-dev zlib-dev"
    4.32  
    4.33  # Rules to configure and make the package.
    4.34  compile_rules()
    4.35  {
    4.36 -	patch -Np1 -i $stuff/install-sh.u
    4.37 -	./configure \
    4.38 -		--prefix=/usr \
    4.39 -		--sysconfdir=/etc \
    4.40 -		--localstatedir=/var \
    4.41 -		--mandir=/usr/share/man \
    4.42 -		--enable-static \
    4.43 -		--disable-ldap \
    4.44 -		--disable-pam \
    4.45 -		--disable-gssapi \
    4.46 -		--disable-acl \
    4.47 -		--disable-slp \
    4.48 -		--enable-dbus \
    4.49 -		--with-dbusdir=/etc/dbus-1 \
    4.50 -		--with-cups-user=nobody \
    4.51 -		--with-cups-group=nogroup \
    4.52 -		--with-languages="de es fr pt_BR ru" \
    4.53 -		--with-pdftops=pdftops \
    4.54 +#	patch -Np1 -i $stuff/install-sh.u
    4.55 +
    4.56 +	export	LDFLAGS="$LDFLAGS -lrt"
    4.57 +
    4.58 +	# Set list of wanted locales in LOCALE_PACK
    4.59 +	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    4.60 +
    4.61 +	# <= 2.0.2 unrecognised
    4.62 +	#	--disable-ldap
    4.63 +	#	--disable-slp
    4.64 +	#	--with-pdftops=pdftops
    4.65 +
    4.66 +	./configure				\
    4.67 +		--prefix=/usr			\
    4.68 +		--sysconfdir=/etc		\
    4.69 +		--localstatedir=/var		\
    4.70 +		--mandir=/usr/share/man		\
    4.71 +		--enable-static			\
    4.72 +		--disable-pam			\
    4.73 +		--disable-gssapi		\
    4.74 +		--disable-acl			\
    4.75 +		--enable-dbus			\
    4.76 +		--with-dbusdir=/etc/dbus-1	\
    4.77 +		--with-cups-user=nobody		\
    4.78 +		--with-cups-group=nogroup	\
    4.79 +		--with-languages="$LOCALE_PACK" \
    4.80  		$CONFIGURE_ARGS &&
    4.81  	make &&
    4.82  	make BUILDROOT=$DESTDIR install
    4.83 -	cp -f $stuff/cups.desktop $install/usr/share/applications/cups.desktop
    4.84 +
    4.85 +	cp -f $stuff/cups.desktop \
    4.86 +		$install/usr/share/applications/cups.desktop
    4.87  }
    4.88  
    4.89  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.90  genpkg_rules()
    4.91  {
    4.92 -	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
    4.93 +	mkdir -p $fs/etc
    4.94 +	mkdir -p $fs/usr/lib
    4.95 +	mkdir -p $fs/usr/share
    4.96  
    4.97 -	cp -a $install/etc/cups $fs/etc
    4.98 -	cp -a $install/etc/dbus* $fs/etc
    4.99 -	cp -a $install/usr/bin $fs/usr
   4.100 -	cp -a $install/usr/sbin $fs/usr
   4.101 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   4.102 -	cp -a $install/usr/lib/cups $fs/usr/lib
   4.103 -	cp -a $install/usr/share/cups $fs/usr/share
   4.104 -	cp -a $install/usr/share/icons $fs/usr/share
   4.105 -	cp -a $install/var $fs
   4.106 +	cp -a $install/etc/cups		$fs/etc
   4.107 +	cp -a $install/etc/dbus*	$fs/etc
   4.108 +	cp -a $install/usr/bin		$fs/usr
   4.109 +	cp -a $install/usr/sbin		$fs/usr
   4.110 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
   4.111 +	cp -a $install/usr/lib/cups	$fs/usr/lib
   4.112 +	cp -a $install/usr/share/cups	$fs/usr/share
   4.113 +	cp -a $install/usr/share/icons	$fs/usr/share
   4.114 +	cp -a $install/var		$fs
   4.115  
   4.116  	# Remove files provided by cups-filters
   4.117 -	rm -f $fs/usr/share/cups/banners/*
   4.118 -	rm -f $fs/usr/share/cups/data/testprint
   4.119 +	rm -f				$fs/usr/share/cups/banners/*
   4.120 +	rm -f				$fs/usr/share/cups/data/testprint
   4.121  
   4.122  	# Remove files provided by libcups
   4.123 -	rm -f $fs/usr/lib/libcups.so*
   4.124 +	rm -f				$fs/usr/lib/libcups.so*
   4.125  
   4.126  	# Daemon script
   4.127 -	cp -a $stuff/etc $fs
   4.128 +	cp -a $stuff/etc		$fs
   4.129  	sed -i 's|^#Group .*|Group lp|' $fs/etc/cups/cups-files.conf
   4.130  
   4.131  	# TazPanel link
   4.132 -	cp -a $stuff/var $fs
   4.133 +	cp -a $stuff/var		$fs
   4.134  
   4.135  	sed -i 's|hostname:9100|&\n\n    parallel:/dev/usb/lp0|' \
   4.136  		$fs/usr/share/cups/templates/choose-uri.tmpl
   4.137 @@ -80,11 +93,13 @@
   4.138  post_install()
   4.139  {
   4.140  	# Start CUPS daemon and edit daemons.conf
   4.141 -	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
   4.142 +	if [ -z "$1" -a ! -s /aufs-umount.sh ]
   4.143 +	  then
   4.144  		/etc/init.d/cupsd start || continue
   4.145  	fi
   4.146  	rm -f "$1"/var/cache/tazpanel/* 2> /dev/null
   4.147 -	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
   4.148 +	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"
   4.149 +	  then
   4.150  		cat >> "$1/etc/daemons.conf" <<EOT
   4.151  # CUPS printing daemon options.
   4.152  CUPSD_OPTIONS=""
   4.153 @@ -95,7 +110,7 @@
   4.154  
   4.155  pre_remove()
   4.156  {
   4.157 -	# Stop CUPS daemon before rm.
   4.158 +	# Stop CUPS daemon before remove.
   4.159  	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
   4.160  	:
   4.161  }
     5.1 --- a/libcups/receipt	Sun Jan 12 11:14:55 2020 +0100
     5.2 +++ b/libcups/receipt	Sun Jan 12 14:31:51 2020 +0100
     5.3 @@ -1,20 +1,20 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="libcups"
     5.7 -VERSION="2.0.2"
     5.8 +VERSION="2.3.1"
     5.9  CATEGORY="system-tools"
    5.10 -SHORT_DESC="Common UNIX Printing System."
    5.11 +TAGS="printer printing"
    5.12 +SHORT_DESC="Common UNIX Printing System - libraries."
    5.13  MAINTAINER="erjo@slitaz.org"
    5.14  LICENSE="GPL2 LGPL2"
    5.15  WEB_SITE="https://www.cups.org/"
    5.16 -TAGS="printer printing"
    5.17  
    5.18 +DEPENDS="libgnutls zlib"
    5.19  WANTED="cups"
    5.20 -DEPENDS="libgnutls zlib"
    5.21  
    5.22  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.23  genpkg_rules()
    5.24  {
    5.25  	mkdir -p $fs/usr/lib
    5.26 -	cp -a $install/usr/lib/libcups.so* $fs/usr/lib
    5.27 +	cp -a $install/usr/lib/libcups.so*	$fs/usr/lib
    5.28  }