diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/dbus | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/dbus')
-rw-r--r-- | source/a/dbus/dbus-1.12.x-allow_root_globally.diff (renamed from source/a/dbus/dbus-1.10.x-allow_root_globally.diff) | 12 | ||||
-rwxr-xr-x | source/a/dbus/dbus.SlackBuild | 32 | ||||
-rw-r--r-- | source/a/dbus/dbus.url | 1 | ||||
-rw-r--r-- | source/a/dbus/slack-desc | 8 |
4 files changed, 33 insertions, 20 deletions
diff --git a/source/a/dbus/dbus-1.10.x-allow_root_globally.diff b/source/a/dbus/dbus-1.12.x-allow_root_globally.diff index 07d1ac333..2ff5a535c 100644 --- a/source/a/dbus/dbus-1.10.x-allow_root_globally.diff +++ b/source/a/dbus/dbus-1.12.x-allow_root_globally.diff @@ -1,9 +1,9 @@ -diff -Nur dbus-1.10.0.orig/bus/system.conf.in dbus-1.10.0/bus/system.conf.in ---- dbus-1.10.0.orig/bus/system.conf.in 2015-07-21 11:46:00.000000000 -0500 -+++ dbus-1.10.0/bus/system.conf.in 2015-10-03 17:47:18.646635691 -0500 -@@ -100,6 +100,14 @@ - <!-- Include legacy configuration location --> - <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/system.conf</include> +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 diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild index 734c134c2..4f923ef16 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Copyright 2007-2010 Robby Workman, Northport, Alabama, USA -# Copyright 2007-2015 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007-2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,10 @@ # 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.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -37,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 @@ -59,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -68,7 +77,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/dbus-1.10.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/dbus-1.12.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -77,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ + --runstatedir=/var/run \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/$PKGNAM-$VERSION \ @@ -88,11 +98,13 @@ CXXFLAGS="$SLKCFLAGS" \ --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 \ - --with-init-scripts=slackware \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +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 @@ -113,7 +125,7 @@ if [ -d $PKG/usr/man ]; then fi # Install a custom init script for dbus - the included one is not good for us -rm $PKG/etc/rc.d/* +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 diff --git a/source/a/dbus/dbus.url b/source/a/dbus/dbus.url new file mode 100644 index 000000000..ab5a193a1 --- /dev/null +++ b/source/a/dbus/dbus.url @@ -0,0 +1 @@ +http://dbus.freedesktop.org/releases/dbus/ diff --git a/source/a/dbus/slack-desc b/source/a/dbus/slack-desc index 0610ab8d3..524723dd3 100644 --- a/source/a/dbus/slack-desc +++ b/source/a/dbus/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# 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 +# 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) @@ -14,5 +14,5 @@ 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: +dbus: Homepage: https://dbus.freedesktop.org/ dbus: |