diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-08 15:59:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-08 16:00:40 -0400 |
| commit | b58cc7efd98b6b0457abe78f2fa8ed0614cd5ccb (patch) | |
| tree | 3670fdbec08bebae7b116041dd52ccb04575e080 | |
| parent | 8ecb873d1275420d0d96a5fe371975bcdcf74178 (diff) | |
Android: gpg is built without --enable-minimal, so it interoperates better with other gpg builds that may default to using other algorithms for encryption.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/gpg_error_on_android.mdwn | 3 | ||||
| -rw-r--r-- | standalone/android/Makefile | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 92e5ab503..e18da6522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ git-annex (4.20130628) UNRELEASED; urgency=low git-annex-shell. * OSX Mountain Lion: Fixed gpg bundled in dmg to not fail due to a missing gpg-agent. + * Android: gpg is built without --enable-minimal, so it interoperates + better with other gpg builds that may default to using other algorithms + for encryption. -- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400 diff --git a/doc/bugs/gpg_error_on_android.mdwn b/doc/bugs/gpg_error_on_android.mdwn index 42f083015..3e69f05f2 100644 --- a/doc/bugs/gpg_error_on_android.mdwn +++ b/doc/bugs/gpg_error_on_android.mdwn @@ -34,3 +34,6 @@ gpg: decryption failed: secret key not available # End of transcript or log. """]] + +> [[done]]; I have deployed the new gpg build for Android and the +> nightly Android app build is now using it. --[[Joey]] diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 50d32f3e8..39b8df054 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -114,7 +114,7 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/build-stamp: rsync.patch $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg/build-stamp: cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && git checkout gnupg-1.4.13 cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./autogen.sh - cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --enable-minimal --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls + cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg; $(MAKE) || true # expected failure in doc build touch $@ |