debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 09:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: whitespace cleanup

Browse source 
In order to make it easier to keep the whitespace consistent in the
configure script, use the same style defined in devel/STYLE for
C/C++.

  Specifically, a line should begin with zero or more tabs followed
  by fewer than eight spaces.

Presumably this will be no more difficult for people editing configure
than for people editing the C and C++ code.
This commit is contained in:
David Bremner 2021-10-09 17:09:16 -03:00
parent a4b1c39331
commit 174ec2a28f
1 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
configure vendored
View file

@ -496,16 +496,16 @@ int main () {
} }
EOF EOF
if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
printf 'No.\nCould not make tempdir for testing session-key support.\n' printf 'No.\nCould not make tempdir for testing session-key support.\n'
errors=$((errors + 1)) errors=$((errors + 1))
elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \ elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
&& GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
&& SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
&& [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
then then
printf "OK.\n" printf "OK.\n"
else else
cat <<EOF cat <<EOF
No. No.
*** Error: Could not extract session keys from encrypted message. *** Error: Could not extract session keys from encrypted message.
@ -515,15 +515,15 @@ version of GPGME.
Please try to rebuild your version of GMime against a more recent Please try to rebuild your version of GMime against a more recent
version of GPGME (at least GPGME 1.8.0). version of GPGME (at least GPGME 1.8.0).
EOF EOF
if command -v gpgme-config >/dev/null; then if command -v gpgme-config >/dev/null; then
printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
else else
printf 'You do not have the GPGME development libraries installed.\n' printf 'You do not have the GPGME development libraries installed.\n'
fi fi
errors=$((errors + 1)) errors=$((errors + 1))
fi fi
if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
rm -rf "$TEMP_GPG" rm -rf "$TEMP_GPG"
fi fi
# see https://github.com/jstedfast/gmime/pull/90 # see https://github.com/jstedfast/gmime/pull/90
@ -570,36 +570,36 @@ int main () {
} }
EOF EOF
if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
errors=$((errors + 1)) errors=$((errors + 1))
elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \ elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
&& echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
&& echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
&& GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
then then
if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
gmime_x509_cert_validity=1 gmime_x509_cert_validity=1
printf "Yes.\n" printf "Yes.\n"
else else
gmime_x509_cert_validity=0 gmime_x509_cert_validity=0
printf "No.\n" printf "No.\n"
if pkg-config --exists "gmime-3.0 >= 3.2.7"; then if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
cat <<EOF cat <<EOF
*** Error: GMime fails to calculate X.509 certificate validity, and *** Error: GMime fails to calculate X.509 certificate validity, and
is later than 3.2.7, which should have fixed this issue. is later than 3.2.7, which should have fixed this issue.
Please follow up on https://github.com/jstedfast/gmime/pull/90 with Please follow up on https://github.com/jstedfast/gmime/pull/90 with
more details. more details.
EOF EOF
errors=$((errors + 1)) errors=$((errors + 1))
fi fi
fi fi
else else
printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n' printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
errors=$((errors + 1)) errors=$((errors + 1))
fi fi
if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
rm -rf "$TEMP_GPG" rm -rf "$TEMP_GPG"
fi fi
# see https://dev.gnupg.org/T3464 # see https://dev.gnupg.org/T3464
@ -647,31 +647,31 @@ int main () {
} }
EOF EOF
if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n' printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
errors=$((errors + 1)) errors=$((errors + 1))
elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \ elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
&& GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
&& rm -f ${TEMP_GPG}/private-keys-v1.d/*.key && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
then then
if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
gmime_verify_with_session_key=1 gmime_verify_with_session_key=1
printf "Yes.\n" printf "Yes.\n"
else else
gmime_verify_with_session_key=0 gmime_verify_with_session_key=0
printf "No.\n" printf "No.\n"
cat <<EOF cat <<EOF
*** Error: GMime fails to verify signatures when decrypting with a session key. *** Error: GMime fails to verify signatures when decrypting with a session key.
This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later. This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later.
See https://dev.gnupg.org/T3464 for more details. See https://dev.gnupg.org/T3464 for more details.
EOF EOF
fi fi
else else
printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n' printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
errors=$((errors + 1)) errors=$((errors + 1))
fi fi
if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
rm -rf "$TEMP_GPG" rm -rf "$TEMP_GPG"
fi fi
else else
have_gmime=0 have_gmime=0
@ -768,10 +768,10 @@ have_python3=0
if [ $have_python -eq 1 ]; then if [ $have_python -eq 1 ]; then
printf "Checking for python3 (>= 3.5)..." printf "Checking for python3 (>= 3.5)..."
if "$python" -c 'import sys, sysconfig; assert sys.version_info >= (3,5)'; >/dev/null 2>&1; then if "$python" -c 'import sys, sysconfig; assert sys.version_info >= (3,5)'; >/dev/null 2>&1; then
printf "Yes.\n" printf "Yes.\n"
have_python3=1 have_python3=1
else else
printf "No (will not install CFFI-based python bindings).\n" printf "No (will not install CFFI-based python bindings).\n"
fi fi
fi fi
@ -783,11 +783,11 @@ if [ $have_python3 -eq 1 ]; then
printf "Checking for python $python3_version development files..." printf "Checking for python $python3_version development files..."
if pkg-config --exists "python-$python3_version"; then if pkg-config --exists "python-$python3_version"; then
have_python3_dev=1 have_python3_dev=1
printf "Yes.\n" printf "Yes.\n"
else else
have_python3_dev=0 have_python3_dev=0
printf "No (will not install CFFI-based python bindings).\n" printf "No (will not install CFFI-based python bindings).\n"
fi fi
fi fi
@ -796,12 +796,12 @@ have_python3_pytest=0
if [ $have_python3_dev -eq 1 ]; then if [ $have_python3_dev -eq 1 ]; then
printf "Checking for python3 cffi and setuptools... " printf "Checking for python3 cffi and setuptools... "
if "$python" -c 'import cffi,setuptools; cffi.FFI().verify()' >/dev/null 2>&1; then if "$python" -c 'import cffi,setuptools; cffi.FFI().verify()' >/dev/null 2>&1; then
printf "Yes.\n" printf "Yes.\n"
have_python3_cffi=1 have_python3_cffi=1
WITH_PYTHON_DOCS=1 WITH_PYTHON_DOCS=1
else else
WITH_PYTHON_DOCS=0 WITH_PYTHON_DOCS=0
printf "No (will not install CFFI-based python bindings).\n" printf "No (will not install CFFI-based python bindings).\n"
fi fi
rm -rf __pycache__ # cffi.FFI().verify() uses this space rm -rf __pycache__ # cffi.FFI().verify() uses this space
@ -809,10 +809,10 @@ if [ $have_python3_dev -eq 1 ]; then
conf=$(mktemp) conf=$(mktemp)
printf "[pytest]\nminversion=3.0\n" > $conf printf "[pytest]\nminversion=3.0\n" > $conf
if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then
printf "Yes.\n" printf "Yes.\n"
have_python3_pytest=1 have_python3_pytest=1
else else
printf "No (will not test CFFI-based python bindings).\n" printf "No (will not test CFFI-based python bindings).\n"
fi fi
rm -f $conf rm -f $conf
fi fi
@ -860,10 +860,10 @@ fi
if [ $WITH_EMACS = "1" ]; then if [ $WITH_EMACS = "1" ]; then
printf "Checking if emacs (>= 25) is available... " printf "Checking if emacs (>= 25) is available... "
if emacs --quick --batch --eval '(if (< emacs-major-version 25) (kill-emacs 1))' > /dev/null 2>&1; then if emacs --quick --batch --eval '(if (< emacs-major-version 25) (kill-emacs 1))' > /dev/null 2>&1; then
printf "Yes.\n" printf "Yes.\n"
else else
printf "No (disabling emacs related parts of build)\n" printf "No (disabling emacs related parts of build)\n"
WITH_EMACS=0 WITH_EMACS=0
fi fi
fi fi
@ -1571,10 +1571,10 @@ EOF
{ {
echo "# Generated by configure, run from doc/conf.py" echo "# Generated by configure, run from doc/conf.py"
if [ $WITH_EMACS = "1" ]; then if [ $WITH_EMACS = "1" ]; then
echo "tags.add('WITH_EMACS')" echo "tags.add('WITH_EMACS')"
fi fi
if [ $WITH_PYTHON_DOCS = "1" ]; then if [ $WITH_PYTHON_DOCS = "1" ]; then
echo "tags.add('WITH_PYTHON')" echo "tags.add('WITH_PYTHON')"
fi fi
printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)" printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)"
} > sphinx.config } > sphinx.config