SliTaz Repositories

     1.1 --- a/dbus/receipt	Sun Apr 23 10:38:23 2017 +0200
     1.2 +++ b/dbus/receipt	Sat Jun 17 22:59:11 2017 +0300
     1.3 @@ -1,4 +1,4 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="dbus"
     1.8  VERSION="1.10.14"
     1.9 @@ -12,9 +12,8 @@
    1.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.11  WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
    1.12  
    1.13 -DEPENDS="expat xorg-libX11 slitaz-base-files"
    1.14  BUILD_DEPENDS="expat-dev xorg-libX11-dev"
    1.15 -SPLIT="dbus-helper"
    1.16 +SPLIT="dbus-helper dbus dbus-dev"
    1.17  
    1.18  # Rules to configure and make the package.
    1.19  compile_rules()
    1.20 @@ -30,23 +29,32 @@
    1.21  		--with-console-auth-dir=/run/console/ \
    1.22  		--docdir=/usr/share/doc/dbus-$VERSION \
    1.23  		$CONFIGURE_ARGS &&
    1.24 -	make && make -j 1 install
    1.25 +	make && make -j1 install
    1.26 +
    1.27 +	# Init script
    1.28 +	cp -a $stuff/etc $install
    1.29 +	chown -R root.root $install/etc
    1.30  }
    1.31  
    1.32  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.33  genpkg_rules()
    1.34  {
    1.35 -	cook_copy_folders var bin dbus-1
    1.36 -	cook_copy_files *.so*
    1.37 -
    1.38 -	# Init script
    1.39 -	cp -a $stuff/etc $fs
    1.40 -
    1.41 -	chown -R root.root $fs
    1.42 +	case $PACKAGE in
    1.43 +		dbus-helper)
    1.44 +			copy dbus-daemon-launch-helper
    1.45 +			CAT="x-window|dbus-daemon-launch-helper"
    1.46 +			;;
    1.47 +		dbus)
    1.48 +			copy @std
    1.49 +			remove_already_packed
    1.50 +			DEPENDS="expat xorg-libX11 slitaz-base-files"
    1.51 +			CONFIG_FILES="/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/"
    1.52 +			;;
    1.53 +		*-dev) copy @dev;;
    1.54 +	esac
    1.55  }
    1.56  
    1.57 -pre_install()
    1.58 -{
    1.59 +pre_install_dbus() {
    1.60  	# Go for echoing on configuration files if any messagebus user
    1.61  	# was found.
    1.62  	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    1.63 @@ -68,11 +76,20 @@
    1.64  	[ -d "$1/var/run" ] || mkdir -p "$1/var/run"
    1.65  }
    1.66  
    1.67 -pre_remove()
    1.68 -{
    1.69 +post_install_dbus() {
    1.70 +	dbus-uuidgen --ensure
    1.71 +}
    1.72 +
    1.73 +pre_remove_dbus() {
    1.74  	if [ -z "$1" ]; then
    1.75  		/etc/init.d/dbus stop
    1.76 -		deluser  messagebus
    1.77 -		delgroup messagebus
    1.78 -	fi 2> /dev/null
    1.79 +	fi 2>/dev/null
    1.80 +	chroot "$1/" deluser  messagebus
    1.81 +	chroot "$1/" delgroup messagebus
    1.82  }
    1.83 +
    1.84 +post_install_dbus_helper() {
    1.85 +	local i="$1/usr/libexec/dbus-daemon-launch-helper"
    1.86 +	chown root:messagebus $i
    1.87 +	chmod 4750 $i
    1.88 +}