[Gpg4win-commits] r1090 - in branches/gpg4win-1-branch: . doc include packages patches patches/gnupg-1.4.9 patches/gnupg2 patches/gpgme patches/gpgme-1.1.8 patches/scute-1.2.0 po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 4 17:43:38 CET 2009
Author: werner
Date: 2009-02-04 17:43:36 +0100 (Wed, 04 Feb 2009)
New Revision: 1090
Added:
branches/gpg4win-1-branch/patches/gnupg-1.4.9/
branches/gpg4win-1-branch/patches/gnupg-1.4.9/01-auto-key-locate.patch
branches/gpg4win-1-branch/patches/gnupg2/
branches/gpg4win-1-branch/patches/gnupg2/01-version.patch.in
branches/gpg4win-1-branch/patches/gpgme-1.1.8/
branches/gpg4win-1-branch/patches/gpgme-1.1.8/01-spawn-prototype.patch
branches/gpg4win-1-branch/patches/gpgme/
branches/gpg4win-1-branch/patches/gpgme/01-gpg2.patch
branches/gpg4win-1-branch/patches/gpgme/02-kleo-bugs-workaround.patch
branches/gpg4win-1-branch/patches/scute-1.2.0/
branches/gpg4win-1-branch/patches/scute-1.2.0/01-bugfixes.patch
branches/gpg4win-1-branch/src/inst-adns.nsi
branches/gpg4win-1-branch/src/inst-paperkey.nsi
branches/gpg4win-1-branch/src/inst-scute.nsi
branches/gpg4win-1-branch/src/uninst-adns.nsi
branches/gpg4win-1-branch/src/uninst-paperkey.nsi
branches/gpg4win-1-branch/src/uninst-scute.nsi
Modified:
branches/gpg4win-1-branch/ChangeLog
branches/gpg4win-1-branch/Makefile.am
branches/gpg4win-1-branch/NEWS
branches/gpg4win-1-branch/README
branches/gpg4win-1-branch/autogen.sh
branches/gpg4win-1-branch/configure.ac
branches/gpg4win-1-branch/doc/pkg-copyright.txt
branches/gpg4win-1-branch/include/config.nsi.in
branches/gpg4win-1-branch/packages/packages.current
branches/gpg4win-1-branch/po/de.po
branches/gpg4win-1-branch/src/Makefile.am
branches/gpg4win-1-branch/src/inst-gpa.nsi
branches/gpg4win-1-branch/src/inst-gpgme.nsi
branches/gpg4win-1-branch/src/inst-sections.nsi
branches/gpg4win-1-branch/src/uninst-gnupg2.nsi
Log:
Updated gnupg versions and several libraries.
Add support for paperkey and scute.
Modified: branches/gpg4win-1-branch/ChangeLog
===================================================================
--- branches/gpg4win-1-branch/ChangeLog 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/ChangeLog 2009-02-04 16:43:36 UTC (rev 1090)
@@ -1,3 +1,22 @@
+2009-02-04 Werner Koch <wk at g10code.com>
+
+ * src/inst-gpa.nsi: Adjust for newer GPA.
+
+ * patches/gpgme-1.1.8/01-spawn-prototype.patch: New.
+
+ * patches/gnupg-1.4.9/01-auto-key-locate.patch: New
+
+ * patches/gnupg2/01-version.patch.in: New.
+ * configure.ac (AC_CONFIG_FILES): Patch the version of GnuPG.
+ (AC_CONFIG_COMMANDS): New.
+
+ * include/config.nsi.in: Support adns, paperkey and scute.
+ * src/inst-paperkey.nsi, src/uninst-paperkey.nsi: New.
+ * src/inst-scute.nsi, src/uninst-scute.nsi: New.
+ * src/inst-adns.nsi, src/uninst-adns.nsi: New.
+ * src/inst-sections.nsi: Add new packages.
+ * src/Makefile: Add new packages.
+
2007-09-17 Werner Koch <wk at g10code.com>
Released 0.9.92.
Modified: branches/gpg4win-1-branch/Makefile.am
===================================================================
--- branches/gpg4win-1-branch/Makefile.am 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/Makefile.am 2009-02-04 16:43:36 UTC (rev 1090)
@@ -48,7 +48,13 @@
patches/claws-mail-3.0.0-rc2/03-smime-plugin.patch \
patches/claws-mail-3.0.0-rc2/04-cvs116.patch \
patches/claws-mail-3.0.0-rc2/99-auto.patch \
- patches/gpgol-0.9.91/01-gpgme.patch
+ patches/gpgme-1.1.8/01-spawn-prototype.patch \
+ patches/gpgme/01-gpg2.patch \
+ patches/gpgme/02-kleo-bugs-workaround.patch \
+ patches/gnupg-1.4.9/01-auto-key-locate.patch \
+ patches/gnupg2/01-version.patch.in \
+ patches/gpgol-0.9.91/01-gpgme.patch \
+ patches/scute-1.2.0/01-bugfixes.patch
copy-news:
cp NEWS doc/website/NEWS.last
Modified: branches/gpg4win-1-branch/NEWS
===================================================================
--- branches/gpg4win-1-branch/NEWS 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/NEWS 2009-02-04 16:43:36 UTC (rev 1090)
@@ -3,6 +3,27 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 1.1.4
+------------------------------------------------
+
+(en) Update GnuPG to 1.4.9 to solve problems on Windows Vista.
+(de) GnuPG wurde auf 1.4.9 aktualisiert um Probleme unter Windws Vista zu lösen.
+
+~~~~~~~~~~~~~~~
+GnuPG: 1.4.9
+GnuPG2: 2.0.10
+DirMngr: 1.0.3-svn310
+GPA: 0.8.0
+GPGol: 0.9.92
+GPGee: 1.3.1
+WinPT: 1.2.0
+Claws-Mail: 3.0.0-rc2
+Novices: 1.0.0
+Einsteiger: 2.0.2
+Durchblicker: 2.0.2
+~~~~~~~~~~~~~~~
+
+
Noteworthy changes in version 1.1.3 (2007-09-17)
------------------------------------------------
Modified: branches/gpg4win-1-branch/README
===================================================================
--- branches/gpg4win-1-branch/README 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/README 2009-02-04 16:43:36 UTC (rev 1090)
@@ -99,7 +99,7 @@
The entire Gpg4win package is
- Copyright (C) 2005, 2006, 2007 g10 Code GmbH
+ Copyright (C) 2005, 2006, 2007, 2009 g10 Code GmbH
GPG4Win is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
Modified: branches/gpg4win-1-branch/autogen.sh
===================================================================
--- branches/gpg4win-1-branch/autogen.sh 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/autogen.sh 2009-02-04 16:43:36 UTC (rev 1090)
@@ -81,7 +81,7 @@
fi
fi
- ./configure --host=${host} --build=${build} \
+ ./configure --host=${host} --build=${build} --enable-maintainer-mode \
--disable-pkg-man_advanced_en "$@"
rc=$?
Modified: branches/gpg4win-1-branch/configure.ac
===================================================================
--- branches/gpg4win-1-branch/configure.ac 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/configure.ac 2009-02-04 16:43:36 UTC (rev 1090)
@@ -1,5 +1,5 @@
# configure.ac for GPG4Win
-# Copyright (C) 2005, 2006, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007, 2009 g10 Code GmbH
#
# This file is part of GPG4Win
#
@@ -26,7 +26,7 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.1.3])
+m4_define([my_version], [1.1.4rc1])
m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
@@ -185,6 +185,7 @@
GPG4WIN_BPKG_BINSRC([GPGee], [gnupg])
GPG4WIN_SPKG([bzip2])
+GPG4WIN_SPKG([adns])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libgcrypt], [libgpg-error])
GPG4WIN_SPKG([libksba], [libgpg-error])
@@ -195,11 +196,13 @@
GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
GPG4WIN_SPKG([gnupg], [libiconv bzip2])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
- w32pth zlib bzip2])
+ w32pth zlib bzip2 adns])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([pinentry])
GPG4WIN_SPKG([gpgol], [gpgme])
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([winpt], [gpgme gnupg])
GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
@@ -232,6 +235,9 @@
# Finalize.
+AC_CONFIG_COMMANDS([gpg4win-conf],[[
+chmod +x patches/gnupg2/01-version.patch
+]])
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(packages/Makefile include/Makefile src/Makefile po/Makefile.in)
@@ -240,4 +246,5 @@
AC_CONFIG_FILES(doc/logo/Makefile)
AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
AC_CONFIG_FILES(doc/website/Makefile)
+AC_CONFIG_FILES(patches/gnupg2/01-version.patch)
AC_OUTPUT
Modified: branches/gpg4win-1-branch/doc/pkg-copyright.txt
===================================================================
--- branches/gpg4win-1-branch/doc/pkg-copyright.txt 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/doc/pkg-copyright.txt 2009-02-04 16:43:36 UTC (rev 1090)
@@ -285,3 +285,51 @@
Julian Seward, Cambridge, UK.
jseward at bzip.org
bzip2/libbzip2 version 1.0.4 of 20 December 2006
+
+ADNS
+
+ adns is Copyright 2008 g10 Code GmbH, Copyright 1997-2000,2003,2006
+ Ian Jackson, Copyright 1999-2000,2003,2006 Tony Finch, and Copyright
+ (C) 1991 Massachusetts Institute of Technology.
+
+ adns 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.
+
+ This program and documentation 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 adns, or one should be available above; if not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA, or email adns-maint at chiark.greenend.org.uk.
+
+
+Paperkey
+
+ Copyright (C) 2007, 2008, 2009 David Shaw <dshaw at jabberwocky.com>
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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.
+
+ The included man page is
+
+ Copyright (C) 2007 Peter Palfrader <peter at palfrader.org>
+
+ Examples have been taken from David Shaw's README. The license is
+ the same as for Paperkey.
Modified: branches/gpg4win-1-branch/include/config.nsi.in
===================================================================
--- branches/gpg4win-1-branch/include/config.nsi.in 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/include/config.nsi.in 2009-02-04 16:43:36 UTC (rev 1090)
@@ -78,6 +78,10 @@
!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@
!define gpg4win_pkg_gnupg @gpg4win_pkg_gnupg@
!define gpg4win_pkg_gnupg_version @gpg4win_pkg_gnupg_version@
@@ -210,6 +214,14 @@
!define gpg4win_pkg_qt_dev @gpg4win_pkg_qt_dev@
!define gpg4win_pkg_qt_src @gpg4win_pkg_qt_src@
+ at HAVE_PKG_SCUTE@
+!define gpg4win_pkg_scute @gpg4win_pkg_scute@
+!define gpg4win_pkg_scute_version @gpg4win_pkg_scute_version@
+
+ at HAVE_PKG_PAPERKEY@
+!define gpg4win_pkg_paperkey @gpg4win_pkg_paperkey@
+!define gpg4win_pkg_paperkey_version @gpg4win_pkg_paperkey_version@
+
# Internal packages.
@HAVE_PKG_MAN_NOVICE_DE@
Modified: branches/gpg4win-1-branch/packages/packages.current
===================================================================
--- branches/gpg4win-1-branch/packages/packages.current 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/packages/packages.current 2009-02-04 16:43:36 UTC (rev 1090)
@@ -182,8 +182,6 @@
#
# GPGee
#
-# 2007-09-11: Replaced by gpgex.
-#
# Note that the -bin package has been repackaged from the
# -noinstaller package using these commands:
# mkdir gpgee-tmp
@@ -192,8 +190,9 @@
# unzip GPGee.zip
# rm GPGee/uninst.exe
# zip ../GPGee-1.2.3-bin.zip GPGee/*
-# server ftp://ftp.gnupg.org/gcrypt/gpgee
-#
+
+server ftp://ftp.gnupg.org/gcrypt/gpgee
+
file GPGee-1.3.1-noinstaller.zip
chk 6e44bbf61776e0a6c8714a514fa39489e94c0179
file GPGee-1.3.1-source.zip
@@ -207,22 +206,15 @@
file gpgol-0.9.92.tar.bz2
chk 98c14c731f8e69e26d243fb4e830c0afa9a66cb7
-#
-# GpgEX
-#
-#server ftp://ftp.g10code.com/g10code/scratch
-#
-#file gpgex-0.0.0-svn18.tar.bz2
-#chk 825320edd689cd221f189ec308531817663295fc
#
# Pth emulation
#
server ftp://ftp.g10code.com/g10code/w32pth
-file w32pth-2.0.1.tar.bz2
-chk e74a770a58f08ba02f311d16c5debe79c218ee5d
+file w32pth-2.0.2.tar.bz2
+chk 9f43acb64867fb54b456f8a1187307ceb7bdf183
#
# Stripped down version of BZIP2
@@ -238,59 +230,59 @@
#
server ftp://ftp.gnupg.org/gcrypt
-file gnupg/gnupg-1.4.7.tar.bz2
-chk 22149105845c79068771837c8deb7d5ba0854927
+file gnupg/gnupg-1.4.9.tar.bz2
+chk 826f4bef1effce61c3799c8f7d3cc8313b340b55
-name gnupg2-2.0.7.tar.bz2
-file gnupg/gnupg-2.0.7.tar.bz2
-chk f7d9ae7695bd9b849475b482bb7b027ec6fadbae
+name gnupg2-2.0.10.tar.bz2
+file gnupg/gnupg-2.0.10.tar.bz2
+chk d25e41a8cc607334b707d13af819ceaa217800b5
-file libgpg-error/libgpg-error-1.5.tar.bz2
-chk 1f83d9af8e8ed3bcbf3a5e9018db257dc6336655
+file libgpg-error/libgpg-error-1.7.tar.bz2
+chk bf8c6babe1e28cae7dd6374ca24ddcc42d57e902
-file libksba/libksba-1.0.2.tar.bz2
-chk 4d2c4a99c313b799590bf3fc223179c454e268b5
+file libksba/libksba-1.0.5.tar.bz2
+chk 2d5939d21f02142197158cd252b2725414a64b33
-file alpha/libassuan/libassuan-1.0.3-svn262.tar.bz2
-chk 8ff570cd6cc4961658664944e5d0088ca4db389b
+file libassuan/libassuan-1.0.5.tar.bz2
+chk f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
-file alpha/libgcrypt/libgcrypt-1.3.0.tar.bz2
-chk 38361925fef99715eccb8a1f73110ce2f3c3896a
+file libgcrypt/libgcrypt-1.4.4.tar.bz2
+chk 3987f0efcbb7048c136d5c859e88eee1763a14f6
-file pinentry/pinentry-0.7.3.tar.gz
-chk 557b886bc7a7030fd185fbc085703ef1ed304db8
+file pinentry/pinentry-0.7.5.tar.gz
+chk 6699a1ff94c649e8905199d480c6412cc43bad3d
-file alpha/gpgme/gpgme-1.1.6-svn1258.tar.bz2
-chk aa4299ec21c3cd5bb4614c45388e9c89ab64093a
+file gpgme/gpgme-1.1.8.tar.bz2
+chk e56da614f3e6acc1cb51af767c77f4a95b05b1e8
server ftp://ftp.g10code.com/g10code/scratch
-file dirmngr-1.0.2-svn267.tar.bz2
-chk 408e9ab1d4755b1fa2ac66ed503bbbe2d791c4e8
+file dirmngr-1.0.3-svn310.tar.bz2
+chk e3f6df819419f1bff8f707cff41220a556c0b272
#
-# GPA
+# GnuPG utilities
#
-server http://wald.intevation.org/frs/download.php
+server http://www.jabberwocky.com/software/paperkey
-file 350/gpa-0.7.6.tar.bz2
-chk bb9182cd4c6bd6677ba9cdcca262dcc1b1d22c3c
+file paperkey-1.0.tar.gz
+chk ddb5fa5612df365ae0ba324ba307d3aa2e549981
#
-# Qt
+# adns
#
-server http://www.kdab.net/~frank/qt-win
+server ftp://ftp.g10code.com/g10code/adns
-name qt-4.3.1-bin.zip
-file Qt-Win-Opensource-4.3.1.zip
-chk 36da6ba5a271bb66dd4e92a6b237ec8051edbf92
+file adns-1.4-g10-2.tar.bz2
+chk 6255a7958dc9e735c3f76595cd973abca09c1f93
-name qt-4.3.1-lib.zip
-file Qt-Win-Opensource-4.3.1-dev.zip
-chk c73998ac45b17ec4b7a52de6ef8f7f0e95d9818a
-server ftp://ftp.trolltech.com/pub/qt/source
-name qt-4.3.1-src.zip
-file qt-win-opensource-src-4.3.1.zip
-chk 7dcdaafe5ab451b1bc9af0e5db080e7b5d484732
+#
+# GPA
+#
+server http://wald.intevation.org/frs/download.php
+
+file 491/gpa-0.8.0.tar.bz2
+chk c519af3ccd3c7e518458e143b2001a8cc6d90467
+
Added: branches/gpg4win-1-branch/patches/gnupg-1.4.9/01-auto-key-locate.patch
===================================================================
--- branches/gpg4win-1-branch/patches/gnupg-1.4.9/01-auto-key-locate.patch 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/patches/gnupg-1.4.9/01-auto-key-locate.patch 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,24 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+ * getkey.c (parse_auto_key_locate): Ignore nodefault and local
+ methods.
+
+
+--- g10/getkey.c (.../tags/gnupg-1.4.9/g10/getkey.c) (revision 4925)
++++ g10/getkey.c (.../branches/STABLE-BRANCH-1-4/g10/getkey.c) (revision 4925)
+@@ -2962,6 +3008,12 @@
+ if(tok[0]=='\0')
+ continue;
+
++ /* For now we silently ignore the new methods introduced with
++ 2.0.10. */
++ if (!ascii_strcasecmp (tok,"nodefault")
++ || !ascii_strcasecmp (tok,"local"))
++ continue;
++
+ akl=xmalloc_clear(sizeof(*akl));
+
+ if(ascii_strcasecmp(tok,"ldap")==0)
+
Property changes on: branches/gpg4win-1-branch/patches/gnupg-1.4.9/01-auto-key-locate.patch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/gpg4win-1-branch/patches/gnupg2/01-version.patch.in
===================================================================
--- branches/gpg4win-1-branch/patches/gnupg2/01-version.patch.in 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/patches/gnupg2/01-version.patch.in 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,22 @@
+#! /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.
+
+
+
+--- jnlib/argparse.c
++++ jnlib/argparse.c
+@@ -868,7 +868,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)))
+
+
Property changes on: branches/gpg4win-1-branch/patches/gnupg2/01-version.patch.in
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/gpg4win-1-branch/patches/gpgme/01-gpg2.patch
===================================================================
--- branches/gpg4win-1-branch/patches/gpgme/01-gpg2.patch 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/patches/gpgme/01-gpg2.patch 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,21 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Change gpgme to use gpg2.exe by default.
+
+
+--- gpgme/w32-util.c
++++ gpgme/w32-util.c
+@@ -307,9 +307,9 @@
+ if (!gpg_program)
+ gpg_program = find_program_in_registry ("gpgProgram");
+ if (!gpg_program)
+- gpg_program = find_program_in_inst_dir ("gpg.exe");
++ gpg_program = find_program_in_inst_dir ("gpg2.exe");
+ if (!gpg_program)
+- gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg.exe");
++ gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg2.exe");
+ UNLOCK (get_path_lock);
+ return gpg_program;
+ }
Property changes on: branches/gpg4win-1-branch/patches/gpgme/01-gpg2.patch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/gpg4win-1-branch/patches/gpgme/02-kleo-bugs-workaround.patch
===================================================================
--- branches/gpg4win-1-branch/patches/gpgme/02-kleo-bugs-workaround.patch 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/patches/gpgme/02-kleo-bugs-workaround.patch 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,85 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Work around bugs in kleopatra 20080706.
+
+diff -rup gpgme/keylist.c gpgme/keylist.c
+--- gpgme/keylist.c 2008-01-28 19:06:04.000000000 +0100
++++ gpgme/keylist.c 2008-07-08 21:16:39.000000000 +0200
+@@ -918,6 +918,14 @@ gpgme_op_keylist_end (gpgme_ctx_t ctx)
+ if (!ctx)
+ return gpg_error (GPG_ERR_INV_VALUE);
+
++ /* Work around missing gpgme_release in kleopatra, which creates
++ dangling gpgsm processes. */
++ if (ctx->engine)
++ {
++ _gpgme_engine_release (ctx->engine);
++ ctx->engine = NULL;
++ }
++
+ return 0;
+ }
+
+diff -rup gpgme/w32-io.c gpgme/w32-io.c
+--- gpgme/w32-io.c 2008-06-26 15:03:27.000000000 +0200
++++ gpgme/w32-io.c 2008-07-08 18:20:12.000000000 +0200
+@@ -53,8 +53,8 @@
+ #define READBUF_SIZE 4096
+ #define WRITEBUF_SIZE 4096
+ #define PIPEBUF_SIZE 4096
+-#define MAX_READERS 20
+-#define MAX_WRITERS 20
++#define MAX_READERS 40
++#define MAX_WRITERS 40
+
+ static struct
+ {
+diff -rup gpgme/wait-global.c gpgme/wait-global.c
+--- gpgme/wait-global.c 2008-07-04 16:15:41.000000000 +0200
++++ gpgme/wait-global.c 2008-07-08 21:15:03.000000000 +0200
+@@ -386,5 +386,13 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error
+ }
+ while (hang);
+
++ /* Work around missing gpgme_release in kleopatra, which creates
++ dangling gpgsm processes. */
++ if (ctx && ctx->engine)
++ {
++ _gpgme_engine_release (ctx->engine);
++ ctx->engine = NULL;
++ }
++
+ return ctx;
+ }
+diff -rup gpgme/wait-private.c gpgme/wait-private.c
+--- gpgme/wait-private.c 2008-07-04 16:15:41.000000000 +0200
++++ gpgme/wait-private.c 2008-07-08 21:17:05.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include "ops.h"
+ #include "priv-io.h"
+ #include "util.h"
++#include "debug.h"
+
+
+ /* The private event loops are used for all blocking operations, and
+@@ -149,5 +150,17 @@ _gpgme_wait_on_condition (gpgme_ctx_t ct
+ gpgme_error_t
+ _gpgme_wait_one (gpgme_ctx_t ctx)
+ {
+- return _gpgme_wait_on_condition (ctx, NULL);
++ gpgme_error_t err;
++
++ err = _gpgme_wait_on_condition (ctx, NULL);
++
++ /* Work around missing gpgme_release in kleopatra, which creates
++ dangling gpgsm processes. */
++ if (ctx->engine)
++ {
++ _gpgme_engine_release (ctx->engine);
++ ctx->engine = NULL;
++ }
++
++ return err;
+ }
Property changes on: branches/gpg4win-1-branch/patches/gpgme/02-kleo-bugs-workaround.patch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/gpg4win-1-branch/patches/gpgme-1.1.8/01-spawn-prototype.patch
===================================================================
--- branches/gpg4win-1-branch/patches/gpgme-1.1.8/01-spawn-prototype.patch 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/patches/gpgme-1.1.8/01-spawn-prototype.patch 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,39 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+
+ * w32-glib-io.c (_gpgme_io_spawn): Make ARGV argument const to
+ match prototype.
+ * w32-qt-io.cpp (_gpgme_io_spawn): Ditto.
+
+
+
+Index: src/w32-qt-io.cpp
+===================================================================
+--- src/w32-qt-io.cpp (revision 1352)
++++ src/w32-qt-io.cpp (working copy)
+@@ -397,7 +397,7 @@
+
+
+ int
+-_gpgme_io_spawn (const char *path, char **argv,
++_gpgme_io_spawn (const char *path, char * const argv[],
+ struct spawn_fd_item_s *fd_list, pid_t *r_pid)
+ {
+ SECURITY_ATTRIBUTES sec_attr;
+Index: src/w32-glib-io.c
+===================================================================
+--- src/w32-glib-io.c (revision 1352)
++++ src/w32-glib-io.c (working copy)
+@@ -448,7 +448,7 @@
+
+
+ int
+-_gpgme_io_spawn (const char *path, char **argv,
++_gpgme_io_spawn (const char *path, char * const argv[],
+ struct spawn_fd_item_s *fd_list, pid_t *r_pid)
+ {
+ SECURITY_ATTRIBUTES sec_attr;
+
+
Property changes on: branches/gpg4win-1-branch/patches/gpgme-1.1.8/01-spawn-prototype.patch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/gpg4win-1-branch/patches/scute-1.2.0/01-bugfixes.patch
===================================================================
--- branches/gpg4win-1-branch/patches/scute-1.2.0/01-bugfixes.patch 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/patches/scute-1.2.0/01-bugfixes.patch 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,54 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+
+diff -rup src/Makefile.am src/Makefile.am
+--- src/Makefile.am 2008-09-02 16:08:09.000000000 +0200
++++ src/Makefile.am 2008-09-03 19:29:28.000000000 +0200
+@@ -146,7 +146,7 @@ clean-local:
+
+ scute_LDADD = @LTLIBOBJS@ $(srcdir)/scute.def -L. -lassuan -lgpg-error -lws2_32
+
+-#.rc.o:
+-# $(RC) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
++.rc.o:
++ $(RC) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+ endif
+diff -rup src/Makefile.in src/Makefile.in
+--- src/Makefile.in 2008-09-02 18:37:38.000000000 +0200
++++ src/Makefile.in 2008-09-03 19:29:46.000000000 +0200
+@@ -210,7 +210,7 @@ am__objects_2 = locking.$(OBJEXT) error-
+ p11-verifyrecoverinit.$(OBJEXT) p11-verifyupdate.$(OBJEXT) \
+ p11-waitforslotevent.$(OBJEXT) p11-wrapkey.$(OBJEXT)
+ @HAVE_W32_SYSTEM_TRUE at am_scute_OBJECTS = dllmain.$(OBJEXT) \
+- at HAVE_W32_SYSTEM_TRUE@ $(am__objects_2)
++ at HAVE_W32_SYSTEM_TRUE@ $(am__objects_2) versioninfo.$(OBJEXT)
+ scute_OBJECTS = $(am_scute_OBJECTS)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -1456,8 +1456,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+ @HAVE_W32_SYSTEM_TRUE at clean-local:
+ @HAVE_W32_SYSTEM_TRUE@ rm -f libgpg-error.a libassuan.a
+
+-#.rc.o:
+-# $(RC) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
++ at HAVE_W32_SYSTEM_TRUE@.rc.o:
++ at HAVE_W32_SYSTEM_TRUE@ $(RC) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -rup src/support.h src/support.h
+--- src/support.h 2008-08-08 17:50:53.000000000 +0200
++++ src/support.h 2008-09-03 19:29:28.000000000 +0200
+@@ -53,7 +53,8 @@ scute_copy_string (char *dest, char *src
+ }
+
+ #ifndef HAVE_STPCPY
+-#include "stpcpy.h"
++/* Copy SRC to DST, returning the address of the terminating '\0' in DST. */
++extern char *stpcpy (char *dst, const char *src);
+ #endif
+
+ /*-- Simple replacement functions. */
Property changes on: branches/gpg4win-1-branch/patches/scute-1.2.0/01-bugfixes.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/gpg4win-1-branch/po/de.po
===================================================================
--- branches/gpg4win-1-branch/po/de.po 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/po/de.po 2009-02-04 16:43:36 UTC (rev 1090)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2007-09-17 16:26+0200\n"
+"POT-Creation-Date: 2009-02-04 17:14+0100\n"
"PO-Revision-Date: 2007-09-13 00:05+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -292,7 +292,7 @@
"Verschlüsselung mittels S/MIME bereitzustellen. Bitte beachten Sie, daß "
"diese Option noch nicht vollständig unterstützt ist."
-#: src/inst-gpa.nsi:62
+#: src/inst-gpa.nsi:72
msgctxt "DESC_SEC_gpa"
msgid "GNU Privacy Assistant"
msgstr ""
@@ -300,7 +300,7 @@
"welches für mehrere Plattformen verfügbar ist. Es kann zusammen oder "
"anstatt von WinPT benutzt werden."
-#: src/inst-gpa.nsi:65
+#: src/inst-gpa.nsi:75
msgctxt "DESC_Menu_gpa"
msgid ""
"Run the GNU Privacy Assistant key management tool. This is an alternative to "
Modified: branches/gpg4win-1-branch/src/Makefile.am
===================================================================
--- branches/gpg4win-1-branch/src/Makefile.am 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/Makefile.am 2009-02-04 16:43:36 UTC (rev 1090)
@@ -38,6 +38,8 @@
inst-gpgme.nsi uninst-gpgme.nsi \
inst-gpgol.nsi uninst-gpgol.nsi \
inst-gpgex.nsi uninst-gpgex.nsi \
+ inst-scute.nsi uninst-scute.nsi \
+ inst-paperkey.nsi uninst-paperkey.nsi \
inst-gtk+.nsi uninst-gtk+.nsi \
inst-jpeg.nsi uninst-jpeg.nsi \
inst-libassuan.nsi uninst-libassuan.nsi \
@@ -45,6 +47,7 @@
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-man_advanced_de.nsi uninst-man_advanced_de.nsi \
inst-man_advanced_en.nsi uninst-man_advanced_en.nsi \
@@ -71,7 +74,7 @@
gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
gpa winpt sylpheed-claws \
claws-mail gnupg2 pinentry libassuan libksba \
- libgcrypt dirmngr w32pth
+ libgcrypt dirmngr w32pth adns scute paperkey
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -100,12 +103,22 @@
# The fields FAQ and faq.html conflict with those in GnuPG1.
-# For now removes them.
+# For now remove them.
define gpg4win_pkg_gnupg2_post_install
-( rm $$$${pkgidir}/share/gnupg/FAQ; \
- rm $$$${pkgidir}/share/gnupg/faq.html )
+( rm $$$${pkgidir}/share/gnupg/FAQ || true; \
+ rm $$$${pkgidir}/share/gnupg/faq.html || true)
endef
+# Paperkey comes with a man pages which we have to convert.
+define gpg4win_pkg_paperkey_post_install
+(for i in paperkey ; \
+ do man -Tlatin1 -l $$$${pkgidir}/share/man/man1/$$$${i}.1 | \
+ sed `printf "s/_\b//g;s/\b.//g"` | \
+ sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/$$$${i}.man ; \
+ done)
+endef
+
+
# 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.
@@ -140,7 +153,9 @@
--with-libgcrypt-prefix=$(idir) \
--with-libassuan-prefix=$(idir) \
--with-zlib=$(idir) \
+ --with-bzip2=$(idir) \
--with-pth-prefix=$(idir) \
+ --with-adns=$(idir) \
--without-included-gettext \
--disable-regex
@@ -197,6 +212,12 @@
--disable-spamassassin-plugin --disable-bogofilter-plugin \
--disable-valgrind
+gpg4win_pkg_scute_configure = --silent \
+ --with-gpg-error-prefix=$(idir) \
+ --with-libassuan-prefix=$(idir)
+
+gpg4win_pkg_paperkey_configure = --silent
+
# Supported make-only source packages.
gpg4win_mpkgs = pthreads-w32 bzip2
Added: branches/gpg4win-1-branch/src/inst-adns.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-adns.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/inst-adns.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,37 @@
+# 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
Modified: branches/gpg4win-1-branch/src/inst-gpa.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-gpa.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/inst-gpa.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -37,9 +37,19 @@
SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
File ${prefix}/share/locale/de/LC_MESSAGES/gpa.mo
+ SetOutPath "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ File ${prefix}/share/locale/ar/LC_MESSAGES/gpa.mo
+
+ SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
+ File ${prefix}/share/locale/es/LC_MESSAGES/gpa.mo
+
+ SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ File ${prefix}/share/locale/fr/LC_MESSAGES/gpa.mo
+
+ SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
+ File ${prefix}/share/locale/ru/LC_MESSAGES/gpa.mo
+
SetOutPath "$INSTDIR\share\gpa"
- File ${prefix}/share/gpa/gpa_tips.en
- File ${prefix}/share/gpa/gpa_tips.de
File ${prefix}/share/gpa/gpa_logo.ppm
File ${prefix}/share/gpa/gpa.png
Modified: branches/gpg4win-1-branch/src/inst-gpgme.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-gpgme.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/inst-gpgme.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -58,5 +58,7 @@
Rename /REBOOTOK libgpgme-qt-11.dll.tmp libgpgme-qt-11.dll
!endif
+ File "${prefix}/libexec/gpgme-w32spawn.exe"
+
!endif
SectionEnd
Added: branches/gpg4win-1-branch/src/inst-paperkey.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-paperkey.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/inst-paperkey.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,48 @@
+# inst-paperkey.nsi - Installer snippet for paperkey -*- coding: latin-1; -*-
+# Copyright (C) 2009 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}/paperkey-${gpg4win_pkg_paperkey_version}
+
+
+!ifdef DEBUG
+Section "Paperkey" SEC_paperkey
+!else
+Section "-Paperkey" SEC_paperkey
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_paperkey}"
+!else
+
+ File "${prefix}/bin/paperkey.exe"
+
+ # Instead of creating a new subdirectory we put the man page into
+ # the gnupg directory.
+ SetOutPath "$INSTDIR\share\gnupg"
+ File "${prefix}/share/man/man1/paperkey.man"
+
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_paperkey ${LANG_ENGLISH} \
+ "A tool to backup keys on paper"
Added: branches/gpg4win-1-branch/src/inst-scute.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-scute.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/inst-scute.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,50 @@
+# 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 "${prefix}/bin/scute.dll"
+
+ SetOverwrite lastused
+ ifErrors 0 +3
+ File /oname=scute.dll.tmp "${prefix}/bin/scute.dll"
+ Rename /REBOOTOK scute.dll.tmp scute.dll
+
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_scute ${LANG_ENGLISH} \
+ "PKCS #11 with GnuPG Agent"
Modified: branches/gpg4win-1-branch/src/inst-sections.nsi
===================================================================
--- branches/gpg4win-1-branch/src/inst-sections.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/inst-sections.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -23,6 +23,9 @@
!include "inst-gpg4win.nsi"
+!ifdef HAVE_PKG_ADNS
+!include "inst-adns.nsi"
+!endif
!ifdef HAVE_PKG_GNUPG
!include "inst-gnupg.nsi"
!endif
@@ -89,6 +92,12 @@
!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
!ifdef HAVE_PKG_PANGO
!include "inst-pango.nsi"
!endif
@@ -161,6 +170,12 @@
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!include "uninst-sylpheed-claws.nsi"
!endif
+!ifdef HAVE_PKG_PAPERKEY
+!include "uninst-paperkey.nsi"
+!endif
+!ifdef HAVE_PKG_SCUTE
+!include "uninst-scute.nsi"
+!endif
!ifdef HAVE_PKG_GPGEE
!include "uninst-gpgee.nsi"
!endif
@@ -250,6 +265,9 @@
!ifdef HAVE_PKG_GNUPG
!include "uninst-gnupg.nsi"
!endif
+!ifdef HAVE_PKG_ADNS
+!include "uninst-adns.nsi"
+!endif
!include "uninst-gpg4win.nsi"
@@ -312,6 +330,28 @@
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
+ !insertmacro SelectSection ${SEC_paperkey}
+ Goto calc_defaults_paperkey_done
+ calc_defaults_paperkey_not_one:
+ StrCmp $R0 "0" 0 calc_defaults_paperkey_done
+ !insertmacro UnselectSection ${SEC_paperkey}
+calc_defaults_paperkey_done:
+!endif
+
!ifdef HAVE_PKG_GPA
g4wihelp::config_fetch_bool "inst_gpa"
StrCmp $R0 "1" 0 calc_defaults_gpa_not_one
@@ -454,6 +494,9 @@
!ifdef HAVE_PKG_GTK_
!insertmacro UnselectSection ${SEC_gtk_}
!endif
+!ifdef HAVE_PKG_ADNS
+ !insertmacro UnselectSection ${SEC_adns}
+!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
!insertmacro UnselectSection ${SEC_libgpg_error}
!endif
@@ -491,6 +534,7 @@
!insertmacro SelectSection ${SEC_libgpg_error}
!insertmacro SelectSection ${SEC_w32pth}
!insertmacro SelectSection ${SEC_zlib}
+ !insertmacro SelectSection ${SEC_adns}
!insertmacro SelectSection ${SEC_pinentry}
!insertmacro SelectSection ${SEC_dirmngr}
skip_gnupg2:
@@ -608,6 +652,22 @@
skip_gpgol:
!endif
+!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} \
+ ${SF_SELECTED} have_paperkey skip_paperkey
+ have_paperkey:
+ # All dependencies are linked in statically.
+ skip_paperkey:
+!endif
+
!ifdef HAVE_PKG_GPGEX
!insertmacro SectionFlagIsSet ${SEC_gpgex} \
${SF_SELECTED} have_gpgex skip_gpgex
@@ -756,6 +816,12 @@
!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
!ifdef HAVE_PKG_GPA
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpa} $(DESC_SEC_gpa)
!endif
Added: branches/gpg4win-1-branch/src/uninst-adns.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-adns.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/uninst-adns.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,37 @@
+# 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
+
Modified: branches/gpg4win-1-branch/src/uninst-gnupg2.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-gnupg2.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/uninst-gnupg2.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -31,6 +31,14 @@
Push "${gpg4win_pkg_gnupg2}"
Call un.SourceDelete
!else
+ # Try to stop a running agent. This is only for the admin but in
+ # some cases that is actually useful.
+ ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_u_gpg_connect_agent
+ ifFileExists "$INSTDIR\libgpg-error-0.dll" 0 no_u_gpg_connect_agent
+ ifFileExists "$INSTDIR\libw32pth-0.dll" 0 no_u_gpg_connect_agent
+ ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
+ no_u_gpg_connect_agent:
+
Delete "$INSTDIR\gpg2.exe"
Delete "$INSTDIR\gpgsm.exe"
Delete "$INSTDIR\gpg-agent.exe"
Added: branches/gpg4win-1-branch/src/uninst-paperkey.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-paperkey.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/uninst-paperkey.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,35 @@
+# uninst-paperkey.nsi - Snippet for paperkey. -*- coding: latin-1; -*-
+# Copyright (C) 2009 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}/paperkey-${gpg4win_pkg_paperkey_version}
+
+; Uninstaller section.
+Section "-un.paperkey"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_paperkey}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\paperkey.exe"
+ Delete "$INSTDIR\share\gnupg\paperkey.man"
+ RMDir "$INSTDIR\share\gnupg"
+!endif
+SectionEnd
Added: branches/gpg4win-1-branch/src/uninst-scute.nsi
===================================================================
--- branches/gpg4win-1-branch/src/uninst-scute.nsi 2009-02-04 16:10:28 UTC (rev 1089)
+++ branches/gpg4win-1-branch/src/uninst-scute.nsi 2009-02-04 16:43:36 UTC (rev 1090)
@@ -0,0 +1,36 @@
+# 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
More information about the Gpg4win-commits
mailing list