[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2010-09-13 Thread Jan de Groot 
Date: Monday, September 13, 2010 @ 06:46:30
  Author: jgc
Revision: 90541

upgpkg: dbus-core 1.4.0-1
Update to 1.4.0

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-13 10:21:58 UTC (rev 90540)
+++ PKGBUILD2010-09-13 10:46:30 UTC (rev 90541)
@@ -3,8 +3,8 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.2.24
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -14,18 +14,12 @@
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
-bug17754.patch
-git-fixes.patch
 dbus)
-md5sums=('565346cecd9cfecf1463540c6086cc2c'
- 'c74a42681e2726b42486dec82993c009'
- 'c4bd7c5e60b1b5df5adbe80da5839c9e'
+md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  patch -Np1 -i "${srcdir}/bug17754.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2010-10-19 Thread Jan de Groot 
Date: Tuesday, October 19, 2010 @ 10:13:56
  Author: jgc
Revision: 96243

Fix missing ECHO definition in configure (FS#21263)

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 14:08:35 UTC (rev 96242)
+++ PKGBUILD2010-10-19 14:13:56 UTC (rev 96243)
@@ -20,7 +20,7 @@
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ECHO=echo ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \
   --enable-inotify --disable-dnotify \

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2010-03-24 Thread Jan de Groot 
Date: Wednesday, March 24, 2010 @ 07:36:47
  Author: jgc
Revision: 73272

upgpkg: dbus-core 1.2.24-1
Update to 1.2.24, fixes FS#18796

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-24 10:51:16 UTC (rev 73271)
+++ PKGBUILD2010-03-24 11:36:47 UTC (rev 73272)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.2.22
+pkgver=1.2.24
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -15,7 +15,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('54c5f3c79a1f852d2256aca07163813c'
+md5sums=('565346cecd9cfecf1463540c6086cc2c'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-06-11 Thread andyrtr 
Date: Monday, June 11, 2012 @ 15:29:45
  Author: andyrtr
Revision: 161477

upgpkg: dbus-core 1.6.0-1

upstream update 1.6.0

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-11 19:18:53 UTC (rev 161476)
+++ PKGBUILD2012-06-11 19:29:45 UTC (rev 161477)
@@ -3,8 +3,8 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.20
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -14,9 +14,10 @@
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
 dbus)
-md5sums=('79eca2f2c1894ac347acce128314428b'
+md5sums=('16dcae2dd0c76e398381601ac9acdec4'
+ '0ebde9920bde83fe26ce32351a7d8954'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-06-28 Thread Ionut Biru 
Date: Thursday, June 28, 2012 @ 07:42:47
  Author: ibiru
Revision: 162693

update to 1.6.2

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-28 10:33:24 UTC (rev 162692)
+++ PKGBUILD2012-06-28 11:42:47 UTC (rev 162693)
@@ -3,29 +3,29 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.6.0
-pkgrel=5
+pkgver=1.6.2
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 
'systemd-tools') # shadow for install scriptlet FS#29341
+depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 
'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
-conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
 dbus)
-md5sums=('16dcae2dd0c76e398381601ac9acdec4'
- '0ebde9920bde83fe26ce32351a7d8954'
+md5sums=('7fbf877ed6ff7da6df90f07158373829'
+ '2cd74b6efca77e4e3aa2b7ccde770668'
  'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
-  cd "${srcdir}/dbus-${pkgver}"
+  cd dbus-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/run/dbus/pid \
   --with-system-socket=/run/dbus/system_bus_socket \
+  --with-console-auth-dir=/run/console \
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
   --disable-tests --disable-asserts \
@@ -35,19 +35,19 @@
 }
 
 package(){
-  cd "${srcdir}/dbus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd dbus-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  rm -f "${pkgdir}/usr/bin/dbus-launch"
-  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
-  rm -rf "${pkgdir}/var/run"
+  rm -f "$pkgdir/usr/bin/dbus-launch"
+  rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
+  rm -rf "$pkgdir/var/run"
 
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
+  install -m755 -d "$pkgdir/etc/rc.d"
+  install -m755 ../dbus "$pkgdir/etc/rc.d/"
 
   #Fix configuration file
-  sed -i -e 's|81|dbus|' 
"${pkgdir}/etc/dbus-1/system.conf"
+  sed -i -e 's|81|dbus|' 
"$pkgdir/etc/dbus-1/system.conf"
 
-  install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
+  install -dm755 "$pkgdir/usr/share/licenses/dbus-core"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/"
 }

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-06-28 Thread Ionut Biru 
Date: Thursday, June 28, 2012 @ 10:04:37
  Author: ibiru
Revision: 162699

fix console auth dir path
the code doesn't handle a path without the ending /

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-28 13:43:33 UTC (rev 162698)
+++ PKGBUILD2012-06-28 14:04:37 UTC (rev 162699)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus-core
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -25,7 +25,7 @@
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/run/dbus/pid \
   --with-system-socket=/run/dbus/system_bus_socket \
-  --with-console-auth-dir=/run/console \
+  --with-console-auth-dir=/run/console/ \
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
   --disable-tests --disable-asserts \

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-07-21 Thread andyrtr 
Date: Saturday, July 21, 2012 @ 07:11:03
  Author: andyrtr
Revision: 163846

upgpkg: dbus-core 1.6.4-1

upstream update 1.6.4

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-21 11:06:11 UTC (rev 163845)
+++ PKGBUILD2012-07-21 11:11:03 UTC (rev 163846)
@@ -3,8 +3,8 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.6.4
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -15,8 +15,8 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
 dbus)
-md5sums=('7fbf877ed6ff7da6df90f07158373829'
- '2cd74b6efca77e4e3aa2b7ccde770668'
+md5sums=('5ec43dc4554cba638917317b2b4f7640'
+ '3d4482ee39b49da334441c76f83bf1cb'
  'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-01-23 Thread Gaetan Bisson 
Date: Tuesday, January 24, 2012 @ 01:36:37
  Author: bisson
Revision: 147202

implement FS#26419

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 06:36:12 UTC (rev 147201)
+++ PKGBUILD2012-01-24 06:36:37 UTC (rev 147202)
@@ -46,12 +46,6 @@
   #Fix configuration file
   sed -i -e 's|81|dbus|' 
"${pkgdir}/etc/dbus-1/system.conf"
 
-  #install .keep files so pacman doesn't delete empty dirs
-  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
-  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
-  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
-  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
-
   install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-04-06 Thread andyrtr 
Date: Friday, April 6, 2012 @ 11:05:46
  Author: andyrtr
Revision: 155789

upgpkg: dbus-core 1.4.20-1

upstream update 1.4.20; remove /var/run dir from pkg - FS#28443

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-06 14:18:25 UTC (rev 155788)
+++ PKGBUILD2012-04-06 15:05:46 UTC (rev 155789)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.16
+pkgver=1.4.20
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -16,7 +16,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('44a2a10678e7e50460879c3eb4453a65'
+md5sums=('79eca2f2c1894ac347acce128314428b'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
@@ -37,9 +37,8 @@
 
   rm -f "${pkgdir}/usr/bin/dbus-launch"
   rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
+  rm -rf "${pkgdir}/var/run"
 
-  chown 81:81 "${pkgdir}/var/run/dbus"
-
   install -m755 -d "${pkgdir}/etc/rc.d"
   install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-04-06 Thread Dave Reisner 
Date: Friday, April 6, 2012 @ 14:17:20
  Author: dreisner
Revision: 155802

move systemdsystemunitdir to /usr

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-06 16:00:20 UTC (rev 155801)
+++ PKGBUILD2012-04-06 18:17:20 UTC (rev 155802)
@@ -27,7 +27,7 @@
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
   --disable-tests --disable-asserts \
-  --with-systemdsystemunitdir=/lib/systemd/system
+  --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-04-09 Thread andyrtr 
Date: Monday, April 9, 2012 @ 10:30:07
  Author: andyrtr
Revision: 155944

upgpkg: dbus-core 1.4.20-2

add dep on shadow; FS#29341

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-09 13:41:08 UTC (rev 155943)
+++ PKGBUILD2012-04-09 14:30:07 UTC (rev 155944)
@@ -4,12 +4,12 @@
 #
 pkgname=dbus-core
 pkgver=1.4.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem')
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for 
install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2011-10-04 Thread Ionut Biru 
Date: Tuesday, October 4, 2011 @ 12:25:43
  Author: ibiru
Revision: 139665

update to 1.4.16

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-04 16:22:17 UTC (rev 139664)
+++ PKGBUILD2011-10-04 16:25:43 UTC (rev 139665)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.14
+pkgver=1.4.16
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -16,7 +16,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('ae6de2562a57516cfabaf56903375ba9'
+md5sums=('44a2a10678e7e50460879c3eb4453a65'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-09-28 Thread andyrtr 
Date: Friday, September 28, 2012 @ 15:33:38
  Author: andyrtr
Revision: 167220

upgpkg: dbus-core 1.6.6-1

upstream update 1.6.6

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-28 15:17:55 UTC (rev 167219)
+++ PKGBUILD2012-09-28 19:33:38 UTC (rev 167220)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.6.4
+pkgver=1.6.6
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -13,10 +13,9 @@
 makedepends=('libx11')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
 dbus)
-md5sums=('5ec43dc4554cba638917317b2b4f7640'
- '3d4482ee39b49da334441c76f83bf1cb'
+md5sums=('5a8b9093d356adfa937d216ea5eb8abc'
  'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-09-29 Thread andyrtr 
Date: Saturday, September 29, 2012 @ 04:08:31
  Author: andyrtr
Revision: 167236

upgpkg: dbus-core 1.6.8-1

upstream update 1.6.8

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-29 06:58:03 UTC (rev 167235)
+++ PKGBUILD2012-09-29 08:08:31 UTC (rev 167236)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.6.6
+pkgver=1.6.8
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -15,7 +15,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
 dbus)
-md5sums=('5a8b9093d356adfa937d216ea5eb8abc'
+md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
  'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-11-07 Thread Tom Gundersen 
Date: Wednesday, November 7, 2012 @ 09:51:11
  Author: tomegun
Revision: 170410

avoid cyclic dependency

systemd is in base, so we don't have to depend on it

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-07 11:29:05 UTC (rev 170409)
+++ PKGBUILD2012-11-07 14:51:11 UTC (rev 170410)
@@ -9,7 +9,7 @@
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 
'systemd-tools') # shadow for install scriptlet FS#29341
+depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for 
install scriptlet FS#29341
 makedepends=('libx11')
 options=(!libtool)
 install=dbus.install

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-11-07 Thread Tom Gundersen 
Date: Wednesday, November 7, 2012 @ 09:52:46
  Author: tomegun
Revision: 170411

avodi cyclic dependency, take two

remove the second reference to systemd

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-07 14:51:11 UTC (rev 170410)
+++ PKGBUILD2012-11-07 14:52:46 UTC (rev 170411)
@@ -9,7 +9,7 @@
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for 
install scriptlet FS#29341
+depends=('expat' 'coreutils' 'filesystem' 'shadow') # shadow for install 
scriptlet FS#29341
 makedepends=('libx11')
 options=(!libtool)
 install=dbus.install

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2011-08-03 Thread Ionut Biru 
Date: Wednesday, August 3, 2011 @ 07:19:59
  Author: ibiru
Revision: 134377

update to 1.4.14

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 11:19:50 UTC (rev 134376)
+++ PKGBUILD2011-08-03 11:19:59 UTC (rev 134377)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.12
+pkgver=1.4.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -16,7 +16,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2010-12-07 Thread Jan de Groot 
Date: Tuesday, December 7, 2010 @ 06:43:34
  Author: jgc
Revision: 102355

upgpkg: dbus-core 1.4.0-2
Add systemd support (FS#21932)

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-07 11:34:24 UTC (rev 102354)
+++ PKGBUILD2010-12-07 11:43:34 UTC (rev 102355)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus-core
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -25,7 +25,8 @@
   --with-system-pid-file=/var/run/dbus.pid \
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
-  --disable-tests --disable-asserts --without-x
+  --disable-tests --disable-asserts --without-x \
+  --with-systemdsystemunitdir=/lib/systemd/system
   make
   make DESTDIR="${pkgdir}" install

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2010-12-22 Thread Jan de Groot 
Date: Wednesday, December 22, 2010 @ 10:04:52
  Author: jgc
Revision: 103698

upgpkg: dbus-core 1.4.1-1
Update to 1.4.1 (security update)

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-22 14:50:23 UTC (rev 103697)
+++ PKGBUILD2010-12-22 15:04:52 UTC (rev 103698)
@@ -3,8 +3,8 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -15,12 +15,12 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282'
+md5sums=('99cb057700c0455fb68f8d57902f77ac'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
-  ECHO=echo ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
\
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \
   --enable-inotify --disable-dnotify \

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2011-05-09 Thread Jan de Groot 
Date: Monday, May 9, 2011 @ 10:39:58
  Author: jgc
Revision: 123268

upgpkg: dbus-core 1.4.8-1
Update to 1.4.8, add a hack to enable X11 autolaunch

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-09 13:50:41 UTC (rev 123267)
+++ PKGBUILD2011-05-09 14:39:58 UTC (rev 123268)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.1
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -15,12 +15,13 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('99cb057700c0455fb68f8d57902f77ac'
+md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
-  ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
\
+  sed -i -e 's/#ifdef DBUS_BUILD_X11/#if 1/' dbus/dbus-sysdeps-unix.c
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \
   --enable-inotify --disable-dnotify \

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2011-06-24 Thread Ionut Biru 
Date: Friday, June 24, 2011 @ 09:30:32
  Author: ibiru
Revision: 128593

update to 1.4.10, drop sed hack and add libx11 to makedepends

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-24 12:56:53 UTC (rev 128592)
+++ PKGBUILD2011-06-24 13:30:32 UTC (rev 128593)
@@ -3,32 +3,36 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.8
+pkgver=1.4.10
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 depends=('expat>=2.0.1' 'coreutils' 'filesystem')
+makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c'
+md5sums=('402a2f8102bedbe236e2891b2b0f31c2'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
-  sed -i -e 's/#ifdef DBUS_BUILD_X11/#if 1/' dbus/dbus-sysdeps-unix.c
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
-  --disable-tests --disable-asserts --without-x \
+  --disable-tests --disable-asserts \
   --with-systemdsystemunitdir=/lib/systemd/system
   make
+}
+
+package(){
+  cd "${srcdir}/dbus-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/bin/dbus-launch"
@@ -48,8 +52,6 @@
   touch "${pkgdir}/etc/dbus-1/session.d/.keep"
   touch "${pkgdir}/etc/dbus-1/system.d/.keep"
 
-  rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1"
-
   install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }

[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2011-06-24 Thread Ionut Biru 
Date: Friday, June 24, 2011 @ 10:03:41
  Author: ibiru
Revision: 128605

update to 1.4.12

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-24 14:00:53 UTC (rev 128604)
+++ PKGBUILD2011-06-24 14:03:41 UTC (rev 128605)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.4.10
+pkgver=1.4.12
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -16,7 +16,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 dbus)
-md5sums=('402a2f8102bedbe236e2891b2b0f31c2'
+md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus)

2012-06-11 Thread Dave Reisner 
Date: Monday, June 11, 2012 @ 20:28:26
  Author: dreisner
Revision: 161495

upgpkg: dbus-core 1.6.0-2

- link against libsystemd
- move pid to /run/dbus/pid
- move system socket to /run/dbus/system_bus_socket
- cleanup rc.d script

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus

--+
 PKGBUILD |   14 --
 dbus |   27 ---
 2 files changed, 20 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-11 23:40:45 UTC (rev 161494)
+++ PKGBUILD2012-06-12 00:28:26 UTC (rev 161495)
@@ -4,12 +4,12 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for 
install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # 
shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
@@ -18,17 +18,19 @@
 dbus)
 md5sums=('16dcae2dd0c76e398381601ac9acdec4'
  '0ebde9920bde83fe26ce32351a7d8954'
- '08f93dd19cffd1b45ab05c1fd4efb560')
+ '3675334f5b4442d1c3e9a008f176e85f')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-  --with-system-pid-file=/var/run/dbus.pid \
+  --with-system-pid-file=/run/dbus/pid \
+  --with-system-socket=/run/dbus/system_bus_socket \
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
   --disable-tests --disable-asserts \
-  --with-systemdsystemunitdir=/usr/lib/systemd/system
+  --with-systemdsystemunitdir=/usr/lib/systemd/system \
+  --enable-systemd
   make
 }
 
@@ -46,6 +48,6 @@
   #Fix configuration file
   sed -i -e 's|81|dbus|' 
"${pkgdir}/etc/dbus-1/system.conf"
 
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
+  install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }

Modified: dbus
===
--- dbus2012-06-11 23:40:45 UTC (rev 161494)
+++ dbus2012-06-12 00:28:26 UTC (rev 161495)
@@ -4,18 +4,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-case "$1" in
+case $1 in
 start)
 stat_busy "Starting D-BUS system messagebus"
-   if [ ! -x /var/run/dbus ] ; then
-   install -m755 -g 81 -o 81 -d /var/run/dbus
-   fi
-if [ -x /usr/bin/dbus-uuidgen ] ; then
+if [[ ! -d /run/dbus ]] ; then
+install -m755 -g 81 -o 81 -d /run/dbus
+fi
+if [[ -x /usr/bin/dbus-uuidgen ]] ; then
 /usr/bin/dbus-uuidgen --ensure
 fi
 
-/usr/bin/dbus-daemon --system
-if [ $? -gt 0 ]; then
+if ! dbus-daemon --system; then
 stat_fail
 else
 add_daemon dbus
@@ -24,27 +23,25 @@
 ;;
 stop)
 stat_busy "Stopping D-BUS system messagebus"
-   [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
-if [ $? -gt 0 ]; then
+if ! { [[ -f /run/dbus/pid ]] && kill $(

[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus.install)

2012-06-13 Thread Dave Reisner 
Date: Wednesday, June 13, 2012 @ 19:16:53
  Author: dreisner
Revision: 161780

upgpkg: dbus-core 1.6.0-3

- package revised install file

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus.install

--+
 PKGBUILD |2 +-
 dbus.install |   14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-13 21:37:16 UTC (rev 161779)
+++ PKGBUILD2012-06-13 23:16:53 UTC (rev 161780)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)

Modified: dbus.install
===
--- dbus.install2012-06-13 21:37:16 UTC (rev 161779)
+++ dbus.install2012-06-13 23:16:53 UTC (rev 161780)
@@ -1,24 +1,24 @@
 post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 
81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
+  getent group dbus >/dev/null || groupadd -g 81 dbus
+  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g 
dbus -d '/' -s /bin/false dbus
+  passwd -l dbus &>/dev/null
   dbus-uuidgen --ensure
 }
 
 post_upgrade() {
   post_install
 
-  #Make sure new rc script can shutdown running dbus
-  if [ -f run/dbus.pid ]; then
+  # Make sure new rc script can shutdown running dbus
+  if [ -f run/dbus.pid -a -d run/dbus ]; then
 mv run/dbus.pid run/dbus/pid
   fi
 }
 
 post_remove() {
   if getent passwd dbus >/dev/null; then
-usr/sbin/userdel dbus
+userdel dbus
   fi
   if getent group dbus >/dev/null; then
-usr/sbin/groupdel dbus
+groupdel dbus
   fi
 }

[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus.install)

2012-06-24 Thread Dave Reisner 
Date: Sunday, June 24, 2012 @ 21:18:52
  Author: dreisner
Revision: 162319

upgpkg: dbus-core 1.6.0-5

- remove dbus-uuidgen logic from install scriplet, depend on 
systemd-machine-id-setup

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus.install

--+
 PKGBUILD |4 ++--
 dbus.install |6 --
 2 files changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-25 01:17:52 UTC (rev 162318)
+++ PKGBUILD2012-06-25 01:18:52 UTC (rev 162319)
@@ -4,12 +4,12 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # 
shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 
'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)

Modified: dbus.install
===
--- dbus.install2012-06-25 01:17:52 UTC (rev 162318)
+++ dbus.install2012-06-25 01:18:52 UTC (rev 162319)
@@ -2,12 +2,6 @@
   getent group dbus >/dev/null || groupadd -g 81 dbus
   getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g 
dbus -d '/' -s /bin/false dbus
   passwd -l dbus &>/dev/null
-
-  if [[ ! -L var/lib/dbus/machine-id ]]; then
-[[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv 
var/lib/dbus/machine-id etc/
-ln -sf ../../../etc/machine-id var/lib/dbus/
-  fi
-  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus dbus.install)

2012-06-24 Thread Dave Reisner 
Date: Sunday, June 24, 2012 @ 15:56:14
  Author: dreisner
Revision: 162301

upgpkg: dbus-core 1.6.0-4

- remove dbus-uuidgen from rc script (this is already done on install)
- juggle machine-id file properly to /etc to play nicely with systemd

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus
  dbus-core/trunk/dbus.install

--+
 PKGBUILD |4 ++--
 dbus |3 ---
 dbus.install |7 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-24 19:35:10 UTC (rev 162300)
+++ PKGBUILD2012-06-24 19:56:14 UTC (rev 162301)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@
 dbus)
 md5sums=('16dcae2dd0c76e398381601ac9acdec4'
  '0ebde9920bde83fe26ce32351a7d8954'
- '3675334f5b4442d1c3e9a008f176e85f')
+ 'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"

Modified: dbus
===
--- dbus2012-06-24 19:35:10 UTC (rev 162300)
+++ dbus2012-06-24 19:56:14 UTC (rev 162301)
@@ -10,9 +10,6 @@
 if [[ ! -d /run/dbus ]] ; then
 install -m755 -g 81 -o 81 -d /run/dbus
 fi
-if [[ -x /usr/bin/dbus-uuidgen ]] ; then
-/usr/bin/dbus-uuidgen --ensure
-fi
 
 if ! dbus-daemon --system; then
 stat_fail

Modified: dbus.install
===
--- dbus.install2012-06-24 19:35:10 UTC (rev 162300)
+++ dbus.install2012-06-24 19:56:14 UTC (rev 162301)
@@ -2,7 +2,12 @@
   getent group dbus >/dev/null || groupadd -g 81 dbus
   getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g 
dbus -d '/' -s /bin/false dbus
   passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure=/etc/machine-id
+
+  if [[ ! -L var/lib/dbus/machine-id ]]; then
+[[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv 
var/lib/dbus/machine-id etc/
+ln -sf ../../../etc/machine-id var/lib/dbus/
+  fi
+  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {

[arch-commits] Commit in dbus-core/trunk (PKGBUILD monitor-service-directories.patch)

2010-03-07 Thread Jan de Groot 
Date: Sunday, March 7, 2010 @ 10:10:46
  Author: jgc
Revision: 71488

upgpkg: dbus-core 1.2.20-1
Update to 1.2.20, add patch to monitor service directories for changes

Added:
  dbus-core/trunk/monitor-service-directories.patch
Modified:
  dbus-core/trunk/PKGBUILD

---+
 PKGBUILD  |7 +
 monitor-service-directories.patch |  135 
 2 files changed, 140 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-07 13:43:05 UTC (rev 71487)
+++ PKGBUILD2010-03-07 15:10:46 UTC (rev 71488)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.2.16
+pkgver=1.2.20
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -14,12 +14,15 @@
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+monitor-service-directories.patch
 dbus)
-md5sums=('c7a47b851ebe02f6726b65b78d1b730b'
+md5sums=('63f4e2412f6599a5e7b10281b9ddc0ac'
+ 'c2dc3e91f4bb819a992b178419f21fb3'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
+  patch -Np1 -i "${srcdir}/monitor-service-directories.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \

Added: monitor-service-directories.patch
===
--- monitor-service-directories.patch   (rev 0)
+++ monitor-service-directories.patch   2010-03-07 15:10:46 UTC (rev 71488)
@@ -0,0 +1,135 @@
+From 9c90fcd2dc4b1b7d818a35ef43d4686052902f59 Mon Sep 17 00:00:00 2001
+From: Colin Walters 
+Date: Thu, 18 Feb 2010 20:33:28 +
+Subject: Monitor service directories for changes
+
+It's not expected to have to manually SIGHUP the bus after installing
+a new .service file.  Since our directory monitoring is already set
+up to queue a full reload which includes service activation, simply
+monitor the servicedirs too.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=23846
+---
+diff --git a/bus/bus.c b/bus/bus.c
+index 8150df2..6495ae7 100644
+--- a/bus/bus.c
 b/bus/bus.c
+@@ -529,11 +529,39 @@ process_config_every_time (BusContext  *context,
+ }
+ 
+ static dbus_bool_t
++list_concat_new (DBusList **a,
++ DBusList **b,
++ DBusList **result)
++{
++  DBusList *link;
++
++  *result = NULL;
++
++  link = _dbus_list_get_first_link (a);
++  for (link = _dbus_list_get_first_link (a); link; link = 
_dbus_list_get_next_link (a, link))
++{
++  if (!_dbus_list_append (result, link->data))
++goto oom;
++}
++  for (link = _dbus_list_get_first_link (b); link; link = 
_dbus_list_get_next_link (b, link))
++{
++  if (!_dbus_list_append (result, link->data))
++goto oom;
++}
++
++  return TRUE;
++oom:
++  _dbus_list_clear (result);
++  return FALSE;
++}
++
++static dbus_bool_t
+ process_config_postinit (BusContext  *context,
+BusConfigParser *parser,
+DBusError   *error)
+ {
+   DBusHashTable *service_context_table;
++  DBusList *watched_dirs = NULL;
+ 
+   service_context_table = bus_config_parser_steal_service_context_table 
(parser);
+   if (!bus_registry_set_service_context_table (context->registry,
+@@ -545,8 +573,20 @@ process_config_postinit (BusContext  *context,
+ 
+   _dbus_hash_table_unref (service_context_table);
+ 
+-  /* Watch all conf directories */
+-  bus_set_watched_dirs (context, bus_config_parser_get_conf_dirs (parser));
++  /* We need to monitor both the configuration directories and directories
++   * containing .service files.
++   */
++  if (!list_concat_new (bus_config_parser_get_conf_dirs (parser),
++bus_config_parser_get_service_dirs (parser),
++&watched_dirs))
++{
++  BUS_SET_OOM (error);
++  return FALSE;
++}
++
++  bus_set_watched_dirs (context, &watched_dirs);
++
++  _dbus_list_clear (&watched_dirs);
+ 
+   return TRUE;
+ }
+diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
+index bb71394..c98e6fc 100644
+--- a/bus/dir-watch-inotify.c
 b/bus/dir-watch-inotify.c
+@@ -156,8 +156,18 @@ _set_watched_dirs_internal (DBusList **directories)
+   wd = inotify_add_watch (inotify_fd, new_dirs[i], IN_CLOSE_WRITE | 
IN_DELETE | IN_MOVED_TO | IN_MOVED_FROM);
+   if (wd < 0)
+ {
+-  _dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", 
new_dirs[i], _dbus_strerror (errno));
+-  goto out;
++  /* Not all service directories need to exist. */
++  if (errno != ENOENT)
++{
++  _dbus_warn ("Cann

[arch-commits] Commit in dbus-core/trunk (PKGBUILD monitor-service-directories.patch)

2010-03-21 Thread Jan de Groot 
Date: Sunday, March 21, 2010 @ 14:27:24
  Author: jgc
Revision: 73010

upgpkg: dbus-core 1.2.22-1
Update to 1.2.22

Modified:
  dbus-core/trunk/PKGBUILD
Deleted:
  dbus-core/trunk/monitor-service-directories.patch

---+
 PKGBUILD  |7 -
 monitor-service-directories.patch |  135 
 2 files changed, 2 insertions(+), 140 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-21 18:23:24 UTC (rev 73009)
+++ PKGBUILD2010-03-21 18:27:24 UTC (rev 73010)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont 
 #
 pkgname=dbus-core
-pkgver=1.2.20
+pkgver=1.2.22
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
@@ -14,15 +14,12 @@
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
-monitor-service-directories.patch
 dbus)
-md5sums=('63f4e2412f6599a5e7b10281b9ddc0ac'
- 'c2dc3e91f4bb819a992b178419f21fb3'
+md5sums=('54c5f3c79a1f852d2256aca07163813c'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
-  patch -Np1 -i "${srcdir}/monitor-service-directories.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \

Deleted: monitor-service-directories.patch
===
--- monitor-service-directories.patch   2010-03-21 18:23:24 UTC (rev 73009)
+++ monitor-service-directories.patch   2010-03-21 18:27:24 UTC (rev 73010)
@@ -1,135 +0,0 @@
-From 9c90fcd2dc4b1b7d818a35ef43d4686052902f59 Mon Sep 17 00:00:00 2001
-From: Colin Walters 
-Date: Thu, 18 Feb 2010 20:33:28 +
-Subject: Monitor service directories for changes
-
-It's not expected to have to manually SIGHUP the bus after installing
-a new .service file.  Since our directory monitoring is already set
-up to queue a full reload which includes service activation, simply
-monitor the servicedirs too.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=23846

-diff --git a/bus/bus.c b/bus/bus.c
-index 8150df2..6495ae7 100644
 a/bus/bus.c
-+++ b/bus/bus.c
-@@ -529,11 +529,39 @@ process_config_every_time (BusContext  *context,
- }
- 
- static dbus_bool_t
-+list_concat_new (DBusList **a,
-+ DBusList **b,
-+ DBusList **result)
-+{
-+  DBusList *link;
-+
-+  *result = NULL;
-+
-+  link = _dbus_list_get_first_link (a);
-+  for (link = _dbus_list_get_first_link (a); link; link = 
_dbus_list_get_next_link (a, link))
-+{
-+  if (!_dbus_list_append (result, link->data))
-+goto oom;
-+}
-+  for (link = _dbus_list_get_first_link (b); link; link = 
_dbus_list_get_next_link (b, link))
-+{
-+  if (!_dbus_list_append (result, link->data))
-+goto oom;
-+}
-+
-+  return TRUE;
-+oom:
-+  _dbus_list_clear (result);
-+  return FALSE;
-+}
-+
-+static dbus_bool_t
- process_config_postinit (BusContext  *context,
-BusConfigParser *parser,
-DBusError   *error)
- {
-   DBusHashTable *service_context_table;
-+  DBusList *watched_dirs = NULL;
- 
-   service_context_table = bus_config_parser_steal_service_context_table 
(parser);
-   if (!bus_registry_set_service_context_table (context->registry,
-@@ -545,8 +573,20 @@ process_config_postinit (BusContext  *context,
- 
-   _dbus_hash_table_unref (service_context_table);
- 
--  /* Watch all conf directories */
--  bus_set_watched_dirs (context, bus_config_parser_get_conf_dirs (parser));
-+  /* We need to monitor both the configuration directories and directories
-+   * containing .service files.
-+   */
-+  if (!list_concat_new (bus_config_parser_get_conf_dirs (parser),
-+bus_config_parser_get_service_dirs (parser),
-+&watched_dirs))
-+{
-+  BUS_SET_OOM (error);
-+  return FALSE;
-+}
-+
-+  bus_set_watched_dirs (context, &watched_dirs);
-+
-+  _dbus_list_clear (&watched_dirs);
- 
-   return TRUE;
- }
-diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
-index bb71394..c98e6fc 100644
 a/bus/dir-watch-inotify.c
-+++ b/bus/dir-watch-inotify.c
-@@ -156,8 +156,18 @@ _set_watched_dirs_internal (DBusList **directories)
-   wd = inotify_add_watch (inotify_fd, new_dirs[i], IN_CLOSE_WRITE | 
IN_DELETE | IN_MOVED_TO | IN_MOVED_FROM);
-   if (wd < 0)
- {
--  _dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", 
new_dirs[i], _dbus_strerror (errno));
--  goto out;
-+  /* Not all service directories need to exist. */
-+  if (errno != ENOENT)
-+{
-+  _dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", 
ne

[arch-commits] Commit in dbus-core/trunk (PKGBUILD bug17754.patch git-fixes.patch)

2010-09-01 Thread Jan de Groot 
Date: Wednesday, September 1, 2010 @ 08:41:16
  Author: jgc
Revision: 89506

upgpkg: dbus-core 1.2.24-2
add patches from 1.2 branch. Backport patch from 1.3 branch that will fix 
FS#20604 with hopefully no side-effects

Added:
  dbus-core/trunk/bug17754.patch
  dbus-core/trunk/git-fixes.patch
Modified:
  dbus-core/trunk/PKGBUILD

-+
 PKGBUILD|   34 ++--
 bug17754.patch  |  392 ++
 git-fixes.patch |  289 +++
 3 files changed, 701 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-01 12:26:16 UTC (rev 89505)
+++ PKGBUILD2010-09-01 12:41:16 UTC (rev 89506)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus-core
 pkgver=1.2.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus";
 arch=(i686 x86_64)
@@ -14,40 +14,46 @@
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+bug17754.patch
+git-fixes.patch
 dbus)
 md5sums=('565346cecd9cfecf1463540c6086cc2c'
+ 'c74a42681e2726b42486dec82993c009'
+ 'c4bd7c5e60b1b5df5adbe80da5839c9e'
  '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  patch -Np1 -i "${srcdir}/bug17754.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
   --with-system-pid-file=/var/run/dbus.pid \
   --enable-inotify --disable-dnotify \
   --disable-verbose-mode --disable-static \
-  --disable-tests --disable-asserts --without-x || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  --disable-tests --disable-asserts --without-x
+  make
+  make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/bin/dbus-launch"
   rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
 
-  chown 81:81 "${pkgdir}/var/run/dbus" || return 1
+  chown 81:81 "${pkgdir}/var/run/dbus"
 
-  install -m755 -d "${pkgdir}/etc/rc.d" || return 1
-  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" || return 1
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
 
   #Fix configuration file
-  sed -i -e 's|81|dbus|' 
"${pkgdir}/etc/dbus-1/system.conf" || return 1
+  sed -i -e 's|81|dbus|' 
"${pkgdir}/etc/dbus-1/system.conf"
 
   #install .keep files so pacman doesn't delete empty dirs
-  touch "${pkgdir}/usr/share/dbus-1/services/.keep" || return 1
-  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" || return 1
-  touch "${pkgdir}/etc/dbus-1/session.d/.keep" || return 1
-  touch "${pkgdir}/etc/dbus-1/system.d/.keep" || return 1
+  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
+  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
+  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
+  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
 
-  rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1" || return 1
+  rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1"
 
   install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }

Added: bug17754.patch
===
--- bug17754.patch  (rev 0)
+++ bug17754.patch  2010-09-01 12:41:16 UTC (rev 89506)
@@ -0,0 +1,392 @@
+diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
+index b3cfa3d..e6d261f 100644
+--- a/dbus/dbus-connection.c
 b/dbus/dbus-connection.c
+@@ -73,6 +73,14 @@
+ _dbus_mutex_unlock ((connection)->mutex); 
   \
+   } while (0)
+ 
++#define SLOTS_LOCK(connection) do { \
++_dbus_mutex_lock ((connection)->slot_mutex);\
++  } while (0)
++
++#define SLOTS_UNLOCK(connection) do {   \
++_dbus_mutex_unlock ((connection)->slot_mutex);  \
++  } while (0)
++
+ #define DISPATCH_STATUS_NAME(s)\
+  ((s) == DBUS_DISPATCH_COMPLETE ? "complete" : \
+   (s) == DBUS_DISPATCH_DATA_REMAINS ? "data remains" : \
+@@ -257,6 +265,7 @@ struct DBusConnection
+   
+   DBusList *filter_list;/**< List of filters. */
+ 
++  DBusMutex *slot_mutex;/**< Lock on slot_list so overall connection 
lock need not be taken */
+   DBusDataSlotList slot_list;   /**< Data stored by allocated integer ID */
+ 
+   DBusHashTable *pending_replies;  /**< Hash of message serials to 
#DBusPendingCall. */  
+@@ -649,39 +658,42 @@ protected_change_watch (DBusConnection 
*connection,
+ DBusWatchToggleFunction toggle_function,
+ dbus_bool_