Merge branch 'gpg4win-2'
authorAndre Heinecke <aheinecke@intevation.de>
Wed, 9 Sep 2015 14:35:59 +0000 (16:35 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Wed, 9 Sep 2015 14:35:59 +0000 (16:35 +0200)
Conflicts:
Makefile.am
NEWS
configure.ac
packages/packages.current
patches/gnupg2-2.0.29/
0001-Enable-wildcard-expansion-with-mingw-w64.patch
patches/gnupg2-2.0.29/
0002-Let-wchar_to_native-convert-to-console-codepage.patch
patches/gnupg2-2.0.29/
0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
patches/gnupg2-2.0.29/
0006-gpgsm-Add-command-option-offline.patch

1  2 
Makefile.am
NEWS
configure.ac
packages/packages.current

diff --cc Makefile.am
@@@ -27,9 -27,27 +27,8 @@@ SUBDIRS = po packages doc sr
  EXTRA_DIST = autogen.sh README.GIT ONEWS \
          doc/license-page doc/GPLv3 \
          build-aux/git-log-footer build-aux/git-log-fix \
 -        patches/dirmngr-1.1.1/dirmngr-pth.patch \
          patches/glib-2.41.5/01-socket.patch \
-         patches/gpgme-1.5.5/0001-Add-offline-mode-support-for-CMS-keylisting.patch \
-               patches/w32pth-2.0.5/workaround-broken-libtool.patch
 -        patches/gnupg2-2.0.29/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
 -        patches/gnupg2-2.0.29/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
 -        patches/gnupg2-2.0.29/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
 -        patches/gnupg2-2.0.29/0006-gpgsm-Add-command-option-offline.patch \
 -        patches/gnupg2/01-version.patch \
 -        patches/gnupg2/01-version.patch.in \
 -        patches/gnutls-2.12.23/01-openssl-wincrypt.patch \
 -        patches/gnutls-2.12.23/02-cve-2013-2116.patch \
 -        patches/gnutls-2.12.23/03-cve-2014-1959.patch \
 -        patches/gnutls-2.12.23/04-cve-2014-0092.patch \
 -        patches/gnutls-2.12.23/05-cve-2014-3466.patch \
 -        patches/gnutls-2.12.23/06-cve-2015-0282.patch \
 -        patches/gnutls-2.12.23/07-cve-2015-0294.patch \
 -        patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch \
 -        patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch \
 -              patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch \
 -        patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
 -              patches/w32pth-2.0.5/workaround-broken-libtool.patch \
 -              patches/scute-1.4.0/workaround-broken-libtool.patch
++        patches/w32pth-2.0.5/workaround-broken-libtool.patch
  
  copy-news:
        cp NEWS doc/website/NEWS.last
diff --cc NEWS
Simple merge
diff --cc configure.ac
@@@ -25,9 -25,7 +25,7 @@@ min_automake_version="1.9.3
  # (git tag -s gpg4win-2.x.y) and run "./autogen.sh --force".  Please
  # bump the version number immediately after the release and do another
  # commit and push so that the git magic is able to work.
- #
- # After a release the make target "copy-news" is to be called as well!
 -m4_define([my_version], [2.2.7])
 +m4_define([my_version], [3.0.0])
  
  # Below is m4 magic to extract and compute the git revision number,
  # the decimalized short revision number, a beta version string and a
@@@ -271,20 -313,30 +271,20 @@@ server ftp://ftp.gnupg.org/gcryp
  file libgpg-error/libgpg-error-1.19.tar.bz2
  chk  4997951ab058788de48b989013668eb3df1e6939
  
 -# last changed: 2015-09-08
 -# by: ah
 -file libgcrypt/libgcrypt-1.6.4.tar.bz2
 -chk  ed52add1ce635deeb2f5c6650e52667debd4ec70
 -
--# last-changed: 2015-06-05
 -# by: ah
 -file libksba/libksba-1.3.3.tar.bz2
 -chk  86fe0436f3c8c394d32e142ee410a9f9560173fb
 -
+ # last-changed: 2015-09-08
  # by: ah
- file libassuan/libassuan-2.2.1.tar.bz2
- chk  c21b86482f6a3624c2b46b91e20f8415f244233a
+ file libassuan/libassuan-2.3.0.tar.bz2
+ chk  23f7ea010983b869f765c36d169dec51c8296cff
  
 -# last changed: 2015-09-08
 +# last changed: 2015-08-20
  # by: ah
 -name gnupg2-2.0.29.tar.bz2
 -file gnupg/gnupg-2.0.29.tar.bz2
 -chk  87eb0df18f9953675f979405a1af10ab6c5322b3
 +name gnupg-w32-2.1.7-20150811-bin.exe
 +file binary/gnupg-w32-2.1.7_20150811.exe
 +chk  dfea3fa2499f64cac223c9329c9f017bc3da11a5
  
 -# checked: 2014-07-16 ah
 -file dirmngr/dirmngr-1.1.1.tar.bz2
 -chk  e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 +name gnupg-w32-2.1.7-20150811-src.tar.xz
 +file binary/gnupg-w32-2.1.7_20150811.tar.xz
 +chk  20439f65b8d94ec79523c45ad72418670ca9d5eb
  
  # last changed: 2015-06-23
  # by: ah