# HG changeset patch # User Hans-G?nter Theisgen # Date 1592923911 -3600 # Node ID a959f8d42765f8254046ef97f982ffa69b6622dc # Parent a5e1588644b79b1cd44c31521efd75602d9b3b06 updated dbus (1.12.12 -> 1.12.18) diff -r a5e1588644b7 -r a959f8d42765 dashel/receipt --- a/dashel/receipt Tue Jun 23 15:33:53 2020 +0100 +++ b/dashel/receipt Tue Jun 23 15:51:51 2020 +0100 @@ -15,7 +15,7 @@ compile_rules() { - cmake .. \ + cmake . \ -DCMAKE_INSTALL_PREFIX=/usr && make && make install diff -r a5e1588644b7 -r a959f8d42765 dbus/receipt --- a/dbus/receipt Tue Jun 23 15:33:53 2020 +0100 +++ b/dbus/receipt Tue Jun 23 15:51:51 2020 +0100 @@ -1,22 +1,22 @@ # SliTaz package receipt v2. PACKAGE="dbus" -VERSION="1.12.12" +VERSION="1.12.18" CATEGORY="x-window" SHORT_DESC="D-Bus, a message bus system" -MAINTAINER="devel@slitaz.org" +MAINTAINER="maintainer@slitaz.org" LICENSE="GPL2" WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/dbus.html" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL" -TARBALL_SHA1="ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa" +# 1.12.12 TARBALL_SHA1="ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa" COOKOPTS="force-arch" # different .h -BUILD_DEPENDS="expat-dev libx11-dev glib-dev libice-dev \ -libsm-dev libxslt xmlto libxml2-tools" # docbook-xsl +BUILD_DEPENDS="expat-dev glib-dev libice-dev libsm-dev libx11-dev + libxslt libxml2-tools xmlto" # docbook-xsl SPLIT="$PACKAGE-helper $PACKAGE-introspect $PACKAGE $PACKAGE-dev" COPY_helper="dbus-daemon-launch-helper" @@ -31,40 +31,44 @@ CONFIG_FILES_std="/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/" -compile_rules() { +compile_rules() +{ # temporarily: --disable-xml-docs - ./configure \ - --disable-doxygen-docs \ - --disable-xml-docs \ - --disable-static \ - --with-console-auth-dir=/run/console/ \ - --with-system-pid-file=/run/dbus/pid \ - --with-system-socket=/run/dbus/system_bus_socket \ - --disable-systemd \ - --without-systemdsystemunitdir \ + ./configure \ + --disable-doxygen-docs \ + --disable-xml-docs \ + --disable-static \ + --with-console-auth-dir=/run/console/ \ + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket \ + --disable-systemd \ + --without-systemdsystemunitdir \ $CONFIGURE_ARGS && fix libtool && make && make -j1 install || return 1 # Init script - cp -a $stuff/etc $install - chown -R root.root $install/etc + cp -a $stuff/etc $install + chown -R root.root $install/etc # docbook stuff mkdir -p $install/usr/share/xml/docbook/stylesheet/dbus - cp doc/introspect.* $install/usr/share/xml/docbook/stylesheet/dbus + cp doc/introspect.* $install/usr/share/xml/docbook/stylesheet/dbus } -pre_install_dbus() { +pre_install_dbus() +{ # Go for echoing on configuration files if any messagebus user # was found. - if ! grep -qs 'messagebus' "$1/etc/passwd"; then + if ! grep -qs 'messagebus' "$1/etc/passwd" + then chroot "$1/" addgroup -g25 -S messagebus chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G messagebus \ -g"D-Bus Message Daemon User" messagebus fi - if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then + if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf" + then action 'Configuring %s/etc/daemons.conf...' "$1" cat >> "$1/etc/daemons.conf" </dev/null chroot "$1/" deluser messagebus chroot "$1/" delgroup messagebus } -post_install_dbus_helper() { +post_install_dbus_helper() +{ local i="$1/usr/libexec/dbus-daemon-launch-helper" chown root:messagebus $i chmod 4750 $i } -post_install_dbus_introspect() { +post_install_dbus_introspect() +{ U="http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" F="file:///usr/share/xml/docbook/stylesheet/dbus/introspect.dtd"