From 29f1d74bea73f87fc0ff9e23d8e40302d5dcb4e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Tue, 17 Mar 2020 17:04:38 -0300 Subject: [PATCH] recipes: daemons/dbus_x11: Replace/rename it to dbus/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- recipes/03-xorg.order | 1 - recipes/daemons/dbus/post-install | 2 +- recipes/daemons/dbus/recipe | 32 ++++++--- recipes/daemons/dbus_x11/post-install | 4 -- recipes/daemons/dbus_x11/recipe | 131 ---------------------------------- 5 files changed, 24 insertions(+), 146 deletions(-) delete mode 100644 recipes/daemons/dbus_x11/post-install delete mode 100644 recipes/daemons/dbus_x11/recipe diff --git a/recipes/03-xorg.order b/recipes/03-xorg.order index 414ab3aa..c42a3028 100644 --- a/recipes/03-xorg.order +++ b/recipes/03-xorg.order @@ -260,4 +260,3 @@ xorg/data/xkeyboard-config: xorg/extra/libxkbcommon: xorg/extra/xdg-user-dirs: xorg/extra/xdg-utils: -daemons/dbus_x11: diff --git a/recipes/daemons/dbus/post-install b/recipes/daemons/dbus/post-install index be589f5c..e3b116b8 100644 --- a/recipes/daemons/dbus/post-install +++ b/recipes/daemons/dbus/post-install @@ -1,4 +1,4 @@ # To validate UUIDs (Universally Unique IDs) -chroot . usr/bin/dbus-uuidgen --ensure 2> /dev/null +chroot "${rootdir:-.}" /usr/bin/dbus-uuidgen --ensure 2> /dev/null diff --git a/recipes/daemons/dbus/recipe b/recipes/daemons/dbus/recipe index 5060ffee..e939820c 100644 --- a/recipes/daemons/dbus/recipe +++ b/recipes/daemons/dbus/recipe @@ -1,7 +1,7 @@ # Build recipe for dbus. # # Copyright (C) 2018, MMPG -# Copyright (c) 2018-2019 Matias Fonzo, . +# Copyright (c) 2018-2020 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,11 +17,14 @@ program=dbus version=1.12.16 -release=1 +release=2 # Set 'outdir' for a nice and well-organized output directory outdir="${outdir}/${arch}/daemons" +# The installation of this package replaces to +replace=dbus + tarname=${program}-${version}.tar.gz # Remote source(s) @@ -50,6 +53,10 @@ build() cd "$srcdir" + # Apply a patch to allow root to do anything (thanks to "Slackware Linux"). + patch -Np1 \ + -i "${worktree}/patches/dbus/dbus-1.12.x-allow_root_globally.diff" + # Set sane permissions chmod -R u+w,go-w,a+rX-s . @@ -58,25 +65,32 @@ build() $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ + --docdir=$docsdir \ + --runstatedir=/run \ --enable-static=no \ --enable-shared=yes \ --enable-debug=no \ --enable-inotify \ - --disable-x11-autolaunch \ + --enable-x11-autolaunch \ --disable-systemd \ --disable-selinux \ - --with-valgrind \ + --disable-doxygen-docs \ + --with-xml=expat \ --with-dbus-user=messagebus \ - --with-console-auth-dir=/var/run/console \ - --with-system-pid-file=/var/run/dbus/dbus.pid \ - --with-system-socket=/var/run/dbus/system_bus_socket \ - --with-session-socket-dir=/tmp \ - --without-x \ + --with-console-auth-dir=/run/console \ + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket \ --build="$(cc -dumpmachine)" make -j${jobs} V=1 make -j${jobs} DESTDIR="$destdir" install-strip + chown root:messagebus "${destdir}/usr/libexec/dbus-daemon-launch-helper" + chmod 4750 "${destdir}/usr/libexec/dbus-daemon-launch-helper" + + mkdir -p "${destdir}/var/lib/dbus" + chown messagebus "${destdir}/var/lib/dbus" + # Compress and link man pages (if needed) if test -d "${destdir}/$mandir" then diff --git a/recipes/daemons/dbus_x11/post-install b/recipes/daemons/dbus_x11/post-install deleted file mode 100644 index e3b116b8..00000000 --- a/recipes/daemons/dbus_x11/post-install +++ /dev/null @@ -1,4 +0,0 @@ - -# To validate UUIDs (Universally Unique IDs) -chroot "${rootdir:-.}" /usr/bin/dbus-uuidgen --ensure 2> /dev/null - diff --git a/recipes/daemons/dbus_x11/recipe b/recipes/daemons/dbus_x11/recipe deleted file mode 100644 index 1494fd4b..00000000 --- a/recipes/daemons/dbus_x11/recipe +++ /dev/null @@ -1,131 +0,0 @@ -# Build recipe for dbus (with X11 support). -# -# Copyright (C) 2018, MMPG -# Copyright (c) 2018-2020 Matias Fonzo, . -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -program=dbus -version=1.12.16 -release=2 - -# Set 'outdir' for a nice and well-organized output directory -outdir="${outdir}/${arch}/daemons" - -pkgname=dbus_x11 - -# The installation of this package replaces to -replace=dbus - -tarname=${program}-${version}.tar.gz - -# Remote source(s) -fetch=http://dbus.freedesktop.org/releases/dbus/$tarname - -description=" -A system daemon and a per user login session daemon (with X11 support). - -The message bus is built on top of a general one-to-one message passing -framework, which can be used by any two apps to communicate directly -(without going through the message bus daemon). -" - -homepage=http://www.freedesktop.org/wiki/Software/dbus/ -license="AFLv2.1 | GPLv2+" - -# Source documentation -docs="AUTHORS COPYING ChangeLog NEWS README" -docsdir="${docdir}/${program}-${version}" - -build() -{ - set -e - - unpack "${tardir}/$tarname" - - cd "$srcdir" - - # Apply a patch to allow root to do anything (thanks to "Slackware Linux"). - patch -Np1 \ - -i "${worktree}/patches/dbus/dbus-1.12.x-allow_root_globally.diff" - - # Set sane permissions - chmod -R u+w,go-w,a+rX-s . - - ./configure \ - CFLAGS="$QICFLAGS" CXXFLAGS="$QICXXFLAGS" LDFLAGS="$QILDFLAGS" \ - $configure_args \ - --libdir=/usr/lib${libSuffix} \ - --mandir=$mandir \ - --docdir=$docsdir \ - --runstatedir=/run \ - --enable-static=no \ - --enable-shared=yes \ - --enable-debug=no \ - --enable-inotify \ - --enable-x11-autolaunch \ - --disable-systemd \ - --disable-selinux \ - --disable-doxygen-docs \ - --with-xml=expat \ - --with-dbus-user=messagebus \ - --with-console-auth-dir=/run/console \ - --with-system-pid-file=/run/dbus/pid \ - --with-system-socket=/run/dbus/system_bus_socket \ - --build="$(cc -dumpmachine)" - - make -j${jobs} V=1 - make -j${jobs} DESTDIR="$destdir" install-strip - - chown root:messagebus "${destdir}/usr/libexec/dbus-daemon-launch-helper" - chmod 4750 "${destdir}/usr/libexec/dbus-daemon-launch-helper" - - mkdir -p "${destdir}/var/lib/dbus" - chown messagebus "${destdir}/var/lib/dbus" - - # Compress and link man pages (if needed) - if test -d "${destdir}/$mandir" - then - ( - cd "${destdir}/$mandir" - find . -type f -exec lzip -9 '{}' + - find . -type l | while read -r file - do - ln -sf "$(readlink -- "$file").lz" "${file}.lz" - rm -- "$file" - done - ) - fi - - # Copy documentation - mkdir -p "${destdir}${docsdir}" - cp -p $docs "${destdir}${docsdir}/" - - # Install perp service for dbus - - mkdir -p "${destdir}/etc/perp/dbus" - - cp -p "${worktree}/archive/dbus/rc.log" \ - "${worktree}/archive/dbus/rc.main" \ - "${destdir}/etc/perp/dbus/" - - chmod 755 "${destdir}"/etc/perp/dbus/rc.* - - # Be an active service by default - chmod +t "${destdir}/etc/perp/dbus" - - # To handle config file(s) - touch "${destdir}/etc/dbus-1/.graft-config" \ - "${destdir}/etc/perp/dbus/.graft-config" -} - -- 2.11.4.GIT