wok-next rev 21579

updated dbus (1.12.12 -> 1.12.18)
author Hans-G?nter Theisgen
date Tue Jun 23 15:51:51 2020 +0100 (2020-06-23)
parents a5e1588644b7
children 427cc0f0476d
files dashel/receipt dbus/receipt
line diff
     1.1 --- a/dashel/receipt	Tue Jun 23 15:33:53 2020 +0100
     1.2 +++ b/dashel/receipt	Tue Jun 23 15:51:51 2020 +0100
     1.3 @@ -15,7 +15,7 @@
     1.4  
     1.5  compile_rules()
     1.6  {
     1.7 -	cmake	..				\
     1.8 +	cmake	.				\
     1.9  		-DCMAKE_INSTALL_PREFIX=/usr &&
    1.10  	make &&
    1.11  	make install
     2.1 --- a/dbus/receipt	Tue Jun 23 15:33:53 2020 +0100
     2.2 +++ b/dbus/receipt	Tue Jun 23 15:51:51 2020 +0100
     2.3 @@ -1,22 +1,22 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="dbus"
     2.7 -VERSION="1.12.12"
     2.8 +VERSION="1.12.18"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="D-Bus, a message bus system"
    2.11 -MAINTAINER="devel@slitaz.org"
    2.12 +MAINTAINER="maintainer@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14  WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/"
    2.15  LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/dbus.html"
    2.16  
    2.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.18  WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
    2.19 -TARBALL_SHA1="ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa"
    2.20 +# 1.12.12 TARBALL_SHA1="ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa"
    2.21  
    2.22  COOKOPTS="force-arch" # different .h
    2.23  
    2.24 -BUILD_DEPENDS="expat-dev libx11-dev glib-dev libice-dev \
    2.25 -libsm-dev libxslt xmlto libxml2-tools" # docbook-xsl
    2.26 +BUILD_DEPENDS="expat-dev glib-dev libice-dev libsm-dev libx11-dev
    2.27 +	libxslt libxml2-tools xmlto" # docbook-xsl
    2.28  SPLIT="$PACKAGE-helper $PACKAGE-introspect $PACKAGE $PACKAGE-dev"
    2.29  
    2.30  COPY_helper="dbus-daemon-launch-helper"
    2.31 @@ -31,40 +31,44 @@
    2.32  
    2.33  CONFIG_FILES_std="/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/"
    2.34  
    2.35 -compile_rules() {
    2.36 +compile_rules()
    2.37 +{
    2.38  	# temporarily: --disable-xml-docs
    2.39 -	./configure \
    2.40 -		--disable-doxygen-docs \
    2.41 -		--disable-xml-docs \
    2.42 -		--disable-static \
    2.43 -		--with-console-auth-dir=/run/console/ \
    2.44 -		--with-system-pid-file=/run/dbus/pid \
    2.45 -		--with-system-socket=/run/dbus/system_bus_socket \
    2.46 -		--disable-systemd \
    2.47 -		--without-systemdsystemunitdir \
    2.48 +	./configure						\
    2.49 +		--disable-doxygen-docs				\
    2.50 +		--disable-xml-docs				\
    2.51 +		--disable-static					\
    2.52 +		--with-console-auth-dir=/run/console/		\
    2.53 +		--with-system-pid-file=/run/dbus/pid		\
    2.54 +		--with-system-socket=/run/dbus/system_bus_socket	\
    2.55 +		--disable-systemd				\
    2.56 +		--without-systemdsystemunitdir			\
    2.57  		$CONFIGURE_ARGS &&
    2.58  	fix libtool &&
    2.59  	make &&
    2.60  	make -j1 install || return 1
    2.61  
    2.62  	# Init script
    2.63 -	cp -a $stuff/etc $install
    2.64 -	chown -R root.root $install/etc
    2.65 +	cp -a $stuff/etc		$install
    2.66 +	chown -R root.root	$install/etc
    2.67  
    2.68  	# docbook stuff
    2.69  	mkdir -p $install/usr/share/xml/docbook/stylesheet/dbus
    2.70 -	cp doc/introspect.* $install/usr/share/xml/docbook/stylesheet/dbus
    2.71 +	cp doc/introspect.*	$install/usr/share/xml/docbook/stylesheet/dbus
    2.72  }
    2.73  
    2.74 -pre_install_dbus() {
    2.75 +pre_install_dbus()
    2.76 +{
    2.77  	# Go for echoing on configuration files if any messagebus user
    2.78  	# was found.
    2.79 -	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    2.80 +	if ! grep -qs 'messagebus' "$1/etc/passwd"
    2.81 +	  then
    2.82  		chroot "$1/" addgroup -g25 -S messagebus
    2.83  		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G messagebus \
    2.84  			-g"D-Bus Message Daemon User" messagebus
    2.85  	fi
    2.86 -	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
    2.87 +	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"
    2.88 +	  then
    2.89  		action 'Configuring %s/etc/daemons.conf...' "$1"
    2.90  		cat >> "$1/etc/daemons.conf" <<EOT
    2.91  # DBUS daemon options.
    2.92 @@ -84,21 +88,25 @@
    2.93  #	[ -z "$1" ] || umount "$1/dev"
    2.94  #}
    2.95  
    2.96 -pre_remove_dbus() {
    2.97 -	if [ -z "$1" ]; then
    2.98 +pre_remove_dbus()
    2.99 +{
   2.100 +	if [ -z "$1" ]
   2.101 +	  then
   2.102  		/etc/init.d/dbus stop
   2.103  	fi 2>/dev/null
   2.104  	chroot "$1/" deluser  messagebus
   2.105  	chroot "$1/" delgroup messagebus
   2.106  }
   2.107  
   2.108 -post_install_dbus_helper() {
   2.109 +post_install_dbus_helper()
   2.110 +{
   2.111  	local i="$1/usr/libexec/dbus-daemon-launch-helper"
   2.112  	chown root:messagebus $i
   2.113  	chmod 4750 $i
   2.114  }
   2.115  
   2.116 -post_install_dbus_introspect() {
   2.117 +post_install_dbus_introspect()
   2.118 +{
   2.119  	U="http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
   2.120  	F="file:///usr/share/xml/docbook/stylesheet/dbus/introspect.dtd"
   2.121