On Fri, Oct 03, 2008 at 12:28:28PM -0400, Brad wrote: > Here is an update to the latest releases of DBus 1.2.3 > and DBus-glib 0.76. Please test, especially on anything > but amd64/i386. i386, running with this and a bunch of ports depending on it for a couple of days now, no problems noticed.
Small request to make such patches possible to apply without manually
editing them...
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 10 Jun 2008 03:09:39 -0000 1.16
> +++ Makefile 1 Oct 2008 22:56:16 -0000
> @@ -2,14 +2,13 @@
>
> COMMENT= message bus system
>
> -DISTNAME= dbus-1.0.2
> -PKGNAME= ${DISTNAME}p5
> -SHARED_LIBS += dbus-1 6.0 # .5.0
> +DISTNAME= dbus-1.2.3
> +SHARED_LIBS+= dbus-1 7.0
> CATEGORIES= x11
>
> HOMEPAGE= http://dbus.freedesktop.org/
>
> -# GPLv2
> +# GPLv2+
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> PERMIT_PACKAGE_CDROM= Yes
> @@ -19,29 +18,28 @@ WANTLIB= ICE X11 Xau Xdmcp SM c expat p
>
> MASTER_SITES= ${HOMEPAGE}/releases/dbus/
>
> -SEPARATE_BUILD= simple
> +CFLAGS+= -pthread
>
> -AUTOCONF_VERSION= 2.59
> -CONFIGURE_STYLE= gnu
> -CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
> - CPPFLAGS="-I${X11BASE}/include" \
> - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread"
> +SEPARATE_BUILD= simple
> +USE_LIBTOOL= Yes
> +USE_X11= Yes
> +CONFIGURE_STYLE= autoconf
> +AUTOCONF_VERSION= 2.61
> +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
> + CPPFLAGS="-I${LOCALBASE}/include"
> CONFIGURE_ARGS= --localstatedir=/var \
> --with-dbus-user=_dbus \
> --with-xml=expat \
> --disable-xml-docs \
> - --disable-doxygen-docs
> + --disable-doxygen-docs \
> + --disable-abstract-sockets
> # Tests are disabled as they change the final dbus binaries
> #CONFIGURE_ARGS= --enable-tests
> #CONFIGURE_ARGS= --enable-verbose-mode
>
> -USE_X11= Yes
> -USE_LIBTOOL= Yes
> -
> FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus
>
> -pre-install:
> - @perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
> - ${WRKSRC}/tools/dbus-uuidgen.1 ${WRKSRC}/bus/dbus-daemon.1
> +pre-build:
> + @${SUBST_CMD} ${WRKSRC}/bus/dbus-daemon.1 ${WRKSRC}/tools/dbus-uuidgen.1
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 5 Apr 2007 17:36:19 -0000 1.4
> +++ distinfo 7 Aug 2008 18:56:30 -0000
> @@ -1,5 +1,5 @@
> -MD5 (dbus-1.0.2.tar.gz) = BVKptUvrSgRJUbfNvI/IVQ==
> -RMD160 (dbus-1.0.2.tar.gz) = 1e3fsFjEwCbUqfCRrZCrzG5Uhho=
> -SHA1 (dbus-1.0.2.tar.gz) = KHDv1uoLWw0U5SGV9WAjinS7Hg4=
> -SHA256 (dbus-1.0.2.tar.gz) = igBBJfWFEqaVdfIfEFrq0NEhf86ctUy6/qwGtL4oxso=
> -SIZE (dbus-1.0.2.tar.gz) = 1400278
> +MD5 (dbus-1.2.3.tar.gz) = 9xZBOFdo6ZNhvSmFaCB87g==
> +RMD160 (dbus-1.2.3.tar.gz) = 0aIHsqTHRPJ8nAE4joDOvbYfQ/A=
> +SHA1 (dbus-1.2.3.tar.gz) = zrjUlrwanC3NvlWVFcAeycDNz4E=
> +SHA256 (dbus-1.2.3.tar.gz) = Fv+qSodY8RXPAseJYrCEntTYAockIP1GDEM6nNWA7Ro=
> +SIZE (dbus-1.2.3.tar.gz) = 1564475
> Index: patches/patch-bus_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-bus_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-bus_Makefile_in
> --- patches/patch-bus_Makefile_in 23 Mar 2008 10:53:55 -0000 1.1
> +++ patches/patch-bus_Makefile_in 1 Oct 2008 22:51:52 -0000
> @@ -1,11 +1,17 @@
> $OpenBSD: patch-bus_Makefile_in,v 1.1 2008/03/23 10:53:55 ajacoutot Exp $
> ---- bus/Makefile.in.orig Thu Mar 20 16:59:20 2008
> -+++ bus/Makefile.in Thu Mar 20 16:59:50 2008
> -@@ -858,7 +858,6 @@ install-data-hook:
> - chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
> - fi
> - $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
> -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
> - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
> - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
> +--- bus/Makefile.in.orig Wed Oct 1 18:50:44 2008
> ++++ bus/Makefile.in Wed Oct 1 18:51:42 2008
> +@@ -1298,13 +1298,6 @@ install-data-hook:
> + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
> + $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
> + $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
> +- if test `id -u` -eq 0; then \
> +- chown root:$(DBUS_USER)
> $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
> +- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
> +- else \
> +- echo "Not installing
> $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
> +- echo "You'll need to manually set permissions to
> root:$(DBUS_USER) and permissions 4750"; \
> +- fi
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> + # Otherwise a system limit (for SysV at least) may be exceeded.
> + .NOEXPORT:
> Index: patches/patch-bus_dbus-daemon_1
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-bus_dbus-daemon_1,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-bus_dbus-daemon_1
> --- patches/patch-bus_dbus-daemon_1 20 Apr 2008 21:00:19 -0000 1.1
> +++ patches/patch-bus_dbus-daemon_1 7 Aug 2008 19:05:36 -0000
> @@ -1,15 +1,15 @@
> $OpenBSD: patch-bus_dbus-daemon_1,v 1.1 2008/04/20 21:00:19 jasper Exp $
> ---- bus/dbus-daemon.1.orig Sun Apr 20 22:54:14 2008
> -+++ bus/dbus-daemon.1 Sun Apr 20 22:54:17 2008
> +--- bus/dbus-daemon.1.orig Wed Aug 6 15:43:48 2008
> ++++ bus/dbus-daemon.1 Thu Aug 7 15:05:14 2008
> @@ -30,9 +30,9 @@ a different configuration file.
>
> .PP
> The \-\-session option is equivalent to
> --"\-\-config-file=/usr/local/etc/dbus-1/session.conf" and the \-\-system
> -+"\-\-config-file=!!SYSCONFDIR!!/dbus-1/session.conf" and the \-\-system
> +-"\-\-config-file=/src/build/jhbuild/etc/dbus-1/session.conf" and the
> \-\-system
> ++"\-\-config-file=${SYSCONFDIR}/dbus-1/session.conf" and the \-\-system
> option is equivalent to
> --"\-\-config-file=/usr/local/etc/dbus-1/system.conf". By creating
> -+"\-\-config-file=!!SYSCONFDIR!!/dbus-1/system.conf". By creating
> +-"\-\-config-file=/src/build/jhbuild/etc/dbus-1/system.conf". By creating
> ++"\-\-config-file=${SYSCONFDIR}/dbus-1/system.conf". By creating
> additional configuration files and using the \-\-config-file option,
> additional special-purpose message bus daemons could be created.
>
> @@ -17,28 +17,52 @@ $OpenBSD: patch-bus_dbus-daemon_1,v 1.1
>
> .PP
> The standard systemwide and per-session message bus setups are
> --configured in the files "/usr/local/etc/dbus-1/system.conf" and
> --"/usr/local/etc/dbus-1/session.conf". These files normally
> -+configured in the files "!!SYSCONFDIR!!/dbus-1/system.conf" and
> -+"!!SYSCONFDIR!!/dbus-1/session.conf". These files normally
> +-configured in the files "/src/build/jhbuild/etc/dbus-1/system.conf" and
> +-"/src/build/jhbuild/etc/dbus-1/session.conf". These files normally
> ++configured in the files "${SYSCONFDIR}/dbus-1/system.conf" and
> ++"${SYSCONFDIR}/dbus-1/session.conf". These files normally
> <include> a system-local.conf or session-local.conf; you can put local
> overrides in those files to avoid modifying the primary configuration
> files.
> -@@ -169,7 +169,7 @@ Only files ending in ".conf" are included.
> +@@ -183,7 +183,7 @@ Only files ending in ".conf" are included.
> This is intended to allow extension of the system bus by particular
> packages. For example, if CUPS wants to be able to send out
> notification of printer queue changes, it could install a file to
> --/usr/local/etc/dbus-1/system.d that allowed all apps to receive
> -+!!SYSCONFDIR!!/dbus-1/system.d that allowed all apps to receive
> +-/src/build/jhbuild/etc/dbus-1/system.d that allowed all apps to receive
> ++${SYSCONFDIR}/dbus-1/system.d that allowed all apps to receive
> this message and allowed the printer daemon user to send it.
>
> .TP
> -@@ -264,7 +264,7 @@ otherwise try your favorite search engine.
> +@@ -312,7 +312,7 @@ otherwise try your favorite search engine.
> .PP
> The <standard_session_servicedirs/> option is only relevant to the
> per-user-session bus daemon defined in
> --/usr/local/etc/dbus-1/session.conf. Putting it in any other
> -+!!SYSCONFDIR!!/dbus-1/session.conf. Putting it in any other
> +-/src/build/jhbuild/etc/dbus-1/session.conf. Putting it in any other
> ++${SYSCONFDIR}/dbus-1/session.conf. Putting it in any other
> + configuration file would probably be nonsense.
> +
> + .TP
> +@@ -321,12 +321,12 @@ configuration file would probably be nonsense.
> + .PP
> + <standard_system_servicedirs/> specifies the standard system-wide
> + activation directories that should be searched for service files.
> +-This option defaults to /src/build/jhbuild/share/dbus-1/system-services.
> ++This option defaults to ${PREFIX}/share/dbus-1/system-services.
> +
> + .PP
> + The <standard_system_servicedirs/> option is only relevant to the
> + per-system bus daemon defined in
> +-/src/build/jhbuild/etc/dbus-1/system.conf. Putting it in any other
> ++${SYSCONFDIR}/dbus-1/system.conf. Putting it in any other
> + configuration file would probably be nonsense.
> +
> + .TP
> +@@ -339,7 +339,7 @@ the dbus-daemon-launch-helper executable in located in
> +
> + .PP
> + The <servicehelper/> option is only relevant to the per-system bus daemon
> +-defined in /src/build/jhbuild/etc/dbus-1/system.conf. Putting it in any
> other
> ++defined in ${SYSCONFDIR}/dbus-1/system.conf. Putting it in any other
> configuration file would probably be nonsense.
>
> .TP
> Index: patches/patch-bus_policy_c
> ===================================================================
> RCS file: patches/patch-bus_policy_c
> diff -N patches/patch-bus_policy_c
> --- patches/patch-bus_policy_c 29 Feb 2008 13:38:56 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,54 +0,0 @@
> -$OpenBSD: patch-bus_policy_c,v 1.1 2008/02/29 13:38:56 bernd Exp $
> -
> -Security fix for CVE-2008-0595.
> -http://secunia.com/advisories/29148/
> -http://lists.freedesktop.org/archives/dbus/2008-February/009401.html
> -
> ---- bus/policy.c.orig Mon Dec 11 20:21:22 2006
> -+++ bus/policy.c Fri Feb 29 10:33:17 2008
> -@@ -931,9 +931,19 @@ bus_client_policy_check_can_send (BusClientPolicy *pol
> -
> - if (rule->d.send.interface != NULL)
> - {
> -- if (dbus_message_get_interface (message) != NULL &&
> -- strcmp (dbus_message_get_interface (message),
> -- rule->d.send.interface) != 0)
> -+ /* The interface is optional in messages. For allow rules, if the
> message
> -+ * has no interface we want to skip the rule (and thus not allow);
> -+ * for deny rules, if the message has no interface we want to use
> the
> -+ * rule (and thus deny).
> -+ */
> -+ dbus_bool_t no_interface;
> -+
> -+ no_interface = dbus_message_get_interface (message) == NULL;
> -+
> -+ if ((no_interface && rule->allow) ||
> -+ (!no_interface &&
> -+ strcmp (dbus_message_get_interface (message),
> -+ rule->d.send.interface) != 0))
> - {
> - _dbus_verbose (" (policy) skipping rule for different
> interface\n");
> - continue;
> -@@ -1117,9 +1127,19 @@ bus_client_policy_check_can_receive (BusClientPolicy *
> -
> - if (rule->d.receive.interface != NULL)
> - {
> -- if (dbus_message_get_interface (message) != NULL &&
> -- strcmp (dbus_message_get_interface (message),
> -- rule->d.receive.interface) != 0)
> -+ /* The interface is optional in messages. For allow rules, if the
> message
> -+ * has no interface we want to skip the rule (and thus not allow);
> -+ * for deny rules, if the message has no interface we want to use
> the
> -+ * rule (and thus deny).
> -+ */
> -+ dbus_bool_t no_interface;
> -+
> -+ no_interface = dbus_message_get_interface (message) == NULL;
> -+
> -+ if ((no_interface && rule->allow) ||
> -+ (!no_interface &&
> -+ strcmp (dbus_message_get_interface (message),
> -+ rule->d.receive.interface) != 0))
> - {
> - _dbus_verbose (" (policy) skipping rule for different
> interface\n");
> - continue;
> Index: patches/patch-dbus-1_pc_in
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-dbus-1_pc_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-dbus-1_pc_in
> --- patches/patch-dbus-1_pc_in 1 Nov 2007 11:04:28 -0000 1.3
> +++ patches/patch-dbus-1_pc_in 5 Jul 2008 01:16:49 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-dbus-1_pc_in,v 1.3 2007/11/01 11:04:28 espie Exp $
> ---- dbus-1.pc.in.orig Mon Dec 11 20:20:51 2006
> -+++ dbus-1.pc.in Thu Nov 1 11:49:45 2007
> -@@ -9,6 +9,6 @@ [EMAIL PROTECTED]@/dbus-1/ser
> +--- dbus-1.pc.in.orig Fri Apr 4 11:24:08 2008
> ++++ dbus-1.pc.in Fri Jul 4 21:14:27 2008
> +@@ -10,6 +10,6 @@ [EMAIL PROTECTED]@
> Name: dbus
> Description: Free desktop message bus
> Version: @VERSION@
> Index: patches/patch-dbus_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-dbus_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-dbus_Makefile_in
> --- patches/patch-dbus_Makefile_in 21 Mar 2007 00:21:58 -0000 1.1
> +++ patches/patch-dbus_Makefile_in 7 Aug 2008 19:05:31 -0000
> @@ -1,12 +1,12 @@
> $OpenBSD: patch-dbus_Makefile_in,v 1.1 2007/03/21 00:21:58 espie Exp $
> ---- dbus/Makefile.in.orig Tue Dec 12 20:41:47 2006
> -+++ dbus/Makefile.in Fri Dec 29 18:45:43 2006
> -@@ -299,7 +299,7 @@ target_cpu = @target_cpu@
> - target_os = @target_os@
> - target_vendor = @target_vendor@
> +--- dbus/Makefile.in.orig Wed Aug 6 15:43:39 2008
> ++++ dbus/Makefile.in Thu Aug 7 14:58:28 2008
> +@@ -310,7 +310,7 @@ top_builddir = @top_builddir@
> + top_srcdir = @top_srcdir@
> configdir = $(sysconfdir)/dbus-1
> --INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS)
> -DDBUS_COMPILATION
> -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
> -+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS)
> -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
> - dbusincludedir = $(includedir)/dbus-1.0/dbus
> - dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus
> - lib_LTLIBRARIES = libdbus-1.la
> + INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS)
> @PIC_CFLAGS@ -DDBUS_COMPILATION \
> +- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
> \
> ++ -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\" \
> + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"
> \
> + -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
> +
> Index: patches/patch-dbus_dbus-sysdeps-unix_c
> ===================================================================
> RCS file: patches/patch-dbus_dbus-sysdeps-unix_c
> diff -N patches/patch-dbus_dbus-sysdeps-unix_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-dbus_dbus-sysdeps-unix_c 7 Aug 2008 19:05:31 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- dbus/dbus-sysdeps-unix.c.orig Wed Aug 6 13:00:29 2008
> ++++ dbus/dbus-sysdeps-unix.c Thu Aug 7 14:58:28 2008
> +@@ -79,8 +79,8 @@
> + #define O_BINARY 0
> + #endif
> +
> +-#ifndef _AI_ADDRCONFIG
> +-#define _AI_ADDRCONFIG 0
> ++#ifndef AI_ADDRCONFIG
> ++#define AI_ADDRCONFIG 0
> + #endif
> +
> + #ifndef HAVE_SOCKLEN_T
> Index: patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-doc_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 1 Nov 2007 11:04:28 -0000 1.1
> +++ patches/patch-doc_Makefile_in 7 Aug 2008 19:05:31 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-doc_Makefile_in,v 1.1 2007/11/01 11:04:28 espie Exp $
> ---- doc/Makefile.in.orig Tue Dec 12 20:41:48 2006
> -+++ doc/Makefile.in Thu Nov 1 12:00:18 2007
> -@@ -407,16 +407,16 @@ uninstall-am: uninstall-info-am
> +--- doc/Makefile.in.orig Wed Aug 6 15:43:39 2008
> ++++ doc/Makefile.in Thu Aug 7 14:58:28 2008
> +@@ -412,16 +412,16 @@ uninstall-am:
> @[EMAIL PROTECTED]: $(HTML_FILES)
>
> @[EMAIL PROTECTED]: dbus-specification.xml
> Index: patches/patch-tools_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-tools_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-tools_Makefile_in
> --- patches/patch-tools_Makefile_in 21 Mar 2007 00:21:58 -0000 1.1
> +++ patches/patch-tools_Makefile_in 7 Aug 2008 19:05:31 -0000
> @@ -1,16 +1,16 @@
> $OpenBSD: patch-tools_Makefile_in,v 1.1 2007/03/21 00:21:58 espie Exp $
> ---- tools/Makefile.in.orig Tue Dec 12 20:41:48 2006
> -+++ tools/Makefile.in Fri Dec 29 18:46:33 2006
> -@@ -289,7 +289,7 @@ target_cpu = @target_cpu@
> - target_os = @target_os@
> - target_vendor = @target_vendor@
> +--- tools/Makefile.in.orig Wed Aug 6 15:43:39 2008
> ++++ tools/Makefile.in Thu Aug 7 14:58:28 2008
> +@@ -301,7 +301,7 @@ target_vendor = @target_vendor@
> + top_builddir = @top_builddir@
> + top_srcdir = @top_srcdir@
> configdir = $(sysconfdir)/dbus-1
> -INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS)
> -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION
> -DDBUS_DAEMONDIR=\"@[EMAIL PROTECTED]"
> -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
> +INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS)
> -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION
> -DDBUS_DAEMONDIR=\"@[EMAIL PROTECTED]"
> -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
> dbus_send_SOURCES = \
> dbus-print-message.c \
> dbus-print-message.h \
> -@@ -325,8 +325,8 @@ CLEANFILES = \
> +@@ -337,8 +337,8 @@ CLEANFILES = \
> run-with-tmp-session-bus.conf
>
>
> Index: patches/patch-tools_dbus-uuidgen_1
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/patches/patch-tools_dbus-uuidgen_1,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-tools_dbus-uuidgen_1
> --- patches/patch-tools_dbus-uuidgen_1 23 Mar 2008 10:53:55 -0000
> 1.2
> +++ patches/patch-tools_dbus-uuidgen_1 21 Jul 2008 02:50:24 -0000
> @@ -6,7 +6,7 @@ $OpenBSD: patch-tools_dbus-uuidgen_1,v 1
>
> .PP
> -This will ensure that /var/lib/dbus/machine-id exists and has the uuid in
> it.
> -+This will ensure that !!SYSCONFDIR!!/dbus-1/machine-id exists and has the
> uuid in it.
> ++This will ensure that ${SYSCONFDIR}/dbus-1/machine-id exists and has the
> uuid in it.
> It won't overwrite an existing uuid, since this id should remain fixed
> for a single machine until the next reboot at least.
>
> @@ -16,7 +16,7 @@ $OpenBSD: patch-tools_dbus-uuidgen_1,v 1
> .I "--get[=FILENAME]"
> -If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
> -(localstatedir is usually /var). If this file exists and is valid, the
> -+If a filename is not given, defaults to !!SYSCONFDIR!!/dbus-1/machine-id.
> ++If a filename is not given, defaults to ${SYSCONFDIR}/dbus-1/machine-id.
> +If this file exists and is valid, the
> uuid in the file is printed on stdout. Otherwise, the command exits
> with a nonzero status.
> @@ -25,7 +25,7 @@ $OpenBSD: patch-tools_dbus-uuidgen_1,v 1
> .I "--ensure[=FILENAME]"
> -If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
> -(localstatedir is usually /var). If this file exists then it will be
> -+If a filename is not given, defaults to !!SYSCONFDIR!!/dbus-1/machine-id.
> ++If a filename is not given, defaults to ${SYSCONFDIR}/dbus-1/machine-id.
> +If this file exists then it will be
> validated, and a failure code returned if it contains the wrong thing.
> If the file does not exist, it will be created with a new uuid in it.
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/dbus/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 10 Jun 2008 03:09:39 -0000 1.5
> +++ pkg/PLIST 1 Oct 2008 22:54:22 -0000
> @@ -2,12 +2,12 @@
> @newgroup _dbus:572
> @newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
> %%SHARED%%
> -bin/dbus-cleanup-sockets
> -bin/dbus-daemon
> -bin/dbus-launch
> -bin/dbus-monitor
> -bin/dbus-send
> -bin/dbus-uuidgen
> [EMAIL PROTECTED] bin/dbus-cleanup-sockets
> [EMAIL PROTECTED] bin/dbus-daemon
> [EMAIL PROTECTED] bin/dbus-launch
> [EMAIL PROTECTED] bin/dbus-monitor
> [EMAIL PROTECTED] bin/dbus-send
> [EMAIL PROTECTED] bin/dbus-uuidgen
> include/dbus-1.0/
> include/dbus-1.0/dbus/
> include/dbus-1.0/dbus/dbus-address.h
> @@ -34,6 +34,12 @@ lib/libdbus-1.a
> lib/libdbus-1.la
> lib/pkgconfig/
> lib/pkgconfig/dbus-1.pc
> [EMAIL PROTECTED] libexec/dbus-1/
> [EMAIL PROTECTED] 4750
> [EMAIL PROTECTED] _dbus
> [EMAIL PROTECTED] libexec/dbus-daemon-launch-helper
> [EMAIL PROTECTED]
> [EMAIL PROTECTED]
> @man man/man1/dbus-cleanup-sockets.1
> @man man/man1/dbus-daemon.1
> @man man/man1/dbus-launch.1
> @@ -42,11 +48,14 @@ lib/pkgconfig/dbus-1.pc
> @man man/man1/dbus-uuidgen.1
> share/dbus-1/
> share/dbus-1/services/
> +share/dbus-1/system-services/
> share/examples/dbus/
> share/examples/dbus/dbus-1/
> @sample ${SYSCONFDIR}/dbus-1/
> share/examples/dbus/dbus-1/session.conf
> @sample ${SYSCONFDIR}/dbus-1/session.conf
> +share/examples/dbus/dbus-1/session.d/
> [EMAIL PROTECTED] ${SYSCONFDIR}/dbus-1/session.d/
> share/examples/dbus/dbus-1/system.conf
> @sample ${SYSCONFDIR}/dbus-1/system.conf
> share/examples/dbus/dbus-1/system.d/
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/dbus-glib/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 27 May 2008 08:02:51 -0000 1.9
> +++ Makefile 1 Oct 2008 22:59:36 -0000
> @@ -2,14 +2,13 @@
>
> COMMENT= glib bindings for dbus message system
>
> -DISTNAME= dbus-glib-0.74
> -PKGNAME= ${DISTNAME}p1
> -SHARED_LIBS += dbus-glib-1 3.0 # .3.0
> +DISTNAME= dbus-glib-0.76
> +SHARED_LIBS+= dbus-glib-1 4.0
> CATEGORIES= x11
>
> HOMEPAGE= http://dbus.freedesktop.org/
>
> -# GPL
> +# GPLv2+
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> PERMIT_PACKAGE_CDROM= Yes
> @@ -20,19 +19,19 @@ WANTLIB= expat c pthread pcre
> MASTER_SITES= ${HOMEPAGE}releases/dbus-glib/
>
> MODULES= devel/gettext
> -LIB_DEPENDS= dbus-1.>=5::x11/dbus \
> +LIB_DEPENDS= dbus-1.>=7::x11/dbus \
> glib-2.0,gobject-2.0::devel/glib2
>
> +#CFLAGS+= -I${LOCALBASE}/include -pthread
> +
> SEPARATE_BUILD= simple
> USE_GMAKE= Yes
> USE_LIBTOOL= Yes
> -
> CONFIGURE_STYLE=gnu
> -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
> - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
> - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread"
> +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> + LDFLAGS="-L${LOCALBASE}/lib"
>
> pre-build:
> - cp ${FILESDIR}/dbus-bus-introspect.xml ${WRKBUILD}/tools/
> + @cp ${FILESDIR}/dbus-bus-introspect.xml ${WRKBUILD}/tools
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/dbus-glib/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 9 Feb 2008 17:37:14 -0000 1.5
> +++ distinfo 5 Jul 2008 00:56:23 -0000
> @@ -1,5 +1,5 @@
> -MD5 (dbus-glib-0.74.tar.gz) = CSPYJaCv8uTrIzOLYwKG+w==
> -RMD160 (dbus-glib-0.74.tar.gz) = CnixOL/h29/uDX++vL5wHGNRGoY=
> -SHA1 (dbus-glib-0.74.tar.gz) = 6oockmn+a19j5lcaLIpTelWPAhE=
> -SHA256 (dbus-glib-0.74.tar.gz) = 6HDYzWGYNO2gZuN/5ptEHWKfmtOoce8oVPu811Ozq+I=
> -SIZE (dbus-glib-0.74.tar.gz) = 654853
> +MD5 (dbus-glib-0.76.tar.gz) = 07cWp+eY+qHGqGdnXwAwag==
> +RMD160 (dbus-glib-0.76.tar.gz) = 0Bte+Fw+JxdJWEn9+DeLzxbAfzE=
> +SHA1 (dbus-glib-0.76.tar.gz) = 97/nw5RVm+4S8K3//TMzBNRxd5o=
> +SHA256 (dbus-glib-0.76.tar.gz) = i8CD+q8+/dREqKRLvL/qUBp7VHc2/aPC2Dv9ybW2cqM=
> +SIZE (dbus-glib-0.76.tar.gz) = 667547
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/dbus-glib/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 9 Feb 2008 17:37:14 -0000 1.3
> +++ pkg/PLIST 19 Jul 2008 15:34:21 -0000
> @@ -1,6 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.3 2008/02/09 17:37:14 jasper Exp $
> %%SHARED%%
> -bin/dbus-binding-tool
> [EMAIL PROTECTED] bin/dbus-binding-tool
> include/dbus-1.0/
> include/dbus-1.0/dbus/
> include/dbus-1.0/dbus/dbus-glib-bindings.h
> @@ -19,7 +19,6 @@ share/gtk-doc/html/dbus-glib/ch01.html
> share/gtk-doc/html/dbus-glib/ch02.html
> share/gtk-doc/html/dbus-glib/ch03.html
> share/gtk-doc/html/dbus-glib/dbus-binding-tool.html
> -share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GLib-low-level.html
> share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GObject-related-functions.html
> share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html
> share/gtk-doc/html/dbus-glib/dbus-glib-DBusGError.html
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
--
viq
pgpBwO5UvNUpX.pgp
Description: PGP signature
