tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: sysutils/dbus 1.10.0 problems
Hi,
From: Greg Troxel <gdt%ir.bbn.com@localhost>, Date: Fri, 18 Sep 2015 14:12:39 -0400
>
> My quick reaction is that if these files are actually config files then
> they belong in PKG_SYSCONFBASE, not PREFIX, and rather than change all
> the packages maybe we should be changing dbus to get configuration in
> the right place. But reading the NEWS, it seems like these are the
> default configs that should not be changed by the user, and if the user
> wants to change them, then they should put new files in SYSCONFBASE.
>
> If that's right, then these shouldn't be CONF_FILES.
>
> So maybe we should use your patch now and really fix post freeze.
>
> I'd like to hear what wiz thinks, having updated dbus and triggering
> this issue.
Thanks for your reply.
wiz@ said "Yes, please", however CONF_FILES in sysutils/dbus is incorrect
as you say.
We should use system-local.conf etc. to change behavior.
DBus developers decided the location of its configuration files as
${PREFIX}/share/dbus-1 instead of SYSCONFBASE.
I would like to follow upstream change.
How about this patch?
Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- audio/pulseaudio/Makefile 25 Apr 2015 14:20:23 -0000 1.98
+++ audio/pulseaudio/Makefile 18 Sep 2015 22:00:20 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.98 2015/04/25 14:20:23 tnn Exp $
DISTNAME= pulseaudio-6.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
EXTRACT_SUFX= .tar.xz
@@ -83,7 +83,7 @@
CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
+ ${PREFIX}/share/dbus-1/system.d/pulseaudio-system.conf
PLIST_VARS+= bonjour coreaudio evdev oss sun
Index: net/avahi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/avahi/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- net/avahi/Makefile 25 Apr 2015 14:23:43 -0000 1.58
+++ net/avahi/Makefile 18 Sep 2015 22:00:32 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.58 2015/04/25 14:23:43 tnn Exp $
DISTNAME= avahi-0.6.31
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= net
MASTER_SITES= http://avahi.org/download/
@@ -67,7 +67,7 @@
CONF_FILES+= ${PREFIX}/share/examples/avahi/services/ssh.service \
${PKG_SYSCONFDIR}/services/ssh.service
CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
+ ${PREFIX}/share/dbus-1/system.d/avahi-dbus.conf
CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER}
CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP}
Index: net/dhcpcd-dbus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/dhcpcd-dbus/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- net/dhcpcd-dbus/Makefile 23 Oct 2012 17:18:16 -0000 1.11
+++ net/dhcpcd-dbus/Makefile 18 Sep 2015 22:00:32 -0000
@@ -2,6 +2,7 @@
#
DISTNAME= dhcpcd-dbus-0.6.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://roy.marples.name/pub/dhcpcd/
MASTER_SITES+= http://roy.aydogan.net/dhcpcd/
@@ -21,7 +22,7 @@
# Install the configuration file
CONF_FILES+= ${EGDIR}/dhcpcd-dbus.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/dhcpcd-dbus.conf
+ ${PREFIX}/share/dbus-1/system.d/dhcpcd-dbus.conf
DEPENDS+= dhcpcd>=5.0.0:../../net/dhcpcd
DEPENDS+= dbus>=1.1:../../sysutils/dbus
Index: net/dnsmasq/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/dnsmasq/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- net/dnsmasq/Makefile 15 Aug 2015 12:38:17 -0000 1.31
+++ net/dnsmasq/Makefile 18 Sep 2015 22:00:32 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.31 2015/08/15 12:38:17 leot Exp $
DISTNAME= dnsmasq-2.75
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
@@ -38,7 +39,7 @@
CFLAGS+= -DHAVE_DBUS
.include "../../sysutils/dbus/buildlink3.mk"
CONF_FILES+= ${EGDIR}/dnsmasq-dbus.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf
+ ${PREFIX}/share/dbus-1/system.d/dnsmasq-dbus.conf
PLIST.dbus= yes
.endif
Index: pkgtools/packagekit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/packagekit/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- pkgtools/packagekit/Makefile 25 Apr 2015 14:24:45 -0000 1.47
+++ pkgtools/packagekit/Makefile 18 Sep 2015 22:00:34 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.47 2015/04/25 14:24:45 tnn Exp $
DISTNAME= PackageKit-0.4.0
-PKGREVISION= 35
+PKGREVISION= 36
PKGNAME= ${DISTNAME:S/PackageKit/packagekit/}
CATEGORIES= pkgtools
MASTER_SITES= http://www.freedesktop.org/software/PackageKit/releases/
@@ -31,9 +31,9 @@
CONF_FILES+= ${EGDIR}/Vendor.conf \
${PKG_SYSCONFDIR}/PackageKit/Vendor.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKit.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKit.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.PackageKit.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKitTestBackend.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf
CHECK_INTERPRETER_SKIP+= lib/pm-utils/sleep.d/95packagekit \
share/PackageKit/helpers/test_spawn/search-name.sh
Index: security/policykit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/policykit/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- security/policykit/Makefile 25 Jul 2015 14:36:12 -0000 1.31
+++ security/policykit/Makefile 18 Sep 2015 22:00:37 -0000
@@ -4,7 +4,7 @@
POLICYKIT_VER= 0.9
DISTNAME= PolicyKit-${POLICYKIT_VER}
PKGNAME= policykit-${POLICYKIT_VER}
-PKGREVISION= 18
+PKGREVISION= 19
CATEGORIES= security
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -20,7 +20,7 @@
EGDIR= ${PREFIX}/share/examples/policykit
CONF_FILES+= ${EGDIR}/PolicyKit.conf ${PKG_SYSCONFDIR}/PolicyKit.conf
-CONF_FILES+= ${EGDIR}/org.freedesktop.PolicyKit.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.PolicyKit.conf
+CONF_FILES+= ${EGDIR}/org.freedesktop.PolicyKit.conf ${PREFIX}/share/dbus-1/system.d/org.freedesktop.PolicyKit.conf
#CONF_FILES+= ${EGDIR}/polkit ${PKG_SYSCONFBASE}/pam.d/polkit
#CONF_FILES+= ${EGDIR}/polkit-bash-completion.sh ${PKG_SYSCONFDIR}/profile.d/polkit-bash-completion.sh
Index: sysutils/consolekit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/consolekit/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- sysutils/consolekit/Makefile 12 Jun 2015 10:51:12 -0000 1.26
+++ sysutils/consolekit/Makefile 18 Sep 2015 22:00:38 -0000
@@ -3,7 +3,7 @@
CONSOLEKIT_VER= 0.4.5
DISTNAME= ConsoleKit-${CONSOLEKIT_VER}
PKGNAME= consolekit-${CONSOLEKIT_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
EXTRACT_SUFX= .tar.bz2
@@ -17,7 +17,7 @@
EGDIR= ${PREFIX}/share/examples/consolekit
CONF_FILES+= ${EGDIR}/00-primary.seat ${PKG_SYSCONFDIR}/seats.d/00-primary.seat
-CONF_FILES+= ${EGDIR}/ConsoleKit.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/ConsoleKit.conf
+CONF_FILES+= ${EGDIR}/ConsoleKit.conf ${PREFIX}/share/dbus-1/system.d/ConsoleKit.conf
MAKE_DIRS= ${PKG_SYSCONFDIR}/seats.d
Index: sysutils/dbus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- sysutils/dbus/Makefile 7 Sep 2015 23:24:46 -0000 1.87
+++ sysutils/dbus/Makefile 18 Sep 2015 22:00:38 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.87 2015/09/07 23:24:46 gdt Exp $
DISTNAME= dbus-1.10.0
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -69,6 +70,12 @@
PLIST_VARS+= linux launchd
+DBUS_CONF_DIR+= ${PREFIX}/share/dbus-1
+OWN_DIRS+= ${DBUS_CONF_DIR}/services
+OWN_DIRS+= ${DBUS_CONF_DIR}/system-services
+OWN_DIRS+= ${DBUS_CONF_DIR}/session.d
+OWN_DIRS+= ${DBUS_CONF_DIR}/system.d
+
RCD_SCRIPTS= dbus
PKG_GROUPS_VARS+= DBUS_GROUP
Index: sysutils/devkitd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/devkitd/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sysutils/devkitd/Makefile 23 Oct 2012 19:50:58 -0000 1.7
+++ sysutils/devkitd/Makefile 18 Sep 2015 22:00:38 -0000
@@ -3,7 +3,7 @@
DISTNAME= devkitd-jmcneill-003
PKGNAME= ${DISTNAME:S/-jmcneill//}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://www.invisible.ca/~jmcneill/devkitd/
@@ -19,7 +19,7 @@
USE_TOOLS+= gmake pkg-config
CONF_FILES+= share/examples/GConf/org.freedesktop.DeviceKit.conf \
- ${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.freedesktop.DeviceKit.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.DeviceKit.conf
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
Index: sysutils/hal/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/hal/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- sysutils/hal/Makefile 7 Sep 2015 09:03:24 -0000 1.74
+++ sysutils/hal/Makefile 18 Sep 2015 22:00:38 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.74 2015/09/07 09:03:24 wiz Exp $
DISTNAME= hal-0.5.14
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
EXTRACT_SUFX= .tar.bz2
@@ -27,7 +27,7 @@
EGDIR= ${PREFIX}/share/examples/hal
-CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf
+CONF_FILES= ${EGDIR}/hal.conf ${PREFIX}/share/dbus-1/system.d/hal.conf
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
Index: sysutils/k3b/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/k3b/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- sysutils/k3b/Makefile 30 Jun 2015 09:57:42 -0000 1.80
+++ sysutils/k3b/Makefile 18 Sep 2015 22:00:39 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.80 2015/06/30 09:57:42 ryoon Exp $
DISTNAME= k3b-2.0.3a
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_KDE:=k3b/}
EXTRACT_SUFX= .tar.xz
@@ -20,7 +20,7 @@
CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
CONF_FILES= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
Index: sysutils/system-tools-backends/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/system-tools-backends/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- sysutils/system-tools-backends/Makefile 12 Jun 2015 10:51:18 -0000 1.18
+++ sysutils/system-tools-backends/Makefile 18 Sep 2015 22:00:39 -0000
@@ -2,7 +2,7 @@
#
DISTNAME= system-tools-backends-2.6.1
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= sysutils
MASTER_SITES= http://system-tools-backends.freedesktop.org/downloads/2.6/
@@ -23,7 +23,7 @@
.endif
EGDIR= ${PREFIX}/share/examples/system-tools-backends
-CONF_FILES+= ${EGDIR}/system-tools-backends.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/system-tools-backends.conf
+CONF_FILES+= ${EGDIR}/system-tools-backends.conf ${PREFIX}/share/dbus-1/system.d/system-tools-backends.conf
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
Index: sysutils/upower/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/upower/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sysutils/upower/Makefile 23 Jul 2015 10:55:17 -0000 1.5
+++ sysutils/upower/Makefile 18 Sep 2015 22:00:39 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.5 2015/07/23 10:55:17 joerg Exp $
DISTNAME= upower-0.99.3
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
EXTRACT_SUFX= .tar.xz
@@ -23,7 +24,7 @@
EGDIR= ${PREFIX}/share/examples/upower
CONF_FILES+= ${EGDIR}/UPower.conf ${PKG_SYSCONFDIR}/UPower.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.UPower.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.UPower.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.UPower.conf
PKGCONFIG_OVERRIDE+= upower-glib.pc.in
USE_PKGLOCALEDIR= yes
Index: x11/kde-runtime4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kde-runtime4/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- x11/kde-runtime4/Makefile 30 Jun 2015 09:57:42 -0000 1.58
+++ x11/kde-runtime4/Makefile 18 Sep 2015 22:00:44 -0000
@@ -2,7 +2,7 @@
DISTNAME= kde-runtime-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
@@ -52,7 +52,7 @@
CONF_FILES+= ${PREFIX}/share/examples/kde-runtime4/kde-information.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
BUILDLINK_DEPMETHOD.qt4-tools= full
Index: x11/kde-workspace4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kde-workspace4/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- x11/kde-workspace4/Makefile 25 Apr 2015 14:25:07 -0000 1.47
+++ x11/kde-workspace4/Makefile 18 Sep 2015 22:00:44 -0000
@@ -2,7 +2,7 @@
DISTNAME= kde-workspace-4.11.14
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
COMMENT= Base workspace for the KDE 4 integrated X11 desktop
@@ -40,13 +40,13 @@
CONF_FILES+= ${PREFIX}/share/examples/kde-workspace4/ksysguarddrc \
${PKG_SYSCONFDIR}/ksysguarddrc
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.fontinst.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.fontinst.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.fontinst.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmkdm.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
SPECIAL_PERMS+= ${PREFIX}/lib/kde4/libexec/kcheckpass \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 6555
@@ -81,7 +81,7 @@
.if ${OPSYS} == "Linux"
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
.endif
SUBST_CLASSES+= paths
Index: x11/kdelibs4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs4/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- x11/kdelibs4/Makefile 25 Apr 2015 14:25:13 -0000 1.80
+++ x11/kdelibs4/Makefile 18 Sep 2015 22:00:44 -0000
@@ -2,7 +2,7 @@
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -33,7 +33,7 @@
CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \
${PKG_SYSCONFDIR}/xdg/menus/applications.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.auth.conf
DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml
DEPENDS+= docbook-xsl>=1.75:../../textproc/docbook-xsl
--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
Home |
Main Index |
Thread Index |
Old Index