diff options
Diffstat (limited to 'testing/source/vtown/deps/dbus')
-rw-r--r-- | testing/source/vtown/deps/dbus/dbus-1.12.x-allow_root_globally.diff | 18 | ||||
-rw-r--r-- | testing/source/vtown/deps/dbus/dbus-enable-elogind.patch | 73 | ||||
-rwxr-xr-x | testing/source/vtown/deps/dbus/dbus.SlackBuild | 164 | ||||
-rw-r--r-- | testing/source/vtown/deps/dbus/dbus.url | 1 | ||||
-rw-r--r-- | testing/source/vtown/deps/dbus/doinst.sh | 26 | ||||
-rw-r--r-- | testing/source/vtown/deps/dbus/rc.messagebus | 81 | ||||
-rw-r--r-- | testing/source/vtown/deps/dbus/slack-desc | 18 |
7 files changed, 0 insertions, 381 deletions
diff --git a/testing/source/vtown/deps/dbus/dbus-1.12.x-allow_root_globally.diff b/testing/source/vtown/deps/dbus/dbus-1.12.x-allow_root_globally.diff deleted file mode 100644 index 2ff5a535..00000000 --- a/testing/source/vtown/deps/dbus/dbus-1.12.x-allow_root_globally.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur dbus-1.12.0.orig/bus/system.conf.in dbus-1.12.0/bus/system.conf.in ---- dbus-1.12.0.orig/bus/system.conf.in 2017-10-30 07:26:18.000000000 -0500 -+++ dbus-1.12.0/bus/system.conf.in 2017-10-31 00:17:34.989634085 -0500 -@@ -125,6 +125,14 @@ - <!-- <limit name="max_match_rules_per_connection">512</limit> --> - <!-- <limit name="max_replies_per_connection">128</limit> --> - -+ <!-- Allow root to do anything over the messagebus. -+ Don't whine about "security" - anyone with root privileges -+ can edit this file anyway, so -ENOHOLE here. --> -+ <policy user="root"> -+ <allow send_destination="*"/> -+ <allow send_interface="*"/> -+ </policy> -+ - <!-- Config files are placed here that among other things, punch - holes in the above policy for specific services. --> - <includedir>system.d</includedir> diff --git a/testing/source/vtown/deps/dbus/dbus-enable-elogind.patch b/testing/source/vtown/deps/dbus/dbus-enable-elogind.patch deleted file mode 100644 index 5cb5d649..00000000 --- a/testing/source/vtown/deps/dbus/dbus-enable-elogind.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200 -+++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100 -@@ -32,6 +32,9 @@ - #if HAVE_SYSTEMD - #include <systemd/sd-login.h> - #endif -+#if HAVE_ELOGIND -+#include <elogind/sd-login.h> -+#endif - - /** - * @addtogroup DBusInternalsUtils -@@ -54,7 +57,7 @@ - const DBusUserInfo *info; - dbus_bool_t result = FALSE; - --#ifdef HAVE_SYSTEMD -+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND) - /* check if we have logind */ - if (access ("/run/systemd/seats/", F_OK) >= 0) - { ---- a/configure.ac 2016-11-03 11:13:58.286528265 +0100 -+++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100 -@@ -185,6 +185,7 @@ - AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto) - AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto) - AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto) -+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto) - AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto) - - AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) -@@ -1184,6 +1185,24 @@ - - AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes) - -+dnl elogind detection -+if test x$enable_elogind = xno ; then -+ have_elogind=no; -+else -+ PKG_CHECK_MODULES([ELOGIND], -+ [libelogind >= 209], -+ [have_elogind=yes], -+ [have_elogind=no]) -+fi -+ -+if test x$have_elogind = xyes; then -+ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind]) -+fi -+ -+if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then -+ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found]) -+fi -+ - dnl systemd detection - if test x$enable_systemd = xno ; then - have_systemd=no; -@@ -1290,7 +1309,7 @@ - fi - - #### Set up final flags --LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS" -+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS" - AC_SUBST([LIBDBUS_LIBS]) - - ### X11 detection -@@ -1949,6 +1968,7 @@ - Building AppArmor support: ${have_apparmor} - Building inotify support: ${have_inotify} - Building kqueue support: ${have_kqueue} -+ Building elogind support: ${have_elogind} - Building systemd support: ${have_systemd} - Building X11 code: ${have_x11} - Building Doxygen docs: ${enable_doxygen_docs} diff --git a/testing/source/vtown/deps/dbus/dbus.SlackBuild b/testing/source/vtown/deps/dbus/dbus.SlackBuild deleted file mode 100755 index 9fac890f..00000000 --- a/testing/source/vtown/deps/dbus/dbus.SlackBuild +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/bash - -# Copyright 2007-2010 Robby Workman, Northport, Alabama, USA -# Copyright 2007-2020 Patrick Volkerding, Sebeka, MN, USA -# Copyright 2020 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=dbus -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2_vtown_1} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -zcat $CWD/dbus-1.12.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/dbus-enable-elogind.patch.gz | patch -p1 --verbose || exit 1 - -NOCONFIGURE=1 ./autogen.sh || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-doxygen-docs \ - --disable-apparmor \ - --disable-selinux \ - --enable-shared=yes \ - --enable-static=no \ - --enable-inotify \ - --enable-user-session \ - --enable-x11-autolaunch \ - --enable-elogind \ - --disable-systemd \ - --without-systemdsystemunitdir \ - --with-system-pid-file=/var/run/dbus/dbus.pid \ - --with-system-socket=/var/run/dbus/system_bus_socket \ - --with-console-auth-dir=/var/run/console \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Install a custom init script for dbus - the included one is not good for us -mkdir -p $PKG/etc/rc.d -zcat $CWD/rc.messagebus.gz > $PKG/etc/rc.d/rc.messagebus.new -chmod 0755 $PKG/etc/rc.d/rc.messagebus.new - -# Fix some directory ownership -chown messagebus $PKG/var/lib/dbus - -# Add documentation -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* HACKING INSTALL NEWS README* doc/*.{txt,html,dtd} \ - $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/testing/source/vtown/deps/dbus/dbus.url b/testing/source/vtown/deps/dbus/dbus.url deleted file mode 100644 index ab5a193a..00000000 --- a/testing/source/vtown/deps/dbus/dbus.url +++ /dev/null @@ -1 +0,0 @@ -http://dbus.freedesktop.org/releases/dbus/ diff --git a/testing/source/vtown/deps/dbus/doinst.sh b/testing/source/vtown/deps/dbus/doinst.sh deleted file mode 100644 index dcefd1ff..00000000 --- a/testing/source/vtown/deps/dbus/doinst.sh +++ /dev/null @@ -1,26 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Keep same perms on rc.messagebus.new: -if [ -e etc/rc.d/rc.messagebus ]; then - cp -a etc/rc.d/rc.messagebus etc/rc.d/rc.messagebus.new.incoming - cat etc/rc.d/rc.messagebus.new > etc/rc.d/rc.messagebus.new.incoming - mv etc/rc.d/rc.messagebus.new.incoming etc/rc.d/rc.messagebus.new -fi - -#config etc/rc.d/rc.messagebus.new -# No, just install the thing. Leaving it as .new will only lead to problems. -if [ -r etc/rc.d/rc.messagebus.new ]; then - mv etc/rc.d/rc.messagebus.new etc/rc.d/rc.messagebus -fi - diff --git a/testing/source/vtown/deps/dbus/rc.messagebus b/testing/source/vtown/deps/dbus/rc.messagebus deleted file mode 100644 index 9a1ffce9..00000000 --- a/testing/source/vtown/deps/dbus/rc.messagebus +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# messagebus: The D-BUS systemwide message bus -# -# description: This is a daemon which broadcasts notifications of system events \ -# and other messages. See http://www.freedesktop.org/software/dbus/ -# -# processname: dbus-daemon - -# This is a modified version of the rc.messagebus script distributed with the -# dbus sources. Thanks to Don Tanner of the GWare <http://gware.org> Project -# for most of the work involved --Robby Workman <rworkman@slackware.com> - - -PIDFILE=/var/run/dbus/dbus.pid - -start() { - mkdir -p $(dirname $PIDFILE) - if ! ps -u messagebus -c | grep -wq dbus-daemon; then - rm -f $(dirname $PIDFILE)/* - if [ -x /usr/bin/dbus-uuidgen -a -x /usr/bin/dbus-daemon ] ; then - echo "Starting system message bus: /usr/bin/dbus-uuidgen --ensure ; /usr/bin/dbus-daemon --system" - /usr/bin/dbus-uuidgen --ensure - /usr/bin/dbus-daemon --system 1> /dev/null - fi - fi -} - -stop() { - if [ -e "$PIDFILE" ]; then - echo "Stopping system message bus..." - pid=$(cat $PIDFILE) - kill $pid 1> /dev/null 2> /dev/null - # Just in case: - killall dbus-daemon 1> /dev/null 2> /dev/null - rm -f $PIDFILE - fi -} - -reload() { - echo "Reloading system message bus configuration..." - if [ -e "$PIDFILE" ]; then - pid=$(cat $PIDFILE) - kill -HUP $pid - else - killall -HUP dbus-daemon - fi -} - -status() { - if ps -u messagebus -c | grep -wq dbus-daemon; then - echo "System dbus-daemon is running." - else - echo "System dbus-daemon is stopped." - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - echo "You may need to restart your Window Manager to reconnect to the system dbus." - ;; - reload) - reload - ;; - status) - status - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|status}" - ;; -esac - diff --git a/testing/source/vtown/deps/dbus/slack-desc b/testing/source/vtown/deps/dbus/slack-desc deleted file mode 100644 index 524723dd..00000000 --- a/testing/source/vtown/deps/dbus/slack-desc +++ /dev/null @@ -1,18 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -dbus: dbus (D-Bus message bus system) -dbus: -dbus: D-Bus supplies both a system daemon (for events such as "new hardware -dbus: device added" or "printer queue changed") and a per user login -dbus: session daemon (for general IPC needs among user applications). -dbus: Also, the message bus is built on top of a general one-to-one message -dbus: passing framework, which can be used by any two apps to communicate -dbus: directly (without going through the message bus daemon). -dbus: -dbus: Homepage: https://dbus.freedesktop.org/ -dbus: |