f87e23c512
* configure.ac: Remove "python" from available_languages and from default_languages. Remove checks for SWIG and available Python versions. Remove substitution of PYTHONS. Remove generation of files in lang/python. * lang/Makefile.am (DIST_SUBDIRS): Remove python. * lang/python/.gitignore, lang/python/AUTHORS, lang/python/COPYING, lang/python/COPYING.LESSER, lang/python/ChangeLog, lang/python/INSTALL, lang/python/NEWS, lang/python/autogen.rc, lang/python/autogen.sh, lang/python/configure.ac: New. * lang/python/Makefile.am (EXTRA_DIST): Add autogen.sh, autogen.rc. copystamp: Remove symbolic linking of gpgme's internal data.h header and of gpgme's config.h file. CLEANFILES: Remove cleaning of config.h and data.h. (RELEASE_ARCHIVE_SUFFIX, ACLOCAL_AMFLAGS, dist-hook, distcheck-hook, .PHONY, gen_start_date, gen-ChangeLog, RELEASE_NAME, release, sign-release): New (copied from top-level Makefile.am). * lang/python/build-aux/compile, lang/python/build-aux/config.guess, lang/python/build-aux/config.sub, lang/python/build-aux/depcomp, lang/python/build-aux/install-sh, lang/python/build-aux/libtool-patch.sed, lang/python/build-aux/ltmain.sh, lang/python/build-aux/missing: New. * m4/ax_pkg_swig.m4: Move to... * lang/python/m4/ax_pkg_swig.m4: ...here. * m4/ax_python_devel.m4: Move to... * lang/python/m4/ax_python_devel.m4: ...here. * m4/python.m4: Move to... * lang/python/m4/python.m4: ...here. * lang/python/m4/gpg-error.m4, lang/python/m4/gpgme.m4, lang/python/m4/libassuan.m4, lang/python/m4/libtool.m4, lang/python/m4/ltoptions.m4, lang/python/m4/ltsugar.m4, lang/python/m4/ltversion.m4, lang/python/m4/lt~obsolete.m4: New. * lang/python/setup.py.in: Remove code for in-tree builds. Initialize libs from @GPGME_LIBS@ instead of @GPGME_CONFIG_LIBS@. Initialize include_dirs and define_macros from @GPGME_CFLAGS@ instead of @GPGME_CONFIG_CFLAGS@. Look for gpgme.h in @prefix@/include and in include_dirs and '/usr/include'. * lang/python/tests/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F, lang/python/tests/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD, lang/python/tests/76F7E2B35832976B50A27A282D9B87E44577EB66, lang/python/tests/7A030357C0F253A5BBCD282FFC4E521B37558F5C, lang/python/tests/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD: New. * lang/python/tests/Makefile.am (test_srcdir): Remove. (TESTS_ENVIRONMENT): Remove adding .libs directory with gpgme library to LD_LIBRARYPATH. (private_keys): Use local copies instead of files from gpgme's tests. (EXTRA_DIST): Add new files. (clean-local): Call local copy of start-stop-agent script. (gpg-sample.stamp): Use local copies of private keys. (pubring-stamp): Use local copies of pubdemo.asc and secdemo.asc. (gpg-agent.conf): Use local copy of pinentry helper. * lang/python/tests/cipher-1.asc, lang/python/tests/cipher-2.asc, lang/python/tests/cipher-3.asc, lang/python/tests/cipher-no-sig.asc, lang/python/tests/pinentry, lang/python/tests/pubdemo.asc, lang/python/tests/pubkey-1.asc, lang/python/tests/secdemo.asc, lang/python/tests/seckey-1.asc, lang/python/tests/start-stop-agent: New. * lang/python/tests/support.py (make_filename): Adapt to changed path of test files. -- This makes building and distributing the Python bindings independent of the sources of gpgme. Many of the new files are copied from gpgme to make the Python bindings a self-contained package. A later commit re-adds the possibility to build the Python bindings as nested package together with gpgme. GnuPG-bug-id: 7110
70 lines
2.2 KiB
Bash
Executable File
70 lines
2.2 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright (C) 2013 g10 Code GmbH
|
|
#
|
|
# This file is free software; as a special exception the author gives
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
# modifications, as long as this notice is preserved. This file is
|
|
# distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY, to the extent permitted by law; without even the implied
|
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
if [ -z "$(command -v gpg-connect-agent)" ]; then
|
|
echo "gpg-agent not installed and thus not started" >&2
|
|
exit 0;
|
|
fi
|
|
|
|
GPG_AGENT_INFO=
|
|
export GPG_AGENT_INFO
|
|
GPG_AGENT=$(which gpg-agent)
|
|
|
|
token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
|
|
|
|
if [ "$1" = "--stop" ]; then
|
|
if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \
|
|
!= "D set" ]; then
|
|
echo "gpg-agent not running" >&2
|
|
exit 0
|
|
fi
|
|
echo "stopping gpg-agent " >&2
|
|
gpg-connect-agent KILLAGENT /bye >/dev/null 2>&1
|
|
exit 0
|
|
fi
|
|
|
|
# Update 'agent-program' in the configuration files to make sure we
|
|
# will always start exactly this agent again if we ever need to.
|
|
for F in gpg.conf gpgsm.conf
|
|
do
|
|
if test -f "$GNUPGHOME/$F"
|
|
then
|
|
cat "$GNUPGHOME/$F" > "$GNUPGHOME/$F~"
|
|
sed -e "s#^agent-program.*#agent-program ${GPG_AGENT}|--debug-quick-random#" \
|
|
>"$GNUPGHOME/$F" <"$GNUPGHOME/$F~"
|
|
rm -f "$GNUPGHOME/$F~"
|
|
fi
|
|
done
|
|
|
|
if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \
|
|
= "D set" ]; then
|
|
echo "gpg-agent already running" >&2
|
|
exit 0
|
|
fi
|
|
|
|
echo "starting gpg-agent.." >&2
|
|
|
|
# GnuPG prior to 2.1.12 needs --allow-loopback-pinentry for the
|
|
# loopback entry to work. Old versions do not understand this though,
|
|
# so we need to be careful.
|
|
if "$GPG_AGENT" --gpgconf-test --allow-loopback-pinentry &&
|
|
test -f "$GNUPGHOME/gpg-agent.conf" &&
|
|
! grep -q allow-loopback-pinentry "$GNUPGHOME/gpg-agent.conf"; then
|
|
echo allow-loopback-pinentry >> "$GNUPGHOME/gpg-agent.conf"
|
|
fi
|
|
|
|
gpg-connect-agent --agent-program="${GPG_AGENT}|--debug-quick-random" putval\ $token\ set /bye
|
|
if [ $? -ne 0 -o "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
|
|
!= "D set" ]; then
|
|
echo "error starting gpg-agent" >&2
|
|
exit 1
|
|
fi
|
|
exit 0
|