mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Android: gpg is built without --enable-minimal, so it interoperates better with other gpg builds that may default to using other algorithms for encryption.

Browse source
This commit is contained in:
Joey Hess 2013-07-08 15:59:52 -04:00
parent c8936038dc
commit 00f52d9e53
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -25,6 +25,9 @@ git-annex (4.20130628) UNRELEASED; urgency=low
git-annex-shell. git-annex-shell.
* OSX Mountain Lion: Fixed gpg bundled in dmg to not fail due to a missing * OSX Mountain Lion: Fixed gpg bundled in dmg to not fail due to a missing
gpg-agent. 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 -- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400

3
doc/bugs/gpg_error_on_android.mdwn
View file

@ -34,3 +34,6 @@ gpg: decryption failed: secret key not available
# End of transcript or log. # 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]]

2
standalone/android/Makefile
View file

@ -114,7 +114,7 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/build-stamp: rsync.patch
$(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg/build-stamp: $(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 && git checkout gnupg-1.4.13
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./autogen.sh 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 cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg; $(MAKE) || true # expected failure in doc build
touch $@ touch $@