summaryrefslogtreecommitdiff
path: root/devel/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'devel/dbus')
-rw-r--r--devel/dbus/Makefile14
-rw-r--r--devel/dbus/distinfo6
-rw-r--r--devel/dbus/files/patch-bus_Makefile.in20
-rw-r--r--devel/dbus/files/patch-bus_bus.c30
-rw-r--r--devel/dbus/files/patch-bus_system.conf.in10
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c56
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c23
-rw-r--r--devel/dbus/pkg-install1
-rw-r--r--devel/dbus/pkg-plist15
9 files changed, 60 insertions, 115 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index c52855667aec..92de3079975b 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= dbus
-PORTVERSION?= 1.0.2
-PORTREVISION?= 2
+PORTVERSION?= 1.1.20
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=--localstatedir=/var \
--disable-doxygen-docs \
--disable-xml-docs
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(DBUS_SLAVE)
@@ -48,10 +48,7 @@ USE_XLIB= yes
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
- ${WRKSRC}/bus/system.conf.in
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|/usr/X11R6|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/dbus/dbus-sysdeps-unix.c
@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
${WRKSRC}/dbus/Makefile.in \
@@ -62,8 +59,7 @@ post-install:
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
- ${MKDIR} ${X11BASE}/etc/dbus-1/system.d
- ${MKDIR} ${X11BASE}/share/dbus-1/services
+ ${MKDIR} ${PREFIX}/share/dbus-1/interfaces
.endif
.include <bsd.port.post.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 86dade22f679..9ec2266417ce 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.0.2.tar.gz) = 0552a9b54beb4a044951b7cdbc8fc855
-SHA256 (dbus-1.0.2.tar.gz) = 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
-SIZE (dbus-1.0.2.tar.gz) = 1400278
+MD5 (dbus-1.1.20.tar.gz) = c552b9bc4b69e4c602644abc21b7661e
+SHA256 (dbus-1.1.20.tar.gz) = 6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
+SIZE (dbus-1.1.20.tar.gz) = 1401902
diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in
new file mode 100644
index 000000000000..b55c5dc79f22
--- /dev/null
+++ b/devel/dbus/files/patch-bus_Makefile.in
@@ -0,0 +1,20 @@
+--- bus/Makefile.in.orig 2008-01-22 14:45:58.000000000 -0500
++++ bus/Makefile.in 2008-01-22 15:24:26.000000000 -0500
+@@ -412,7 +412,7 @@ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
+
+@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \
+ $(DBUS_BUS_LIBS) \
+ $(top_builddir)/dbus/libdbus-convenience.la
+
+-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+ $(XML_SOURCES) \
+ config-parser-common.c \
diff --git a/devel/dbus/files/patch-bus_bus.c b/devel/dbus/files/patch-bus_bus.c
deleted file mode 100644
index af6b06529fe3..000000000000
--- a/devel/dbus/files/patch-bus_bus.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- bus/bus.c.orig Wed Mar 21 16:20:57 2007
-+++ bus/bus.c Wed Mar 21 16:22:08 2007
-@@ -21,6 +21,7 @@
- *
- */
-
-+#include <signal.h>
- #include "bus.h"
- #include "activation.h"
- #include "connection.h"
-@@ -731,14 +732,18 @@ bus_context_new (const DBusString *confi
- }
-
- bytes = _dbus_string_get_length (&pid);
-- if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
-+ signal (SIGPIPE, SIG_IGN);
-+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
-+ errno != EPIPE)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Printing message bus PID: %s\n",
- _dbus_strerror (errno));
- _dbus_string_free (&pid);
-+ signal (SIGPIPE, SIG_DFL);
- goto failed;
- }
-+ signal (SIGPIPE, SIG_DFL);
-
- if (print_pid_fd > 2)
- _dbus_close_socket (print_pid_fd, NULL);
diff --git a/devel/dbus/files/patch-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in
deleted file mode 100644
index cfb3f879ec79..000000000000
--- a/devel/dbus/files/patch-bus_system.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- bus/system.conf.in.orig Wed May 3 02:08:16 2006
-+++ bus/system.conf.in Wed May 3 02:09:58 2006
-@@ -52,6 +52,7 @@
- <!-- Config files are placed here that among other things, punch
- holes in the above policy for specific services. -->
- <includedir>system.d</includedir>
-+ <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir>
-
- <!-- This is included last so local configuration can override what's
- in this standard file -->
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
index 83b1c33d72be..bd0353d36d62 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -1,12 +1,10 @@
---- dbus/dbus-sysdeps-unix.c.orig Wed Nov 1 18:30:46 2006
-+++ dbus/dbus-sysdeps-unix.c Sun Nov 5 21:57:27 2006
-@@ -834,10 +834,10 @@ write_credentials_byte (int
- {
+--- dbus/dbus-sysdeps-unix.c.orig 2008-02-15 20:26:46.000000000 -0500
++++ dbus/dbus-sysdeps-unix.c 2008-02-15 20:28:46.000000000 -0500
+@@ -1032,9 +1032,9 @@ write_credentials_byte (int
int bytes_written;
char buf[1] = { '\0' };
--#if defined(HAVE_CMSGCRED)
+ #if defined(HAVE_CMSGCRED)
- struct {
-+#if defined(HAVE_CMSGCRED)
+ union {
struct cmsghdr hdr;
- struct cmsgcred cred;
@@ -14,7 +12,7 @@
} cmsg;
struct iovec iov;
struct msghdr msg;
-@@ -848,10 +848,10 @@ write_credentials_byte (int
+@@ -1045,10 +1045,10 @@ write_credentials_byte (int
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
@@ -28,20 +26,19 @@
cmsg.hdr.cmsg_level = SOL_SOCKET;
cmsg.hdr.cmsg_type = SCM_CREDS;
#endif
-@@ -918,9 +918,10 @@ _dbus_read_credentials_unix_socket (int
- char buf;
-
+@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket (int
+ pid_read = DBUS_PID_UNSET;
+
#ifdef HAVE_CMSGCRED
- struct {
-+ struct cmsgcred *cred;
+ union {
- struct cmsghdr hdr;
-- struct cmsgcred cred;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ struct cmsghdr hdr;
+- struct cmsgcred cred;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
} cmsg;
#elif defined(LOCAL_CREDS)
-@@ -957,8 +958,8 @@ _dbus_read_credentials_unix_socket (int
+@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket (int
#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
memset (&cmsg, 0, sizeof (cmsg));
@@ -52,7 +49,7 @@
#endif
again:
-@@ -981,7 +982,8 @@ _dbus_read_credentials_unix_socket (int
+@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket (int
}
#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
@@ -62,26 +59,17 @@
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Message from recvmsg() was not SCM_CREDS");
-@@ -1009,9 +1011,10 @@ _dbus_read_credentials_unix_socket (int
+@@ -1229,8 +1230,11 @@ _dbus_read_credentials_socket (int
cr_len, (int) sizeof (cr), _dbus_strerror (errno));
}
#elif defined(HAVE_CMSGCRED)
-- credentials->pid = cmsg.cred.cmcred_pid;
-- credentials->uid = cmsg.cred.cmcred_euid;
-- credentials->gid = cmsg.cred.cmcred_groups[0];
+- pid_read = cmsg.cred.cmcred_pid;
+- uid_read = cmsg.cred.cmcred_euid;
++ struct cmsgcred *cred;
++
+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+ credentials->pid = cred->cmcred_pid;
-+ credentials->uid = cred->cmcred_euid;
-+ credentials->gid = cred->cmcred_groups[0];
++ pid_read = cred->cmcred_pid;
++ uid_read = cred->cmcred_euid;
#elif defined(LOCAL_CREDS)
- credentials->pid = DBUS_PID_UNSET;
- credentials->uid = cmsg.cred.sc_uid;
-@@ -2687,7 +2690,7 @@ _dbus_get_standard_session_servicedirs (
- }
- else
- {
-- if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+ if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/X11R6/share:/usr/share:"))
- goto oom;
- }
-
+ pid_read = DBUS_PID_UNSET;
+ uid_read = cmsg.cred.sc_uid;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
deleted file mode 100644
index 4a6bf2c7a505..000000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- dbus/dbus-sysdeps-util-unix.c.orig Mon Dec 11 14:21:10 2006
-+++ dbus/dbus-sysdeps-util-unix.c Wed Mar 21 16:22:45 2007
-@@ -157,15 +157,19 @@ _dbus_become_daemon (const DBusString *p
- }
-
- bytes = _dbus_string_get_length (&pid);
-- if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
-+ signal (SIGPIPE, SIG_IGN);
-+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
-+ errno != EPIPE)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Printing message bus PID: %s\n",
- _dbus_strerror (errno));
- _dbus_string_free (&pid);
- kill (child_pid, SIGTERM);
-+ signal (SIGPIPE, SIG_DFL);
- return FALSE;
- }
-+ signal (SIGPIPE, SIG_DFL);
-
- _dbus_string_free (&pid);
- }
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
index 5a49ace79e13..4ed46afa771a 100644
--- a/devel/dbus/pkg-install
+++ b/devel/dbus/pkg-install
@@ -34,6 +34,7 @@ POST-INSTALL)
/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
+ /usr/bin/chgrp ${GROUP} ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper
${PKG_PREFIX}/bin/dbus-uuidgen --ensure
exit 0
;;
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 9836e0dbbbaa..3bbf8b3c9956 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -28,21 +28,24 @@ lib/libdbus-1.la
lib/libdbus-1.so
lib/libdbus-1.so.3
libdata/pkgconfig/dbus-1.pc
+libexec/dbus-daemon-launch-helper
+@exec mkdir -p %D/libexec/dbus-1
@exec mkdir -p %D/etc/dbus-1/system.d
-@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
+@exec mkdir -p %D/share/dbus-1/interfaces
@exec mkdir -p %D/share/dbus-1/services
-@exec mkdir -p %%X11BASE%%/share/dbus-1/services
+@exec mkdir -p %D/share/dbus-1/system-services
+@exec mkdir -p %D/etc/dbus-1/session.d
+@dirrmtry share/dbus-1/system-services
@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1/interfaces
@dirrmtry share/dbus-1
-@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true
+@dirrmtry libexec/dbus-1
@dirrm include/dbus-%%VERSION%%/include/dbus
@dirrm include/dbus-%%VERSION%%/include
@dirrm include/dbus-%%VERSION%%/dbus
@dirrm include/dbus-%%VERSION%%
@dirrm etc/dbus-1/system.d
+@dirrm etc/dbus-1/session.d
@dirrm etc/dbus-1
@unexec rm -f /var/run/dbus/dbus.pid
@unexec rm -f /var/run/dbus/dbus.pipe
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 12:43:01 +0000