diff options
| -rw-r--r-- | patches/gnupg-2.1.16.local.patch | 96 | ||||
| -rw-r--r-- | vars/build.vars | 8 |
2 files changed, 4 insertions, 100 deletions
diff --git a/patches/gnupg-2.1.16.local.patch b/patches/gnupg-2.1.16.local.patch deleted file mode 100644 index 5ee3792d..00000000 --- a/patches/gnupg-2.1.16.local.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- gnupg-2.1.16/tests/inittests.orig 2016-02-02 07:05:16.000000000 +0100 -+++ gnupg-2.1.16/tests/inittests 2016-12-18 00:56:32.207073100 +0100 -@@ -9,91 +9,5 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - --set -e -- --sample_certs=' --cert_g10code_test1.pem --cert_g10code_pete1.pem --cert_g10code_theo1.pem --' -- --private_keys=' --32100C27173EF6E9C4E9A25D3D69F86D37A4F939 --' -- --clean_files=' --gpgsm.conf gpg-agent.conf trustlist.txt pubring.kbx --msg msg.sig msg.unsig --' -- -- --[ -z "$srcdir" ] && srcdir=. --[ -z "$GPGSM" ] && GPGSM=../sm/gpgsm -- --if [ -d $srcdir/samplekeys ] \ -- && grep TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then -- : --else -- # During make distclean the Makefile has already been removed, -- # so we need this extra test. -- if ! grep gnupg-test-directory testdir.stamp >/dev/null 2>&1; then -- echo "inittests: please cd to the tests directory first" >&2 -- exit 1 -- fi --fi -- --if [ "$1" = "--clean" ]; then -- if [ -d private-keys-v1.d ]; then -- rm private-keys-v1.d/* 2>/dev/null || true -- rmdir private-keys-v1.d -- fi -- rm ${clean_files} testdir.stamp 2>/dev/null || true -- exit 0 --fi -- --if [ "$GNUPGHOME" != "`/bin/pwd`" ]; then -- echo "inittests: please set GNUPGHOME to the test directory" >&2 -- exit 1 --fi -- --if [ -n "$GPG_AGENT_INFO" ]; then -- echo "inittests: please unset GPG_AGENT_INFO" >&2 -- exit 1 --fi -- --# A stamp file used with --clean --echo gnupg-test-directory > testdir.stamp -- -- --# Create the private key directy if it does not exists and copy --# the sample keys. --[ -d private-keys-v1.d ] || mkdir private-keys-v1.d --for i in ${private_keys}; do -- cat ${srcdir}/samplekeys/$i.key >private-keys-v1.d/$i.key --done -- --# Create the configuration scripts --# Note, die to an expired test certificate, we need to use --# the faked system time option. --cat > gpgsm.conf <<EOF --no-secmem-warning --disable-crl-checks --agent-program ../agent/gpg-agent --faked-system-time 1038835799 --EOF -- --cat > gpg-agent.conf <<EOF --no-grab --pinentry-program /home/wk/work/pinentry/gtk/pinentry-gtk --EOF -- --cat > trustlist.txt <<EOF --# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE --3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E S --EOF -- --# Make sure that the sample certs are available but ignore errors here --# because we are not a test script. --for i in ${sample_certs}; do -- $GPGSM --import ${srcdir}/samplekeys/$i || true --done -+#testing cross compiled binaries, nope. -+exit 0 diff --git a/vars/build.vars b/vars/build.vars index 5f250f68..7c199103 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -894,8 +894,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_LIBGPG_ERROR_VERSION:=1.36}; : ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2}; : ${PKG_LIBGPG_ERROR_IN_TREE:=1}; -: ${PKG_LIBASSUAN_SHA256SUM:=47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449}; -: ${PKG_LIBASSUAN_VERSION:=2.5.1}; +: ${PKG_LIBASSUAN_SHA256SUM:=91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702}; +: ${PKG_LIBASSUAN_VERSION:=2.5.3}; : ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2}; : ${PKG_LIBASSUAN_CONFIGURE_ARGS_EXTRA:=--with-libgpg-error-prefix=${PREFIX_NATIVE}}; : ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${DEFAULT_GITROOT}/compilers/bfirm@main"}; @@ -1796,8 +1796,8 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht : ${PKG_GIT_IN_TREE:=1}; : ${PKG_GIT_MAKEFLAGS_BUILD:="HAVE_DEV_TTY=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes V=99"}; : ${PKG_GIT_SUBDIR:=git-${PKG_GIT_VERSION}}; -: ${PKG_GNUPG_SHA256SUM:=49b9a6a6787ad00d4d2d69d8c7ee8905923782583f06078a064a0c80531d8844}; -: ${PKG_GNUPG_VERSION:=2.1.16}; +: ${PKG_GNUPG_SHA256SUM:=242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0}; +: ${PKG_GNUPG_VERSION:=2.2.19}; : ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2}; : ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"}; : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2}; |