 @@ -1,192 +1,208 @@
-$NetBSD: patch-an,v 1.1 2010/09/01 13:45:25 wiz Exp $
+$NetBSD: patch-an,v 1.2 2013/02/27 19:29:33 markd Exp $
 libassuan2 support from
 http://websvn.kde.org/?view=revision&revision=1078528
---- kleopatra/uiserver/assuanserverconnection.cpp.orig	2009-11-21 09:45:01.000000000 +0000
+Work around moc inability to parse a boost macro
 --- kleopatra/uiserver/assuanserverconnection.cpp.orig	2011-04-20 20:03:31.000000000 +0000
 +++ kleopatra/uiserver/assuanserverconnection.cpp
-@@ -116,13 +116,18 @@ static const unsigned int INIT_SOCKET_FL
+@@ -77,11 +77,13 @@
  #include <kleo-assuan.h>
 +#ifndef Q_MOC_RUN
  #include <boost/type_traits/remove_pointer.hpp>
  #include <boost/lexical_cast.hpp>
  #include <boost/bind.hpp>
  #include <boost/mem_fn.hpp>
  #include <boost/mpl/if.hpp>
 +#endif
  #include <vector>
  #include <map>
@@ -116,13 +118,18 @@ static const unsigned int INIT_SOCKET_FL
  static const int FOR_READING = 0;
  static const unsigned int MAX_ACTIVE_FDS = 32;
 +static void my_assuan_release( assuan_context_t ctx ) {
 +    if ( ctx )
 +        assuan_release( ctx );
 +}
++
  // shared_ptr for assuan_context_t w/ deleter enforced to assuan_deinit_server:
  typedef shared_ptr< remove_pointer<assuan_context_t>::type > AssuanContextBase;
  struct AssuanContext : AssuanContextBase {
      AssuanContext() : AssuanContextBase() {}
 -    explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_deinit_server ) {}
 +    explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &my_assuan_release ) {}
 -    void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_deinit_server ); }
 +    void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &my_assuan_release ); }
  };
  static inline gpg_error_t assuan_process_done_msg( assuan_context_t ctx, gpg_error_t err, const char * err_msg ) {
-@@ -240,7 +245,8 @@ Q_SIGNALS:
+@@ -240,7 +247,8 @@ Q_SIGNALS:
  public Q_SLOTS:
      void slotReadActivity( int ) {
          assert( ctx );
 -        if ( const int err = assuan_process_next( ctx.get() ) ) {
 +        int done = false;
 +        if ( const int err = assuan_process_next( ctx.get(), &done ) || done ) {
              //if ( err == -1 || gpg_err_code(err) == GPG_ERR_EOF ) {
                  topHalfDeletion();
                  if ( nohupedCommands.empty() )
-@@ -296,15 +302,17 @@ private:
+@@ -296,15 +304,17 @@ private:
+     }
  private:
 -    static void reset_handler( assuan_context_t ctx_ ) {
 +    static gpg_error_t reset_handler( assuan_context_t ctx_, char * ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
          conn.reset();
++
 +        return 0;
+     }
 -    static int option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
 +    static gpg_error_t option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -317,7 +325,7 @@ private:
+@@ -317,7 +327,7 @@ private:
          //return gpg_error( GPG_ERR_UNKNOWN_OPTION );
+     }
 -    static int session_handler( assuan_context_t ctx_, char * line ) {
 +    static gpg_error_t session_handler( assuan_context_t ctx_, char * line ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -344,7 +352,7 @@ private:
+@@ -344,7 +354,7 @@ private:
          return assuan_process_done( ctx_, 0 );
+     }
 -    static int capabilities_handler( assuan_context_t ctx_, char * line ) {
 +    static gpg_error_t capabilities_handler( assuan_context_t ctx_, char * line ) {
          if ( !QByteArray( line ).trimmed().isEmpty() ) {
              static const QString errorString = i18n("CAPABILITIES does not take arguments");
              return assuan_process_done_msg( ctx_, gpg_error( GPG_ERR_ASS_PARAMETER ), errorString );
-@@ -357,7 +365,7 @@ private:
+@@ -357,7 +367,7 @@ private:
          return assuan_process_done( ctx_, assuan_send_data( ctx_, capabilities, sizeof capabilities - 1 ) );
+     }
 -    static int getinfo_handler( assuan_context_t ctx_, char * line ) {
 +    static gpg_error_t getinfo_handler( assuan_context_t ctx_, char * line ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -386,7 +394,7 @@ private:
+@@ -386,7 +396,7 @@ private:
          return assuan_process_done( ctx_, assuan_send_data( ctx_, ba.constData(), ba.size() ) );
+     }
 -    static int start_keymanager_handler( assuan_context_t ctx_, char * line ) {
 +    static gpg_error_t start_keymanager_handler( assuan_context_t ctx_, char * line ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -400,7 +408,7 @@ private:
+@@ -400,7 +410,7 @@ private:
          return assuan_process_done( ctx_, 0 );
+     }
 -    static int start_confdialog_handler( assuan_context_t ctx_, char * line ) {
 +    static gpg_error_t start_confdialog_handler( assuan_context_t ctx_, char * line ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -418,7 +426,7 @@ private:
+@@ -418,7 +428,7 @@ private:
      // format: TAG (FD|FD=\d+|FILE=...)
      template <bool in, typename T_memptr>
 -    static int IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
 +    static gpg_error_t IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -498,19 +506,19 @@ private:
+@@ -498,19 +508,19 @@ private:
+     }
 -    static int input_handler( assuan_context_t ctx, char * line ) {
 +    static gpg_error_t input_handler( assuan_context_t ctx, char * line ) {
          return IO_handler<true>( ctx, line, &Private::inputs );
+     }
 -    static int output_handler( assuan_context_t ctx, char * line ) {
 +    static gpg_error_t output_handler( assuan_context_t ctx, char * line ) {
          return IO_handler<false>( ctx, line, &Private::outputs );
+     }
 -    static int message_handler( assuan_context_t ctx, char * line ) {
 +    static gpg_error_t message_handler( assuan_context_t ctx, char * line ) {
          return IO_handler<true>( ctx, line, &Private::messages );
+     }
 -    static int file_handler( assuan_context_t ctx_, char * line ) {
 +    static gpg_error_t file_handler( assuan_context_t ctx_, char * line ) {
          assert( assuan_get_pointer( ctx_ ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -572,7 +580,7 @@ private:
+@@ -572,7 +582,7 @@ private:
+     }
      template <typename T_memptr, typename T_memptr2>
 -    static int recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
 +    static gpg_error_t recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
          assert( assuan_get_pointer( ctx ) );
          AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
-@@ -656,11 +664,11 @@ private:
+@@ -656,11 +666,11 @@ private:
          return assuan_process_done( ctx, 0 );
+     }
 -    static int recipient_handler( assuan_context_t ctx, char * line ) {
 +    static gpg_error_t recipient_handler( assuan_context_t ctx, char * line ) {
          return recipient_sender_handler( &Private::recipients, &Private::informativeRecipients, ctx, line );
+     }
 -    static int sender_handler( assuan_context_t ctx, char * line ) {
 +    static gpg_error_t sender_handler( assuan_context_t ctx, char * line ) {
          return recipient_sender_handler( &Private::senders, &Private::informativeSenders, ctx, line, true );
+     }
-@@ -792,11 +800,15 @@ AssuanServerConnection::Private::Private
+@@ -792,11 +802,15 @@ AssuanServerConnection::Private::Private
      if ( fd == ASSUAN_INVALID_FD )
          throw Exception( gpg_error( GPG_ERR_INV_ARG ), "pre-assuan_init_socket_server_ext" );
 -    assuan_context_t naked_ctx = 0;
 -    if ( const gpg_error_t err = assuan_init_socket_server_ext( &naked_ctx, fd, INIT_SOCKET_FLAGS ) )
 +    {
 +        assuan_context_t naked_ctx = 0;
 +        if ( const gpg_error_t err = assuan_new( &naked_ctx ) )
 +            throw Exception( err, "assuan_new" );
 +        ctx.reset( naked_ctx );
 +    }
 +    if ( const gpg_error_t err = assuan_init_socket_server( ctx.get(), fd, INIT_SOCKET_FLAGS ) )
          throw Exception( err, "assuan_init_socket_server_ext" );
 -    ctx.reset( naked_ctx ); naked_ctx = 0;
      // for callbacks, associate the context with this connection:
      assuan_set_pointer( ctx.get(), this );
-@@ -824,34 +836,34 @@ AssuanServerConnection::Private::Private
+@@ -824,34 +838,34 @@ AssuanServerConnection::Private::Private
      // register our INPUT/OUTPUT/MESSGAE/FILE handlers:
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT",  input_handler ) )
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT",  input_handler, "" ) )
          throw Exception( err, "register \"INPUT\" handler" );
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE",  message_handler ) )
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE",  message_handler, "" ) )
          throw Exception( err, "register \"MESSAGE\" handler" );
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler ) )
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler, "" ) )
          throw Exception( err, "register \"OUTPUT\" handler" );
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler ) )
 @@ -213,92 +229,92 @@ http://websvn.kde.org/?view=revision&rev
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler, "" ) )
          throw Exception( err, "register \"RECIPIENT\" handler" );
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler ) )
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler, "" ) )
          throw Exception( err, "register \"SENDER\" handler" );
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler ) )
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler, "" ) )
          throw Exception( err, "register \"SESSION\" handler" );
 -    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler ) )
 +    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler, "" ) )
          throw Exception( err, "register \"CAPABILITIES\" handler" );
      assuan_set_hello_line( ctx.get(), "GPG UI server (Kleopatra/" KLEOPATRA_VERSION_STRING ") ready to serve" );
-@@ -904,20 +916,14 @@ class InquiryHandler : public QObject {
+@@ -904,20 +918,14 @@ class InquiryHandler : public QObject {
      Q_OBJECT
  public:
 -#ifdef HAVE_ASSUAN_INQUIRE_EXT
      explicit InquiryHandler( const char * keyword_, QObject * p=0 )
          : QObject( p ),
 -# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
 -          buffer( 0 ),
 -          buflen( 0 ),
 -# endif
            keyword( keyword_ )
+     {
+     }
 -# ifdef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
 -    static int handler( void * cb_data, int rc, unsigned char * buffer, size_t buflen )
 +    static gpg_error_t handler( void * cb_data, gpg_error_t rc, unsigned char * buffer, size_t buflen )
+     {
          assert( cb_data );
          InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
-@@ -926,26 +932,9 @@ public:
+@@ -926,26 +934,9 @@ public:
          delete this_;
          return 0;
+     }
 -# else
 -    static int handler( void * cb_data, int rc )
 -    {
 -        assert( cb_data );
 -        InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
 -        emit this_->signal( rc, QByteArray::fromRawData( reinterpret_cast<const char*>(this_->buffer), this_->buflen ), this_->keyword );
 -        std::free( this_->buffer );
 -        delete this_;
 -        return 0;
 -    }
 -# endif
  private:
 -# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
 -    friend class ::Kleo::AssuanCommand;
 -    unsigned char * buffer;
 -    size_t buflen;
 -# endif
      const char * keyword;
 -#endif // HAVE_ASSUAN_INQUIRE_EXT
  Q_SIGNALS:
      void signal( int rc, const QByteArray & data, const QByteArray & keyword );
-@@ -1157,20 +1146,13 @@ int AssuanCommand::inquire( const char *
+@@ -1157,20 +1148,13 @@ int AssuanCommand::inquire( const char *
      if ( d->nohup )
          return makeError( GPG_ERR_INV_OP );
 -#ifdef HAVE_ASSUAN_INQUIRE_EXT
      std::auto_ptr<InquiryHandler> ih( new InquiryHandler( keyword, receiver ) );
      receiver->connect( ih.get(), SIGNAL(signal(int,QByteArray,QByteArray)), slot );
      if ( const gpg_error_t err = assuan_inquire_ext( d->ctx.get(), keyword,
 -# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
 -                                                     &ih->buffer, &ih->buflen,
 -# endif
                                                       maxSize, InquiryHandler::handler, ih.get() ) )
           return err;
      ih.release();
      return 0;
 -#else
 -    return makeError( GPG_ERR_NOT_SUPPORTED ); // libassuan too old
 -#endif // HAVE_ASSUAN_INQUIRE_EXT
+ }
  void AssuanCommand::done( const GpgME::Error& err, const QString & details ) {
-@@ -1262,7 +1244,7 @@ const std::vector<KMime::Types::Mailbox>
+@@ -1262,7 +1246,7 @@ const std::vector<KMime::Types::Mailbox>
      return d->senders;
+ }
 -int AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
 +gpg_error_t AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
      assert( assuan_get_pointer( ctx ) );
      AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );

 @@ -1,31 +1,31 @@
-$NetBSD: distinfo,v 1.17 2012/11/11 22:29:13 joerg Exp $
+$NetBSD: distinfo,v 1.18 2013/02/27 19:29:33 markd Exp $
 SHA1 (kdepim-4.4.11.1.tar.bz2) = 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2
 RMD160 (kdepim-4.4.11.1.tar.bz2) = 51394b9dcb3aecc4f108e87de37c21e3af820ee1
 Size (kdepim-4.4.11.1.tar.bz2) = 8964708 bytes
 SHA1 (patch-aa) = 19bc087365f31f2ab5f62238530185646e3826fb
 SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
 SHA1 (patch-ae) = d45948eb8a083cb2cf900bc946f0f346e1f56d73
 SHA1 (patch-af) = 2a4341c4ae9e1a7aab20fee9c9d27b4cfaa63e1c
 SHA1 (patch-ag) = 45a094af644835a0859f354db0c880fc891aa977
 SHA1 (patch-ah) = 5b5235666c568de23fc79ef461df6b8f66a67ce6
 SHA1 (patch-ai) = 304ddaf381ae4cb217d033268868366760c2d071
 SHA1 (patch-aj) = 26285317562f55e1bee4740286069d4c2213d2fa
 SHA1 (patch-ak) = ba5152d71810759b4bcbe526f7d05eeb8ed8944b
 SHA1 (patch-akregator_plugins_mk4storage_CMakeLists.txt) = 804c66cd07ae0d5f71c4e6ff05be65e6c438e4cb
 SHA1 (patch-al) = 55c77b3ad49e97e304778f56379cabb62af95e07
 SHA1 (patch-am) = 862ed0d6c699146945bb6c5aff8aaec8030ce101
-SHA1 (patch-an) = 0644fda1025698dcb6833672ca88656931cd73dd
+SHA1 (patch-an) = 3f7da9f127a6bd7f97602b6faa5d2376f18fc7b0
 SHA1 (patch-ao) = e8c93353d3d73662a55589dc71ceb8d7e03426bd
 SHA1 (patch-ap) = cf6854d683345d51c6d9f19286d73fea693a241a
 SHA1 (patch-kalarm_CMakeLists.txt) = 6799c123f626c50b8bef7ca3e720f899938accdc
 SHA1 (patch-kmail_imapaccountbase.h) = 0f04ffe6e936bdd8ca5823be3d711a41965c64c8
 SHA1 (patch-kmail_networkaccount.h) = 0e1f95fcabad758fcd75a1c0e6605fcf7e57dd2b
 SHA1 (patch-knode_CMakeLists.txt) = 0f3fcf56b46ff0b82fbadb3602947b6235db5234
 SHA1 (patch-kontact_plugins_akregator_CMakeLists.txt) = d148f3adad4fd2889dbd5e80402904322a4721c4
 SHA1 (patch-korganizer_CMakeLists.txt) = 3beb3f01c7e77cb4551dfe359ee4dddbca035840
 SHA1 (patch-libkleo_backends_qgpgme_threadedjobmixin.h) = ebad4d39e349e0b089a6d9cddfd9dd14f5e898ba
 SHA1 (patch-plugins_kaddressbook_editorpages_CMakeLists.txt) = 106a99f984eb1991065f920d120b03a5095f6688
 SHA1 (patch-plugins_kmail_bodypartformatter_CMakeLists.txt) = 63b88d4afdbb9901c7b0344559d41a21b733c57f