Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cc62620be7dad4e29d54ce0cdf0b5686e99e6537)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cc62620be7dad4e29d54ce0cdf0b5686e99e6537)
  • Date: Wed, 13 Jul 2016 20:32:19 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome2-libs/dconf/DEPENDS | 1 -
gnome2-libs/dconf/HISTORY | 3 +++
net/wpa_supplicant/DEPENDS | 2 +-
net/wpa_supplicant/HISTORY | 3 +++
net/wpa_supplicant/INSTALL | 23 ++++++++++++++++++-----
utils/bluez5/BUILD | 4 ++--
utils/bluez5/HISTORY | 3 +++
utils/dbus/DETAILS | 1 +
utils/dbus/HISTORY | 4 ++++
utils/dbus/init.d/smgl-messagebus | 14 +++++++++++---
10 files changed, 46 insertions(+), 12 deletions(-)

New commits:
commit cc62620be7dad4e29d54ce0cdf0b5686e99e6537
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dbus: implemented reload function in the init script

commit 0a0001c95571c2635154fd29e89884c7c42ab7ac
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wpa_supplicant: corrected dbus build flags and configs

commit 718fb8fde6cfc3a20b688017ed7292e682d96ef0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dconf: dropped useless dependency

commit 7c2f20d743ff0741c6c2059af31ed1754d00cfea
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bluez5: dropped deprecated var

diff --git a/gnome2-libs/dconf/DEPENDS b/gnome2-libs/dconf/DEPENDS
index 8feae8b..66c00e0 100755
--- a/gnome2-libs/dconf/DEPENDS
+++ b/gnome2-libs/dconf/DEPENDS
@@ -1,5 +1,4 @@
depends glib2 &&
-depends vala &&
depends libxslt &&
depends docbook-xsl &&

diff --git a/gnome2-libs/dconf/HISTORY b/gnome2-libs/dconf/HISTORY
index 7c0fa3f..9fcf465 100644
--- a/gnome2-libs/dconf/HISTORY
+++ b/gnome2-libs/dconf/HISTORY
@@ -1,3 +1,6 @@
+2016-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: dropped vala -- not required for build
+
2014-11-23 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Use disable_pic function to fix CFLAGS

diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index 3f4fd2c..b3b524a 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -30,6 +30,6 @@ if [[ $CONFIG_CTRL_IFACE != n ]]; then
fi &&

optional_depends dbus \
- CONFIG_CTRL_IFACE_DBUS \
+ "CONFIG_CTRL_IFACE_DBUS CONFIG_CTRL_IFACE_DBUS_NEW" \
"" \
"to enable D-Bus control interface"
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index e00931d..e7de6c3 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2016-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, INSTALL: corrected dbus build flags and configs
+
2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply libressl.patch
* libressl.patch: added, backported from OpenBSD to fix build against
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 6a0db9a..562f52f 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -13,14 +13,27 @@ if is_depends_enabled $SPELL qt4; then
fi &&

if is_depends_enabled $SPELL dbus; then
- install -vm 755 -d "$INSTALL_ROOT/usr/share/dbus-1/system-services" &&
+ local DBUS_CONFIG_DIR="$INSTALL_ROOT/etc/dbus-1/system.d" &&
+ local DBUS_SYSTEM_DIR="$INSTALL_ROOT/usr/share/dbus-1/system-services" &&

-
DBUS_FILE="$INSTALL_ROOT/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
&&
+ if [ ! -d "$DBUS_SYSTEM_DIR" ]; then
+ install -vm 755 -d "$DBUS_SYSTEM_DIR"
+ fi &&
+
+ if [ ! -d "$DBUS_CONFIG_DIR" ]; then
+ install -vm 755 -d "$DBUS_CONFIG_DIR"
+ fi &&
+
+ DBUS_FILE="$DBUS_SYSTEM_DIR/fi.epitest.hostap.WPASupplicant.service" &&
+ DBUS_FILE2="$DBUS_SYSTEM_DIR/fi.w1.wpa_supplicant1.service" &&

if [[ $WPA_RELEASE == legacy ]]; then
- install -Tvm 644 dbus-wpa_supplicant.service "$DBUS_FILE"
- elif [[ $WPA_RELEASE == devel ]]; then
- install -Tvm 644 dbus/fi.epitest.hostap.WPASupplicant.service
"$DBUS_FILE"
+ install -Tvm 644 dbus-wpa_supplicant.service "$DBUS_FILE" &&
+ install_config_file dbus-wpa_supplicant.conf
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
+ else
+ install -Tvm 644 dbus/fi.epitest.hostap.WPASupplicant.service
"$DBUS_FILE" &&
+ install -Tvm 644 dbus/fi.w1.wpa_supplicant1.service "$DBUS_FILE2" &&
+ install_config_file dbus/dbus-wpa_supplicant.conf
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
fi
fi &&

diff --git a/utils/bluez5/BUILD b/utils/bluez5/BUILD
index 5f57a58..5b706e8 100755
--- a/utils/bluez5/BUILD
+++ b/utils/bluez5/BUILD
@@ -1,3 +1,3 @@
-OPTS="$BLUEZOPTS $OPTS" &&
-OPTS+=" --disable-systemd" &&
+OPTS="--disable-systemd $OPTS" &&
+
default_build
diff --git a/utils/bluez5/HISTORY b/utils/bluez5/HISTORY
index 66a6df0..1c792cd 100644
--- a/utils/bluez5/HISTORY
+++ b/utils/bluez5/HISTORY
@@ -1,3 +1,6 @@
+2016-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: dropped deprecated var
+
2016-07-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.40
* DEPENDS: corrected flags for udev; added libical opt dep
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index f6086cb..a35c62a 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,5 +1,6 @@
SPELL=dbus
VERSION=1.10.8
+ PATCHLEVEL=1

SOURCE_HASH=sha512:becc6c27b81a716ca498f3cdce2dae9fe5b39d7d334f66a9eae7ae8ce6448ea8c5fdfc500138371992828693a2f8f3a503efb147e163103aa64eac9b4bcf9906
SECURITY_PATCH=15
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 9ba37b9..5a7488a 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,7 @@
+2016-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/smgl-messagebus: implement reload()
+
2016-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.10.8

diff --git a/utils/dbus/init.d/smgl-messagebus
b/utils/dbus/init.d/smgl-messagebus
index 8fa7b36..77da6e3 100755
--- a/utils/dbus/init.d/smgl-messagebus
+++ b/utils/dbus/init.d/smgl-messagebus
@@ -68,9 +68,17 @@ status() {
fi
}

-reload() { exit 3; }
-force_reload() { exit 3; }
+reload() {
+ echo "Reloading D-BUS configuration..."
+ /usr/bin/dbus-send --print-reply \
+ --system \
+ --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+
+ evaluate_retval
+}

usage() {
- echo "Usage: $0 {start|stop|restart|status}"
+ echo "Usage: $0 {start|stop|restart|reload|status}"
}



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cc62620be7dad4e29d54ce0cdf0b5686e99e6537), Vlad Glagolev, 07/13/2016

Archive powered by MHonArc 2.6.24.

Top of Page