date:20120903

svn commit: r1380175 - in /subversion/trunk: configure.ac subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

2012-09-03 Thread philip

Author: philip
Date: Mon Sep  3 08:59:54 2012
New Revision: 1380175

URL: http://svn.apache.org/viewvc?rev=1380175view=rev
Log:
Followup to r1242759 which removed the explicit D-Bus calls from the
GNOME keyring code.  D-Bus is still used but it's all in the external
libgnome-keyring. 

* configure.ac: (gnome_keyring) Don't require D-Bus.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (): Remove include.

Modified:
subversion/trunk/configure.ac
subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1380175r1=1380174r2=1380175view=diff
==
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Sep  3 08:59:54 2012
@@ -501,7 +501,7 @@ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 CPPFLAGS=$old_CPPFLAGS
 
 
-dnl D-Bus (required for support for KWallet and GNOME Keyring) 
---
+dnl D-Bus (required for support for KWallet) ---
 
 if test -n $PKG_CONFIG; then
   AC_MSG_CHECKING([for D-Bus .pc file])
@@ -570,31 +570,27 @@ if test $with_gnome_keyring != no; t
   if test $svn_enable_shared = yes; then
 if test $APR_HAS_DSO = yes; then
   if test -n $PKG_CONFIG; then
-if test $HAVE_DBUS = yes; then
-  AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
-  if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
+AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
+if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
+  AC_MSG_RESULT([yes])
+  old_CPPFLAGS=$CPPFLAGS
+  SVN_GNOME_KEYRING_INCLUDES=`$PKG_CONFIG --cflags glib-2.0 
gnome-keyring-1`
+  CPPFLAGS=$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES
+  AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, 
with_gnome_keyring=no)
+  AC_MSG_CHECKING([for GNOME Keyring])
+  if test $with_gnome_keyring = yes; then
 AC_MSG_RESULT([yes])
-old_CPPFLAGS=$CPPFLAGS
-SVN_GNOME_KEYRING_INCLUDES=$DBUS_CPPFLAGS `$PKG_CONFIG --cflags 
glib-2.0 gnome-keyring-1`
-CPPFLAGS=$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES
-AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, 
with_gnome_keyring=no)
-AC_MSG_CHECKING([for GNOME Keyring])
-if test $with_gnome_keyring = yes; then
-  AC_MSG_RESULT([yes])
-  AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
-[Is GNOME Keyring support enabled?])
-  CPPFLAGS=$old_CPPFLAGS
-  SVN_GNOME_KEYRING_LIBS=$DBUS_LIBS `$PKG_CONFIG --libs glib-2.0 
gnome-keyring-1`
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([cannot find GNOME Keyring])
-fi
+AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
+  [Is GNOME Keyring support enabled?])
+CPPFLAGS=$old_CPPFLAGS
+SVN_GNOME_KEYRING_LIBS=`$PKG_CONFIG --libs glib-2.0 
gnome-keyring-1`
   else
 AC_MSG_RESULT([no])
-AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
+AC_MSG_ERROR([cannot find GNOME Keyring])
   fi
 else
-  AC_MSG_ERROR([cannot find D-Bus])
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
 fi
   else
 AC_MSG_ERROR([cannot find pkg-config])

Modified: subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1380175r1=1380174r2=1380175view=diff
==
--- subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c 
(original)
+++ subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Mon 
Sep  3 08:59:54 2012
@@ -38,7 +38,6 @@
 #include svn_private_config.h
 
 #include glib.h
-#include dbus/dbus.h
 #include gnome-keyring.h

svn commit: r1380189 - in /subversion/branches/1.7.x-r1242759: ./ configure.ac subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

2012-09-03 Thread philip

Author: philip
Date: Mon Sep  3 10:06:29 2012
New Revision: 1380189

URL: http://svn.apache.org/viewvc?rev=1380189view=rev
Log:
On the '1.7.x-r1242759' branch: merge r1380175 from trunk to remove
unnecessary compile-time dependencies.

Modified:
subversion/branches/1.7.x-r1242759/   (props changed)
subversion/branches/1.7.x-r1242759/configure.ac

subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Propchange: subversion/branches/1.7.x-r1242759/
--
  Merged /subversion/trunk:r1380175

Modified: subversion/branches/1.7.x-r1242759/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1242759/configure.ac?rev=1380189r1=1380188r2=1380189view=diff
==
--- subversion/branches/1.7.x-r1242759/configure.ac (original)
+++ subversion/branches/1.7.x-r1242759/configure.ac Mon Sep  3 10:06:29 2012
@@ -532,7 +532,7 @@ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 CPPFLAGS=$old_CPPFLAGS
 
 
-dnl D-Bus (required for support for KWallet and GNOME Keyring) 
---
+dnl D-Bus (required for support for KWallet) ---
 
 if test -n $PKG_CONFIG; then
   AC_MSG_CHECKING([for D-Bus .pc file])
@@ -582,31 +582,27 @@ if test $with_gnome_keyring != no; t
   if test $svn_enable_shared = yes; then
 if test $APR_HAS_DSO = yes; then
   if test -n $PKG_CONFIG; then
-if test $HAVE_DBUS = yes; then
-  AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
-  if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
+AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
+if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
+  AC_MSG_RESULT([yes])
+  old_CPPFLAGS=$CPPFLAGS
+  SVN_GNOME_KEYRING_INCLUDES=`$PKG_CONFIG --cflags glib-2.0 
gnome-keyring-1`
+  CPPFLAGS=$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES
+  AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, 
with_gnome_keyring=no)
+  AC_MSG_CHECKING([for GNOME Keyring])
+  if test $with_gnome_keyring = yes; then
 AC_MSG_RESULT([yes])
-old_CPPFLAGS=$CPPFLAGS
-SVN_GNOME_KEYRING_INCLUDES=$DBUS_CPPFLAGS `$PKG_CONFIG --cflags 
glib-2.0 gnome-keyring-1`
-CPPFLAGS=$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES
-AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, 
with_gnome_keyring=no)
-AC_MSG_CHECKING([for GNOME Keyring])
-if test $with_gnome_keyring = yes; then
-  AC_MSG_RESULT([yes])
-  AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
-[Is GNOME Keyring support enabled?])
-  CPPFLAGS=$old_CPPFLAGS
-  SVN_GNOME_KEYRING_LIBS=$DBUS_LIBS `$PKG_CONFIG --libs glib-2.0 
gnome-keyring-1`
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([cannot find GNOME Keyring])
-fi
+AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
+  [Is GNOME Keyring support enabled?])
+CPPFLAGS=$old_CPPFLAGS
+SVN_GNOME_KEYRING_LIBS=`$PKG_CONFIG --libs glib-2.0 
gnome-keyring-1`
   else
 AC_MSG_RESULT([no])
-AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
+AC_MSG_ERROR([cannot find GNOME Keyring])
   fi
 else
-  AC_MSG_ERROR([cannot find D-Bus])
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
 fi
   else
 AC_MSG_ERROR([cannot find pkg-config])

Modified: 
subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1380189r1=1380188r2=1380189view=diff
==
--- 
subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
 (original)
+++ 
subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
 Mon Sep  3 10:06:29 2012
@@ -38,7 +38,6 @@
 #include svn_private_config.h
 
 #include glib.h
-#include dbus/dbus.h
 #include gnome-keyring.h

svn commit: r1380218 - in /subversion/trunk/tools/server-side/svnpubsub/rc.d: svnwcsub.freebsd svnwcsub.solaris

2012-09-03 Thread danielsh

Author: danielsh
Date: Mon Sep  3 12:38:48 2012
New Revision: 1380218

URL: http://svn.apache.org/viewvc?rev=1380218view=rev
Log:
[in tools/server-side/svnpubsub]

No functional change.

* rc.d/svnwcsub.freebsd, rc.d/svnwcsub.solaris:
Reorder flags to match each other and rc.d/svnwcsub.debian.

Modified:
subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris

Modified: subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd?rev=1380218r1=1380217r2=1380218view=diff
==
--- subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd 
(original)
+++ subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd Mon Sep  
3 12:38:48 2012
@@ -33,6 +33,7 @@ command_args=--daemon \
   --logfile=${svnwcsub_logfile} \
   --pidfile=${pidfile} \
   --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
-  --umask=002 ${svnwcsub_config}
+  --umask=002 \
+ ${svnwcsub_config}
 
 run_rc_command $1

Modified: subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris?rev=1380218r1=1380217r2=1380218view=diff
==
--- subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris 
(original)
+++ subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris Mon Sep  
3 12:38:48 2012
@@ -14,8 +14,8 @@ SVNWCSUB_CMD=/usr/local/svnpubsub/svnwc
   --daemon \
   --logfile=${svnwcsub_logfile} \
   --pidfile=${pidfile} \
-  --umask=002 \
   --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
+  --umask=002 \
   ${svnwcsub_config}
 
 RETVAL=0

svn commit: r1380219 - /subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian

2012-09-03 Thread danielsh

Author: danielsh
Date: Mon Sep  3 12:39:50 2012
New Revision: 1380219

URL: http://svn.apache.org/viewvc?rev=1380219view=rev
Log:
[in tools/server-side/svnpubsub/]

* rc.d/svnwcsub.debian: Pass --umask=0002, for sanity and and for consistency
with the equivalent scripts for other OSes.

Modified:
subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian

Modified: subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian?rev=1380219r1=1380218r2=1380219view=diff
==
--- subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian (original)
+++ subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian Mon Sep  
3 12:39:50 2012
@@ -24,6 +24,7 @@ SVNWCSUB_CMD=/opt/svnpubsub/svnwcsub.py
   --logfile=${svnwcsub_logfile} \
   --pidfile=${pidfile} \
   --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
+  --umask=002 \
   ${svnwcsub_config} 
 
 RETVAL=0

svn commit: r1380269 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-09-03 Thread stsp

Author: stsp
Date: Mon Sep  3 15:17:14 2012
New Revision: 1380269

URL: http://svn.apache.org/viewvc?rev=1380269view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Fix a new build error during cyrus-sasl
   compilation. For some reason it now expects the saslauthd/cmulocal directory
   to exist, but that directory exists one level above... not sure what's
   going on but pointing it at the existing directory seems to fix things.

Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1380269r1=1380268r2=1380269view=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Sep  3 15:17:14 2012
@@ -862,6 +862,8 @@ endif
 $(CYRUS_SASL_SRCDIR)/lib/dlopen.c.patched
mv $(CYRUS_SASL_SRCDIR)/lib/dlopen.c.patched \
$(CYRUS_SASL_SRCDIR)/lib/dlopen.c
+   # Fix a weird autotools error about missing cmulocal dir
+   (cd $(CYRUS_SASL_SRCDIR)/saslauthd/  ln -sf ../cmulocal)
touch $@
 
 # configure cyrus-sasl

svn commit: r1380282 - /subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py

2012-09-03 Thread danielsh

Author: danielsh
Date: Mon Sep  3 16:09:35 2012
New Revision: 1380282

URL: http://svn.apache.org/viewvc?rev=1380282view=rev
Log:
[in tools/server-side/svnpubsub]

* svnwcsub.py
  (BackgroundWorker._update): Use the correct exception class.

Modified:
subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py

Modified: subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py?rev=1380282r1=1380281r2=1380282view=diff
==
--- subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py Mon Sep  3 
16:09:35 2012
@@ -258,7 +258,7 @@ class BackgroundWorker(threading.Thread)
 dotrevision = os.path.join(wc.path, '.revision') 
 try:
 os.unlink(dotrevision)
-except IOError, e:
+except OSError, e:
 if e.errno != errno.ENOENT:
 raise
 open(dotrevision, 'w').write(info['Revision'])

svn commit: r1380295 - /subversion/trunk/subversion/libsvn_client/update.c

2012-09-03 Thread rhuijben

Author: rhuijben
Date: Mon Sep  3 17:00:41 2012
New Revision: 1380295

URL: http://svn.apache.org/viewvc?rev=1380295view=rev
Log:
* subversion/libsvn_client/update.c
  (update_internal): Ensure output variable is set correctly when returning
early. This can currently happen when cropping a working copy by reducing
the depth to excluded, when skipping an update on a conflicted tree and
when no base node exists for the update anchor.

Found by: Ben Smith-Mannschott bsmith.occs{_AT_}gmail.com

Modified:
subversion/trunk/subversion/libsvn_client/update.c

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1380295r1=1380294r2=1380295view=diff
==
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Mon Sep  3 17:00:41 2012
@@ -211,6 +211,9 @@ update_internal(svn_revnum_t *result_rev
  SVN_CONFIG_CATEGORY_CONFIG,
  APR_HASH_KEY_STRING) : NULL;
 
+  if (result_rev)
+*result_rev = SVN_INVALID_REVNUM;
+
   /* An unknown depth can't be sticky. */
   if (depth == svn_depth_unknown)
 depth_is_sticky = FALSE;

svn commit: r1380175 - in /subversion/trunk: configure.ac subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

svn commit: r1380189 - in /subversion/branches/1.7.x-r1242759: ./ configure.ac subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

svn commit: r1380218 - in /subversion/trunk/tools/server-side/svnpubsub/rc.d: svnwcsub.freebsd svnwcsub.solaris

svn commit: r1380219 - /subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian

svn commit: r1380269 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

svn commit: r1380282 - /subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py

svn commit: r1380295 - /subversion/trunk/subversion/libsvn_client/update.c

7 matches

Site Navigation

Mail list logo

Footer information