2008-04-25 Marcus Brinkmann <marcus@ulysses.g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 25 Apr 2008 21:36:33 +0000 (21:36 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 25 Apr 2008 21:36:33 +0000 (21:36 +0000)
* packages/packages.current: Add libgsasl, libtasn1, opencdk,
gnutls.
* configure.ac: Add support for libgsasl, libtasn1, opencdk and
gnutls source packages.
* include/config.nsi.in: Likewise.
* inst-libgsasl.nsi, uninst-libgsasl.nsi, inst-libtasn1.nsi,
uninst-libtasn1.nsi, inst-opencdk.nsi, uninst-opencdk.nsi,
inst-gnutls.nsi, uninst-gnutls.nsi: New files.
* src/Makefile.am (EXTRA_DIST): Add these files.
(gpg4win_spkgs): Add libgsasl, libtasn1, opencdk, gnutls.
(gpg4win_pkg_gnutls_configure): New variable.
(gpg4win_pkg_claws_configure): Enable pthread and gnutls.
* patches/claws-mail-3.4.0/04-gnutls.patch: New file.

15 files changed:
ChangeLog
configure.ac
include/config.nsi.in
packages/packages.current
patches/claws-mail-3.4.0/04-gnutls.patch [new file with mode: 0755]
src/Makefile.am
src/inst-gnutls.nsi [new file with mode: 0644]
src/inst-libgsasl.nsi [new file with mode: 0644]
src/inst-libtasn1.nsi [new file with mode: 0644]
src/inst-opencdk.nsi [new file with mode: 0644]
src/inst-sections.nsi
src/uninst-gnutls.nsi [new file with mode: 0644]
src/uninst-libgsasl.nsi [new file with mode: 0644]
src/uninst-libtasn1.nsi [new file with mode: 0644]
src/uninst-opencdk.nsi [new file with mode: 0644]

index 392cab1..4ecd336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2008-04-25  Marcus Brinkmann  <marcus@ulysses.g10code.com>
 
+       * packages/packages.current: Add libgsasl, libtasn1, opencdk,
+       gnutls.
+       * configure.ac: Add support for libgsasl, libtasn1, opencdk and
+       gnutls source packages.
+       * include/config.nsi.in: Likewise.
+       * inst-libgsasl.nsi, uninst-libgsasl.nsi, inst-libtasn1.nsi,
+       uninst-libtasn1.nsi, inst-opencdk.nsi, uninst-opencdk.nsi,
+       inst-gnutls.nsi, uninst-gnutls.nsi: New files.
+       * src/Makefile.am (EXTRA_DIST): Add these files.
+       (gpg4win_spkgs): Add libgsasl, libtasn1, opencdk, gnutls.
+       (gpg4win_pkg_gnutls_configure): New variable.
+       (gpg4win_pkg_claws_configure): Enable pthread and gnutls.
+       * patches/claws-mail-3.4.0/04-gnutls.patch: New file.
+
        * packages/packages.current: Update libetpan and claws-mail.
        * src/inst-libetpan.nsi: Update to latest version.
        * src/Makefile.am (gpg4win_pkg_claws_mail_configure): Add
index a6a23d3..18510ea 100644 (file)
@@ -201,9 +201,13 @@ GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
 GPG4WIN_SPKG([winpt], [gpgme gnupg])
+GPG4WIN_SPKG([libgsasl])
+GPG4WIN_SPKG([libtasn1])
+GPG4WIN_SPKG([opencdk], [libgpg-error libgcrypt])
+GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 opencdk])
 GPG4WIN_SPKG([libetpan], [pthreads-w32])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
-                            gpgme pthreads-w32 crypt regex libetpan])
+                            gpgme pthreads-w32 crypt regex libetpan gnutls])
 # The Eudora license (the one for the EMS API) is still not acceptable.
 #GPG4WIN_SPKG([eudoragpg])
 GPG4WIN_IPKG([man_novice_de])
index f731bca..568ac9e 100644 (file)
 !define gpg4win_pkg_gpgee_version @gpg4win_pkg_gpgee_version@
 !define gpg4win_pkg_gpgee_src @gpg4win_pkg_gpgee_src@
 
+@HAVE_PKG_LIBGSASL@
+!define gpg4win_pkg_libgsasl @gpg4win_pkg_libgsasl@
+!define gpg4win_pkg_libgsasl_version @gpg4win_pkg_libgsasl_version@
+
+@HAVE_PKG_LIBTASN1@
+!define gpg4win_pkg_libtasn1 @gpg4win_pkg_libtasn1@
+!define gpg4win_pkg_libtasn1_version @gpg4win_pkg_libtasn1_version@
+
+@HAVE_PKG_OPENCDK@
+!define gpg4win_pkg_opencdk @gpg4win_pkg_opencdk@
+!define gpg4win_pkg_opencdk_version @gpg4win_pkg_opencdk_version@
+
+@HAVE_PKG_GNUTLS@
+!define gpg4win_pkg_gnutls @gpg4win_pkg_gnutls@
+!define gpg4win_pkg_gnutls_version @gpg4win_pkg_gnutls_version@
+
 @HAVE_PKG_LIBETPAN@
 !define gpg4win_pkg_libetpan @gpg4win_pkg_libetpan@
 !define gpg4win_pkg_libetpan_version @gpg4win_pkg_libetpan_version@
index 1878ec1..185738e 100644 (file)
@@ -66,6 +66,27 @@ file regex-0.12-src.zip
 chk  b9faae10efae552f23c213891a3ed8187cb7d017
 
 #
+# GNU TLS and support libraries
+#
+
+server http://josefsson.org/gsasl/releases
+
+file libgsasl-0.2.25.tar.gz
+chk  aa38392b835adb7a4102970f9c262a83e2f75f3d
+
+server http://josefsson.org/gnutls/releases
+
+file libtasn1/libtasn1-1.4.tar.gz
+chk  684c9dc343b0155a074c2127ac8050f983528bc8
+
+file opencdk/opencdk-0.6.6.tar.bz2
+chk  ad333a55632eca9b7d035d3cc5c7f0b0342cb14e
+
+file gnutls-2.3.7.tar.bz2
+chk  ee059b846b6a4a969afaa104b677b42d2270be2f
+
+
+#
 # libetpan for claws
 #
 
diff --git a/patches/claws-mail-3.4.0/04-gnutls.patch b/patches/claws-mail-3.4.0/04-gnutls.patch
new file mode 100755 (executable)
index 0000000..4e209eb
--- /dev/null
@@ -0,0 +1,49 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2008-04-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * Fix a couple of bugs in W32 GNUTLS support.
+
+diff -rup claws-mail-3.4.0-orig/src/addrindex.h claws-mail-3.4.0/src/addrindex.h
+--- claws-mail-3.4.0-orig/src/addrindex.h      2008-04-18 12:47:07.000000000 +0200
++++ claws-mail-3.4.0/src/addrindex.h   2008-04-25 21:43:36.000000000 +0200
+@@ -91,6 +91,11 @@ struct _AddressInterface {
+       void (*stopSearch)( void * );
+ };
++#ifdef G_OS_WIN32
++/* W32 headers define INTERFACE to "struct".  */
++#undef interface
++#endif
++
+ typedef struct _AddressDataSource AddressDataSource;
+ struct _AddressDataSource {
+       AddrItemObject obj;
+diff -rup claws-mail-3.4.0-orig/src/common/ssl_certificate.c claws-mail-3.4.0/src/common/ssl_certificate.c
+--- claws-mail-3.4.0-orig/src/common/ssl_certificate.c 2008-04-18 12:47:08.000000000 +0200
++++ claws-mail-3.4.0/src/common/ssl_certificate.c      2008-04-25 21:34:25.000000000 +0200
+@@ -33,16 +33,16 @@
+ #include <string.h>
+ #endif
+ #include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
+ #include <stdio.h>
+-#include <netdb.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+-
+ #ifdef G_OS_WIN32
+-#include "winsock2.h"
+-#endif
++#  include <winsock2.h>
++#else
++#  include <sys/socket.h>
++#  include <netinet/in.h>
++#  include <netdb.h>
++#endif /* G_OS_WIN32 */
+ #include "ssl_certificate.h"
+ #include "utils.h"
+ #include "log.h"
index 1eb0cd6..0359bdc 100644 (file)
@@ -25,6 +25,10 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         inst-gpg4win.nsi          uninst-gpg4win.nsi         \
         inst-atk.nsi               uninst-atk.nsi            \
         inst-cairo.nsi            uninst-cairo.nsi           \
+        inst-libgsasl.nsi         uninst-libgsasl.nsi        \
+        inst-libtasn1.nsi         uninst-libtasn1.nsi        \
+        inst-opencdk.nsi          uninst-opencdk.nsi         \
+        inst-gnutls.nsi                   uninst-gnutls.nsi          \
         inst-libetpan.nsi         uninst-libetpan.nsi        \
         inst-claws-mail.nsi       uninst-claws-mail.nsi      \
         inst-crypt.nsi            uninst-crypt.nsi           \
@@ -73,7 +77,8 @@ CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
 
 # Supported source packages.
 gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
-               gpa winpt libetpan claws-mail gnupg2 pinentry \
+               gpa winpt libgsasl libtasn1 opencdk gnutls \
+                libetpan claws-mail gnupg2 pinentry \
                libassuan libksba libgcrypt dirmngr w32pth
 
 # Extra options to configure for individual packages.
@@ -192,6 +197,9 @@ gpg4win_pkg_gpgex_configure = --silent \
 gpg4win_pkg_winpt_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
+gpg4win_pkg_gnutls_configure = \
+  --disable-cxx
+
 # The CFLAGS are needed to find pthread-w32.
 gpg4win_pkg_libetpan_configure = \
   CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
@@ -199,7 +207,7 @@ gpg4win_pkg_libetpan_configure = \
 gpg4win_pkg_claws_mail_configure = \
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
   --with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
-  --with-config-dir="Claws-mail" --disable-pthread \
+  --with-config-dir="Claws-mail" --enable-pthread --enable-gnutls \
   --enable-libetpan --disable-aspell --disable-trayicon-plugin \
   --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
   --disable-jpilot --disable-startup-notification --disable-ipv6 \
diff --git a/src/inst-gnutls.nsi b/src/inst-gnutls.nsi
new file mode 100644 (file)
index 0000000..5793b60
--- /dev/null
@@ -0,0 +1,40 @@
+# 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-26.dll
+
+!endif
+SectionEnd
diff --git a/src/inst-libgsasl.nsi b/src/inst-libgsasl.nsi
new file mode 100644 (file)
index 0000000..2c8d464
--- /dev/null
@@ -0,0 +1,38 @@
+# 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
new file mode 100644 (file)
index 0000000..27f74e5
--- /dev/null
@@ -0,0 +1,38 @@
+# 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-opencdk.nsi b/src/inst-opencdk.nsi
new file mode 100644 (file)
index 0000000..cb46f2f
--- /dev/null
@@ -0,0 +1,38 @@
+# inst-opencdk.nsi - Installer snippet for opencdk.        -*- 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}/opencdk-${gpg4win_pkg_opencdk_version}
+
+!ifdef DEBUG
+Section "opencdk" SEC_opencdk
+!else
+Section "-opencdk" SEC_opencdk
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File ${gpg4win_pkg_opencdk}
+!else
+
+  File ${prefix}/bin/libopencdk-10.dll
+
+!endif
+SectionEnd
index c3669ad..6ae8524 100644 (file)
@@ -1,5 +1,5 @@
 # inst-sections.nsi - Installer for GPG4Win sections.  -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2006, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
 !ifdef HAVE_PKG_GPGEE
 !include "inst-gpgee.nsi"
 !endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!include "inst-claws-mail.nsi"
+!ifdef HAVE_PKG_LIBGSASL
+!include "inst-libgsasl.nsi"
 !endif
-!ifdef HAVE_PKG_CLAWS_MAIL
+!ifdef HAVE_PKG_LIBTASN1
+!include "inst-libtasn1.nsi"
+!endif
+!ifdef HAVE_PKG_OPENCDK
+!include "inst-opencdk.nsi"
+!endif
+!ifdef HAVE_PKG_GNUTLS
+!include "inst-gnutls.nsi"
+!endif
+!ifdef HAVE_PKG_LIBETPAN
 !include "inst-libetpan.nsi"
 !endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+!include "inst-claws-mail.nsi"
+!endif
 #!ifdef HAVE_PKG_EUDORAGPG
 #!include "inst-eudoragpg.nsi"
 #!endif
 #!include "uninst-eudoragpg.nsi"
 #!endif
 !ifdef HAVE_PKG_CLAWS_MAIL
+!include "uninst-claws-mail.nsi"
+!endif
+!ifdef HAVE_PKG_LIBETPAN
 !include "uninst-libetpan.nsi"
 !endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!include "uninst-claws-mail.nsi"
+!ifdef HAVE_PKG_GNUTLS
+!include "uninst-gnutls.nsi"
+!endif
+!ifdef HAVE_PKG_OPENCDK
+!include "uninst-opencdk.nsi"
+!endif
+!ifdef HAVE_PKG_LIBTASN1
+!include "uninst-libtasn1.nsi"
+!endif
+!ifdef HAVE_PKG_LIBGSASL
+!include "uninst-libgsasl.nsi"
 !endif
 !ifdef HAVE_PKG_GPGEE
 !include "uninst-gpgee.nsi"
@@ -481,6 +505,18 @@ Function CalcDepends
 !ifdef HAVE_PKG_GTK_
   !insertmacro UnselectSection ${SEC_gtk_}
 !endif
+!ifdef HAVE_PKG_LIBGSASL
+  !insertmacro UnselectSection ${SEC_libgsasl}
+!endif
+!ifdef HAVE_PKG_LIBTASN1
+  !insertmacro UnselectSection ${SEC_libtasn1}
+!endif
+!ifdef HAVE_PKG_OPENCDK
+  !insertmacro UnselectSection ${SEC_opencdk}
+!endif
+!ifdef HAVE_PKG_GNUTLS
+  !insertmacro UnselectSection ${SEC_gnutls}
+!endif
 !ifdef HAVE_PKG_LIBGPG_ERROR
   !insertmacro UnselectSection ${SEC_libgpg_error}
 !endif
@@ -595,7 +631,6 @@ Function CalcDepends
   skip_gpa:
 !endif
 
-
 !ifdef HAVE_PKG_CLAWS_MAIL
   !insertmacro SectionFlagIsSet ${SEC_claws_mail} ${SF_SELECTED} have_claws_mail skip_claws_mail
   have_claws_mail:
@@ -609,9 +644,28 @@ Function CalcDepends
   !insertmacro SelectSection ${SEC_crypt}
   !insertmacro SelectSection ${SEC_regex}
   !insertmacro SelectSection ${SEC_libetpan}
+  !insertmacro SelectSection ${SEC_gnutls}
   skip_claws_mail:
 !endif
 
+!ifdef HAVE_PKG_GNUTLS
+  !insertmacro SectionFlagIsSet ${SEC_gnutls} ${SF_SELECTED} have_gnutls skip_gnutls
+  have_gnutls:
+  !insertmacro SelectSection ${SEC_zlib}
+  !insertmacro SelectSection ${SEC_libgcrypt}
+  !insertmacro SelectSection ${SEC_libgsasl}
+  !insertmacro SelectSection ${SEC_libtasn1}
+  !insertmacro SelectSection ${SEC_opencdk}
+  skip_gnutls:
+!endif
+
+!ifdef HAVE_PKG_OPENCDK
+  !insertmacro SectionFlagIsSet ${SEC_opencdk} ${SF_SELECTED} have_opencdk skip_opencdk
+  have_opencdk:
+  !insertmacro SelectSection ${SEC_libgcrypt}
+  !insertmacro SelectSection ${SEC_libgpg_error}
+  skip_opencdk:
+!endif
 
 !ifdef HAVE_PKG_GTK_
   !insertmacro SectionFlagIsSet ${SEC_gtk_} \
@@ -702,6 +756,13 @@ Function CalcDepends
    skip_gpgme:
 !endif
 
+!ifdef HAVE_PKG_LIBGCRYPT
+  !insertmacro SectionFlagIsSet ${SEC_libgcrypt} ${SF_SELECTED} have_libgcrypt skip_libgcrypt
+  have_libgcrypt:
+  !insertmacro SelectSection ${SEC_libgpg_error}
+  skip_libgcrypt:
+!endif
+
   # Package "zlib" has no dependencies.
   # Package "pkgconfig" has no dependencies.
   # Package "libgpg-error" has no dependencies.
diff --git a/src/uninst-gnutls.nsi b/src/uninst-gnutls.nsi
new file mode 100644 (file)
index 0000000..978d187
--- /dev/null
@@ -0,0 +1,39 @@
+# 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"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd
diff --git a/src/uninst-libgsasl.nsi b/src/uninst-libgsasl.nsi
new file mode 100644 (file)
index 0000000..4d5bcad
--- /dev/null
@@ -0,0 +1,37 @@
+# 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
new file mode 100644 (file)
index 0000000..42eeb7f
--- /dev/null
@@ -0,0 +1,37 @@
+# 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
diff --git a/src/uninst-opencdk.nsi b/src/uninst-opencdk.nsi
new file mode 100644 (file)
index 0000000..2fe9441
--- /dev/null
@@ -0,0 +1,37 @@
+# uninst-opencdk.nsi - Installer snippet for opencdk.-*- 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}/opencdk-${gpg4win_pkg_opencdk_version}
+
+
+; Uninstaller section.
+Section "-un.opencdk"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_opencdk}"
+  Call un.SourceDelete
+!else
+
+  Delete "$INSTDIR\libopencdk-10.dll"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd