[pkgsrc/trunk]: pkgsrc/sysutils/dbus update to 1.0.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/dbus update to 1.0.0
From: drochner <drochner%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:13:57 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d2a10d2a1cc
branches:  trunk
changeset: 521479:9d2a10d2a1cc
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Nov 13 15:16:20 2006 +0000

description:
update to 1.0.0
This is the first formal stable release; there were some fixes since
0.92, cleanup and documentation update. The protocol is now considered
stable.

diffstat:

 sysutils/dbus/Makefile         |   20 +-----
 sysutils/dbus/PLIST            |   10 +--
 sysutils/dbus/distinfo         |   15 ++--
 sysutils/dbus/files/dbus.sh    |    3 +-
 sysutils/dbus/patches/patch-aa |   12 ++--
 sysutils/dbus/patches/patch-ab |  123 -----------------------------------------
 sysutils/dbus/patches/patch-ac |   14 ++--
 sysutils/dbus/patches/patch-ae |   14 ----
 sysutils/dbus/patches/patch-ag |   15 +++++
 9 files changed, 44 insertions(+), 182 deletions(-)

diffs (truncated from 340 to 300 lines):

diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Mon Nov 13 15:05:45 2006 +0000
+++ b/sysutils/dbus/Makefile    Mon Nov 13 15:16:20 2006 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/11/07 09:30:16 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/11/13 15:16:20 drochner Exp $
 #
 
-DISTNAME=      dbus-0.92
-PKGREVISION=   1
+DISTNAME=      dbus-1.0.0
 CATEGORIES=    sysutils
-MASTER_SITES=  http://freedesktop.org/software/dbus/releases/
+MASTER_SITES=  http://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=    jmmv%NetBSD.org@localhost
 HOMEPAGE=      http://www.freedesktop.org/Software/dbus
@@ -49,22 +48,14 @@
 CONFIGURE_ARGS+=       --enable-verbose-mode
 .endif
 
-# Next version will automatically detect this with a sane configure check,
-# so it should go away.
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=       --enable-kqueue
-.endif
-
 PKG_SYSCONFSUBDIR=     dbus-1
 MAKE_DIRS=             ${PKG_SYSCONFDIR}/event.d
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/system.d
 
-DOCDIR=                        ${PREFIX}/share/doc/dbus
 EGDIR=                 ${PREFIX}/share/examples/dbus
 CONF_FILES=            ${EGDIR}/session.conf ${PKG_SYSCONFDIR}/session.conf
 CONF_FILES+=           ${EGDIR}/system.conf ${PKG_SYSCONFDIR}/system.conf
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR}
+INSTALLATION_DIRS=     ${EGDIR}
 
 RCD_SCRIPTS=           dbus
 
@@ -73,9 +64,6 @@
 PKG_GECOS.messagebus=  System message bus
 PKG_HOME.messagebus=   ${VARBASE}/run/dbus
 
-post-install:
-       cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${DOCDIR}
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/PLIST
--- a/sysutils/dbus/PLIST       Mon Nov 13 15:05:45 2006 +0000
+++ b/sysutils/dbus/PLIST       Mon Nov 13 15:16:20 2006 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2006/11/04 00:42:30 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/11/13 15:16:20 drochner Exp $
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
 bin/dbus-monitor
 bin/dbus-send
+bin/dbus-uuidgen
 include/dbus-1.0/dbus/dbus-address.h
 include/dbus-1.0/dbus/dbus-bus.h
 include/dbus-1.0/dbus/dbus-connection.h
@@ -27,17 +28,12 @@
 man/man1/dbus-launch.1
 man/man1/dbus-monitor.1
 man/man1/dbus-send.1
-share/doc/dbus/dbus-faq.html
-share/doc/dbus/dbus-specification.html
-share/doc/dbus/dbus-test-plan.html
-share/doc/dbus/dbus-tutorial.html
-share/doc/dbus/dcop-howto.txt
+man/man1/dbus-uuidgen.1
 share/examples/dbus/session.conf
 share/examples/dbus/system.conf
 share/examples/rc.d/dbus
 @dirrm share/examples/dbus
 @exec ${MKDIR} %D/share/dbus-1/services
-@dirrm share/doc/dbus
 @dirrm share/dbus-1/services
 @dirrm share/dbus-1
 @dirrm lib/dbus-1.0/include/dbus
diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/distinfo
--- a/sysutils/dbus/distinfo    Mon Nov 13 15:05:45 2006 +0000
+++ b/sysutils/dbus/distinfo    Mon Nov 13 15:16:20 2006 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2006/09/17 12:02:00 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2006/11/13 15:16:20 drochner Exp $
 
-SHA1 (dbus-0.92.tar.gz) = 37edf2fd6c471b086261462b8b8d3dd2656e1bb4
-RMD160 (dbus-0.92.tar.gz) = 23de0396bf5565c02e2e710bebd95ad5de1832a8
-Size (dbus-0.92.tar.gz) = 1388345 bytes
-SHA1 (patch-aa) = fbf728371c76c1daa267591cd76dec3138f30acf
-SHA1 (patch-ab) = ae2d4d3870acbb48088bc6b1eec4cf181f748493
-SHA1 (patch-ac) = 9ce70807b7d61bf653fa9a55097989958aef8d59
-SHA1 (patch-ae) = c73bed4ec4cca5e7bcdec749ac85ba2c56d8469a
+SHA1 (dbus-1.0.0.tar.gz) = dbc3adcb3ae7abbcdf5b0b3e1623a140042e1491
+RMD160 (dbus-1.0.0.tar.gz) = d4cfc0dafc5c0bcc283f55267bb24b351b8bf377
+Size (dbus-1.0.0.tar.gz) = 1405045 bytes
+SHA1 (patch-aa) = 4d66a0083384448dc89fefe00eb82eeb3aaf13b1
+SHA1 (patch-ac) = cc9b05c917f8ddba3dc2eda2c059f84c5f02fc4d
+SHA1 (patch-ag) = 469993db97a74da50c61449454c02c8a7c69e7bd
diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/files/dbus.sh
--- a/sysutils/dbus/files/dbus.sh       Mon Nov 13 15:05:45 2006 +0000
+++ b/sysutils/dbus/files/dbus.sh       Mon Nov 13 15:16:20 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbus.sh,v 1.4 2006/08/28 08:28:57 jmmv Exp $
+# $NetBSD: dbus.sh,v 1.5 2006/11/13 15:16:20 drochner Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
@@ -21,6 +21,7 @@
                @CHMOD@ 0755 "@VARBASE@/run/dbus"
                @CHOWN@ messagebus:messagebus "@VARBASE@/run/dbus"
        fi
+       @PREFIX@/bin/dbus-uuidgen --ensure
 }
 
 load_rc_config $name
diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/patches/patch-aa
--- a/sysutils/dbus/patches/patch-aa    Mon Nov 13 15:05:45 2006 +0000
+++ b/sysutils/dbus/patches/patch-aa    Mon Nov 13 15:16:20 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2006/08/28 08:28:57 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2006/11/13 15:16:20 drochner Exp $
 
---- bus/Makefile.in.orig       2006-08-18 21:42:14.000000000 +0200
+--- bus/Makefile.in.orig       2006-10-14 19:27:58.000000000 +0200
 +++ bus/Makefile.in
-@@ -301,11 +301,11 @@ target_alias = @target_alias@
+@@ -303,11 +303,11 @@ target_alias = @target_alias@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
@@ -17,9 +17,9 @@
  
  EFENCE = 
  CONFIG_IN_FILES = \
-@@ -852,8 +852,6 @@ install-data-hook:
-               chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
-       fi
+@@ -856,8 +856,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
diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/patches/patch-ab
--- a/sysutils/dbus/patches/patch-ab    Mon Nov 13 15:05:45 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/08/28 08:28:57 jmmv Exp $
-
---- dbus/dbus-sysdeps.c.orig   2006-08-18 17:46:59.000000000 +0200
-+++ dbus/dbus-sysdeps.c
-@@ -488,6 +488,35 @@ _dbus_connect_unix_socket (const char   
- }
- 
- /**
-+ * Enables or disables the reception of credentials on the given socket during
-+ * the next message transmission.  This is only effective if the #LOCAL_CREDS
-+ * system feature exists, in which case the other side of the connection does
-+ * not have to do anything special to send the credentials.
-+ *
-+ * @param fd socket on which to change the #LOCAL_CREDS flag.
-+ * @param on whether to enable or disable the #LOCAL_CREDS flag.
-+ */
-+static dbus_bool_t
-+_dbus_set_local_creds (int fd, dbus_bool_t on)
-+{
-+  dbus_bool_t retval = TRUE;
-+
-+#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
-+  int val = on ? 1 : 0;
-+  if (setsockopt (fd, 0, LOCAL_CREDS, &val, sizeof (val)) < 0)
-+    {
-+      _dbus_verbose ("Unable to set LOCAL_CREDS socket option on fd %d\n", fd);
-+      retval = FALSE;
-+    }
-+  else
-+    _dbus_verbose ("LOCAL_CREDS %s for further messages on fd %d\n",
-+                   on ? "enabled" : "disabled", fd);
-+#endif
-+
-+  return retval;
-+}
-+
-+/**
-  * Creates a socket and binds it to the given path,
-  * then listens on the socket. The socket is
-  * set to be nonblocking.
-@@ -605,6 +634,15 @@ _dbus_listen_unix_socket (const char    
-       return -1;
-     }
- 
-+  if (!_dbus_set_local_creds (listen_fd, TRUE))
-+    {
-+      dbus_set_error (error, _dbus_error_from_errno (errno),
-+                      "Failed to enable LOCAL_CREDS on socket \"%s\": %s",
-+                      path, _dbus_strerror (errno));
-+      close (listen_fd);
-+      return -1;
-+    }
-+
-   if (!_dbus_set_fd_nonblocking (listen_fd, error))
-     {
-       _DBUS_ASSERT_ERROR_IS_SET (error);
-@@ -875,6 +913,11 @@ _dbus_read_credentials_unix_socket  (int
-         struct cmsghdr hdr;
-         struct cmsgcred cred;
-   } cmsg;
-+#elif defined(LOCAL_CREDS)
-+  struct {
-+        struct cmsghdr hdr;
-+        struct sockcred cred;
-+  } cmsg;
- #endif
- 
-   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-@@ -889,17 +932,11 @@ _dbus_read_credentials_unix_socket  (int
- 
-   _dbus_credentials_clear (credentials);
- 
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
--  /* Set the socket to receive credentials on the next message */
--  {
--    int on = 1;
--    if (setsockopt (client_fd, 0, LOCAL_CREDS, &on, sizeof (on)) < 0)
--      {
--      _dbus_verbose ("Unable to set LOCAL_CREDS socket option\n");
--      return FALSE;
--      }
--  }
--#endif
-+  /* Systems supporting LOCAL_CREDS are configured to have this feature
-+   * enabled (if it does not conflict with HAVE_CMSGCRED) prior accepting
-+   * the connection.  Therefore, the received message must carry the
-+   * credentials information without doing anything special.
-+   */
- 
-   iov.iov_base = &buf;
-   iov.iov_len = 1;
-@@ -908,7 +945,7 @@ _dbus_read_credentials_unix_socket  (int
-   msg.msg_iov = &iov;
-   msg.msg_iovlen = 1;
- 
--#ifdef HAVE_CMSGCRED
-+#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-   memset (&cmsg, 0, sizeof (cmsg));
-   msg.msg_control = &cmsg;
-   msg.msg_controllen = sizeof (cmsg);
-@@ -933,7 +970,7 @@ _dbus_read_credentials_unix_socket  (int
-       return FALSE;
-     }
- 
--#ifdef HAVE_CMSGCRED
-+#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-   if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
-     {
-       dbus_set_error (error, DBUS_ERROR_FAILED,
-@@ -965,6 +1002,13 @@ _dbus_read_credentials_unix_socket  (int
-     credentials->pid = cmsg.cred.cmcred_pid;
-     credentials->uid = cmsg.cred.cmcred_euid;
-     credentials->gid = cmsg.cred.cmcred_groups[0];
-+#elif defined(LOCAL_CREDS)
-+    credentials->pid = DBUS_PID_UNSET;
-+    credentials->uid = cmsg.cred.sc_uid;
-+    credentials->gid = cmsg.cred.sc_gid;
-+    /* Since we have already got the credentials from this socket, we can
-+     * disable its LOCAL_CREDS flag if it was ever set. */
-+    _dbus_set_local_creds (client_fd, FALSE);
- #elif defined(HAVE_GETPEEREID)
-     uid_t euid;
-     gid_t egid;
diff -r e6ffd56f26fc -r 9d2a10d2a1cc sysutils/dbus/patches/patch-ac
--- a/sysutils/dbus/patches/patch-ac    Mon Nov 13 15:05:45 2006 +0000
+++ b/sysutils/dbus/patches/patch-ac    Mon Nov 13 15:16:20 2006 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2006/09/17 12:02:00 jmmv Exp $
+$NetBSD: patch-ac,v 1.6 2006/11/13 15:16:20 drochner Exp $
 
---- tools/run-with-tmp-session-bus.sh.orig     2006-08-10 23:44:00.000000000 +0200
+--- tools/run-with-tmp-session-bus.sh.orig     2006-10-01 05:18:47.000000000 +0200
 +++ tools/run-with-tmp-session-bus.sh
-@@ -34,9 +34,11 @@ cat $DBUS_TOP_BUILDDIR/bus/session.conf 
+@@ -38,9 +38,11 @@ if ! test -e "$DBUS_TOP_BUILDDIR"/bus/db
+     die "$DBUS_TOP_BUILDDIR/bus/dbus-daemon does not exist"
+ fi
  
- echo "Created configuration file $CONFIG_FILE" >&2
- 
--export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
-+PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+-export PATH="$DBUS_TOP_BUILDDIR"/bus:$PATH
++PATH="$DBUS_TOP_BUILDDIR"/bus:$PATH
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/cyrus-saslauthd Use md5.h in distfile instead...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Added new package py-emphem-3.7b:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/cyrus-saslauthd Use md5.h in distfile instead...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Added new package py-emphem-3.7b:
Indexes:
Home | Main Index | Thread Index | Old Index