merged in default ENGINE-247
authorKrista Bennett <krista@pep-project.org>
Tue, 12 Sep 2017 19:18:57 +0200
branchENGINE-247
changeset 20484612060c1d49
parent 2046 deec7a422249
parent 2047 a4d4320b09bc
child 2049 87a105b9151c
merged in default
src/message_api.c
src/pEp_internal.h
     1.1 --- a/build-config/Darwin.conf	Tue Sep 12 17:46:27 2017 +0200
     1.2 +++ b/build-config/Darwin.conf	Tue Sep 12 19:18:57 2017 +0200
     1.3 @@ -50,8 +50,8 @@
     1.4  
     1.5  ######### OpenPGP #########
     1.6  LIBGPGME=libgpgme.dylib
     1.7 -GPGME_LIB=-L/opt/local/lib
     1.8 -GPGME_INC=-I/opt/local/include
     1.9 +GPGME_LIB=-L$(HOME)/lib
    1.10 +GPGME_INC=-I$(HOME)/include
    1.11  
    1.12  ######### Engine internals #########
    1.13  
     2.1 --- a/doc/build-macos.md	Tue Sep 12 17:46:27 2017 +0200
     2.2 +++ b/doc/build-macos.md	Tue Sep 12 19:18:57 2017 +0200
     2.3 @@ -65,7 +65,7 @@
     2.4  cp -r /opt/local/lib/libgpg* ~/code/gpgme/build/lib
     2.5  ~~~
     2.6  
     2.7 -It's of course possible to skip MacPort's version, and use a self-compiled GPGME/GPG.
     2.8 +It's of course possible to skip MacPort's version, and use a self-compiled GPGME/GPG. The default build configuration assumes this case, and assumes you have installed your GPGME with `$(HOME)` as your prefix.
     2.9  
    2.10  # pEp Engine
    2.11  
     3.1 --- a/src/message_api.c	Tue Sep 12 17:46:27 2017 +0200
     3.2 +++ b/src/message_api.c	Tue Sep 12 19:18:57 2017 +0200
     3.3 @@ -1870,9 +1870,11 @@
     3.4                                                                      &_verify_keylist);
     3.5  
     3.6                              if (status == PEP_VERIFIED || status == PEP_VERIFIED_AND_TRUSTED)
     3.7 +                            {
     3.8                                  decrypt_status = PEP_DECRYPTED_AND_VERIFIED;
     3.9                              
    3.10                                  status = combine_keylists(session, &_verify_keylist, &_keylist, src->from);
    3.11 +                            }
    3.12                          }
    3.13                      }
    3.14                  }
     4.1 --- a/src/pEp_internal.h	Tue Sep 12 17:46:27 2017 +0200
     4.2 +++ b/src/pEp_internal.h	Tue Sep 12 19:18:57 2017 +0200
     4.3 @@ -189,7 +189,7 @@
     4.4          size_t psize, char **ctext, size_t *csize
     4.5  );
     4.6  
     4.7 -#ifdef NDEBUG
     4.8 +#if defined(NDEBUG) || defined(NOLOG)
     4.9  #define DEBUG_LOG(TITLE, ENTITY, DESC)
    4.10  #else
    4.11  #ifdef ANDROID