dbus: update to 1.16.2

package/dbus/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.10.20
-PKG_RELEASE:=		3
-PKG_HASH:=		e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48
+PKG_VERSION:=		1.16.2
+PKG_RELEASE:=		1
+PKG_HASH:=		0ba2a1a4b16afe7bceb2c07e9ce99a8c2c3508e5dec290dbb643384bd6beb7e2
 PKG_DESCR:=		desktop bus daemon
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		libdbus libexpat
@@ -17,8 +17,6 @@ PKG_SITES:=		https://dbus.freedesktop.org/releases/dbus/
 PKG_LIBNAME:=		libdbus
 PKG_OPTS:=		dev
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
 PKG_SUBPKGS:=		DBUS LIBDBUS
 PKGSD_LIBDBUS:=		DBUS library
 PKGSC_LIBDBUS:=		libs/misc
@@ -29,29 +27,18 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBDBUS},${PKGSD_LIBDBUS},${PKGSC_LIBDBUS},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-luuid
-
-AUTOTOOL_STYLE:=	autoreconf
-CONFIGURE_ARGS+=	--disable-systemd \
-			--disable-tests \
-			--disable-asserts \
-			--enable-abstract-sockets \
-			--with-dbus-user=dbus \
-			--with-system-socket=/run/dbus/system_bus_socket \
-			--with-system-pid-file=/run/dbus/dbus.pid \
-			--disable-verbose-mode \
-			--disable-apparmor \
-			--disable-kqueue \
-			--disable-selinux \
-			--disable-libaudit \
-			--disable-doxygen-docs \
-			--disable-xml-docs \
-			--without-x
+CONFIG_STYLE:=		cmake
+CMAKE_FLAGS+=		-DCMAKE_INSTALL_RUNSTATEDIR="/var/run" \
+			-DCMAKE_INSTALL_SYSCONFDIR="/etc" \
+			-DCMAKE_INSTALL_DATADIR="/usr/share" \
+			-DDBUS_SESSION_SOCKET_DIR="/var/run/dbus/session_bus_socket" \
+			-DDBUS_BUILD_TESTS=OFF \
+			-DDBUS_ENABLE_DOXYGEN_DOCS=OFF \
+			-DDBUS_ENABLE_QTHELP_DOCS=OFF \
+			-DDBUS_ENABLE_XML_DOCS=OFF \
+			-DENABLE_SYSTEMD=OFF \
+			-DDBUS_WITH_GLIB=OFF
 
-pre-install:
-	${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus
-	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
-		$(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus
 
 libdbus-install:
 	${INSTALL_DIR} ${IDIR_LIBDBUS}/usr/lib

package/dbus/files/dbus.init

@@ -11,7 +11,7 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	mkdir -p /run/dbus /var/lib
+	mkdir -p /run/dbus /var/lib /var/run/dbus
 	ln -sf /lib/dbus /var/lib/dbus
 	/usr/bin/dbus-daemon --system
 	;;

package/dbus/files/dbus.postinst

@@ -1,8 +1,8 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 gid=$(get_next_gid)
-add_group dbus $gid
-add_user dbus $(get_next_uid) $gid /var/run/dbus
+add_group messagebus $gid
+add_user messagebus $(get_next_uid) $gid /var/run/dbus
 add_rcconf dbus NO
 if [ -z $IPKG_INSTROOT ];then 
   echo Generating UUID