[weasel-commit] Source: dbus=1.2.3-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sat, 09 Jan 2010 21:16:03 -0500
================================
dbus:source=1.2.3-2 (previous: 1.2.3-1)
cvc rdiff dbus -1 /weasel.rpath.org@wgl:3-devel/1.2.3-2
================================
1.2.3-2 Filip Brcic (brcha@xxxxxxx) Sat Jan 9 21:15:56 2010
fixed recipe + added metadata
dbus.recipe: changed
Index: dbus.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- dbus.recipe /weasel.rpath.org@wgl:3-devel/1.2.3-1
+++ dbus.recipe /weasel.rpath.org@wgl:3-devel/1.2.3-2
@@ -1,5 +1,6 @@
#
# Copyright (c) 2004-2008 rPath, Inc.
+# Copyright (c) 2009-2010 Weasel GNU/Linux
# This file is distributed under the terms of the MIT License.
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
@@ -8,21 +9,29 @@
name = 'dbus'
version = '1.2.3'
- buildRequires = [ 'expat:devel', 'pkg-config:devel', 'xmlto:runtime',
+ buildRequires = [
+ 'expat:devel', 'pkg-config:devel', 'xmlto:runtime',
'file:runtime', 'libX11:devel', 'imake:runtime', 'libICE:devel',
- 'libSM:devel', ]
+ 'libSM:devel',
+ ]
+
+ shortDesc = 'Desktop BUS'
+ longDesc = """
+A message bus system, a simple way for applications to talk to each other
+"""
+ url = 'http://dbus.freedesktop.org/'
+ licenses = [ 'GPL-2', 'AFL-2.1' ]
+ categories = [ 'System' ]
def unpack(r):
- r.Description(shortDesc='Desktop BUS',
- longDesc='A message bus system, a simple way for
applications to talk to each other')
- r.PackageURL('http://dbus.freedesktop.org/')
- r.Licenses('GPL-2', 'AFL-2.1')
-
r.macros.dbus_user = 'dbus'
r.addArchive('http://dbus.freedesktop.org/releases/dbus/')
r.addPatch('dbus-1.2.3-panic-from-dbus_signature_validate.patch')
+ r.addPatch('dbus-1.2.3-bsd.patch')
- r.addSource('dbus.sh')
+ r.addSource('30-dbus',
+ dest='%(sysconfdir)s/X11/xinit/xinitrc.d/',
+ mode=0755)
r.macros.cflags += ' -rdynamic'
r.macros.ldflags += ' -rdynamic'
@@ -30,7 +39,8 @@
r.Replace('<user>.*</user>', '<user>%(dbus_user)s</user>',
'bus/system.conf*')
- r.extraConfig = (
+ def configure(r):
+ r.Configure(
' --with-x'
' --enable-inotify'
' --with-xml=expat'
@@ -42,29 +52,12 @@
' --disable-xml-docs'
)
- if Arch.x86_64:
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
- r.Configure(r.extraConfig,
- objDir='build32', overrideMacros=macros32,
- preConfigure='USE_ARCH=32')
- r.Make(dir='build32', overrideMacros=macros32,
preMake='USE_ARCH=32')
- r.MakeInstall(dir='build32', overrideMacros=macros32,
preMake='USE_ARCH=32')
- r.NormalizePkgConfig(exceptions='.*')
-
- def configure(r):
- r.Configure(r.extraConfig)
-
def policy(r):
r.addSource('dbus.initd', dest='%(initdir)s/dbus', mode=0755)
r.MakeDirs('%(localstatedir)s/run/dbus')
r.MakeDirs('%(localstatedir)s/lib/dbus')
r.MakeDirs('%(datadir)s/dbus-1/services')
- r.Install('dbus.sh', '%(sysconfdir)s/X11/xinit/xinitrc.d/dbus.sh')
r.ExcludeDirectories(exceptions=['%(datadir)s/dbus-1/services'])
r.MakeDirs('%(libdir)s/dbus-1.0/services')
dbus-1.2.3-bsd.patch: new
--- /dev/null
+++ dbus-1.2.3-bsd.patch
@@ -0,0 +50 @@
+https://bugs.gentoo.org/show_bug.cgi?id=236779
+
+
+commit 3564e5cbe4d9c0538d6eb519904ef0befab39d75
+Author: Joe Marcus Clarke <marcus@xxxxxxxxxxxxxxx>
+Date: Thu Sep 4 22:13:30 2008 -0400
+
+ Bug 17061: Handle error return from sysconf correctly
+
+ * dbus/dbus-sysdeps-unix.c:
+ * dbus/dbus-sysdeps-util-unix.c: Cast return
+ from sysconf temporarily so we actually see
+ -1.
+
+ Signed-off-by: Colin Walters <walters@xxxxxxxxxx>
+
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index 3f963bc..24a3774 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -1493,7 +1493,11 @@ fill_user_info (DBusUserInfo *info,
+ /* retrieve maximum needed size for buf */
+ buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
+
+- if (buflen <= 0)
++ /* sysconf actually returns a long, but everything else expects size_t,
++ * so just recast here.
++ * https://bugs.freedesktop.org/show_bug.cgi?id=17061
++ */
++ if ((long) buflen <= 0)
+ buflen = 1024;
+
+ result = -1;
+diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
+index 55eb934..0343a90 100644
+--- a/dbus/dbus-sysdeps-util-unix.c
++++ b/dbus/dbus-sysdeps-util-unix.c
+@@ -836,7 +836,11 @@ fill_group_info (DBusGroupInfo *info,
+ /* retrieve maximum needed size for buf */
+ buflen = sysconf (_SC_GETGR_R_SIZE_MAX);
+
+- if (buflen <= 0)
++ /* sysconf actually returns a long, but everything else expects size_t,
++ * so just recast here.
++ * https://bugs.freedesktop.org/show_bug.cgi?id=17061
++ */
++ if ((long) buflen <= 0)
+ buflen = 1024;
+
+ result = -1;
30-dbus: new
--- /dev/null
+++ 30-dbus
@@ -0,0 +9 @@
+#!/bin/bash
+
+# launches a session dbus instance
+
+dbuslaunch="`which dbus-launch 2>/dev/null`"
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z
"$DBUS_SESSION_BUS_ADDRESS" ]; then
+ eval `$dbuslaunch --sh-syntax --exit-with-session`
+fi
+
dbus.sh: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: dbus=1.2.3-2 - rbuilder
