wok-current rev 22633
updated dbus, dbus-dev and dbus-helper (1.6.22 -> 1.12.16)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Mon Jan 13 13:56:07 2020 +0100 (2020-01-13) |
| parents | 53c1379e13fa |
| children | 916ebbb03a03 |
| files | dbus-dev/receipt dbus-helper/receipt dbus/receipt |
line diff
1.1 --- a/dbus-dev/receipt Mon Jan 13 11:52:56 2020 +0100 1.2 +++ b/dbus-dev/receipt Mon Jan 13 13:56:07 2020 +0100 1.3 @@ -1,23 +1,25 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="dbus-dev" 1.7 -VERSION="1.6.22" 1.8 +VERSION="1.12.16" 1.9 CATEGORY="development" 1.10 -SHORT_DESC="D-Bus is a message bus system devel files." 1.11 -WANTED="dbus" 1.12 +SHORT_DESC="A message bus system - development files." 1.13 MAINTAINER="pankso@slitaz.org" 1.14 LICENSE="GPL2" 1.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus" 1.16 -HOST_ARCH="i486 arm" 1.17 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" 1.18 1.19 DEPENDS="dbus pkg-config" 1.20 +WANTED="dbus" 1.21 + 1.22 +HOST_ARCH="i486 arm" 1.23 1.24 # Rules to gen a SliTaz package suitable for Tazpkg. 1.25 genpkg_rules() 1.26 { 1.27 mkdir -p $fs/usr/lib 1.28 - cp -a $install/usr/include $fs/usr 1.29 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.30 - cp -a $install/usr/lib/dbus-1.0 $fs/usr/lib 1.31 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.32 + 1.33 + cp -a $install/usr/include $fs/usr 1.34 + cp -a $install/usr/lib/*.*a $fs/usr/lib 1.35 + cp -a $install/usr/lib/dbus-1.0 $fs/usr/lib 1.36 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.37 }
2.1 --- a/dbus-helper/receipt Mon Jan 13 11:52:56 2020 +0100 2.2 +++ b/dbus-helper/receipt Mon Jan 13 13:56:07 2020 +0100 2.3 @@ -1,21 +1,22 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="dbus-helper" 2.7 -VERSION="1.6.22" 2.8 +VERSION="1.12.16" 2.9 CATEGORY="development" 2.10 -SHORT_DESC="D-Bus is a message bus system devel files." 2.11 -WANTED="dbus" 2.12 +SHORT_DESC="A message bus system - development file." 2.13 MAINTAINER="pankso@slitaz.org" 2.14 LICENSE="GPL2" 2.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus" 2.16 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" 2.17 2.18 DEPENDS="dbus" 2.19 +WANTED="dbus" 2.20 2.21 # Rules to gen a SliTaz package suitable for Tazpkg. 2.22 genpkg_rules() 2.23 { 2.24 mkdir -p $fs/usr/lib 2.25 - cp -a $install/usr/lib/dbus $fs/usr/lib 2.26 - chown root.25 $fs/usr/lib/dbus/dbus-daemon-launch-helper 2.27 - chmod 4750 $fs/usr/lib/dbus/dbus-daemon-launch-helper 2.28 + 2.29 + cp -a $install/usr/lib/dbus $fs/usr/lib 2.30 + chown root.25 $fs/usr/lib/dbus/dbus-daemon-launch-helper 2.31 + chmod 4750 $fs/usr/lib/dbus/dbus-daemon-launch-helper 2.32 }
3.1 --- a/dbus/receipt Mon Jan 13 11:52:56 2020 +0100 3.2 +++ b/dbus/receipt Mon Jan 13 13:56:07 2020 +0100 3.3 @@ -1,45 +1,53 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="dbus" 3.7 -VERSION="1.6.22" 3.8 +VERSION="1.12.16" 3.9 CATEGORY="x-window" 3.10 -SHORT_DESC="D-Bus is a message bus system." 3.11 +SHORT_DESC="A message bus system." 3.12 MAINTAINER="pankso@slitaz.org" 3.13 LICENSE="GPL2" 3.14 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" 3.15 + 3.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.17 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus" 3.18 -WGET_URL="http://dbus.freedesktop.org/releases/dbus/$TARBALL" 3.19 +WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL" 3.20 + 3.21 +DEPENDS="expat slitaz-base-files util-linux-uuid xorg-libICE 3.22 + xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp" 3.23 +BUILD_DEPENDS="expat-dev util-linux-uuid-dev xorg-libX11-dev" 3.24 + 3.25 HOST_ARCH="i486 arm" 3.26 3.27 -DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \ 3.28 -xorg-libXau xorg-libXdmcp util-linux-uuid" 3.29 -BUILD_DEPENDS="xorg-libX11-dev expat-dev util-linux-uuid-dev" 3.30 - 3.31 # Rules to configure and make the package. 3.32 compile_rules() 3.33 { 3.34 - ./configure \ 3.35 - --libexecdir=/usr/lib/dbus \ 3.36 - --sysconfdir=/etc \ 3.37 - --localstatedir=/var \ 3.38 + ./configure \ 3.39 + --libexecdir=/usr/lib/dbus \ 3.40 + --sysconfdir=/etc \ 3.41 + --localstatedir=/var \ 3.42 $CONFIGURE_ARGS && 3.43 - make && make -j 1 install 3.44 + make && 3.45 + make install 3.46 } 3.47 3.48 # Rules to gen a SliTaz package suitable for Tazpkg. 3.49 genpkg_rules() 3.50 { 3.51 - mkdir -p $fs/usr/lib $fs/usr/share 3.52 - cp -a $install/etc $fs 3.53 - cp -a $install/var $fs 3.54 - cp -a $install/usr/bin $fs/usr 3.55 - cp -a $install/usr/lib/*.so* $fs/usr/lib 3.56 - cp -a $install/usr/lib/dbus $fs/usr/lib 3.57 + mkdir -p $fs/usr/lib 3.58 + mkdir -p $fs/usr/share 3.59 + 3.60 + cp -a $install/etc $fs 3.61 + cp -a $install/var $fs 3.62 + cp -a $install/usr/bin $fs/usr 3.63 + cp -a $install/usr/lib/*.so* $fs/usr/lib 3.64 + cp -a $install/usr/lib/dbus $fs/usr/lib 3.65 + cp -a $install/usr/share/dbus* $fs/usr/share 3.66 + 3.67 + # Init script 3.68 + cp -a $stuff/etc $fs 3.69 + 3.70 # Remove helper --> dbus-helper 3.71 rm $fs/usr/lib/dbus/dbus-daemon-launch-helper 3.72 - cp -a $install/usr/share/dbus* $fs/usr/share 3.73 - # Init script 3.74 - cp -a $stuff/etc $fs 3.75 + 3.76 chown -R root.root $fs 3.77 } 3.78 3.79 @@ -47,7 +55,8 @@ 3.80 { 3.81 # Go for echoing on configuration files if any messagebus user 3.82 # was found. 3.83 - if ! grep -qs 'messagebus' "$1/etc/passwd"; then 3.84 + if ! grep -qs 'messagebus' "$1/etc/passwd" 3.85 + then 3.86 action 'Adding user: messagebus...' 3.87 echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd" 3.88 echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow" 3.89 @@ -55,7 +64,8 @@ 3.90 echo 'messagebus:!::' >> "$1/etc/gshadow" 3.91 status 3.92 fi 3.93 - if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then 3.94 + if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf" 3.95 + then 3.96 action 'Configuring %s/etc/daemons.conf...' "$1" 3.97 cat >> "$1/etc/daemons.conf" << "EOT" 3.98 # DBUS daemon options. 3.99 @@ -64,12 +74,14 @@ 3.100 EOT 3.101 status 3.102 fi 3.103 + 3.104 [ -d "$1/var/run" ] || mkdir -p "$1/var/run" 3.105 } 3.106 3.107 pre_remove() 3.108 { 3.109 - if [ -z "$1" ]; then 3.110 + if [ -z "$1" ] 3.111 + then 3.112 /etc/init.d/dbus stop 2> /dev/null 3.113 deluser messagebus 3.114 fi