[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.5-20-g7462799
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Sep 1 14:07:56 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 7462799c1b4065414b1ca2ff36f7c32907810e1b (commit)
via a07c319c55af5c7eaa082d31faed076d793be542 (commit)
via 54a013e2ac23d926c809f6a26bd9f3dbcebe436f (commit)
via 778fa4685e24ab91935ee29591ee5576bfb88f2c (commit)
via b22989d2d42dba12aca526725dacc61d21f37a0c (commit)
via 631d18d6142ee8ef6a97eaf392b8cc713866ee32 (commit)
from 4acaf7fab7b0de019f05aee0abb5443af4d769b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7462799c1b4065414b1ca2ff36f7c32907810e1b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Sep 1 11:40:06 2015 +0200
Remove libgcrypt and scute
* src/inst-libgcrypt.nsi, src/inst-scute.nsi,
src/uninst-libgcrypt.nsi src/uninst-scute.nsi,
patches/scute-1.4.0/workaround-broken-libtool.patch: Removed.
* configure.ac, packages/packages.current,
src/Makefile.am, src/config.nsi.in,
src/inst-sections.nsi: Update accordingly.
diff --git a/Makefile.am b/Makefile.am
index e1b541a..e35b597 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
build-aux/git-log-footer build-aux/git-log-fix \
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/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 --git a/configure.ac b/configure.ac
index 598eb1c..68f3a58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,13 +353,11 @@ GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
GPG4WIN_SPKG([libpng], [pkgconfig])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
-GPG4WIN_SPKG([libgcrypt], [libgpg-error])
GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
GPG4WIN_SPKG([gpgme], [libgpg-error glib])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
-GPG4WIN_SPKG([scute], [libgpg-error libassuan])
GPG4WIN_SPKG([paperkey])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
GPG4WIN_SPKG([w32pth])
diff --git a/packages/packages.current b/packages/packages.current
index 00834c6..9ef14d6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -271,11 +271,6 @@ server ftp://ftp.gnupg.org/gcrypt
file libgpg-error/libgpg-error-1.19.tar.bz2
chk 4997951ab058788de48b989013668eb3df1e6939
-# last changed: 2015-03-09
-# by: ah
-file libgcrypt/libgcrypt-1.6.3.tar.bz2
-chk 9456e7b64db9df8360a1407a38c8c958da80bbf1
-
# last-changed: 2015-06-05
# by: ah
file libassuan/libassuan-2.2.1.tar.bz2
@@ -296,10 +291,6 @@ chk 20439f65b8d94ec79523c45ad72418670ca9d5eb
file pinentry/pinentry-0.9.4.tar.bz2
chk 0c47f0ddea4631bcba01ebbeca8bffe0bf43e440
-# checked: 2014-07-16 ah
-file scute/scute-1.4.0.tar.bz2
-chk e28141d2b03612c09512651795976c58ed3f8035
-
# last changed: 2015-08-26
# by: ah
file gpgme/gpgme-1.6.0.tar.bz2
diff --git a/patches/scute-1.4.0/workaround-broken-libtool.patch b/patches/scute-1.4.0/workaround-broken-libtool.patch
deleted file mode 100755
index 90dc776..0000000
--- a/patches/scute-1.4.0/workaround-broken-libtool.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-diff -Nru scute-1.4.0.orig/src/scute.def scute-1.4.0/src/scute.def
---- scute-1.4.0.orig/src/scute.def 2015-06-05 11:56:03.876727509 +0200
-+++ scute-1.4.0/src/scute.def 2015-06-05 11:56:23.572873320 +0200
-@@ -1,32 +1,3 @@
--; scute.def - List of symbols to export.
--; Copyright (C) 2005, 2006 g10 Code GmbH
--;
--; This file is part of Scute.
--;
--; Scute is free software; you can redistribute it and/or modify it
--; under the terms of the GNU General Public License as published by
--; the Free Software Foundation; either version 2 of the License, or
--; (at your option) any later version.
--;
--; Scute is distributed in the hope that it will be useful, but
--; WITHOUT ANY WARRANTY; without even the implied warranty of
--; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--; General Public License for more details.
--;
--; You should have received a copy of the GNU General Public License
--; along with Scute; if not, write to the Free Software Foundation,
--; Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--;
--; In addition, as a special exception, g10 Code GmbH gives permission
--; to link this library: with the Mozilla Fondations's code for
--; Mozilla (or with modified versions of it that use the same license
--; as the "Mozilla" code), and distribute the linked executables. You
--; must obey the GNU General Public License in all respects for all of
--; the code used other than "Mozilla". If you modify this file, you
--; may extend this exception to your version of the file, but you are
--; not obligated to do so. If you do not wish to do so, delete this
--; exception statement from your version.
--
- EXPORTS
- C_CancelFunction @1
- C_CloseAllSessions @2
diff --git a/src/Makefile.am b/src/Makefile.am
index 44c3ee6..2f9ed72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,14 +37,12 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-gnupg-w32.nsi uninst-gnupg-w32.nsi \
inst-gpa.nsi uninst-gpa.nsi \
inst-gpgme.nsi uninst-gpgme.nsi \
- inst-scute.nsi uninst-scute.nsi \
inst-paperkey.nsi uninst-paperkey.nsi \
inst-gpgol.nsi uninst-gpgol.nsi \
inst-gpgex.nsi uninst-gpgex.nsi \
inst-gdk-pixbuf.nsi uninst-gdk-pixbuf.nsi \
inst-gtk+.nsi uninst-gtk+.nsi \
inst-libassuan.nsi uninst-libassuan.nsi \
- inst-libgcrypt.nsi uninst-libgcrypt.nsi \
inst-libgpg-error.nsi uninst-libgpg-error.nsi \
inst-libiconv.nsi uninst-libiconv.nsi \
inst-libpng.nsi uninst-libpng.nsi \
@@ -88,8 +86,8 @@ CLEANFILES = g4wihelp.dll versioninfo.txt $(README_files) $(HOWTO_files) \
gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
libgpg-error gpgme gpgol gpgex libpng \
gpa opencdk \
- pinentry libassuan libgcrypt \
- w32pth scute paperkey regex libiconv gettext
+ pinentry libassuan \
+ w32pth paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
@@ -190,14 +188,6 @@ gpg4win_pkg_libassuan_configure = --silent --enable-static
gpg4win_pkg_libassuan_ex_configure = --silent --enable-static
-# Using gpgsm with VirtualBox on AES-NI hardware crashes gpg-agent.
-# However, the Libgcrypt's regression tests work just fine. I don't
-# have a windows instance on AES-NI, thus I can't currently debug
-# this. As a workaround we disable AES-NI for now.
-gpg4win_pkg_libgcrypt_configure = --silent \
- --with-gpg-error-prefix=$(idir) \
- --disable-aesni-support
-
gpg4win_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
# We would like to use --with-libiconv-prefix and
@@ -244,9 +234,6 @@ gpg4win_pkg_gpgex_configure = --silent \
--with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
-gpg4win_pkg_scute_configure = --silent \
- --with-gpg-error-prefix=$(idir) --with-libassuan-prefix=$(idir)
-
gpg4win_pkg_paperkey_configure = --silent
# Supported make-only source packages.
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 2bd7aa7..0a5e332 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -64,10 +64,6 @@
!define gpg4win_pkg_libassuan @gpg4win_pkg_libassuan@
!define gpg4win_pkg_libassuan_version @gpg4win_pkg_libassuan_version@
- at HAVE_PKG_LIBGCRYPT@
-!define gpg4win_pkg_libgcrypt @gpg4win_pkg_libgcrypt@
-!define gpg4win_pkg_libgcrypt_version @gpg4win_pkg_libgcrypt_version@
-
@HAVE_PKG_GPGME@
!define gpg4win_pkg_gpgme @gpg4win_pkg_gpgme@
!define gpg4win_pkg_gpgme_version @gpg4win_pkg_gpgme_version@
@@ -194,10 +190,6 @@
!define gpg4win_pkg_kleopatra_version @gpg4win_pkg_kleopatra_version@
!define gpg4win_pkg_kleopatra_src @gpg4win_pkg_kleopatra_src@
- at HAVE_PKG_SCUTE@
-!define gpg4win_pkg_scute @gpg4win_pkg_scute@
-!define gpg4win_pkg_scute_version @gpg4win_pkg_scute_version@
-
@HAVE_PKG_PAPERKEY@
!define gpg4win_pkg_paperkey @gpg4win_pkg_paperkey@
!define gpg4win_pkg_paperkey_version @gpg4win_pkg_paperkey_version@
diff --git a/src/inst-libgcrypt.nsi b/src/inst-libgcrypt.nsi
deleted file mode 100644
index a90ffbe..0000000
--- a/src/inst-libgcrypt.nsi
+++ /dev/null
@@ -1,53 +0,0 @@
-# inst-libgcrypt.nsi - snippet for libgcrypt. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libgcrypt-${gpg4win_pkg_libgcrypt_version}
-
-
-!ifdef DEBUG
-Section "libgcrypt" SEC_libgcrypt
-!else
-Section "-libgcrypt" SEC_libgcrypt
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_libgcrypt}"
-!else
- ClearErrors
- SetOverwrite try
- File "${prefix}/bin/libgcrypt-20.dll"
- SetOverwrite lastused
- ifErrors 0 +3
- File /oname=libgcrypt-20.dll.tmp "${prefix}/bin/libgcrypt-20.dll"
- Rename /REBOOTOK libgcrypt-20.dll.tmp libgcrypt-20.dll
-
- SetOutPath "$INSTDIR\lib"
- File /oname=libgcrypt.imp "${prefix}/lib/libgcrypt.dll.a"
-
- SetOutPath "$INSTDIR\include"
- File "${prefix}/include/gcrypt.h"
-
-
-!endif
-SectionEnd
diff --git a/src/inst-scute.nsi b/src/inst-scute.nsi
deleted file mode 100644
index cf5ae7e..0000000
--- a/src/inst-scute.nsi
+++ /dev/null
@@ -1,50 +0,0 @@
-# inst-scute.nsi - Installer snippet for scute. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/scute-${gpg4win_pkg_scute_version}
-
-
-!ifdef DEBUG
-Section "Scute" SEC_scute
-!else
-Section "-Scute" SEC_scute
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_scute}"
-!else
- ClearErrors
- SetOverwrite try
- File /oname=scute.dll "${prefix}/bin/libscute-0.dll"
-
- SetOverwrite lastused
- ifErrors 0 +3
- File /oname=scute.dll.tmp "${prefix}/bin/libscute-0.dll"
- Rename /REBOOTOK scute.dll.tmp scute.dll
-
-!endif
-SectionEnd
-
-
-LangString DESC_SEC_scute ${LANG_ENGLISH} \
- "PKCS #11 with GnuPG Agent"
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 10bf391..d0bb30f 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -68,9 +68,6 @@
!ifdef HAVE_PKG_GLIB
!include "inst-glib.nsi"
!endif
-!ifdef HAVE_PKG_LIBGCRYPT
-!include "inst-libgcrypt.nsi"
-!endif
!ifdef HAVE_PKG_EXPAT
!include "inst-expat.nsi"
!endif
@@ -119,9 +116,6 @@
!ifdef HAVE_PKG_GPGEX
!include "inst-gpgex.nsi"
!endif
-!ifdef HAVE_PKG_SCUTE
-!include "inst-scute.nsi"
-!endif
!ifdef HAVE_PKG_PAPERKEY
!include "inst-paperkey.nsi"
!endif
@@ -163,9 +157,6 @@
!ifdef HAVE_PKG_PAPERKEY
!include "uninst-paperkey.nsi"
!endif
-!ifdef HAVE_PKG_SCUTE
-!include "uninst-scute.nsi"
-!endif
!ifdef HAVE_PKG_GPGEX
!include "uninst-gpgex.nsi"
!endif
@@ -218,9 +209,6 @@
!ifdef HAVE_PKG_EXPAT
!include "uninst-expat.nsi"
!endif
-!ifdef HAVE_PKG_LIBGCRYPT
-!include "uninst-libgcrypt.nsi"
-!endif
!ifdef HAVE_PKG_GLIB
!include "uninst-glib.nsi"
!endif
@@ -334,17 +322,6 @@ calc_defaults_gpgol_done:
calc_defaults_gpgex_done:
!endif
-!ifdef HAVE_PKG_SCUTE
- g4wihelp::config_fetch_bool "inst_scute"
- StrCmp $R0 "1" 0 calc_defaults_scute_not_one
- !insertmacro SelectSection ${SEC_scute}
- Goto calc_defaults_scute_done
- calc_defaults_scute_not_one:
- StrCmp $R0 "0" 0 calc_defaults_scute_done
- !insertmacro UnselectSection ${SEC_scute}
-calc_defaults_scute_done:
-!endif
-
!ifdef HAVE_PKG_PAPERKEY
g4wihelp::config_fetch_bool "inst_paperkey"
StrCmp $R0 "1" 0 calc_defaults_paperkey_not_one
@@ -474,9 +451,6 @@ Function CalcDepends
!ifdef HAVE_PKG_LIBGPG_ERROR
!insertmacro UnselectSection ${SEC_libgpg_error}
!endif
-!ifdef HAVE_PKG_LIBGCRYPT
- !insertmacro UnselectSection ${SEC_libgcrypt}
-!endif
!ifdef HAVE_PKG_W32PTH
!insertmacro UnselectSection ${SEC_w32pth}
!endif
@@ -522,13 +496,6 @@ Function CalcDepends
# First the explicitely installed packages.
-!ifdef HAVE_PKG_SCUTE
- !insertmacro SectionFlagIsSet ${SEC_scute} \
- ${SF_SELECTED} have_scute skip_scute
- have_scute:
- # All dependencies are linked in statically.
- skip_scute:
-!endif
!ifdef HAVE_PKG_PAPERKEY
!insertmacro SectionFlagIsSet ${SEC_paperkey} \
@@ -848,9 +815,6 @@ FunctionEnd
!ifdef HAVE_PKG_GPGEX
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgex} $(DESC_SEC_gpgex)
!endif
-!ifdef HAVE_PKG_SCUTE
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_scute} $(DESC_SEC_scute)
-!endif
!ifdef HAVE_PKG_PAPERKEY
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_paperkey} $(DESC_SEC_paperkey)
!endif
diff --git a/src/uninst-libgcrypt.nsi b/src/uninst-libgcrypt.nsi
deleted file mode 100644
index c208795..0000000
--- a/src/uninst-libgcrypt.nsi
+++ /dev/null
@@ -1,40 +0,0 @@
-# uninst-libgcrypt.nsi - Uninstaller f. libgcrypt. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libgcrypt-${gpg4win_pkg_libgcrypt_version}
-
-
-; Uninstaller section.
-Section "-un.libgcrypt"
-!ifdef SOURCES
- Push "${gpg4win_pkg_libgcrypt}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\libgcrypt-20.dll"
- Delete "$INSTDIR\lib\libgcrypt.imp"
- Delete "$INSTDIR\include\gcrypt.h"
-
- RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-scute.nsi b/src/uninst-scute.nsi
deleted file mode 100644
index e15661a..0000000
--- a/src/uninst-scute.nsi
+++ /dev/null
@@ -1,36 +0,0 @@
-# uninst-scute.nsi - Installer snippet for scute. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/scute-${gpg4win_pkg_scute_version}
-
-
-; Uninstaller section.
-Section "-un.scute"
-!ifdef SOURCES
- Push "${gpg4win_pkg_scute}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\scute.dll"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
commit a07c319c55af5c7eaa082d31faed076d793be542
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Aug 31 17:09:19 2015 +0200
Remove bzip2
* src/inst-bzip2.nsi, src/uninst-bzip2.nsi: Removed.
* configure.ac, packages/packages.current,
src/Makefile.am, src/config.nsi.in,
src/inst-sections.nsi: Update accordingly.
diff --git a/configure.ac b/configure.ac
index 779657a..598eb1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,7 +352,6 @@ GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
glib gdk-pixbuf cairo])
GPG4WIN_SPKG([libpng], [pkgconfig])
-GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libgcrypt], [libgpg-error])
GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
diff --git a/packages/packages.current b/packages/packages.current
index 8dc9f0a..00834c6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -259,16 +259,6 @@ file w32pth-2.0.5.tar.bz2
chk d648b98ce215f81e901f3f982470d37c704433a6
#
-# Stripped down version of BZIP2
-# (full source at http://bzip.org)
-#
-server ftp://ftp.g10code.com/g10code/bzip2
-
-# checked: 2014-07-16 ah
-file bzip2-1.0.6-g10.tar.gz
-chk 6e38be3377340a21a1f13ff84b5e6adce97cd1d4
-
-#
# GnuPG et al.
#
# All tarballs from this server are verified with an openpgp
diff --git a/src/Makefile.am b/src/Makefile.am
index a0bd4cb..44c3ee6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-dbus.nsi uninst-dbus.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
- inst-bzip2.nsi uninst-bzip2.nsi \
uninst-claws-mail.nsi uninst-claws-mail-cmds.nsi \
inst-final.nsi
@@ -251,16 +250,10 @@ gpg4win_pkg_scute_configure = --silent \
gpg4win_pkg_paperkey_configure = --silent
# Supported make-only source packages.
-gpg4win_mpkgs = bzip2 zlib
+gpg4win_mpkgs = zlib
# Extra options for the make invocations for individual packages.
# make_flags is used for building, make_args_inst is used for installing.
-gpg4win_pkg_bzip2_make_args = \
- CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
-
-gpg4win_pkg_bzip2_make_args_inst = \
- PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
-
gpg4win_pkg_zlib_make_args = \
-fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 4f69189..2bd7aa7 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -96,10 +96,6 @@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
!define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
- at HAVE_PKG_BZIP2@
-!define gpg4win_pkg_bzip2 @gpg4win_pkg_bzip2@
-!define gpg4win_pkg_bzip2_version @gpg4win_pkg_bzip2_version@
-
@HAVE_PKG_LIBPNG@
!define gpg4win_pkg_libpng @gpg4win_pkg_libpng@
!define gpg4win_pkg_libpng_version @gpg4win_pkg_libpng_version@
diff --git a/src/inst-bzip2.nsi b/src/inst-bzip2.nsi
deleted file mode 100644
index 85c14f0..0000000
--- a/src/inst-bzip2.nsi
+++ /dev/null
@@ -1,39 +0,0 @@
-# inst-bzip2.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/bzip2-${gpg4win_pkg_bzip2_version}
-
-!ifdef DEBUG
-Section "bzip2" SEC_bzip2
-!else
-Section "-bzip2" SEC_bzip2
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_bzip2}"
-!else
- # Nothing to install as we link statically.
-!endif
-SectionEnd
-
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 903a43f..10bf391 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -26,9 +26,6 @@
# gpg4win_build_list in config.nsi. The order determines also the
# order in the packages selection dialog.
-!ifdef HAVE_PKG_BZIP2
-!include "inst-bzip2.nsi"
-!endif
!ifdef HAVE_PKG_DBUS
!include "inst-dbus.nsi"
!endif
@@ -275,9 +272,6 @@
!ifdef HAVE_PKG_DBUS
!include "uninst-dbus.nsi"
!endif
-!ifdef HAVE_PKG_BZIP2
-!include "uninst-bzip2.nsi"
-!endif
!include "uninst-gpg4win.nsi"
@@ -477,9 +471,6 @@ Function CalcDepends
!ifdef HAVE_PKG_GTK_
!insertmacro UnselectSection ${SEC_gtk_}
!endif
-!ifdef HAVE_PKG_BZIP2
- !insertmacro UnselectSection ${SEC_bzip2}
-!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
!insertmacro UnselectSection ${SEC_libgpg_error}
!endif
@@ -675,8 +666,6 @@ Function CalcDepends
skip_libgpg_error:
!endif
- # Package "bzip2" has no dependencies.
-
!ifdef HAVE_PKG_GTK_
!insertmacro SectionFlagIsSet ${SEC_gtk_} \
${SF_SELECTED} have_gtk_ skip_gtk_
diff --git a/src/uninst-bzip2.nsi b/src/uninst-bzip2.nsi
deleted file mode 100644
index 149af40..0000000
--- a/src/uninst-bzip2.nsi
+++ /dev/null
@@ -1,36 +0,0 @@
-# uninst-bzip2.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/bzip2-${gpg4win_pkg_bzip2_version}
-
-
-; Uninstaller section.
-Section "-un.bzip2"
-!ifdef SOURCES
- Push "${gpg4win_pkg_bzip2}"
- Call un.SourceDelete
-!else
- # Nothing to uninstall
-!endif
-SectionEnd
commit 54a013e2ac23d926c809f6a26bd9f3dbcebe436f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Aug 31 17:03:20 2015 +0200
Remove adns
* src/inst-adns.nsi, src/uninst-adns.nsi: Removed
* configure.ac, packages/packages.current,
src/Makefile.am, src/config.nsi.in,
src/inst-sections.nsi: Update accordingly.
diff --git a/configure.ac b/configure.ac
index 88c1008..779657a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,6 @@ GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
GPG4WIN_SPKG([libpng], [pkgconfig])
GPG4WIN_SPKG([bzip2])
-GPG4WIN_SPKG([adns])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libgcrypt], [libgpg-error])
GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
diff --git a/packages/packages.current b/packages/packages.current
index c032812..8dc9f0a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -333,17 +333,6 @@ server http://www.jabberwocky.com/software/paperkey
file paperkey-1.3.tar.gz
chk 16af56d0e7bdf081d60c59ea4d72e7df6d9cec21
-#
-# adns
-#
-server ftp://ftp.g10code.com/g10code/adns
-
-# last changed: 2015-04-16
-# by: ah
-# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
-file adns-1.4-g10-6.tar.bz2
-chk cc124d58828ab1d6fa7df49aaeb37985c5225de5
-
#
# Qt
diff --git a/src/Makefile.am b/src/Makefile.am
index efc4191..a0bd4cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,7 +47,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-libgcrypt.nsi uninst-libgcrypt.nsi \
inst-libgpg-error.nsi uninst-libgpg-error.nsi \
inst-libiconv.nsi uninst-libiconv.nsi \
- inst-adns.nsi uninst-adns.nsi \
inst-libpng.nsi uninst-libpng.nsi \
inst-compendium.nsi uninst-compendium.nsi \
inst-man_advanced_de.nsi uninst-man_advanced_de.nsi \
@@ -91,7 +90,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
libgpg-error gpgme gpgol gpgex libpng \
gpa opencdk \
pinentry libassuan libgcrypt \
- adns w32pth scute paperkey regex libiconv gettext
+ w32pth scute paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
@@ -200,8 +199,6 @@ gpg4win_pkg_libgcrypt_configure = --silent \
--with-gpg-error-prefix=$(idir) \
--disable-aesni-support
-gpg4win_pkg_adns_configure = --silent
-
gpg4win_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
# We would like to use --with-libiconv-prefix and
diff --git a/src/config.nsi.in b/src/config.nsi.in
index ddafac4..4f69189 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -72,10 +72,6 @@
!define gpg4win_pkg_gpgme @gpg4win_pkg_gpgme@
!define gpg4win_pkg_gpgme_version @gpg4win_pkg_gpgme_version@
- at HAVE_PKG_ADNS@
-!define gpg4win_pkg_adns @gpg4win_pkg_adns@
-!define gpg4win_pkg_adns_version @gpg4win_pkg_adns_version@
-
@HAVE_PKG_GNUPG_W32@
!define gpg4win_pkg_gnupg_w32 @gpg4win_pkg_gnupg_w32@
!define gpg4win_pkg_gnupg_w32_version @gpg4win_pkg_gnupg_w32_version@
diff --git a/src/inst-adns.nsi b/src/inst-adns.nsi
deleted file mode 100644
index a521d4b..0000000
--- a/src/inst-adns.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# inst-adns.nsi - snippet for adns. -*- coding: latin-1; -*-
-# Copyright (C) 2008 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/adns-${gpg4win_pkg_adns_version}
-
-!ifdef DEBUG
-Section "adns" SEC_adns
-!else
-Section "-adns" SEC_adns
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_adns}"
-!else
- File ${prefix}/bin/libadns-1.dll
-
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 0ddc54b..903a43f 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -26,9 +26,6 @@
# gpg4win_build_list in config.nsi. The order determines also the
# order in the packages selection dialog.
-!ifdef HAVE_PKG_ADNS
-!include "inst-adns.nsi"
-!endif
!ifdef HAVE_PKG_BZIP2
!include "inst-bzip2.nsi"
!endif
@@ -281,9 +278,6 @@
!ifdef HAVE_PKG_BZIP2
!include "uninst-bzip2.nsi"
!endif
-!ifdef HAVE_PKG_ADNS
-!include "uninst-adns.nsi"
-!endif
!include "uninst-gpg4win.nsi"
@@ -486,9 +480,6 @@ Function CalcDepends
!ifdef HAVE_PKG_BZIP2
!insertmacro UnselectSection ${SEC_bzip2}
!endif
-!ifdef HAVE_PKG_ADNS
- !insertmacro UnselectSection ${SEC_adns}
-!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
!insertmacro UnselectSection ${SEC_libgpg_error}
!endif
@@ -684,7 +675,6 @@ Function CalcDepends
skip_libgpg_error:
!endif
- # Package "adns" has no dependencies.
# Package "bzip2" has no dependencies.
!ifdef HAVE_PKG_GTK_
diff --git a/src/uninst-adns.nsi b/src/uninst-adns.nsi
deleted file mode 100644
index d9ab32a..0000000
--- a/src/uninst-adns.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# uninst-adns.nsi - Uninstaller for adns. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/adns-${gpg4win_pkg_adns_version}
-
-
-; Uninstaller section.
-Section "-un.adns"
-!ifdef SOURCES
- Push "${gpg4win_pkg_adns}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\libadns-1.dll"
-
- RMDir "$INSTDIR"
-!endif
-SectionEnd
-
commit 778fa4685e24ab91935ee29591ee5576bfb88f2c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Aug 31 12:09:53 2015 +0200
Remove dirmngr and libksba
* patches/dirmngr-1.1.1/dirmngr-pth.patch,
src/inst-dirmngr.nsi,
src/inst-libksba.nsi,
src/uninst-dirmngr.nsi,
src/uninst-libksba.nsi: Removed.
* src/inst-sections.nsi,
src/Makefile.am,
src/config.nsi.in,
Makefile.am,
configure.ac,
packages/packages.current: Update accordingly.
diff --git a/Makefile.am b/Makefile.am
index ab93d2e..e1b541a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ SUBDIRS = po packages doc src
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 \
diff --git a/configure.ac b/configure.ac
index 91c5967..88c1008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,9 +356,7 @@ GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libgcrypt], [libgpg-error])
-GPG4WIN_SPKG([libksba], [libgpg-error])
GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
-GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
GPG4WIN_SPKG([gpgme], [libgpg-error glib])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
diff --git a/packages/packages.current b/packages/packages.current
index da7b43a..c032812 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -288,11 +288,6 @@ chk 9456e7b64db9df8360a1407a38c8c958da80bbf1
# last-changed: 2015-06-05
# by: ah
-file libksba/libksba-1.3.3.tar.bz2
-chk 86fe0436f3c8c394d32e142ee410a9f9560173fb
-
-# last-changed: 2015-06-05
-# by: ah
file libassuan/libassuan-2.2.1.tar.bz2
chk c21b86482f6a3624c2b46b91e20f8415f244233a
@@ -306,10 +301,6 @@ name gnupg-w32-2.1.7-20150811-src.tar.xz
file binary/gnupg-w32-2.1.7_20150811.tar.xz
chk 20439f65b8d94ec79523c45ad72418670ca9d5eb
-# checked: 2014-07-16 ah
-file dirmngr/dirmngr-1.1.1.tar.bz2
-chk e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
-
# last changed: 2015-06-23
# by: ah
file pinentry/pinentry-0.9.4.tar.bz2
diff --git a/patches/dirmngr-1.1.1/dirmngr-pth.patch b/patches/dirmngr-1.1.1/dirmngr-pth.patch
deleted file mode 100755
index 11c0fcd..0000000
--- a/patches/dirmngr-1.1.1/dirmngr-pth.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-patch -p0 -l -f $* < $0
-exit $?
-
---- src/dirmngr.c.orig 2014-08-13 13:29:03.609026165 +0000
-+++ src/dirmngr.c 2014-08-13 13:30:19.328411198 +0000
-@@ -668,12 +668,14 @@
- Note that this will also do the pth_init. */
-
- /* Init Libgcrypt. */
-+#if GCRYPT_VERSION_NUMBER < 0x010600
- rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
- if (rc)
- {
- log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
- gpg_strerror (rc));
- }
-+#endif
- gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
- if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
- {
diff --git a/src/Makefile.am b/src/Makefile.am
index a01e14b..efc4191 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,14 +24,13 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-sections.nsi installer.nsi installer-finish.nsi \
QtCore.pc QtGui.pc zlib.pc sha1sum.c mkportable.c \
mkportable-vanilla.h mkportable-light.h mkportable-full.h \
- qt.conf kleowrap.c potomo Memento.nsh dirmngr.conf \
+ qt.conf kleowrap.c potomo Memento.nsh \
inst-gpg4win.nsi uninst-gpg4win.nsi \
inst-atk.nsi uninst-atk.nsi \
inst-expat.nsi uninst-expat.nsi \
inst-freetype.nsi uninst-freetype.nsi \
inst-fontconfig.nsi uninst-fontconfig.nsi \
inst-cairo.nsi uninst-cairo.nsi \
- inst-dirmngr.nsi uninst-dirmngr.nsi \
inst-gettext.nsi uninst-gettext.nsi \
inst-libffi.nsi uninst-libffi.nsi \
inst-glib.nsi uninst-glib.nsi \
@@ -48,7 +47,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-libgcrypt.nsi uninst-libgcrypt.nsi \
inst-libgpg-error.nsi uninst-libgpg-error.nsi \
inst-libiconv.nsi uninst-libiconv.nsi \
- inst-libksba.nsi uninst-libksba.nsi \
inst-adns.nsi uninst-adns.nsi \
inst-libpng.nsi uninst-libpng.nsi \
inst-compendium.nsi uninst-compendium.nsi \
@@ -92,8 +90,8 @@ CLEANFILES = g4wihelp.dll versioninfo.txt $(README_files) $(HOWTO_files) \
gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
libgpg-error gpgme gpgol gpgex libpng \
gpa opencdk \
- pinentry libassuan libksba libgcrypt \
- adns dirmngr w32pth scute paperkey regex libiconv gettext
+ pinentry libassuan libgcrypt \
+ adns w32pth scute paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
@@ -194,9 +192,6 @@ gpg4win_pkg_libassuan_configure = --silent --enable-static
gpg4win_pkg_libassuan_ex_configure = --silent --enable-static
-gpg4win_pkg_libksba_configure = --silent \
- --with-gpg-error-prefix=$(idir)
-
# Using gpgsm with VirtualBox on AES-NI hardware crashes gpg-agent.
# However, the Libgcrypt's regression tests work just fine. I don't
# have a windows instance on AES-NI, thus I can't currently debug
@@ -209,26 +204,6 @@ gpg4win_pkg_adns_configure = --silent
gpg4win_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
-gpg4win_pkg_dirmngr_configure = \
- --with-gpg-error-prefix=$(idir) \
- --with-ksba-prefix=$(idir) \
- --with-libgcrypt-prefix=$(idir) \
- --with-libassuan-prefix=$(idir) \
- --with-pth-prefix=$(idir)
-
-gpg4win_pkg_gnupg2_configure = \
- --with-gpg-error-prefix=$(idir) \
- --with-ksba-prefix=$(idir) \
- --with-libgcrypt-prefix=$(idir) \
- --with-libassuan-prefix=$(idir) \
- --with-zlib=$(idir) \
- --with-bzip2=$(idir) \
- --with-pth-prefix=$(idir) \
- --with-adns=$(idir) \
- --without-included-gettext \
- --enable-gpgtar \
- --disable-regex
-
# We would like to use --with-libiconv-prefix and
# --with-libintl-prefix, but these don't work with the cheesy
# non-"libfoo.la" versions of iconv and gettext that we are using.
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 4f2ea1c..ddafac4 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -68,14 +68,6 @@
!define gpg4win_pkg_libgcrypt @gpg4win_pkg_libgcrypt@
!define gpg4win_pkg_libgcrypt_version @gpg4win_pkg_libgcrypt_version@
- at HAVE_PKG_LIBKSBA@
-!define gpg4win_pkg_libksba @gpg4win_pkg_libksba@
-!define gpg4win_pkg_libksba_version @gpg4win_pkg_libksba_version@
-
- at HAVE_PKG_DIRMNGR@
-!define gpg4win_pkg_dirmngr @gpg4win_pkg_dirmngr@
-!define gpg4win_pkg_dirmngr_version @gpg4win_pkg_dirmngr_version@
-
@HAVE_PKG_GPGME@
!define gpg4win_pkg_gpgme @gpg4win_pkg_gpgme@
!define gpg4win_pkg_gpgme_version @gpg4win_pkg_gpgme_version@
diff --git a/src/inst-dirmngr.nsi b/src/inst-dirmngr.nsi
deleted file mode 100644
index 01abd6f..0000000
--- a/src/inst-dirmngr.nsi
+++ /dev/null
@@ -1,96 +0,0 @@
-# inst-dirmngr.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/dirmngr-${gpg4win_pkg_dirmngr_version}
-
-!ifdef DEBUG
-Section "dirmngr" SEC_dirmngr
-!else
-Section "-dirmngr" SEC_dirmngr
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_dirmngr}"
-!else
- Var /GLOBAL DirMngrStatus
- g4wihelp::service_query "DirMngr"
- StrCpy $DirMngrStatus $R0
-
- File "${prefix}/bin/dirmngr.exe"
- File "${prefix}/bin/dirmngr-client.exe"
- File "${prefix}/libexec/dirmngr_ldap.exe"
-
- # Create a directory for extra certs for documentation reasons.
- SetShellVarContext all
- SetOutPath "$APPDATA\GNU\lib\dirmngr\extra-certs"
-
- # Note: The make-msi.pl script ignores the following line, which is
- # ok, because the Windows installer does not override locally
- # modified files.
- ifFileExists "$APPDATA\GNU\etc\dirmngr\dirmngr.conf" dirmngr_no_conf 0
- SetOutPath "$APPDATA\GNU\etc\dirmngr"
-
- File "${SRCDIR}/dirmngr.conf"
- File "${prefix}/share/doc/dirmngr/examples/bnetza-10r-ocsp.signer"
-
- SetOutPath "$APPDATA\GNU\etc\dirmngr\trusted-certs"
- File "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
- File "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
- dirmngr_no_conf:
- SetShellVarContext current
-
- SetOutPath "$INSTDIR"
-
- StrCmp $DirMngrStatus "MISSING" 0 dirmngr_created
- # Create the service.
- g4wihelp::service_create "DirMngr" "DirMngr" \
- '"$INSTDIR\dirmngr.exe" --service'
- dirmngr_created:
-
- # Start the service.
- # FIXME: This does not work. Luckily, it is also not needed.
- # g4wihelp::service_start "DirMngr" "2" '"$INSTDIR\dirmngr.exe"' "--service"
- # This works.
- g4wihelp::service_start "DirMngr" 0
-
- # If requested, install the configuration files.
- # Fixme: I don't think that is right (wk)!
- ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
- StrCmp $0 "" no_config_dirmngr_files
- CreateDirectory "$0\gnupg"
-
- g4wihelp::config_fetch "dirmngr.conf"
- StrCmp $R0 "" no_config_dirmngr_conf
- CopyFiles $R0 "$0\gnupg\dirmngr.conf"
- no_config_dirmngr_conf:
-
- g4wihelp::config_fetch "dirmngr_ldapservers.conf"
- StrCmp $R0 "" no_config_dirmngr_ldapservers_conf
- CopyFiles $R0 "$0\gnupg\dirmngr_ldapservers.conf"
- no_config_dirmngr_ldapservers_conf:
-
- no_config_dirmngr_files:
-
-!endif
-SectionEnd
diff --git a/src/inst-libksba.nsi b/src/inst-libksba.nsi
deleted file mode 100644
index f517394..0000000
--- a/src/inst-libksba.nsi
+++ /dev/null
@@ -1,46 +0,0 @@
-# inst-libksba.nsi - snippet for libksba. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libksba-${gpg4win_pkg_libksba_version}
-
-
-!ifdef DEBUG
-Section "libksba" SEC_libksba
-!else
-Section "-libksba" SEC_libksba
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_libksba}"
-!else
- File ${prefix}/bin/libksba-8.dll
-
- SetOutPath "$INSTDIR\lib"
- File /oname=libksba.imp "${prefix}/lib/libksba.dll.a"
-
- SetOutPath "$INSTDIR\include"
- File "${prefix}/include/ksba.h"
-
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index e7979af..0ddc54b 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -74,9 +74,6 @@
!ifdef HAVE_PKG_GLIB
!include "inst-glib.nsi"
!endif
-!ifdef HAVE_PKG_LIBKSBA
-!include "inst-libksba.nsi"
-!endif
!ifdef HAVE_PKG_LIBGCRYPT
!include "inst-libgcrypt.nsi"
!endif
@@ -98,9 +95,6 @@
!ifdef HAVE_PKG_ATK
!include "inst-atk.nsi"
!endif
-!ifdef HAVE_PKG_DIRMNGR
-!include "inst-dirmngr.nsi"
-!endif
!ifdef HAVE_PKG_GDK_PIXBUF
!include "inst-gdk-pixbuf.nsi"
!endif
@@ -212,9 +206,6 @@
!ifdef HAVE_PKG_GDK_PIXBUF
!include "uninst-gdk-pixbuf.nsi"
!endif
-!ifdef HAVE_PKG_DIRMNGR
-!include "uninst-dirmngr.nsi"
-!endif
!ifdef HAVE_PKG_ATK
!include "uninst-atk.nsi"
!endif
@@ -236,9 +227,6 @@
!ifdef HAVE_PKG_LIBGCRYPT
!include "uninst-libgcrypt.nsi"
!endif
-!ifdef HAVE_PKG_LIBKSBA
-!include "uninst-libksba.nsi"
-!endif
!ifdef HAVE_PKG_GLIB
!include "uninst-glib.nsi"
!endif
@@ -507,18 +495,12 @@ Function CalcDepends
!ifdef HAVE_PKG_LIBGCRYPT
!insertmacro UnselectSection ${SEC_libgcrypt}
!endif
-!ifdef HAVE_PKG_LIBKSBA
- !insertmacro UnselectSection ${SEC_libksba}
-!endif
!ifdef HAVE_PKG_W32PTH
!insertmacro UnselectSection ${SEC_w32pth}
!endif
!ifdef HAVE_PKG_LIBASSUAN
!insertmacro UnselectSection ${SEC_libassuan}
!endif
-!ifdef HAVE_PKG_DIRMNGR
- !insertmacro UnselectSection ${SEC_dirmngr}
-!endif
!ifdef HAVE_PKG_PINENTRY
!insertmacro UnselectSection ${SEC_pinentry}
!endif
@@ -684,17 +666,6 @@ Function CalcDepends
skip_pinentry:
!endif
-!ifdef HAVE_PKG_DIRMNGR
- !insertmacro SectionFlagIsSet ${SEC_dirmngr} ${SF_SELECTED} have_dirmngr skip_dirmngr
- have_dirmngr:
- !insertmacro SelectSection ${SEC_libgpg_error}
- !insertmacro SelectSection ${SEC_libgcrypt}
- !insertmacro SelectSection ${SEC_libassuan}
- !insertmacro SelectSection ${SEC_libksba}
- !insertmacro SelectSection ${SEC_w32pth}
- skip_dirmngr:
-!endif
-
!ifdef HAVE_PKG_LIBASSUAN
!insertmacro SectionFlagIsSet ${SEC_libassuan} ${SF_SELECTED} have_libassuan skip_libassuan
have_libassuan:
@@ -705,13 +676,6 @@ Function CalcDepends
# Package "w32pth" has no dependencies.
-!ifdef HAVE_PKG_LIBKSBA
- !insertmacro SectionFlagIsSet ${SEC_libksba} ${SF_SELECTED} have_libksba skip_libksba
- have_libksba:
- !insertmacro SelectSection ${SEC_libgpg_error}
- skip_libksba:
-!endif
-
!ifdef HAVE_PKG_LIBGPG_ERROR
!insertmacro SectionFlagIsSet ${SEC_libgpg_error} ${SF_SELECTED} have_libgpg_error skip_libgpg_error
have_libgpg_error:
diff --git a/src/uninst-dirmngr.nsi b/src/uninst-dirmngr.nsi
deleted file mode 100644
index 3cb2e3f..0000000
--- a/src/uninst-dirmngr.nsi
+++ /dev/null
@@ -1,64 +0,0 @@
- # uninst-dirmngr.nsi - Uninstaller snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/dirmngr-${gpg4win_pkg_dirmngr_version}
-
-
-# Uninstaller section.
-Section "-un.dirmngr"
-!ifdef SOURCES
- Push "${gpg4win_pkg_dirmngr}"
- Call un.SourceDelete
-!else
- # Try to stop the daemon in case it is running.
- g4wihelp::service_stop "DirMngr"
-
- g4wihelp::service_delete "DirMngr"
-
- Delete "$INSTDIR\dirmngr.exe"
- Delete "$INSTDIR\dirmngr-client.exe"
- Delete "$INSTDIR\dirmngr_ldap.exe"
- RMDir "$INSTDIR\cache"
-
- # The next thing is only to cleanup cruft from versions < 1.9.3.
- # Newer versions install them into COMMON_APPDATA and they are not
- # removed on purpose. Remove the extra-certs directory. Obviously
- # this works only if the user has not populated it.
- RMDir "$INSTDIR\lib\dirmngr\extra-certs"
- RMDir "$INSTDIR\lib\dirmngr"
-
- # Remove etc files. This is only useful for installer < 1.9.3.
-
- Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"
- Delete "$INSTDIR\etc\dirmngr\bnetza-10r-ocsp.signer"
-
- Delete "$INSTDIR\etc\dirmngr\trusted-certs\README"
- Delete "$INSTDIR\etc\dirmngr\trusted-certs\bnetza-10r-ca.crt"
-
- RMDir "$INSTDIR\etc\dirmngr\trusted-certs"
- RMDir "$INSTDIR\etc\dirmngr"
- RMDir "$INSTDIR\etc"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-libksba.nsi b/src/uninst-libksba.nsi
deleted file mode 100644
index a776ede..0000000
--- a/src/uninst-libksba.nsi
+++ /dev/null
@@ -1,41 +0,0 @@
-# uninst-libksba.nsi - Uninstaller f. libksba. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libksba-${gpg4win_pkg_libksba_version}
-
-
-; Uninstaller section.
-Section "-un.libksba"
-!ifdef SOURCES
- Push "${gpg4win_pkg_libksba}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\libksba-8.dll"
- Delete "$INSTDIR\lib\libksba.imp"
- Delete "$INSTDIR\include\ksba.h"
-
- RMDir "$INSTDIR"
-!endif
-SectionEnd
-
commit b22989d2d42dba12aca526725dacc61d21f37a0c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Aug 28 12:30:54 2015 +0200
Remove gnupg patches.
* gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch,
gnupg2-2.0.28/
0002-Let-wchar_to_native-convert-to-console-codepage.patch,
gnupg2-2.0.28/
0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch,
gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch,
gnupg2-2.0.28/0007-sm-Revert-to-use-SHA-1-for-CSR-generation.patch,
gnupg2/01-version.patch.in: Removed.
diff --git a/patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch b/patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch
deleted file mode 100755
index 6c5b9f8..0000000
--- a/patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From f80d5af3ad8705cf439db380cc846a647d67bcbd Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Tue, 12 Aug 2014 21:22:23 +0200
-Subject: [PATCH] Enable wildcard expansion with mingw-w64
-
- * g10/gpg.c: Define _dowildcard = -1;
-
---
- If this value is defined wildcard support in the c runtime
- is enabled again. See mingw-w64 crt/CRT_glob.c
----
- g10/gpg.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/g10/gpg.c b/g10/gpg.c
-index 1a8e6e7..437e7f0 100644
---- a/g10/gpg.c
-+++ b/g10/gpg.c
-@@ -68,6 +68,9 @@
- #define MY_O_BINARY 0
- #endif
-
-+#ifdef __MINGW32__
-+int _dowildcard = -1;
-+#endif
-
- enum cmd_and_opt_values
- {
---
-1.9.1
diff --git a/patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch b/patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch
deleted file mode 100755
index 4765cd2..0000000
--- a/patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From ba62c8e78bc4d14cfe8c69928ec10fa14e8c6cd8 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 21 Aug 2014 12:05:12 +0200
-Subject: [PATCH] Let wchar_to_native convert to console codepage
-
- * jnlib/w32-gettext.c (wchar_to_native): Use GetConsoleOutputCP.
-
---
- Just using CP_ACP does not neccessarily convert to the correct
- codepage as codepages might differ between ConsoleOutput and
- GUI output (which it usually does).
-
- GnuPG-bug-id: 1691, 1373, 1674
----
- jnlib/w32-gettext.c | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/jnlib/w32-gettext.c b/jnlib/w32-gettext.c
-index 14cb1e1..a1b7e90 100644
---- a/jnlib/w32-gettext.c
-+++ b/jnlib/w32-gettext.c
-@@ -1299,7 +1299,7 @@ utf8_to_wchar (const char *string, size_t length, size_t *retlen)
- }
-
-
--/* Return a malloced string encoded in UTF-8 from the wide char input
-+/* Return a malloced string encoded for the native codepage from the wide char input
- string STRING. Caller must free this value. On failure returns
- NULL. The result of calling this function with STRING set to NULL
- is not defined. */
-@@ -1308,8 +1308,19 @@ wchar_to_native (const wchar_t *string, size_t length, size_t *retlen)
- {
- int n;
- char *result;
--
-- n = WideCharToMultiByte (CP_ACP, 0, string, length, NULL, 0, NULL, NULL);
-+ /* We are a console program thus we need to use the
-+ GetConsoleOutputCP function and not the the GetACP which
-+ would give the codepage for a GUI program. Note this is not
-+ a bulletproof detection because GetConsoleCP might return a
-+ different one for console input. Not sure how to cope with
-+ that. If the console Code page is not known we fall back to
-+ the system code page. This is how utf8conv does resolve this. */
-+ unsigned int cpno = GetConsoleOutputCP ();
-+
-+ if (!cpno)
-+ cpno = GetACP ();
-+
-+ n = WideCharToMultiByte (cpno, 0, string, length, NULL, 0, NULL, NULL);
- if (n < 0 || (n+1) <= 0)
- return NULL;
-
-@@ -1317,7 +1328,7 @@ wchar_to_native (const wchar_t *string, size_t length, size_t *retlen)
- if (!result)
- return NULL;
-
-- n = WideCharToMultiByte (CP_ACP, 0, string, length, result, n, NULL, NULL);
-+ n = WideCharToMultiByte (cpno, 0, string, length, result, n, NULL, NULL);
- if (n < 0)
- {
- jnlib_free (result);
---
-1.9.1
diff --git a/patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch b/patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
deleted file mode 100755
index 2d4b70c..0000000
--- a/patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 70c387b523fa115f02a7d545fb1f503e9b86f913 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Fri, 24 Oct 2014 18:05:29 +0200
-Subject: [PATCH] Fix gpgtar 8 bit encoding handling on Win32
-
- * tools/gpgtar-create.c (fillup_entry_w32, scan_directory): Convert
- to and from local encoding.
- * tools/gpgtar.c (wchar_to_cp, cp_to_wchar): New. Generalized
- conversion functions.
- (utf8_to_wchar, wchar_to_utf8): Removed.
- (wchar_to_native, native_to_wchar): New.
- * tools/gpgtar.h: Update accordingly.
-
---
-
- Gpgtar needs to handle filenames in the local 8 bit encoding on
- Windows as it uses the 8 bit file io functions.
-
- GnuPG-bug-id: 1624, 1746
----
- tools/gpgtar-create.c | 10 +++++-----
- tools/gpgtar.c | 48 ++++++++++++++++++++++++++++++++++--------------
- tools/gpgtar.h | 4 ++--
- 3 files changed, 41 insertions(+), 21 deletions(-)
-
-diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
-index 09587e4..b586243 100644
---- a/tools/gpgtar-create.c
-+++ b/tools/gpgtar-create.c
-@@ -72,13 +72,13 @@ fillup_entry_w32 (tar_header_t hdr)
- for (p=hdr->name; *p; p++)
- if (*p == '/')
- *p = '\\';
-- wfname = utf8_to_wchar (hdr->name);
-+ wfname = native_to_wchar (hdr->name);
- for (p=hdr->name; *p; p++)
- if (*p == '\\')
- *p = '/';
- if (!wfname)
- {
-- log_error ("error utf8-ing `%s': %s\n", hdr->name, w32_strerror (-1));
-+ log_error ("error converting `%s': %s\n", hdr->name, w32_strerror (-1));
- return gpg_error_from_syserror ();
- }
- if (!GetFileAttributesExW (wfname, GetFileExInfoStandard, &fad))
-@@ -299,7 +299,7 @@ scan_directory (const char *dname, scanctrl_t scanctrl)
- for (p=fname; *p; p++)
- if (*p == '/')
- *p = '\\';
-- wfname = utf8_to_wchar (fname);
-+ wfname = native_to_wchar (fname);
- xfree (fname);
- if (!wfname)
- {
-@@ -322,11 +322,11 @@ scan_directory (const char *dname, scanctrl_t scanctrl)
-
- do
- {
-- char *fname = wchar_to_utf8 (fi.cFileName);
-+ char *fname = wchar_to_native (fi.cFileName);
- if (!fname)
- {
- err = gpg_error_from_syserror ();
-- log_error ("error utf8-ing filename: %s\n", w32_strerror (-1));
-+ log_error ("error converting filename: %s\n", w32_strerror (-1));
- break;
- }
- for (p=fname; *p; p++)
-diff --git a/tools/gpgtar.c b/tools/gpgtar.c
-index f88964f..644cdd0 100644
---- a/tools/gpgtar.c
-+++ b/tools/gpgtar.c
-@@ -465,18 +465,19 @@ gnupg_mkdir (const char *name, const char *modestr)
- #endif
- }
-
-+
- #ifdef HAVE_W32_SYSTEM
--/* Return a malloced string encoded in UTF-8 from the wide char input
-- string STRING. Caller must free this value. Returns NULL and sets
-- ERRNO on failure. Calling this function with STRING set to NULL is
-- not defined. */
--char *
--wchar_to_utf8 (const wchar_t *string)
-+/* Return a malloced string encoded for the codepage CODEPAGE from the wide
-+ char input string STRING. Caller must free this value. Returns NULL
-+ and sets ERRNO on failure. Calling this function with STRING set to
-+ NULL is not defined. */
-+static char *
-+wchar_to_cp (const wchar_t *string, unsigned int codepage)
- {
- int n;
- char *result;
-
-- n = WideCharToMultiByte (CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL);
-+ n = WideCharToMultiByte (codepage, 0, string, -1, NULL, 0, NULL, NULL);
- if (n < 0)
- {
- errno = EINVAL;
-@@ -487,7 +488,7 @@ wchar_to_utf8 (const wchar_t *string)
- if (!result)
- return NULL;
-
-- n = WideCharToMultiByte (CP_UTF8, 0, string, -1, result, n, NULL, NULL);
-+ n = WideCharToMultiByte (codepage, 0, string, -1, result, n, NULL, NULL);
- if (n < 0)
- {
- xfree (result);
-@@ -497,19 +498,18 @@ wchar_to_utf8 (const wchar_t *string)
- return result;
- }
-
--
--/* Return a malloced wide char string from an UTF-8 encoded input
-+/* Return a malloced wide char string from an CODEPAGE encoded input
- string STRING. Caller must free this value. Returns NULL and sets
- ERRNO on failure. Calling this function with STRING set to NULL is
- not defined. */
--wchar_t *
--utf8_to_wchar (const char *string)
-+static wchar_t*
-+cp_to_wchar (const char *string, unsigned int codepage)
- {
- int n;
- size_t nbytes;
- wchar_t *result;
-
-- n = MultiByteToWideChar (CP_UTF8, 0, string, -1, NULL, 0);
-+ n = MultiByteToWideChar (codepage, 0, string, -1, NULL, 0);
- if (n < 0)
- {
- errno = EINVAL;
-@@ -526,7 +526,7 @@ utf8_to_wchar (const char *string)
- if (!result)
- return NULL;
-
-- n = MultiByteToWideChar (CP_UTF8, 0, string, -1, result, n);
-+ n = MultiByteToWideChar (codepage, 0, string, -1, result, n);
- if (n < 0)
- {
- free (result);
-@@ -535,4 +535,24 @@ utf8_to_wchar (const char *string)
- }
- return result;
- }
-+
-+/* Return a malloced string encoded in the active code page from the
-+ wide char input string STRING. Caller must free this value.
-+ Returns NULL and sets ERRNO on failure.
-+ Calling this function with STRING set to NULL is not defined. */
-+char *
-+wchar_to_native (const wchar_t *string)
-+{
-+ return wchar_to_cp (string, CP_ACP);
-+}
-+
-+/* Return a malloced wide char string from an UTF-8 encoded input
-+ string STRING. Caller must free this value. Returns NULL and sets
-+ ERRNO on failure. Calling this function with STRING set to NULL is
-+ not defined. */
-+wchar_t *
-+native_to_wchar (const char *string)
-+{
-+ return cp_to_wchar(string, CP_ACP);
-+}
- #endif /*HAVE_W32_SYSTEM*/
-diff --git a/tools/gpgtar.h b/tools/gpgtar.h
-index 5790894..8c0de85 100644
---- a/tools/gpgtar.h
-+++ b/tools/gpgtar.h
-@@ -113,8 +113,8 @@ gpg_error_t write_record (estream_t stream, const void *record);
-
- int gnupg_mkdir (const char *name, const char *modestr);
- #ifdef HAVE_W32_SYSTEM
--char *wchar_to_utf8 (const wchar_t *string);
--wchar_t *utf8_to_wchar (const char *string);
-+char *wchar_to_native (const wchar_t *string);
-+wchar_t *native_to_wchar (const char *string);
- #endif
-
- /*-- gpgtar-create.c --*/
---
-1.9.1
diff --git a/patches/gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch b/patches/gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch
deleted file mode 100755
index 4427417..0000000
--- a/patches/gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From fa16fba7c5e6c139bbc0556d6316d32c4d9f1e22 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 29 Jun 2015 11:03:58 +0200
-Subject: [PATCH] gpgsm: Add command option "offline".
-
-* sm/server.c (option_handler): Add "offline".
-(cmd_getinfo): Ditto.
-* sm/certchain.c (is_cert_still_valid):
-(do_validate_chain):
-* sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
-of --disable-dirmngr.
-* sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
-ctrl->offline.
---
-
-Adding this option makes it easier to implement the corresponding
-feature in gpgme.
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
-(cherry picked from commit 2c9c46e2a2b8f9a1bdc1ef46a135b5fc7d1a8073)
-
-Conflicts:
- sm/gpgsm.h
----
- doc/gpgsm.texi | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- sm/call-dirmngr.c | 2 +-
- sm/certchain.c | 6 +--
- sm/gpgsm.c | 1 +
- sm/gpgsm.h | 1 +
- sm/server.c | 19 +++++++-
- 6 files changed, 151 insertions(+), 8 deletions(-)
-
-diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
-index b0882b8..32fbe38 100644
---- a/doc/gpgsm.texi
-+++ b/doc/gpgsm.texi
-@@ -462,6 +462,7 @@ will not have on your local keybox), the operator can tell both your IP
- address and the time when you verified the signature.
-
-
-+ at anchor{gpgsm-option --validation-model}
- @item --validation-model @var{name}
- @opindex validation-model
- This option changes the default validation model. The only possible
-@@ -554,6 +555,7 @@ may be given (@pxref{how-to-specify-a-user-id}).
- Write output to @var{file}. The default is to write it to stdout.
-
-
-+ at anchor{gpgsm-option --with-key-data}
- @item --with-key-data
- @opindex with-key-data
- Displays extra information with the @code{--list-keys} commands. Especially
-@@ -561,6 +563,7 @@ a line tagged @code{grp} is printed which tells you the keygrip of a
- key. This string is for example used as the file name of the
- secret key.
-
-+ at anchor{gpgsm-option --with-validation}
- @item --with-validation
- @opindex with-validation
- When doing a key listing, do a full validation check for each key and
-@@ -1160,7 +1163,9 @@ Assuan manual for details.
- * GPGSM EXPORT:: Export certificates.
- * GPGSM IMPORT:: Import certificates.
- * GPGSM DELETE:: Delete certificates.
-+* GPGSM GETAUDITLOG:: Retrieve an audit log.
- * GPGSM GETINFO:: Information about the process
-+* GPGSM OPTION:: Session options.
- @end menu
-
-
-@@ -1350,6 +1355,7 @@ may be issued as a progress indicator.
-
- @node GPGSM LISTKEYS
- @subsection List available keys
-+ at anchor{gpgsm-cmd listkeys}
-
- To list the keys in the internal database or using an external key
- provider, the command:
-@@ -1449,6 +1455,23 @@ this requires that the usual escape quoting rules are done.
- The certificates must be specified unambiguously otherwise an error is
- returned.
-
-+ at node GPGSM GETAUDITLOG
-+ at subsection Retrieve an audit log.
-+ at anchor{gpgsm-cmd getauditlog}
-+
-+This command is used to retrieve an audit log.
-+
-+ at example
-+GETAUDITLOG [--data] [--html]
-+ at end example
-+
-+If @option{--data} is used, the audit log is send using D-lines
-+instead of being sent to the file descriptor given by an OUTPUT
-+command. If @option{--html} is used, the output is formated as an
-+XHTML block. This is designed to be incorporated into a HTML
-+document.
-+
-+
- @node GPGSM GETINFO
- @subsection Return information about the process
-
-@@ -1465,10 +1488,113 @@ Return the version of the program.
- @item pid
- Return the process id of the process.
- @item agent-check
--Return success if the agent is running.
-+Return OK if the agent is running.
- @item cmd_has_option @var{cmd} @var{opt}
--Return success if the command @var{cmd} implements the option @var{opt}.
-+Return OK if the command @var{cmd} implements the option @var{opt}.
- The leading two dashes usually used with @var{opt} shall not be given.
-+ at item offline
-+Return OK if the connection is in offline mode. This may be either
-+due to a @code{OPTION offline=1} or due to @command{gpgsm} being
-+started with option @option{--disable-dirmngr}.
-+ at end table
-+
-+ at node GPGSM OPTION
-+ at subsection Session options.
-+
-+The standard Assuan option handler supports these options.
-+
-+ at example
-+OPTION @var{name}[=@var{value}]
-+ at end example
-+
-+These @var{name}s are recognized:
-+
-+ at table @code
-+
-+ at item putenv
-+Change the session's environment to be passed via gpg-agent to
-+Pinentry. @var{value} is a string of the form
-+ at code{<KEY>[=[<STRING>]]}. If only @code{<KEY>} is given the
-+environment variable @code{<KEY>} is removed from the session
-+environment, if @code{<KEY>=} is given that environment variable is
-+set to the empty string, and if @code{<STRING>} is given it is set to
-+that string.
-+
-+ at item display
-+Set the session environment variable @code{DISPLAY} is set to @var{value}.
-+ at item ttyname
-+Set the session environment variable @code{GPG_TTY} is set to @var{value}.
-+ at item ttytype
-+Set the session environment variable @code{TERM} is set to @var{value}.
-+ at item lc-ctype
-+Set the session environment variable @code{LC_CTYPE} is set to @var{value}.
-+ at item lc-messages
-+Set the session environment variable @code{LC_MESSAGES} is set to @var{value}.
-+ at item xauthority
-+Set the session environment variable @code{XAUTHORITY} is set to @var{value}.
-+ at item pinentry-user-data
-+Set the session environment variable @code{PINENTRY_USER_DATA} is set
-+to @var{value}.
-+
-+ at item include-certs
-+This option overrides the command line option
-+ at option{--include-certs}. A @var{value} of -2 includes all
-+certificates except for the root certificate, -1 includes all
-+certicates, 0 does not include any certicates, 1 includes only the
-+signers certicate and all other positive values include up to
-+ at var{value} certificates starting with the signer cert.
-+
-+ at item list-mode
-+ at xref{gpgsm-cmd listkeys}.
-+
-+ at item list-to-output
-+If @var{value} is true the output of the list commands
-+(@pxref{gpgsm-cmd listkeys}) is written to the file descriptor set
-+with the last OUTPUT command. If @var{value} is false the output is
-+written via data lines; this is the default.
-+
-+ at item with-validation
-+If @var{value} is true for each listed certificate the validation
-+status is printed. This may result in the download of a CRL or the
-+user being asked about the trustworthiness of a root certificate. The
-+default is given by a command line option (@pxref{gpgsm-option
-+--with-validation}).
-+
-+
-+ at item with-secret
-+If @var{value} is true certificates with a corresponding private key
-+are marked by the list commands.
-+
-+ at item validation-model
-+This option overrides the command line option
-+ at option{validation-model} for the session.
-+(@pxref{gpgsm-option --validation-model}.)
-+
-+ at item with-key-data
-+This option globally enables the command line option
-+ at option{--with-key-data}. (@pxref{gpgsm-option --with-key-data}.)
-+
-+ at item enable-audit-log
-+If @var{value} is true data to write an audit log is gathered.
-+(@pxref{gpgsm-cmd getauditlog}.)
-+
-+ at item allow-pinentry-notify
-+If this option is used notifications about the launch of a Pinentry
-+are passed back to the client.
-+
-+ at item with-ephemeral-keys
-+If @var{value} is true ephemeral certificates are included in the
-+output of the list commands.
-+
-+ at item no-encrypt-to
-+If this option is used all keys set by the command line option
-+ at option{--encrypt-to} are ignored.
-+
-+ at item offline
-+If @var{value} is true or @var{value} is not given all network access
-+is disabled for this session. This is the same as the command line
-+option @option{--disable-dirmngr}.
-+
- @end table
-
- @mansect see also
-diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
-index 6540a8f..2517e7d 100644
---- a/sm/call-dirmngr.c
-+++ b/sm/call-dirmngr.c
-@@ -201,7 +201,7 @@ start_dirmngr_ext (ctrl_t ctrl, assuan_context_t *ctx_r)
- assuan_context_t ctx = NULL;
- int try_default = 0;
-
-- if (opt.disable_dirmngr)
-+ if (opt.disable_dirmngr || ctrl->offline)
- return gpg_error (GPG_ERR_NO_DIRMNGR);
-
- if (*ctx_r)
-diff --git a/sm/certchain.c b/sm/certchain.c
-index 1fbe9ca..9d7a9d8 100644
---- a/sm/certchain.c
-+++ b/sm/certchain.c
-@@ -959,7 +959,7 @@ is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
- {
- gpg_error_t err;
-
-- if (opt.no_crl_check && !ctrl->use_ocsp)
-+ if (ctrl->offline || (opt.no_crl_check && !ctrl->use_ocsp))
- {
- audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK,
- gpg_error (GPG_ERR_NOT_ENABLED));
-@@ -1727,9 +1727,9 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
- if (opt.no_policy_check)
- log_info ("policies not checked due to %s option\n",
- "--disable-policy-checks");
-- if (opt.no_crl_check && !ctrl->use_ocsp)
-+ if (ctrl->offline || (opt.no_crl_check && !ctrl->use_ocsp))
- log_info ("CRLs not checked due to %s option\n",
-- "--disable-crl-checks");
-+ ctrl->offline ? "offline" : "--disable-crl-checks");
- }
-
- if (!rc)
-diff --git a/sm/gpgsm.c b/sm/gpgsm.c
-index ef01a5c..9069bc7 100644
---- a/sm/gpgsm.c
-+++ b/sm/gpgsm.c
-@@ -1991,6 +1991,7 @@ gpgsm_init_default_ctrl (struct server_control_s *ctrl)
- ctrl->include_certs = default_include_certs;
- ctrl->use_ocsp = opt.enable_ocsp;
- ctrl->validation_model = default_validation_model;
-+ ctrl->offline = opt.disable_dirmngr;
- }
-
-
-diff --git a/sm/gpgsm.h b/sm/gpgsm.h
-index 25a2e5b..98ab81c 100644
---- a/sm/gpgsm.h
-+++ b/sm/gpgsm.h
-@@ -196,6 +196,7 @@ struct server_control_s
- signer) */
- int use_ocsp; /* Set to true if OCSP should be used. */
- int validation_model; /* Set to 1 for the chain model. */
-+ int offline; /* If true gpgsm won't do any network access. */
- };
-
-
-diff --git a/sm/server.c b/sm/server.c
-index 6ba5e58..7adb09a 100644
---- a/sm/server.c
-+++ b/sm/server.c
-@@ -301,6 +301,16 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
- {
- ctrl->server_local->no_encrypt_to = 1;
- }
-+ else if (!strcmp (key, "offline"))
-+ {
-+ /* We ignore this option if gpgsm has been started with
-+ --disable-dirmngr (which also sets offline). */
-+ if (!opt.disable_dirmngr)
-+ {
-+ int i = *value? !!atoi (value) : 1;
-+ ctrl->offline = i;
-+ }
-+ }
- else
- err = gpg_error (GPG_ERR_UNKNOWN_OPTION);
-
-@@ -1079,10 +1089,12 @@ static const char hlp_getinfo[] =
- " pid - Return the process id of the server.\n"
- " agent-check - Return success if the agent is running.\n"
- " cmd_has_option CMD OPT\n"
-- " - Returns OK if the command CMD implements the option OPT.";
-+ " - Returns OK if the command CMD implements the option OPT.\n"
-+ " offline - Returns OK if the conenction is in offline mode.";
- static gpg_error_t
- cmd_getinfo (assuan_context_t ctx, char *line)
- {
-+ ctrl_t ctrl = assuan_get_pointer (ctx);
- int rc = 0;
-
- if (!strcmp (line, "version"))
-@@ -1099,7 +1111,6 @@ cmd_getinfo (assuan_context_t ctx, char *line)
- }
- else if (!strcmp (line, "agent-check"))
- {
-- ctrl_t ctrl = assuan_get_pointer (ctx);
- rc = gpgsm_agent_send_nop (ctrl);
- }
- else if (!strncmp (line, "cmd_has_option", 14)
-@@ -1134,6 +1145,10 @@ cmd_getinfo (assuan_context_t ctx, char *line)
- }
- }
- }
-+ else if (!strcmp (line, "offline"))
-+ {
-+ rc = ctrl->offline? 0 : gpg_error (GPG_ERR_GENERAL);
-+ }
- else
- rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
-
---
-1.9.1
diff --git a/patches/gnupg2-2.0.28/0007-sm-Revert-to-use-SHA-1-for-CSR-generation.patch b/patches/gnupg2-2.0.28/0007-sm-Revert-to-use-SHA-1-for-CSR-generation.patch
deleted file mode 100755
index b42a7c6..0000000
--- a/patches/gnupg2-2.0.28/0007-sm-Revert-to-use-SHA-1-for-CSR-generation.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 35d3ced4fda90a5410a579850ca92ea6a356b402 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 27 Jul 2015 11:28:31 +0200
-Subject: [PATCH] sm: Revert to use SHA-1 for CSR generation.
-
-* sm/certreqgen.c (create_request): Revert to use SHA-1 but change to
-set it only at one place.
---
-
-Regression-due-to: bdf439035d123e4751e133ad42982673b0c86b75
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- sm/certreqgen.c | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/sm/certreqgen.c b/sm/certreqgen.c
-index ab8fbc8..a1e9bf8 100644
---- a/sm/certreqgen.c
-+++ b/sm/certreqgen.c
-@@ -587,7 +587,13 @@ proc_parameters (ctrl_t ctrl,
-
-
- /* Parameters are checked, the key pair has been created. Now
-- generate the request and write it out */
-+ generate the request and write it out.
-+
-+ Note: We use SHA-1 here because Libksba hash a shortcut to use
-+ assume that if SIG_VAL uses as algo the string "rsa". To fix that
-+ we would need to replace that string by an appropriate OID. We
-+ leave this change for 2.1.
-+ */
- static int
- create_request (ctrl_t ctrl,
- struct para_data_s *para,
-@@ -597,6 +603,7 @@ create_request (ctrl_t ctrl,
- {
- ksba_certreq_t cr;
- gpg_error_t err;
-+ int hashalgo = GCRY_MD_SHA1;
- gcry_md_hd_t md;
- ksba_stop_reason_t stopreason;
- int rc = 0;
-@@ -611,7 +618,7 @@ create_request (ctrl_t ctrl,
- if (err)
- return err;
-
-- rc = gcry_md_open (&md, GCRY_MD_SHA256, 0);
-+ rc = gcry_md_open (&md, hashalgo, 0);
- if (rc)
- {
- log_error ("md_open failed: %s\n", gpg_strerror (rc));
-@@ -792,10 +799,10 @@ create_request (ctrl_t ctrl,
-
- if (carddirect)
- rc = gpgsm_scd_pksign (ctrl, carddirect, NULL,
-- gcry_md_read(md, GCRY_MD_SHA1),
-- gcry_md_get_algo_dlen (GCRY_MD_SHA1),
-- GCRY_MD_SHA1,
-- &sigval, &siglen);
-+ gcry_md_read (md, hashalgo),
-+ gcry_md_get_algo_dlen (hashalgo),
-+ hashalgo,
-+ &sigval, &siglen);
- else
- {
- char *orig_codeset;
-@@ -808,9 +815,9 @@ create_request (ctrl_t ctrl,
- " more.\n"));
- i18n_switchback (orig_codeset);
- rc = gpgsm_agent_pksign (ctrl, hexgrip, desc,
-- gcry_md_read(md, GCRY_MD_SHA1),
-- gcry_md_get_algo_dlen (GCRY_MD_SHA1),
-- GCRY_MD_SHA1,
-+ gcry_md_read(md, hashalgo),
-+ gcry_md_get_algo_dlen (hashalgo),
-+ hashalgo,
- &sigval, &siglen);
- xfree (desc);
- }
---
-1.9.1
diff --git a/patches/gnupg2/01-version.patch.in b/patches/gnupg2/01-version.patch.in
deleted file mode 100755
index 7b7afa2..0000000
--- a/patches/gnupg2/01-version.patch.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Make --version also print the version number of Gpg4win so that we
-can see in bug reports what patches have been used.
-
-(For version < 2.0.11 chnage the patch line from 1023 to 868.)
-
---- jnlib/argparse.c
-+++ jnlib/argparse.c
-@@ -1023,7 +1023,7 @@
- fputs (strusage (11), stdout);
- if ((s=strusage (12)))
- printf (" (%s)", s );
-- printf (" %s\n", strusage (13) );
-+ printf (" %s %s\n", strusage (13), "(Gpg4win @PACKAGE_VERSION@)");
- /* Additional version lines. */
- for (i=20; i < 30; i++)
- if ((s=strusage (i)))
-
commit 631d18d6142ee8ef6a97eaf392b8cc713866ee32
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Aug 28 12:26:31 2015 +0200
Remove gnutls and dependencies
This remvoes curl, libgsasl, libtasn1 and gnutls
* 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/25_updatedgdocfrommaster.patch,
patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch,
patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch,
patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch,
src/inst-curl.nsi,
src/inst-gnutls.nsi,
src/inst-libgsasl.nsi,
src/inst-libtasn1.nsi,
src/uninst-curl.nsi,
src/uninst-gnutls.nsi,
src/uninst-libgsasl.nsi,
src/uninst-libtasn1.nsi: Removed.
* Makefile.am, configure.ac, packages/packages.current,
src/Makefile.am, src/config.nsi.in, src/inst-sections.nsi: Update
accordingly.
diff --git a/Makefile.am b/Makefile.am
index b6ccd0b..ab93d2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,24 +30,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
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/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
- patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
- patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
- patches/gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch \
- patches/gnupg2-2.0.28/0007-sm-Revert-to-use-SHA-1-for-CSR-generation.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
diff --git a/configure.ac b/configure.ac
index e101106..91c5967 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,15 +361,11 @@ GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
GPG4WIN_SPKG([gpgme], [libgpg-error glib])
-GPG4WIN_SPKG([curl], [zlib gnutls])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([scute], [libgpg-error libassuan])
GPG4WIN_SPKG([paperkey])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
-GPG4WIN_SPKG([libgsasl])
-GPG4WIN_SPKG([libtasn1])
-GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 libgcrypt])
GPG4WIN_SPKG([w32pth])
GPG4WIN_SPKG([libiconv])
GPG4WIN_SPKG([gettext], [libiconv])
diff --git a/packages/packages.current b/packages/packages.current
index e9528ae..da7b43a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -38,39 +38,6 @@ chk a4d316c404ff54ca545ea71a27af7dbc29817088
#
-# GNU TLS and support libraries
-#
-
-server ftp://ftp.gnu.org/pub/gnu
-
-# checked: 2014-06-20 ah
-file gsasl/libgsasl-1.8.0.tar.gz
-chk 08fd5dfdd3d88154cf06cb0759a732790c47b4f7
-
-# checked: 2014-06-20 ah
-file libtasn1/libtasn1-2.14.tar.gz
-chk 22f9e0b15f870c8e03ac9cc1ead969d4d84eb931
-
-
-server ftp://ftp.gnutls.org/gcrypt
-# checked: 2014-06-20 ah
-# verified with key 1F42 4189 05D8 206A A754 CCDC 29EE 58B9 9686 5171
-file gnutls/v2.12/gnutls-2.12.23.tar.bz2
-chk 3c0ba2153560abfb08d88dcb016cd6b72e465db5
-
-
-#
-# curl for GnuPG
-#
-
-server http://curl.haxx.se/download
-
-# checked: 2015-06-05 ah - updated
-# verified with key 914C 533D F9B2 ADA2 204F 586D 78E1 1C6B 279D 5C91
-file curl-7.42.1.tar.bz2
-chk f65708915875b8cb35edb51d8dd31440dc02fbd3
-
-#
# GLIB
#
# The GTK boyz seem to think that sha256sum files on the server
diff --git a/patches/gnutls-2.12.23/01-openssl-wincrypt.patch b/patches/gnutls-2.12.23/01-openssl-wincrypt.patch
deleted file mode 100755
index 4c6189d..0000000
--- a/patches/gnutls-2.12.23/01-openssl-wincrypt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-2013-04-25 Werner Koch <wk at gnupg.org>
-
- Fix name clash between wincrypt.h and openssl.h.
- * libextra/gnutls_openssl.c: Undef X509_NAME.
- * libextra/includes/gnutls/openssl.h: Ditto.
-
-
---- libextra/gnutls_openssl.c~ 2012-01-06 20:06:24.000000000 +0100
-+++ libextra/gnutls_openssl.c 2013-04-25 11:22:22.878826900 +0200
-@@ -35,6 +35,9 @@
- name, so restore the original name. */
- #undef shutdown
-
-+/* wincrypt.h defines a X509_NAME macro. But it is a type for us. */
-+#undef X509_NAME
-+
- /* XXX: See lib/gnutls_int.h. */
- #define GNUTLS_POINTER_TO_INT(_) ((int) GNUTLS_POINTER_TO_INT_CAST (_))
- #define GNUTLS_INT_TO_POINTER(_) ((void*) GNUTLS_POINTER_TO_INT_CAST (_))
---- libextra/includes/gnutls/openssl.h~ 2012-01-06 20:06:24.000000000 +0100
-+++ libextra/includes/gnutls/openssl.h 2013-04-25 11:21:52.346829024 +0200
-@@ -42,6 +42,10 @@
-
- #include <gnutls/gnutls.h>
-
-+/* wincrypt.h defines a X509_NAME macro. But it is a type for us. */
-+#undef X509_NAME
-+
-+
- /* Extra definitions that do not longer exist in gnutls.
- */
- #define GNUTLS_X509_CN_SIZE 256
diff --git a/patches/gnutls-2.12.23/02-cve-2013-2116.patch b/patches/gnutls-2.12.23/02-cve-2013-2116.patch
deleted file mode 100755
index 432f2ac..0000000
--- a/patches/gnutls-2.12.23/02-cve-2013-2116.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 5164d5a1d57cd0372a5dd074382ca960ca18b27d Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
-Date: Thu, 23 May 2013 09:54:37 +0200
-Subject: [PATCH 3/3] re-applied sanity check patch
-
----
- lib/gnutls_cipher.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
-index 2835121..71f5a98 100644
---- a/lib/gnutls_cipher.c
-+++ b/lib/gnutls_cipher.c
-@@ -561,6 +561,8 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
- return GNUTLS_E_DECRYPTION_FAILED;
- }
- pad = ciphertext.data[ciphertext.size - 1]; /* pad */
-+ if (pad+1 > ciphertext.size-hash_size)
-+ pad_failed = GNUTLS_E_DECRYPTION_FAILED;
-
- /* Check the pading bytes (TLS 1.x).
- * Note that we access all 256 bytes of ciphertext for padding check
---
-1.7.10.4
diff --git a/patches/gnutls-2.12.23/03-cve-2014-1959.patch b/patches/gnutls-2.12.23/03-cve-2014-1959.patch
deleted file mode 100755
index cb2e6e2..0000000
--- a/patches/gnutls-2.12.23/03-cve-2014-1959.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From b1abfe3d182d68539900092eb42fc62cf1bb7e7c Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at redhat.com>
-Date: Wed, 12 Feb 2014 16:11:58 +0100
-Subject: [PATCH] Fix bug that prevented the rejection of v1 intermediate CA
- certificates.
-
-Reported by Suman Jana.
-
-
-Description: fix rejection of v1 intermediate CA
- Fix bug that prevented the rejection of v1 intermediate CA
- certificates.
- Reported by Suman Jana.
- This is b1abfe3d182d68539900092eb42fc62cf1bb7e7c from upstream git,
- unfuzzed for 2.12.x by Andreas Metzler.
-Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
-Origin: upstream
-Bug: http://www.gnutls.org/security.html#GNUTLS-SA-2014-1
-Forwarded: not-needed
-Last-Update: 2014-02-15
-
---- gnutls26-2.12.23.orig/lib/x509/verify.c
-+++ gnutls26-2.12.23/lib/x509/verify.c
-@@ -644,8 +644,10 @@ _gnutls_x509_verify_certificate (const g
- /* note that here we disable this V1 CA flag. So that no version 1
- * certificates can exist in a supplied chain.
- */
-- if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT))
-+ if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT)) {
- flags &= ~(GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
-+ flags |= GNUTLS_VERIFY_DO_NOT_ALLOW_X509_V1_CA_CRT;
-+ }
- if ((ret =
- _gnutls_verify_certificate2 (certificate_list[i - 1],
- &certificate_list[i], 1, flags,
diff --git a/patches/gnutls-2.12.23/04-cve-2014-0092.patch b/patches/gnutls-2.12.23/04-cve-2014-0092.patch
deleted file mode 100755
index e0bd8ee..0000000
--- a/patches/gnutls-2.12.23/04-cve-2014-0092.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 6aa26f78150ccbdf0aec1878a41c17c41d358a3b Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
-Date: Thu, 27 Feb 2014 19:42:26 +0100
-Subject: [PATCH] corrected return codes
-
----
- lib/x509/verify.c | 16 ++++++++++------
- 1 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/lib/x509/verify.c b/lib/x509/verify.c
-index c9a6b0d..eef85a8 100644
---- a/lib/x509/verify.c
-+++ b/lib/x509/verify.c
-@@ -141,7 +141,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- result =
-@@ -150,7 +150,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- result =
-@@ -158,7 +158,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- result =
-@@ -166,7 +166,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- /* If the subject certificate is the same as the issuer
-@@ -206,6 +206,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
- else
- gnutls_assert ();
-
-+fail:
- result = 0;
-
- cleanup:
-@@ -330,7 +331,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
- gnutls_datum_t cert_signed_data = { NULL, 0 };
- gnutls_datum_t cert_signature = { NULL, 0 };
- gnutls_x509_crt_t issuer = NULL;
-- int issuer_version, result;
-+ int issuer_version, result = 0;
-
- if (output)
- *output = 0;
-@@ -363,7 +364,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
- if (issuer_version < 0)
- {
- gnutls_assert ();
-- return issuer_version;
-+ return 0;
- }
-
- if (!(flags & GNUTLS_VERIFY_DISABLE_CA_SIGN) &&
-@@ -385,6 +386,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
- if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
- goto cleanup;
- }
-
-@@ -393,6 +395,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
- if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
- goto cleanup;
- }
-
-@@ -410,6 +413,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
- else if (result < 0)
- {
- gnutls_assert();
-+ result = 0;
- goto cleanup;
- }
-
---
-1.7.1
diff --git a/patches/gnutls-2.12.23/05-cve-2014-3466.patch b/patches/gnutls-2.12.23/05-cve-2014-3466.patch
deleted file mode 100755
index 58af165..0000000
--- a/patches/gnutls-2.12.23/05-cve-2014-3466.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 89238044ade02c4d80e334ab74056ef28599663d Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
-Date: Fri, 23 May 2014 19:53:03 +0200
-Subject: [PATCH] Prevent memory corruption due to server hello parsing.
-
-Issue discovered by Joonas Kuorilehto of Codenomicon.
----
- lib/gnutls_handshake.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
-index e4a63e4..e652528 100644
---- a/lib/gnutls_handshake.c
-+++ b/lib/gnutls_handshake.c
-@@ -1797,7 +1797,7 @@ _gnutls_read_server_hello (gnutls_session_t session,
- DECR_LEN (len, 1);
- session_id_len = data[pos++];
-
-- if (len < session_id_len)
-+ if (len < session_id_len || session_id_len > TLS_MAX_SESSION_ID_SIZE)
- {
- gnutls_assert ();
- return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;
---
-1.7.1
diff --git a/patches/gnutls-2.12.23/06-cve-2015-0282.patch b/patches/gnutls-2.12.23/06-cve-2015-0282.patch
deleted file mode 100755
index a12dd6a..0000000
--- a/patches/gnutls-2.12.23/06-cve-2015-0282.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From d326f81daed5a1a06476d66a81584f8c7b71141d Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at redhat.com>
-Date: Mon, 23 Feb 2015 10:03:47 +0100
-Subject: [PATCH] Added fix for GNUTLS-SA-2015-1
-
----
- lib/gnutls_algorithms.c | 8 ++++++++
- lib/gnutls_algorithms.h | 1 +
- lib/gnutls_pubkey.c | 4 ++--
- lib/gnutls_sig.c | 14 ++++++++------
- lib/x509/common.h | 2 +-
- lib/x509/crq.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
- lib/x509/privkey.c | 3 ++-
- lib/x509/verify.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
- lib/x509/x509.c | 4 ++--
- lib/x509/x509_int.h | 7 ++++---
- 10 files changed, 127 insertions(+), 42 deletions(-)
-
-Index: gnutls26-2.12.23/lib/gnutls_algorithms.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/gnutls_algorithms.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/gnutls_algorithms.c 2015-03-20 09:07:52.579827744 -0400
-@@ -2056,6 +2056,14 @@
- return ret;
- }
-
-+int
-+_gnutls_sign_get_hash (gnutls_sign_algorithm_t algorithm)
-+{
-+ GNUTLS_SIGN_LOOP (if (p->id == algorithm) return p->mac);
-+
-+ return GNUTLS_MAC_UNKNOWN;
-+}
-+
- gnutls_sign_algorithm_t
- _gnutls_x509_oid2sign_algorithm (const char *oid)
- {
-Index: gnutls26-2.12.23/lib/gnutls_algorithms.h
-===================================================================
---- gnutls26-2.12.23.orig/lib/gnutls_algorithms.h 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/gnutls_algorithms.h 2015-03-20 09:07:52.583827801 -0400
-@@ -105,6 +105,7 @@
- enum encipher_type _gnutls_kx_encipher_type (gnutls_kx_algorithm_t algorithm);
-
- /* Functions for sign algorithms. */
-+int _gnutls_sign_get_hash (gnutls_sign_algorithm_t algorithm);
- gnutls_sign_algorithm_t _gnutls_x509_oid2sign_algorithm (const char *oid);
- gnutls_sign_algorithm_t _gnutls_x509_pk_to_sign (gnutls_pk_algorithm_t pk,
- gnutls_mac_algorithm_t mac);
-Index: gnutls26-2.12.23/lib/gnutls_pubkey.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/gnutls_pubkey.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/gnutls_pubkey.c 2015-03-20 09:07:52.583827801 -0400
-@@ -1048,7 +1048,7 @@
- return GNUTLS_E_INVALID_REQUEST;
- }
-
-- ret = pubkey_verify_sig( data, NULL, signature, pubkey->pk_algorithm,
-+ ret = pubkey_verify_sig(GNUTLS_MAC_UNKNOWN, data, NULL, signature, pubkey->pk_algorithm,
- pubkey->params, pubkey->params_size);
- if (ret < 0)
- {
-@@ -1086,7 +1086,7 @@
- }
-
- ret =
-- pubkey_verify_sig (NULL, hash, signature, key->pk_algorithm,
-+ pubkey_verify_sig (GNUTLS_MAC_UNKNOWN, NULL, hash, signature, key->pk_algorithm,
- key->params, key->params_size);
-
- return ret;
-Index: gnutls26-2.12.23/lib/gnutls_sig.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/gnutls_sig.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/gnutls_sig.c 2015-03-20 09:07:52.583827801 -0400
-@@ -273,7 +273,8 @@
- verify_tls_hash (gnutls_session_t session, gnutls_protocol_t ver, gnutls_cert * cert,
- const gnutls_datum_t * hash_concat,
- gnutls_datum_t * signature, size_t sha1pos,
-- gnutls_pk_algorithm_t pk_algo)
-+ gnutls_pk_algorithm_t pk_algo,
-+ int hashalg)
- {
- int ret;
- gnutls_datum_t vdata;
-@@ -309,7 +310,7 @@
- ret = _gnutls_rsa_verify (&vdata, signature, cert->params,
- cert->params_size, 1);
- else
-- ret = pubkey_verify_sig( NULL, &vdata, signature, pk_algo,
-+ ret = pubkey_verify_sig(hashalg, NULL, &vdata, signature, pk_algo,
- cert->params, cert->params_size);
-
- if (ret < 0)
-@@ -324,7 +325,7 @@
- vdata.data = &hash_concat->data[sha1pos];
- vdata.size = hash_concat->size - sha1pos;
-
-- ret = pubkey_verify_sig( NULL, &vdata, signature, pk_algo,
-+ ret = pubkey_verify_sig(hashalg, NULL, &vdata, signature, pk_algo,
- cert->params, cert->params_size);
- /* verify signature */
- if (ret < 0)
-@@ -428,7 +429,8 @@
- ret = verify_tls_hash (session, ver, cert, &dconcat, signature,
- dconcat.size -
- _gnutls_hash_get_algo_len (hash_algo),
-- _gnutls_sign_get_pk_algorithm (algo));
-+ _gnutls_sign_get_pk_algorithm (algo),
-+ hash_algo);
- if (ret < 0)
- {
- gnutls_assert ();
-@@ -491,7 +493,7 @@
-
- ret =
- verify_tls_hash (session, ver, cert, &dconcat, signature, 0,
-- cert->subject_pk_algorithm);
-+ cert->subject_pk_algorithm, hash_algo);
- if (ret < 0)
- {
- gnutls_assert ();
-@@ -582,7 +584,7 @@
-
- ret =
- verify_tls_hash (session, ver, cert, &dconcat, signature, 16,
-- cert->subject_pk_algorithm);
-+ cert->subject_pk_algorithm, GNUTLS_MAC_UNKNOWN);
- if (ret < 0)
- {
- gnutls_assert ();
-Index: gnutls26-2.12.23/lib/x509/common.h
-===================================================================
---- gnutls26-2.12.23.orig/lib/x509/common.h 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/x509/common.h 2015-03-20 09:07:52.583827801 -0400
-@@ -151,7 +151,7 @@
- void _asnstr_append_name (char *name, size_t name_size, const char *part1,
- const char *part2);
-
--int pubkey_verify_sig (const gnutls_datum_t * tbs,
-+int pubkey_verify_sig (int hashalg, const gnutls_datum_t * tbs,
- const gnutls_datum_t * hash,
- const gnutls_datum_t * signature,
- gnutls_pk_algorithm_t pk, bigint_t * issuer_params,
-Index: gnutls26-2.12.23/lib/x509/crq.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/x509/crq.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/x509/crq.c 2015-03-20 09:07:52.583827801 -0400
-@@ -2540,6 +2540,7 @@
- gnutls_datum signature = { NULL, 0 };
- bigint_t params[MAX_PUBLIC_PARAMS_SIZE];
- int ret, params_size = 0, i;
-+int hashalg, sigalg;
-
- ret =
- _gnutls_x509_get_signed_data (crq->crq, "certificationRequestInfo", &data);
-@@ -2565,7 +2566,10 @@
- goto cleanup;
- }
-
-- ret = pubkey_verify_sig(&data, NULL, &signature,
-+ sigalg = gnutls_x509_crq_get_signature_algorithm (crq);
-+ hashalg = _gnutls_sign_get_hash(sigalg);
-+
-+ ret = pubkey_verify_sig(hashalg, &data, NULL, &signature,
- gnutls_x509_crq_get_pk_algorithm (crq, NULL),
- params, params_size);
- if (ret < 0)
-@@ -2588,5 +2592,48 @@
- return ret;
- }
-
-+/**
-+ * gnutls_x509_crq_get_signature_algorithm:
-+ * @crl: should contain a #gnutls_x509_crl_t structure
-+ *
-+ * This function will return a value of the #gnutls_sign_algorithm_t
-+ * enumeration that is the signature algorithm.
-+ *
-+ * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
-+ * negative error value.
-+ **/
-+int
-+gnutls_x509_crq_get_signature_algorithm (gnutls_x509_crq_t crq)
-+{
-+ int result;
-+ gnutls_datum_t sa;
-+
-+ if (crq == NULL)
-+ {
-+ gnutls_assert ();
-+ return GNUTLS_E_INVALID_REQUEST;
-+ }
-+
-+ /* Read the signature algorithm. Note that parameters are not
-+ * read. They will be read from the issuer's certificate if needed.
-+ */
-+
-+ result =
-+ _gnutls_x509_read_value (crq->crq, "signatureAlgorithm.algorithm",
-+ &sa, 0);
-+
-+ if (result < 0)
-+ {
-+ gnutls_assert ();
-+ return result;
-+ }
-+
-+ result = _gnutls_x509_oid2sign_algorithm ((const char *) sa.data);
-+
-+ _gnutls_free_datum (&sa);
-+
-+ return result;
-+}
-+
- #endif /* ENABLE_PKI */
-
-Index: gnutls26-2.12.23/lib/x509/privkey.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/x509/privkey.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/x509/privkey.c 2015-03-20 09:07:52.583827801 -0400
-@@ -1828,7 +1828,8 @@
- return GNUTLS_E_INVALID_REQUEST;
- }
-
-- result = _gnutls_x509_privkey_verify_signature (data, signature, key);
-+ result = _gnutls_x509_privkey_verify_signature (GNUTLS_MAC_UNKNOWN, data, signature, key);
-+
- if (result < 0)
- {
- gnutls_assert ();
-Index: gnutls26-2.12.23/lib/x509/verify.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/x509/verify.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/x509/verify.c 2015-03-20 09:07:52.587827857 -0400
-@@ -332,6 +332,7 @@
- gnutls_datum_t cert_signature = { NULL, 0 };
- gnutls_x509_crt_t issuer = NULL;
- int issuer_version, result = 0;
-+ int sigalg, hashalg;
-
- if (output)
- *output = 0;
-@@ -399,8 +400,18 @@
- goto cleanup;
- }
-
-+ sigalg = gnutls_x509_crt_get_signature_algorithm (cert);
-+ hashalg = _gnutls_sign_get_hash(sigalg);
-+
-+ if (hashalg == GNUTLS_MAC_UNKNOWN)
-+ {
-+ gnutls_assert();
-+ result = 0;
-+ goto cleanup;
-+ }
-+
- result =
-- _gnutls_x509_verify_signature (&cert_signed_data, NULL, &cert_signature,
-+ _gnutls_x509_verify_signature (hashalg, &cert_signed_data, NULL, &cert_signature,
- issuer);
- if (result == GNUTLS_E_PK_SIG_VERIFY_FAILED)
- {
-@@ -423,10 +434,6 @@
- */
- if (is_issuer (cert, cert) == 0)
- {
-- int sigalg;
--
-- sigalg = gnutls_x509_crt_get_signature_algorithm (cert);
--
- if (((sigalg == GNUTLS_SIGN_RSA_MD2) &&
- !(flags & GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2)) ||
- ((sigalg == GNUTLS_SIGN_RSA_MD5) &&
-@@ -749,12 +756,12 @@
- * params[1] is public key
- */
- static int
--_pkcs1_rsa_verify_sig (const gnutls_datum_t * text,
-- const gnutls_datum_t * prehash,
-- const gnutls_datum_t * signature, bigint_t * params,
-- int params_len)
-+_pkcs1_rsa_verify_sig (gnutls_mac_algorithm_t hash, const gnutls_datum_t * text,
-+ const gnutls_datum_t * prehash,
-+ const gnutls_datum_t * signature, bigint_t * params,
-+ int params_len)
- {
-- gnutls_mac_algorithm_t hash = GNUTLS_MAC_UNKNOWN;
-+ gnutls_mac_algorithm_t phash = GNUTLS_MAC_UNKNOWN;
- int ret;
- opaque digest[MAX_HASH_SIZE], md[MAX_HASH_SIZE], *cmp;
- int digest_size;
-@@ -774,7 +781,7 @@
-
- digest_size = sizeof (digest);
- if ((ret =
-- decode_ber_digest_info (&decrypted, &hash, digest, &digest_size)) != 0)
-+ decode_ber_digest_info (&decrypted, &phash, digest, &digest_size)) != 0)
- {
- gnutls_assert ();
- _gnutls_free_datum (&decrypted);
-@@ -783,6 +790,15 @@
-
- _gnutls_free_datum (&decrypted);
-
-+ if (hash != GNUTLS_MAC_UNKNOWN && hash != phash)
-+ {
-+ gnutls_assert();
-+ return GNUTLS_E_PK_SIG_VERIFY_FAILED;
-+ }
-+ else
-+ hash = phash;
-+
-+
- if (digest_size != _gnutls_hash_get_algo_len (hash))
- {
- gnutls_assert ();
-@@ -878,11 +894,11 @@
- * not verified, or 1 otherwise.
- */
- int
--pubkey_verify_sig (const gnutls_datum_t * tbs,
-- const gnutls_datum_t * hash,
-- const gnutls_datum_t * signature,
-- gnutls_pk_algorithm_t pk, bigint_t * issuer_params,
-- int issuer_params_size)
-+pubkey_verify_sig (int hashalg, const gnutls_datum_t * tbs,
-+ const gnutls_datum_t * hash,
-+ const gnutls_datum_t * signature,
-+ gnutls_pk_algorithm_t pk, bigint_t * issuer_params,
-+ int issuer_params_size)
- {
-
- switch (pk)
-@@ -890,7 +906,7 @@
- case GNUTLS_PK_RSA:
-
- if (_pkcs1_rsa_verify_sig
-- (tbs, hash, signature, issuer_params, issuer_params_size) != 0)
-+ (hashalg, tbs, hash, signature, issuer_params, issuer_params_size) != 0)
- {
- gnutls_assert ();
- return GNUTLS_E_PK_SIG_VERIFY_FAILED;
-@@ -1021,7 +1037,7 @@
- * 'signature' is the signature!
- */
- int
--_gnutls_x509_verify_signature (const gnutls_datum_t * tbs,
-+_gnutls_x509_verify_signature (int hashalg, const gnutls_datum_t * tbs,
- const gnutls_datum_t * hash,
- const gnutls_datum_t * signature,
- gnutls_x509_crt_t issuer)
-@@ -1041,7 +1057,7 @@
- }
-
- ret =
-- pubkey_verify_sig (tbs, hash, signature,
-+ pubkey_verify_sig (hashalg, tbs, hash, signature,
- gnutls_x509_crt_get_pk_algorithm (issuer, NULL),
- issuer_params, issuer_params_size);
- if (ret < 0)
-@@ -1066,13 +1082,13 @@
- * 'signature' is the signature!
- */
- int
--_gnutls_x509_privkey_verify_signature (const gnutls_datum_t * tbs,
-+_gnutls_x509_privkey_verify_signature (int hashalg, const gnutls_datum_t * tbs,
- const gnutls_datum_t * signature,
- gnutls_x509_privkey_t issuer)
- {
- int ret;
-
-- ret = pubkey_verify_sig (tbs, NULL, signature, issuer->pk_algorithm,
-+ ret = pubkey_verify_sig (hashalg, tbs, NULL, signature, issuer->pk_algorithm,
- issuer->params, issuer->params_size);
- if (ret < 0)
- {
-@@ -1293,6 +1309,7 @@
- gnutls_datum_t crl_signature = { NULL, 0 };
- gnutls_x509_crt_t issuer;
- int result;
-+ int sigalg, hashalg;
-
- if (output)
- *output = 0;
-@@ -1334,6 +1351,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
- goto cleanup;
- }
-
-@@ -1341,11 +1359,21 @@
- if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
-+ goto cleanup;
-+ }
-+
-+ sigalg = gnutls_x509_crl_get_signature_algorithm (crl);
-+ hashalg = _gnutls_sign_get_hash(sigalg);
-+ if (hashalg == GNUTLS_MAC_UNKNOWN)
-+ {
-+ gnutls_assert();
-+ result = 0;
- goto cleanup;
- }
-
- result =
-- _gnutls_x509_verify_signature (&crl_signed_data, NULL, &crl_signature,
-+ _gnutls_x509_verify_signature (hashalg, &crl_signed_data, NULL, &crl_signature,
- issuer);
- if (result == GNUTLS_E_PK_SIG_VERIFY_FAILED)
- {
-@@ -1358,14 +1386,11 @@
- else if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
- goto cleanup;
- }
-
- {
-- int sigalg;
--
-- sigalg = gnutls_x509_crl_get_signature_algorithm (crl);
--
- if (((sigalg == GNUTLS_SIGN_RSA_MD2) &&
- !(flags & GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2)) ||
- ((sigalg == GNUTLS_SIGN_RSA_MD5) &&
-Index: gnutls26-2.12.23/lib/x509/x509.c
-===================================================================
---- gnutls26-2.12.23.orig/lib/x509/x509.c 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/x509/x509.c 2015-03-20 09:07:52.587827857 -0400
-@@ -2714,7 +2714,7 @@
- return GNUTLS_E_INVALID_REQUEST;
- }
-
-- result = _gnutls_x509_verify_signature (data, NULL, signature, crt);
-+ result = _gnutls_x509_verify_signature (GNUTLS_MAC_UNKNOWN, data, NULL, signature, crt);
- if (result < 0)
- {
- gnutls_assert ();
-@@ -2752,7 +2752,7 @@
- return GNUTLS_E_INVALID_REQUEST;
- }
-
-- result = _gnutls_x509_verify_signature (NULL, hash, signature, crt);
-+ result = _gnutls_x509_verify_signature (GNUTLS_MAC_UNKNOWN, NULL, hash, signature, crt);
- if (result < 0)
- {
- gnutls_assert ();
-Index: gnutls26-2.12.23/lib/x509/x509_int.h
-===================================================================
---- gnutls26-2.12.23.orig/lib/x509/x509_int.h 2015-03-20 09:07:52.587827857 -0400
-+++ gnutls26-2.12.23/lib/x509/x509_int.h 2015-03-20 09:07:52.587827857 -0400
-@@ -187,11 +187,11 @@
- bigint_t * issuer_params,
- unsigned int issuer_params_size);
-
--int _gnutls_x509_verify_signature (const gnutls_datum_t * tbs,
-+int _gnutls_x509_verify_signature (int sigalg, const gnutls_datum_t * tbs,
- const gnutls_datum_t * hash,
- const gnutls_datum_t * signature,
- gnutls_x509_crt_t issuer);
--int _gnutls_x509_privkey_verify_signature (const gnutls_datum_t * tbs,
-+int _gnutls_x509_privkey_verify_signature (int sigalg, const gnutls_datum_t * tbs,
- const gnutls_datum_t * signature,
- gnutls_x509_privkey_t issuer);
-
-@@ -390,5 +390,6 @@
- const char *ext_id,
- const gnutls_datum_t * ext_data,
- unsigned int critical);
--
-+int
-+gnutls_x509_crq_get_signature_algorithm (gnutls_x509_crq_t crq);
- #endif
diff --git a/patches/gnutls-2.12.23/07-cve-2015-0294.patch b/patches/gnutls-2.12.23/07-cve-2015-0294.patch
deleted file mode 100755
index 2983fec..0000000
--- a/patches/gnutls-2.12.23/07-cve-2015-0294.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 2458d6d158fd523418e331e50abb35cd334bb795 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at redhat.com>
-Date: Mon, 23 Feb 2015 10:41:56 +0100
-Subject: [PATCH] added fix for certificate algorithm consistency check
-
----
- lib/x509/x509.c | 34 +++++++++++++++++++++++++++++++++-
- 1 file changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/lib/x509/x509.c b/lib/x509/x509.c
-index 6db574c..f51ba3b 100644
---- a/lib/x509/x509.c
-+++ b/lib/x509/x509.c
-@@ -165,7 +165,7 @@ gnutls_x509_crt_import (gnutls_x509_crt_t cert,
- gnutls_x509_crt_fmt_t format)
- {
- int result = 0, need_free = 0;
-- gnutls_datum_t _data;
-+ gnutls_datum_t _data, sa1 = {NULL, 0}, sa2 = {NULL, 0};
-
- if (cert == NULL)
- {
-@@ -233,6 +233,36 @@ gnutls_x509_crt_import (gnutls_x509_crt_t cert,
- goto cleanup;
- }
-
-+ result =
-+ _gnutls_x509_read_value (cert->cert, "tbsCertificate.signature.algorithm",
-+ &sa1, 0);
-+ if (result != ASN1_SUCCESS)
-+ {
-+ result = _gnutls_asn2err (result);
-+ gnutls_assert ();
-+ goto cleanup;
-+ }
-+
-+ result =
-+ _gnutls_x509_read_value (cert->cert, "signatureAlgorithm.algorithm",
-+ &sa2, 0);
-+ if (result != ASN1_SUCCESS)
-+ {
-+ result = _gnutls_asn2err (result);
-+ gnutls_assert ();
-+ goto cleanup;
-+ }
-+
-+ if (sa1.size != sa2.size || sa1.size == 0 || strcmp(sa1.data, sa2.data) != 0)
-+ {
-+ result = GNUTLS_E_CERTIFICATE_ERROR;
-+ gnutls_assert ();
-+ goto cleanup;
-+ }
-+
-+ _gnutls_free_datum (&sa1);
-+ _gnutls_free_datum (&sa2);
-+
- /* Since we do not want to disable any extension
- */
- cert->use_extensions = 1;
-@@ -242,6 +272,8 @@ gnutls_x509_crt_import (gnutls_x509_crt_t cert,
- return 0;
-
- cleanup:
-+ _gnutls_free_datum (&sa1);
-+ _gnutls_free_datum (&sa2);
- if (need_free)
- _gnutls_free_datum (&_data);
- return result;
---
-libgit2 0.21.4
diff --git a/patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch b/patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch
deleted file mode 100755
index 2f77d3b..0000000
--- a/patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch
+++ /dev/null
@@ -1,637 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-Description: Update gdoc script from gnutls master.
- This includes bef38b98c0536d81c0e4b2e78a9182e1df1d451c among other fixes:
- .
- [PATCH] Avoid depending on hash order in gdoc.
- .
- Previously, gdoc had a hash of regexp replacements for each output
- format, and applied the replacements in the order that "keys" returned
- for the hash. However, not all orders are safe -- and now that Perl 5.18
- randomises hash order per-process, it only worked sometimes!
-Origin: upstream
-Bug-Debian: http://bugs.debian.org/724167
-Forwarded: not-needed
-
---- gnutls26-2.12.23.orig/doc/scripts/gdoc
-+++ gnutls26-2.12.23/doc/scripts/gdoc
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl
-+eval '(exit $?0)' && eval 'exec perl "$0" ${1+"$@"}'
-+ & eval 'exec perl "$0" $argv:q'
-+ if 0;
-
- ## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
- ## added -texinfo, -listfunc, -pkg-name
-@@ -7,6 +9,8 @@
- ## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
- ## added -tex
- ## Copyright (c) 1998 Michael Zucchi
-+## Copyright (c) 2013 Adam Sampson
-+## made highlighting not depend on hash order, for Perl 5.18
-
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -132,57 +136,59 @@
- use POSIX qw(strftime);
-
- # match expressions used to find embedded type information
--$type_constant = "((?<!\")\\\%(\\w+))";
--$type_func = "(\\w+\\(\\))";
--$type_param = "\\\@(\\w+)";
--$type_struct = "\\\#(\\w+)";
--$type_env = "(\\\$\\w+)";
-+$type_constant = "\\\%([A-Za-z0-9_]+)";
-+$type_func = "([A-Za-z0-9_]+\\(\\))";
-+$type_param = '\@([A-Za-z0-9_]+)\s*';
-+$type_struct = "\\\#([A-Za-z0-9_]+)";
-+$type_env = "(\\\$[A-Za-z0-9_]+)";
-
-
- # Output conversion substitutions.
- # One for each output format
-
- # these work fairly well
--%highlights_html = ( $type_constant, "<i>\$2</i>",
-- $type_func, "<b>\$1</b>",
-- $type_struct, "<i>\$1</i>",
-- $type_param, "<tt><b>\$1</b></tt>" );
-+ at highlights_html = ( [$type_constant, '"<i>$1</i>"'],
-+ [$type_func, '"<b>$1</b>"'],
-+ [$type_struct, '"<i>$1</i>"'],
-+ [$type_param, '" <tt><b>$1</b></tt> "'] );
- $blankline_html = "<p>";
-
--%highlights_texinfo = ( $type_constant, "\\\@code{\$2}",
-- $type_func, "\\\@code{\$1}",
-- $type_struct, "\\\@code{\$1}",
-- $type_param, "\\\@code{\$1}" );
-+ at highlights_texinfo = ( [$type_param, '" \@code{$1} "'],
-+ [$type_constant, '"\@code{$1} "'],
-+ [$type_func, '"\@code{$1} "'],
-+ [$type_struct, '"\@code{$1} "'],
-+ );
- $blankline_texinfo = "";
-
--%highlights_tex = ( $type_constant, "{\\\\it \$2}",
-- $type_func, "{\\\\bf \$1}",
-- $type_struct, "{\\\\it \$1}",
-- $type_param, "{\\\\bf \$1}" );
-+ at highlights_tex = ( [$type_param, '" {\\\bf $1} "'],
-+ [$type_constant, '"{\\\it $1}"'],
-+ [$type_func, '"{\\\bf $1}"'],
-+ [$type_struct, '"{\\\it $1}"'],
-+ );
- $blankline_tex = "\\\\";
-
- # sgml, docbook format
--%highlights_sgml = ( $type_constant, "<replaceable class=\"option\">\$2</replaceable>",
-- $type_func, "<function>\$1</function>",
-- $type_struct, "<structname>\$1</structname>",
-- $type_env, "<envar>\$1</envar>",
-- $type_param, "<parameter>\$1</parameter>" );
-+ at highlights_sgml = ( [$type_constant, '"<replaceable class=\"option\">$1</replaceable>"'],
-+ [$type_func, '"<function>$1</function>"'],
-+ [$type_struct, '"<structname>$1</structname>"'],
-+ [$type_env, '"<envar>$1</envar>"'],
-+ [$type_param, '" <parameter>$1</parameter> "'] );
- $blankline_sgml = "</para><para>\n";
-
- # these are pretty rough
--%highlights_man = ( $type_constant, "\\\\fB\$2\\\\fP",
-- $type_func, "\\\\fB\$1\\\\fP",
-- $type_struct, "\\\\fB\$1\\\\fP",
-- $type_param, "\\\\fI\$1\\\\fP" );
-+ at highlights_man = ( [$type_constant, '"\\\fB$1\\\fP"'],
-+ [$type_func, '"\\\fB$1\\\fP"'],
-+ [$type_struct, '"\\\fB$1\\\fP"'],
-+ [$type_param, '" \\\fI$1\\\fP "'] );
- $blankline_man = "";
-
- # text-mode
--%highlights_text = ( $type_constant, "\$2",
-- $type_func, "\$1",
-- $type_struct, "\$1",
-- $type_param, "\$1" );
-+ at highlights_text = ( [$type_constant, '"$1"'],
-+ [$type_func, '"$1"'],
-+ [$type_struct, '"$1"'],
-+ [$type_param, '"$1 "'] );
- $blankline_text = "";
--
-+my $lineprefix = "";
-
- sub usage {
- print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -tex | -texinfo -listfunc ]\n";
-@@ -201,7 +207,7 @@ if ($#ARGV==-1) {
-
- $verbose = 0;
- $output_mode = "man";
--%highlights = %highlights_man;
-+ at highlights = @highlights_man;
- $blankline = $blankline_man;
- $modulename = "API Documentation";
- $sourceversion = strftime "%Y-%m-%d", localtime;
-@@ -210,27 +216,27 @@ while ($ARGV[0] =~ m/^-(.*)/) {
- $cmd = shift @ARGV;
- if ($cmd eq "-html") {
- $output_mode = "html";
-- %highlights = %highlights_html;
-+ @highlights = @highlights_html;
- $blankline = $blankline_html;
- } elsif ($cmd eq "-man") {
- $output_mode = "man";
-- %highlights = %highlights_man;
-+ @highlights = @highlights_man;
- $blankline = $blankline_man;
- } elsif ($cmd eq "-tex") {
- $output_mode = "tex";
-- %highlights = %highlights_tex;
-+ @highlights = @highlights_tex;
- $blankline = $blankline_tex;
- } elsif ($cmd eq "-texinfo") {
- $output_mode = "texinfo";
-- %highlights = %highlights_texinfo;
-+ @highlights = @highlights_texinfo;
- $blankline = $blankline_texinfo;
- } elsif ($cmd eq "-text") {
- $output_mode = "text";
-- %highlights = %highlights_text;
-+ @highlights = @highlights_text;
- $blankline = $blankline_text;
- } elsif ($cmd eq "-docbook") {
- $output_mode = "sgml";
-- %highlights = %highlights_sgml;
-+ @highlights = @highlights_sgml;
- $blankline = $blankline_sgml;
- } elsif ($cmd eq "-listfunc") {
- $output_mode = "listfunc";
-@@ -270,6 +276,8 @@ sub dump_section {
- my $name = shift @_;
- my $contents = join "\n", @_;
-
-+ $name = " $name";
-+
- if ($name =~ m/$type_constant/) {
- $name = $1;
- # print STDERR "constant section '$1' = '$contents'\n";
-@@ -280,6 +288,7 @@ sub dump_section {
- $parameters{$name} = $contents;
- } else {
- # print STDERR "other section '$name' = '$contents'\n";
-+ $name =~ tr/ //d;
- $sections{$name} = $contents;
- push @sectionlist, $name;
- }
-@@ -296,35 +305,15 @@ sub dump_section {
- # sections => %descriont descriptions
- #
-
--sub repstr {
-- $pattern = shift;
-- $repl = shift;
-- $match1 = shift;
-- $match2 = shift;
-- $match3 = shift;
-- $match4 = shift;
--
-- $output = $repl;
-- $output =~ s,\$1,$match1,g;
-- $output =~ s,\$2,$match2,g;
-- $output =~ s,\$3,$match3,g;
-- $output =~ s,\$4,$match4,g;
--
-- eval "\$return = qq/$output/";
--
--# print "pattern $pattern matched 1=$match1 2=$match2 3=$match3 4=$match4 replace $repl yielded $output interpolated $return\n";
--
-- $return;
--}
--
- sub just_highlight {
- my $contents = join "\n", @_;
- my $line;
- my $ret = "";
-
-- foreach $pattern (keys %highlights) {
--# print "scanning pattern $pattern ($highlights{$pattern})\n";
-- $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, $3, $4):gse;
-+ foreach $highlight (@highlights) {
-+ my ($pattern, $replace) = @$highlight;
-+ #print "scanning pattern $pattern ($replace)\n";
-+ $contents =~ s/$pattern/$replace/gees;
- }
- foreach $line (split "\n", $contents) {
- if ($line eq ""){
-@@ -370,13 +359,45 @@ sub output_texinfo {
- }
- }
- foreach $section (@{$args{'sectionlist'}}) {
-+ $section =~ s/\@//g;
- print "\n\@strong{$section:} " if $section ne $section_default;
-- $args{'sections'}{$section} =~ s:([{}]):\@\1:gs;
-+ $args{'sections'}{$section} =~ s:([{}]):\@$1:gs;
- output_highlight($args{'sections'}{$section});
- }
- print "\@end deftypefun\n\n";
- }
-
-+sub output_enum_texinfo {
-+ my %args = %{$_[0]};
-+ my ($parameter, $section);
-+ my $count;
-+ my $name = $args{'enum'};
-+ my $param;
-+ my $param2;
-+ my $sec;
-+ my $check;
-+ my $type;
-+
-+ print "\n\@c $name\n";
-+ print "\@table \@code\n";
-+
-+ $check=0;
-+ foreach $parameter (@{$args{'parameterlist'}}) {
-+ $param1 = $parameter;
-+ $param1 =~ s/_/_\@-/g;
-+
-+ $check = 1;
-+ print "\@item ".$param1."\n";
-+# print "\n";
-+
-+ $param2 = $args{'parameters'}{$parameter};
-+ $out = just_highlight($param2);
-+ chomp $out;
-+ print $out . "\n";
-+ }
-+ print "\@end table\n";
-+}
-+
- # output in html
- sub output_html {
- my %args = %{$_[0]};
-@@ -428,7 +449,9 @@ sub output_tex {
-
- $func =~ s/_/\\_/g;
-
-- print "\n\n\\subsection{". $func . "}\n\\label{" . $args{'function'} . "}\n";
-+ print "\n\n\\begin{function}\n";
-+ print "\\functionTitle{". $func . "}\n";
-+ print "\\index{". $func . "}\n";
-
- $type = $args{'functiontype'};
- $type =~ s/_/\\_/g;
-@@ -451,9 +474,8 @@ sub output_tex {
- }
- print ")\n";
-
-- print "\n{\\large{Arguments}}\n";
-+ print "\n\\begin{functionArguments}\n";
-
-- print "\\begin{itemize}\n";
- $check=0;
- foreach $parameter (@{$args{'parameterlist'}}) {
- $param1 = $args{'parametertypes'}{$parameter};
-@@ -462,11 +484,12 @@ sub output_tex {
- $param2 =~ s/_/\\_/g;
-
- $check = 1;
-- print "\\item {\\it ".$param1."} {\\bf ".$param2."}: \n";
-+ print "\\functionArgument {\\it ".$param1."} {\\bf ".$param2."}: \n";
- # print "\n";
-
- $param3 = $args{'parameters'}{$parameter};
-- $param3 =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-+ $param3 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
-+ $param3 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
-
- $out = just_highlight($param3);
- $out =~ s/_/\\_/g;
-@@ -475,31 +498,72 @@ sub output_tex {
- if ($check==0) {
- print "\\item void\n";
- }
-- print "\\end{itemize}\n";
-+ print "\\end{functionArguments}\n";
-
- foreach $section (@{$args{'sectionlist'}}) {
- $sec = $section;
- $sec =~ s/_/\\_/g;
-- $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-+ $sec =~ s/#([a-zA-Z\_]+)/{\\it $1}/g;
-
-- print "\n{\\large{$sec}}\\\\\n";
-- print "\\begin{rmfamily}\n";
-+ print "\n\\begin{function${sec}}\n";
-+ $out = $args{'sections'}{$section};
-
-- $sec = $args{'sections'}{$section};
-- $sec =~ s/\\:/:/g;
-- $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-- $sec =~ s/->/\$\\rightarrow\$/g;
-- $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
--
-- $out = just_highlight($sec);
-- $out =~ s/_/\\_/g;
-+ $out =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
-+ $out =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
-+ $out =~ s/\@([a-zA-Z\_]+)/{\\bf $1}/g;
-+ $out =~ s/_/\\_\\-/g;
-+ $out =~ s/\$/\\\$/g;
-+ $out =~ s/#/\\#/g;
-+ $out =~ s/\n\n/\n/g;
-+ $out =~ s/\\:/:/g;
-+ $out =~ s/\-\>/\$\\rightarrow\$/g;
-+ $out =~ s/([0-9]+)\^([0-9]+)/\$\{$1\}\^\{$2\}\$/g;
-
- print $out;
-- print "\\end{rmfamily}\n";
-+ print "\\end{function${sec}}\n";
- }
-- print "\n";
-+ print "\\end{function}\n\n";
- }
-
-+sub output_enum_tex {
-+ my %args = %{$_[0]};
-+ my ($parameter, $section);
-+ my $count;
-+ my $name = $args{'enum'};
-+ my $param;
-+ my $param2;
-+ my $sec;
-+ my $check;
-+ my $type;
-+
-+ print "\n\n\\begin{enum}\n";
-+ $name =~ s/_/\\_/g;
-+ print "\\enumTitle{". $name . "}\n";
-+ print "\\index{". $name . "}\n";
-+
-+ print "\n\\begin{enumList}\n";
-+
-+ $check=0;
-+ foreach $parameter (@{$args{'parameterlist'}}) {
-+ $param1 = $parameter;
-+ $param1 =~ s/_/\\_\\-/g;
-+
-+ $check = 1;
-+ print "\\enumElement{".$param1."}{";
-+# print "\n";
-+
-+ $param2 = $args{'parameters'}{$parameter};
-+ $param2 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
-+ $param2 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
-+ $out = just_highlight($param2);
-+ $out =~ s/_/\\_/g;
-+ chomp $out;
-+ print $out . "}\n";
-+ }
-+ print "\\end{enumList}\n";
-+
-+ print "\\end{enum}\n\n";
-+}
-
- # output in sgml DocBook
- sub output_sgml {
-@@ -639,11 +703,14 @@ sub output_man {
- if ($args{'bugsto'}) {
- print ".SH \"REPORTING BUGS\"\n";
- print "Report bugs to <". $args{'bugsto'} . ">.\n";
-+ print ".br\n";
-+ print "General guidelines for reporting bugs: http://www.gnu.org/gethelp/\n";
-+ print ".br\n";
- if ($args{'pkgname'}) {
- print $args{'pkgname'} . " home page: " .
- "http://www.gnu.org/software/" . $args{'module'} . "/\n";
- }
-- print "General help using GNU software: http://www.gnu.org/gethelp/\n";
-+ print "\n";
- }
-
- if ($args{'copyright'}) {
-@@ -670,6 +737,10 @@ sub output_man {
- print ".B info " . $args{'seeinfo'} . "\n";
- print ".PP\n";
- print "should give you access to the complete manual.\n";
-+ print "As an alternative you may obtain the manual from:\n";
-+ print ".IP\n";
-+ print ".B http://www.gnu.org/software/" . $args{'module'} . "/manual/\n";
-+ print ".PP\n";
- }
- }
-
-@@ -705,6 +776,10 @@ sub output_function {
- eval "output_".$output_mode."(\@_);";
- }
-
-+sub output_enum {
-+ eval "output_enum_".$output_mode."(\@_);";
-+}
-+
-
- ##
- # takes a function prototype and spits out all the details
-@@ -744,7 +819,7 @@ sub dump_function {
- # print STDERR " :> @args\n";
- $type = join " ", @args;
-
-- if ($parameters{$param} eq "" && $param != "void") {
-+ if ((!defined($parameters{$param}) || $parameters{$param} eq "") && $param ne "void") {
- $parameters{$param} = "-- undescribed --";
- print STDERR "warning: $lineno: Function parameter '$param' not described in '$function_name'\n";
- }
-@@ -781,6 +856,56 @@ sub dump_function {
- }
- }
-
-+sub dump_enum {
-+ my $prototype = shift @_;
-+
-+ if (($prototype =~ m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([\-a-zA-Z0-9_~=,:\s\(\)\<]+)\s*\}\s*([a-zA-Z0-9_]+);.*/)) {
-+# || $prototype =~ m/^\s*enum\s+([a-zA-Z0-9_~:]+).*/) {
-+ $args = $1;
-+ $name = $2;
-+
-+ foreach $arg (split ',', $args) {
-+ # strip leading/trailing spaces
-+ $arg =~ s/^\s*//;
-+ $arg =~ s/\s*$//;
-+ $arg =~ s/([A-Za-z0-9_]+)\s*=.*/$1/g;
-+# print STDERR "SCAN ARG: '$arg'\n";
-+
-+ next if $arg eq '';
-+ if ((!defined($parameters{$arg}) || $parameters{$arg} eq "")) {
-+ $parameters{$arg} = "-- undescribed --";
-+ print STDERR "warning: $lineno: Enumeration parameter '$arg' not described in '$name'\n";
-+ }
-+
-+ push @parameterlist, $arg;
-+
-+# print STDERR "param = '$arg'\n";
-+ }
-+ } else {
-+# print STDERR "warning: $lineno: Cannot understand enumeration: '$prototype'\n";
-+ return;
-+ }
-+
-+ output_enum({'enum' => $name,
-+ 'module' => $modulename,
-+ 'sourceversion' => $sourceversion,
-+ 'include' => $include,
-+ 'includefuncprefix' => $includefuncprefix,
-+ 'bugsto' => $bugsto,
-+ 'pkgname' => $pkgname,
-+ 'copyright' => $copyright,
-+ 'verbatimcopying' => $verbatimcopying,
-+ 'seeinfo' => $seeinfo,
-+ 'functiontype' => $return_type,
-+ 'parameterlist' => \@parameterlist,
-+ 'parameters' => \%parameters,
-+ 'parametertypes' => \%parametertypes,
-+ 'sectionlist' => \@sectionlist,
-+ 'sections' => \%sections,
-+ 'purpose' => $function_purpose
-+ });
-+}
-+
- ######################################################################
- # main
- # states
-@@ -797,7 +922,7 @@ $doc_start = "^/\\*\\*\$";
- $doc_end = "\\*/";
- $doc_com = "\\s*\\*\\s*";
- $doc_func = $doc_com."(\\w+):?";
--$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w ]+):\\s*(.*)";
-+$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w]+):\\s*(.*)";
- $doc_content = $doc_com."(.*)";
-
- %constants = ();
-@@ -809,6 +934,7 @@ $doc_content = $doc_com."(.*)";
- $contents = "";
- $section_default = "Description"; # default section
- $section = $section_default;
-+$enum = 0;
-
- $lineno = 0;
- foreach $file (@ARGV) {
-@@ -816,18 +942,21 @@ foreach $file (@ARGV) {
- print STDERR "Error: Cannot open file $file\n";
- next;
- }
-- while (<IN>) {
-+ while ($line = <IN>) {
- $lineno++;
-
- if ($state == 0) {
-- if (/$doc_start/o) {
-+ if ($line =~ /$doc_start/o) {
- $state = 1; # next line is always the function name
-+# print STDERR "XXX: start of doc comment\n";
- }
- } elsif ($state == 1) { # this line is the function name (always)
-- if (/$doc_func/o) {
-+ if ($line =~ /$doc_func/o) {
- $function = $1;
- $state = 2;
-- if (/-\s*(.*)/) {
-+# print STDERR "XXX: start of doc comment, looking for prototype\n";
-+
-+ if ($line =~ /-\s*(.*)/) {
- $function_purpose = $1;
- } else {
- $function_purpose = "";
-@@ -841,11 +970,11 @@ foreach $file (@ARGV) {
- $state = 0;
- }
- } elsif ($state == 2) { # look for head: lines, and include content
-- if (/$doc_sect/o) {
-+ if ($line =~ /$doc_sect/o) {
- $newsection = $1;
- $newcontents = $2;
-
-- if ($contents ne "") {
-+ if ($contents ne '') {
- dump_section($section, $contents);
- $section = $section_default;
- }
-@@ -855,7 +984,7 @@ foreach $file (@ARGV) {
- $contents .= "\n";
- }
- $section = $newsection;
-- } elsif (/$doc_end/) {
-+ } elsif ($line =~ /$doc_end/) {
-
- if ($contents ne "") {
- dump_section($section, $contents);
-@@ -863,13 +992,12 @@ foreach $file (@ARGV) {
- $contents = "";
- }
-
--# print STDERR "end of doc comment, looking for prototype\n";
- $prototype = "";
- $state = 3;
-- } elsif (/$doc_content/) {
-+ } elsif ($line =~ /$doc_content/) {
- # miguel-style comment kludge, look for blank lines after
- # @parameter line to signify start of description
-- if ($1 eq "" && $section =~ m/^@/) {
-+ if ($1 eq '' && $section =~ m/^@/) {
- dump_section($section, $contents);
- $section = $section_default;
- $contents = "";
-@@ -881,13 +1009,16 @@ foreach $file (@ARGV) {
- print STDERR "warning: $lineno: Bad line: $_";
- }
- } elsif ($state == 3) { # scanning for function { (end of prototype)
-- if (m#\s*/\*\s+MACDOC\s*#io) {
-+ if ($line =~ m#\s*/\*\s+MACDOC\s*#io) {
- # do nothing
- }
-- elsif (/([^\{]*)/) {
-+ elsif ($enum == 1 && $line =~ /(^\s*\{).*/) {
-+ $prototype .= "{";
-+ }
-+ elsif ($line =~ /([^\{]*)/) {
- $prototype .= $1;
- }
-- if (/\{/) {
-+ if ($enum == 0 && $line =~ /\{/) {
- $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
- $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
- $prototype =~ s@^ +@@gos; # strip leading spaces
-@@ -901,9 +1032,32 @@ foreach $file (@ARGV) {
- %sections = ();
- @sectionlist = ();
- $prototype = "";
-+ $enum = 0;
-
- $state = 0;
- }
-+ elsif ($enum == 1 && $line =~ /\}/) {
-+ $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
-+ $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
-+ $prototype =~ s@^ +@@gos; # strip leading spaces
-+ dump_enum($prototype);
-+
-+ $function = "";
-+ %constants = ();
-+ %parameters = ();
-+ %parametertypes = ();
-+ @parameterlist = ();
-+ %sections = ();
-+ @sectionlist = ();
-+ $prototype = "";
-+ $enum = 0;
-+
-+ $state = 0;
-+ }
-+ elsif ($line =~ /([a-zA-Z\s]+)enum(.*)$/) {
-+ $enum = 1;
-+ }
-+
- }
- }
- }
diff --git a/patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch b/patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch
deleted file mode 100755
index c4efe34..0000000
--- a/patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-patch -p0 -l -f $* < $0
-exit $?
-
-2014-08-06 Andre Heinecke <aheinecke at intevation.de>
-
- * lib/gcrypt/init.c: Use GCRY_THREAD_OPTION_PTHREAD_IMPL macro
- instead of defining the gcry_thread_cbs structure itself.
-
---- lib/gcrypt/init.c.oirg 2014-08-06 11:52:26.858064946 +0000
-+++ lib/gcrypt/init.c 2014-08-06 12:10:31.121726144 +0000
-@@ -32,16 +32,9 @@
- /* Functions that refer to the initialization of the libgcrypt library.
- */
-
--static struct gcry_thread_cbs gct = {
-- .option = (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
-- .init = NULL,
-- .select = NULL,
-- .waitpid = NULL,
-- .accept = NULL,
-- .connect = NULL,
-- .sendmsg = NULL,
-- .recvmsg = NULL,
--};
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+
-+static struct gcry_thread_cbs gct;
-
- int
- gnutls_crypto_init (void)
-@@ -53,11 +46,12 @@
-
- if (gnutls_mutex_init != NULL)
- {
-+#if GCRYPT_VERSION_NUMBER < 0x010600
- gct.mutex_init = gnutls_mutex_init;
- gct.mutex_destroy = gnutls_mutex_deinit;
- gct.mutex_lock = gnutls_mutex_lock;
- gct.mutex_unlock = gnutls_mutex_unlock;
--
-+#endif
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gct);
- }
diff --git a/patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch b/patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch
deleted file mode 100755
index 5a6b520..0000000
--- a/patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-2014-08-04 Andre Heinecke <aheinecke at intevation.de>
-
- Apply gnulib commit 8672534
- * gl/msvc-inval.c: Use __cdecl instead of cdecl
- * lib/gl/msvc-inval.c: Wtf, they have it twice o.O
-
-
-diff -ru a/gl/msvc-inval.c b/gl/msvc-inval.c
---- a/gl/msvc-inval.c 2014-08-04 20:41:03.938286457 +0200
-+++ b/gl/msvc-inval.c 2014-08-04 20:41:40.138286520 +0200
-@@ -28,7 +28,7 @@
-
- # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-@@ -45,7 +45,7 @@
-
- # if defined _MSC_VER
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-@@ -94,7 +94,7 @@
- }
- }
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-diff -ru a/lib/gl/msvc-inval.c b/lib/gl/msvc-inval.c
---- a/lib/gl/msvc-inval.c 2014-08-04 20:41:03.938286457 +0200
-+++ b/lib/gl/msvc-inval.c 2014-08-04 20:41:40.138286520 +0200
-@@ -28,7 +28,7 @@
-
- # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-@@ -45,7 +45,7 @@
-
- # if defined _MSC_VER
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-@@ -94,7 +94,7 @@
- }
- }
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
diff --git a/patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch b/patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch
deleted file mode 100755
index 825ea74..0000000
--- a/patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-2014-08-04 Andre Heinecke <aheinecke at intevation.de>
-
- Apply gnulib commit 8672534
- * gl/msvc-inval.c: Use __cdecl instead of cdecl
-
-
-diff -ru libtasn1-2.14.orig/gl/msvc-inval.c libtasn1-2.14/gl/msvc-inval.c
---- libtasn1-2.14.orig/gl/msvc-inval.c 2014-08-04 20:41:03.938286457 +0200
-+++ libtasn1-2.14/gl/msvc-inval.c 2014-08-04 20:41:40.138286520 +0200
-@@ -28,7 +28,7 @@
-
- # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-@@ -45,7 +45,7 @@
-
- # if defined _MSC_VER
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
-@@ -94,7 +94,7 @@
- }
- }
-
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
- const wchar_t *function,
- const wchar_t *file,
diff --git a/src/Makefile.am b/src/Makefile.am
index 555bcca..a01e14b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,10 +31,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-freetype.nsi uninst-freetype.nsi \
inst-fontconfig.nsi uninst-fontconfig.nsi \
inst-cairo.nsi uninst-cairo.nsi \
- inst-libgsasl.nsi uninst-libgsasl.nsi \
- inst-libtasn1.nsi uninst-libtasn1.nsi \
- inst-gnutls.nsi uninst-gnutls.nsi \
- inst-curl.nsi uninst-curl.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
inst-gettext.nsi uninst-gettext.nsi \
inst-libffi.nsi uninst-libffi.nsi \
@@ -95,8 +91,8 @@ CLEANFILES = g4wihelp.dll versioninfo.txt $(README_files) $(HOWTO_files) \
# Supported source packages.
gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
libgpg-error gpgme gpgol gpgex libpng \
- gpa libgsasl libtasn1 opencdk gnutls curl \
- gnupg2 pinentry libassuan libksba libgcrypt \
+ gpa opencdk \
+ pinentry libassuan libksba libgcrypt \
adns dirmngr w32pth scute paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
@@ -277,26 +273,6 @@ gpg4win_pkg_gpgex_configure = --silent \
--with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
-# We want to build with libgcrypt
-# We can't use pkcs11 tue to tto much additional dependencies.
-gpg4win_pkg_gnutls_configure = \
- --disable-cxx \
- --with-libgcrypt \
- --without-p11-kit \
- --with-libtasn1-prefix=$(idir) \
- --with-libgcrypt-prefix=$(idir)
-
-# In 2.12.21 gnutls_openssl is not linked to libtasn1, thus we use
-# this hack to here. (Using the included minitasn does work either
-# due to a missing soruce file.)
-gpg4win_pkg_gnutls_make_args = \
- LTLIBTASN1=-ltasn1
-
-
-gpg4win_pkg_curl_configure = \
- --with-gnutls --without-ca-bundle --with-libiconv-prefix=$(idir) \
- CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
-
gpg4win_pkg_scute_configure = --silent \
--with-gpg-error-prefix=$(idir) --with-libassuan-prefix=$(idir)
@@ -419,20 +395,6 @@ define gpg4win_pkg_libpng_post_install
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
-define gpg4win_pkg_libgsasl_post_install
- (cd $$$${pkgidir}; \
- perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
-endef
-
-define gpg4win_pkg_libtasn1_post_install
- (cd $$$${pkgidir}; \
- perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
-endef
-
-define gpg4win_pkg_gnutls_post_install
- (cd $$$${pkgidir}; \
- perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
-endef
# We don't use khelpcenter in kleopatra so remove the help links and
# point to the correct common folder
diff --git a/src/config.nsi.in b/src/config.nsi.in
index e58e05b..4f2ea1c 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -104,22 +104,6 @@
!define gpg4win_pkg_gpa @gpg4win_pkg_gpa@
!define gpg4win_pkg_gpa_version @gpg4win_pkg_gpa_version@
- at HAVE_PKG_LIBGSASL@
-!define gpg4win_pkg_libgsasl @gpg4win_pkg_libgsasl@
-!define gpg4win_pkg_libgsasl_version @gpg4win_pkg_libgsasl_version@
-
- at HAVE_PKG_LIBTASN1@
-!define gpg4win_pkg_libtasn1 @gpg4win_pkg_libtasn1@
-!define gpg4win_pkg_libtasn1_version @gpg4win_pkg_libtasn1_version@
-
- at HAVE_PKG_GNUTLS@
-!define gpg4win_pkg_gnutls @gpg4win_pkg_gnutls@
-!define gpg4win_pkg_gnutls_version @gpg4win_pkg_gnutls_version@
-
- at HAVE_PKG_CURL@
-!define gpg4win_pkg_curl @gpg4win_pkg_curl@
-!define gpg4win_pkg_curl_version @gpg4win_pkg_curl_version@
-
@HAVE_PKG_ZLIB@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
!define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
diff --git a/src/inst-curl.nsi b/src/inst-curl.nsi
deleted file mode 100644
index 546c965..0000000
--- a/src/inst-curl.nsi
+++ /dev/null
@@ -1,38 +0,0 @@
-# inst-curl.nsi - Installer snippet for curl. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/curl-${gpg4win_pkg_curl_version}
-
-!ifdef DEBUG
-Section "curl" SEC_curl
-!else
-Section "-curl" SEC_curl
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_curl}
-!else
-
- File ${prefix}/bin/libcurl-4.dll
-
-!endif
-SectionEnd
diff --git a/src/inst-gnutls.nsi b/src/inst-gnutls.nsi
deleted file mode 100644
index e8acc41..0000000
--- a/src/inst-gnutls.nsi
+++ /dev/null
@@ -1,40 +0,0 @@
-# inst-gnutls.nsi - Installer snippet for gnutls. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gnutls-${gpg4win_pkg_gnutls_version}
-
-!ifdef DEBUG
-Section "gnutls" SEC_gnutls
-!else
-Section "-gnutls" SEC_gnutls
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_gnutls}
-!else
-
- File ${prefix}/bin/libgnutls-26.dll
- File ${prefix}/bin/libgnutls-extra-26.dll
- File ${prefix}/bin/libgnutls-openssl-27.dll
-
-!endif
-SectionEnd
diff --git a/src/inst-libgsasl.nsi b/src/inst-libgsasl.nsi
deleted file mode 100644
index 2c8d464..0000000
--- a/src/inst-libgsasl.nsi
+++ /dev/null
@@ -1,38 +0,0 @@
-# inst-libgsasl.nsi - Installer snippet for libgsasl. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libgsasl-${gpg4win_pkg_libgsasl_version}
-
-!ifdef DEBUG
-Section "libgsasl" SEC_libgsasl
-!else
-Section "-libgsasl" SEC_libgsasl
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_libgsasl}
-!else
-
- File ${prefix}/bin/libgsasl-7.dll
-
-!endif
-SectionEnd
diff --git a/src/inst-libtasn1.nsi b/src/inst-libtasn1.nsi
deleted file mode 100644
index 27f74e5..0000000
--- a/src/inst-libtasn1.nsi
+++ /dev/null
@@ -1,38 +0,0 @@
-# inst-libtasn1.nsi - Installer snippet for libtasn1. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libtasn1-${gpg4win_pkg_libtasn1_version}
-
-!ifdef DEBUG
-Section "libtasn1" SEC_libtasn1
-!else
-Section "-libtasn1" SEC_libtasn1
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_libtasn1}
-!else
-
- File ${prefix}/bin/libtasn1-3.dll
-
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index b43414b..e7979af 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -35,9 +35,6 @@
!ifdef HAVE_PKG_DBUS
!include "inst-dbus.nsi"
!endif
-!ifdef HAVE_PKG_LIBGSASL
-!include "inst-libgsasl.nsi"
-!endif
!ifdef HAVE_PKG_LIBICONV
!include "inst-libiconv.nsi"
!endif
@@ -110,12 +107,6 @@
!ifdef HAVE_PKG_GTK_
!include "inst-gtk+.nsi"
!endif
-!ifdef HAVE_PKG_GNUTLS
-!include "inst-gnutls.nsi"
-!endif
-!ifdef HAVE_PKG_CURL
-!include "inst-curl.nsi"
-!endif
!ifdef HAVE_PKG_PINENTRY
!include "inst-pinentry.nsi"
!endif
@@ -293,15 +284,9 @@
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "uninst-man_novice_en.nsi"
!endif
-!ifdef HAVE_PKG_LIBTASN1
-!include "uninst-libtasn1.nsi"
-!endif
!ifdef HAVE_PKG_LIBICONV
!include "uninst-libiconv.nsi"
!endif
-!ifdef HAVE_PKG_LIBGSASL
-!include "uninst-libgsasl.nsi"
-!endif
!ifdef HAVE_PKG_DBUS
!include "uninst-dbus.nsi"
!endif
@@ -672,25 +657,6 @@ Function CalcDepends
# Package "dbus" has no dependencies.
# Package "oxygen-icons" has no dependencies.
-!ifdef HAVE_PKG_CURL
- !insertmacro SectionFlagIsSet ${SEC_curl} ${SF_SELECTED} have_curl skip_curl
- have_curl:
- !insertmacro SelectSection ${SEC_zlib}
- !insertmacro SelectSection ${SEC_gnutls}
- skip_curl:
-!endif
-
-!ifdef HAVE_PKG_GNUTLS
- !insertmacro SectionFlagIsSet ${SEC_gnutls} ${SF_SELECTED} have_gnutls skip_gnutls
- have_gnutls:
- !insertmacro SelectSection ${SEC_libgsasl}
- !insertmacro SelectSection ${SEC_libtasn1}
- skip_gnutls:
-!endif
-
- # Package "libtasn1" has no dependencies.
- # Package "libgsasl" has no dependencies.
-
!ifdef HAVE_PKG_GPGME
!insertmacro SectionFlagIsSet ${SEC_gpgme} \
${SF_SELECTED} have_gpgme skip_gpgme
diff --git a/src/uninst-curl.nsi b/src/uninst-curl.nsi
deleted file mode 100644
index 1c6581c..0000000
--- a/src/uninst-curl.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# uninst-curl.nsi - Installer snippet for curl.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/curl-${gpg4win_pkg_curl_version}
-
-
-; Uninstaller section.
-Section "-un.curl"
-!ifdef SOURCES
- Push "${gpg4win_pkg_curl}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libcurl-4.dll"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-gnutls.nsi b/src/uninst-gnutls.nsi
deleted file mode 100644
index 6576cd6..0000000
--- a/src/uninst-gnutls.nsi
+++ /dev/null
@@ -1,40 +0,0 @@
-# uninst-gnutls.nsi - Installer snippet for gnutls.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gnutls-${gpg4win_pkg_gnutls_version}
-
-
-; Uninstaller section.
-Section "-un.gnutls"
-!ifdef SOURCES
- Push "${gpg4win_pkg_gnutls}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libgnutls-26.dll"
- Delete "$INSTDIR\libgnutls-extra-26.dll"
- Delete "$INSTDIR\libgnutls-openssl-26.dll"
- Delete "$INSTDIR\libgnutls-openssl-27.dll"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-libgsasl.nsi b/src/uninst-libgsasl.nsi
deleted file mode 100644
index 4d5bcad..0000000
--- a/src/uninst-libgsasl.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# uninst-libgsasl.nsi - Installer snippet for libgsasl.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libgsasl-${gpg4win_pkg_libgsasl_version}
-
-
-; Uninstaller section.
-Section "-un.libgsasl"
-!ifdef SOURCES
- Push "${gpg4win_pkg_libgsasl}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libgsasl-7.dll"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-libtasn1.nsi b/src/uninst-libtasn1.nsi
deleted file mode 100644
index 42eeb7f..0000000
--- a/src/uninst-libtasn1.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# uninst-libtasn1.nsi - Installer snippet for libtasn1.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libtasn1-${gpg4win_pkg_libtasn1_version}
-
-
-; Uninstaller section.
-Section "-un.libtasn1"
-!ifdef SOURCES
- Push "${gpg4win_pkg_libtasn1}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libtasn1-3.dll"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 22 +-
configure.ac | 10 -
packages/packages.current | 72 ---
patches/dirmngr-1.1.1/dirmngr-pth.patch | 21 -
...-Enable-wildcard-expansion-with-mingw-w64.patch | 34 --
...har_to_native-convert-to-console-codepage.patch | 67 ---
...x-gpgtar-8-bit-encoding-handling-on-Win32.patch | 187 ------
.../0006-gpgsm-Add-command-option-offline.patch | 340 -----------
...sm-Revert-to-use-SHA-1-for-CSR-generation.patch | 85 ---
patches/gnupg2/01-version.patch.in | 21 -
patches/gnutls-2.12.23/01-openssl-wincrypt.patch | 36 --
patches/gnutls-2.12.23/02-cve-2013-2116.patch | 28 -
patches/gnutls-2.12.23/03-cve-2014-1959.patch | 39 --
patches/gnutls-2.12.23/04-cve-2014-0092.patch | 105 ----
patches/gnutls-2.12.23/05-cve-2014-3466.patch | 29 -
patches/gnutls-2.12.23/06-cve-2015-0282.patch | 484 ----------------
patches/gnutls-2.12.23/07-cve-2015-0294.patch | 74 ---
.../gnutls-2.12.23/25_updatedgdocfrommaster.patch | 637 ---------------------
.../fix-gcrypt-private-api-usage.patch | 44 --
patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch | 71 ---
patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch | 40 --
.../scute-1.4.0/workaround-broken-libtool.patch | 40 --
src/Makefile.am | 96 +---
src/config.nsi.in | 40 --
src/inst-adns.nsi | 37 --
src/inst-bzip2.nsi | 39 --
src/inst-curl.nsi | 38 --
src/inst-dirmngr.nsi | 96 ----
src/inst-gnutls.nsi | 40 --
src/inst-libgcrypt.nsi | 53 --
src/inst-libgsasl.nsi | 38 --
src/inst-libksba.nsi | 46 --
src/inst-libtasn1.nsi | 38 --
src/inst-scute.nsi | 50 --
src/inst-sections.nsi | 127 ----
src/uninst-adns.nsi | 37 --
src/uninst-bzip2.nsi | 36 --
src/uninst-curl.nsi | 37 --
src/uninst-dirmngr.nsi | 64 ---
src/uninst-gnutls.nsi | 40 --
src/uninst-libgcrypt.nsi | 40 --
src/uninst-libgsasl.nsi | 37 --
src/uninst-libksba.nsi | 41 --
src/uninst-libtasn1.nsi | 37 --
src/uninst-scute.nsi | 36 --
45 files changed, 6 insertions(+), 3623 deletions(-)
delete mode 100755 patches/dirmngr-1.1.1/dirmngr-pth.patch
delete mode 100755 patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch
delete mode 100755 patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch
delete mode 100755 patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
delete mode 100755 patches/gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch
delete mode 100755 patches/gnupg2-2.0.28/0007-sm-Revert-to-use-SHA-1-for-CSR-generation.patch
delete mode 100755 patches/gnupg2/01-version.patch.in
delete mode 100755 patches/gnutls-2.12.23/01-openssl-wincrypt.patch
delete mode 100755 patches/gnutls-2.12.23/02-cve-2013-2116.patch
delete mode 100755 patches/gnutls-2.12.23/03-cve-2014-1959.patch
delete mode 100755 patches/gnutls-2.12.23/04-cve-2014-0092.patch
delete mode 100755 patches/gnutls-2.12.23/05-cve-2014-3466.patch
delete mode 100755 patches/gnutls-2.12.23/06-cve-2015-0282.patch
delete mode 100755 patches/gnutls-2.12.23/07-cve-2015-0294.patch
delete mode 100755 patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch
delete mode 100755 patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch
delete mode 100755 patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch
delete mode 100755 patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch
delete mode 100755 patches/scute-1.4.0/workaround-broken-libtool.patch
delete mode 100644 src/inst-adns.nsi
delete mode 100644 src/inst-bzip2.nsi
delete mode 100644 src/inst-curl.nsi
delete mode 100644 src/inst-dirmngr.nsi
delete mode 100644 src/inst-gnutls.nsi
delete mode 100644 src/inst-libgcrypt.nsi
delete mode 100644 src/inst-libgsasl.nsi
delete mode 100644 src/inst-libksba.nsi
delete mode 100644 src/inst-libtasn1.nsi
delete mode 100644 src/inst-scute.nsi
delete mode 100644 src/uninst-adns.nsi
delete mode 100644 src/uninst-bzip2.nsi
delete mode 100644 src/uninst-curl.nsi
delete mode 100644 src/uninst-dirmngr.nsi
delete mode 100644 src/uninst-gnutls.nsi
delete mode 100644 src/uninst-libgcrypt.nsi
delete mode 100644 src/uninst-libgsasl.nsi
delete mode 100644 src/uninst-libksba.nsi
delete mode 100644 src/uninst-libtasn1.nsi
delete mode 100644 src/uninst-scute.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list