[Pkg-gnupg-commit] r309 - in /gpa/trunk/debian: changelog control patches/628305_build_with_libassuan_v2.patch

[dleidert at users.alioth.debian.org]

Author: dleidert
Date: Sun Jan 27 15:20:42 2013
New Revision: 309

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=309
Log:
* debian/control (Homepage): Updated (closes: #696826).
* debian/patches/628305_build_with_libassuan_v2.patch: Updated.
  - src/server.c (gpa_start_server): Call assuan_sock_init (closes: #699096).

Modified:
    gpa/trunk/debian/changelog
    gpa/trunk/debian/control
    gpa/trunk/debian/patches/628305_build_with_libassuan_v2.patch

Modified: gpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/changelog?rev=309&op=diff
==============================================================================
--- gpa/trunk/debian/changelog (original)
+++ gpa/trunk/debian/changelog Sun Jan 27 15:20:42 2013
@@ -1,6 +1,9 @@
 gpa (0.9.0-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * debian/control (Homepage): Updated (closes: #696826).
+  * debian/patches/628305_build_with_libassuan_v2.patch: Updated.
+    - src/server.c (gpa_start_server): Call assuan_sock_init (closes: #699096).
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 27 Jan 2013 15:42:06 +0100
 

Modified: gpa/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/control?rev=309&op=diff
==============================================================================
--- gpa/trunk/debian/control (original)
+++ gpa/trunk/debian/control Sun Jan 27 15:20:42 2013
@@ -13,7 +13,7 @@
                libgpgme11-dev (>> 1.2.0),
                libgtk2.0-dev (>> 2.10.0)
 Standards-Version: 3.9.3
-Homepage: http://gpa.wald.intevation.org
+Homepage: http://www.gnupg.org/related_software/gpa/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gpa/trunk/
 DM-Upload-Allowed: yes

Modified: gpa/trunk/debian/patches/628305_build_with_libassuan_v2.patch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/patches/628305_build_with_libassuan_v2.patch?rev=309&op=diff
==============================================================================
--- gpa/trunk/debian/patches/628305_build_with_libassuan_v2.patch (original)
+++ gpa/trunk/debian/patches/628305_build_with_libassuan_v2.patch Sun Jan 27 15:20:42 2013
@@ -1,12 +1,14 @@
 Author: Marcus Brinkmann  <marcus at g10code.de>
 Reviewed-By: gregor herrmann <gregoa at debian.org>
+Bug-Debian: http://bugs.debian.org/628305
 Origin: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpa.git;a=commitdiff;h=a27c69e99c5b29b618fc90d8ade6a81d89784e58
-Description: Fix FTBFS with libassuan series 2.
+Bug-Debian: http://bugs.debian.org/699096
+Origin: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpa.git;a=commitdiff;h=de5ed61012cfc76d8ef0ebff81625331d43b8b28
+Description: Fix FTBFS and segfault with libassuan series 2.
  * configure.ac: Set NEED_LIBASSUAN_VERSION and NEED_LIBASSUAN_API
    to 1.1.0 and 2 resp.
- * server.c: Update to new assuan interface.
+ * server.c: Update to new assuan interface. Call assuan_sock_init.
 Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/628305
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -369,16 +371,31 @@
    return TRUE; /* Keep the listen_fd in the event loop.  */
  }
  
-@@ -1929,7 +1949,7 @@
+@@ -1922,6 +1942,7 @@
+ gpa_start_server (void)
+ {
+   char *socket_name;
++  gpg_error_t err;
+   int rc;
+   assuan_fd_t fd;
+   struct sockaddr_un serv_addr;
+@@ -1929,7 +1950,14 @@
    GIOChannel *channel;
    unsigned int source_id;
  
 -  assuan_set_assuan_err_source (GPG_ERR_SOURCE_DEFAULT);
 +  assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
++  err = assuan_sock_init ();
++  if (err)
++    {
++      g_debug ("assuan_sock_init failed: %s <%s>",
++               gpg_strerror (err), gpg_strsource (err));
++      return;
++    }
    
    socket_name = g_build_filename (gnupg_homedir, "S.uiserver", NULL);
    if (strlen (socket_name)+1 >= sizeof serv_addr.sun_path ) 
-@@ -1974,14 +1994,14 @@
+@@ -1974,14 +2002,14 @@
    g_free (socket_name);
    socket_name = NULL;