Merge branch 'master' into 'master'

Update security.pEp to 1.0.213 (23)

See merge request fdroid/fdroiddata!3896
This commit is contained in:
Pierre Rudloff 2018-11-06 13:12:33 +00:00
commit 9d71c16e88

View file

@ -73,13 +73,29 @@ Build:1.0.209.withoutKeysync,19
sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
ndk=r14b
Maintainer Notes:
Do not set AUM when srclibs tend to change!
Auto Update Mode:Version v%v
.
Build:1.0.213.withoutKeysync,23
commit=v1.0.213
subdir=k9mail
gradle=WithoutkeysyncPlayStore
srclibs=pEpJNIAdapter@441,pEpEngine@3104,yml2@2.5.8
prebuild=pwd && \
$$pEpJNIAdapter$$/android/external/generate-standalone-ndk-toolchain.sh && \
rm -rvf /tmp/ndk-18-arm && \
mv ndk-18-arm /tmp && \
ln -s /tmp/ndk-18-arm $$pEpJNIAdapter$$/android/external/ndk-18-arm && \
rm -vf src/main/res/xml/changelog_master.xml && \
sed -i 's:docs.patch:docs.patch\n\tsed -i "s\:src doc tests\:src\:\" libgcrypt/Makefile.am:' $$pEpJNIAdapter$$/android/external/Makefile && \
sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf && \
sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
ndk=r18b
Auto Update Mode:None
Update Check Mode:Tags
Current Version:1.0.209
Current Version Code:19
Current Version:1.0.213
Current Version Code:23