[Gpg4win-commits] r791 - in trunk: . include packages patches/claws-mail-3.4.0 src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Apr 25 23:36:34 CEST 2008
Author: marcus
Date: 2008-04-25 23:36:33 +0200 (Fri, 25 Apr 2008)
New Revision: 791
Added:
trunk/patches/claws-mail-3.4.0/04-gnutls.patch
trunk/src/inst-gnutls.nsi
trunk/src/inst-libgsasl.nsi
trunk/src/inst-libtasn1.nsi
trunk/src/inst-opencdk.nsi
trunk/src/uninst-gnutls.nsi
trunk/src/uninst-libgsasl.nsi
trunk/src/uninst-libtasn1.nsi
trunk/src/uninst-opencdk.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2008-04-25 Marcus Brinkmann <marcus at 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.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/ChangeLog 2008-04-25 21:36:33 UTC (rev 791)
@@ -1,5 +1,19 @@
2008-04-25 Marcus Brinkmann <marcus at 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
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/configure.ac 2008-04-25 21:36:33 UTC (rev 791)
@@ -201,9 +201,13 @@
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])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/include/config.nsi.in 2008-04-25 21:36:33 UTC (rev 791)
@@ -113,6 +113,22 @@
!define gpg4win_pkg_gpgee_version @gpg4win_pkg_gpgee_version@
!define gpg4win_pkg_gpgee_src @gpg4win_pkg_gpgee_src@
+ 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_OPENCDK@
+!define gpg4win_pkg_opencdk @gpg4win_pkg_opencdk@
+!define gpg4win_pkg_opencdk_version @gpg4win_pkg_opencdk_version@
+
+ at 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@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/packages/packages.current 2008-04-25 21:36:33 UTC (rev 791)
@@ -66,6 +66,27 @@
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
#
Added: trunk/patches/claws-mail-3.4.0/04-gnutls.patch
===================================================================
--- trunk/patches/claws-mail-3.4.0/04-gnutls.patch 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/patches/claws-mail-3.4.0/04-gnutls.patch 2008-04-25 21:36:33 UTC (rev 791)
@@ -0,0 +1,49 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2008-04-25 Marcus Brinkmann <marcus at 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"
Property changes on: trunk/patches/claws-mail-3.4.0/04-gnutls.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/Makefile.am 2008-04-25 21:36:33 UTC (rev 791)
@@ -25,6 +25,10 @@
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 @@
# 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_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_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 \
Added: trunk/src/inst-gnutls.nsi
===================================================================
--- trunk/src/inst-gnutls.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/inst-gnutls.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Added: trunk/src/inst-libgsasl.nsi
===================================================================
--- trunk/src/inst-libgsasl.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/inst-libgsasl.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Added: trunk/src/inst-libtasn1.nsi
===================================================================
--- trunk/src/inst-libtasn1.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/inst-libtasn1.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Added: trunk/src/inst-opencdk.nsi
===================================================================
--- trunk/src/inst-opencdk.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/inst-opencdk.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/inst-sections.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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.
#
@@ -110,12 +110,24 @@
!ifdef HAVE_PKG_GPGEE
!include "inst-gpgee.nsi"
!endif
+!ifdef HAVE_PKG_LIBGSASL
+!include "inst-libgsasl.nsi"
+!endif
+!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_CLAWS_MAIL
-!include "inst-libetpan.nsi"
-!endif
#!ifdef HAVE_PKG_EUDORAGPG
#!include "inst-eudoragpg.nsi"
#!endif
@@ -181,11 +193,23 @@
#!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"
!endif
@@ -481,6 +505,18 @@
!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 @@
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,10 +644,29 @@
!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_} \
${SF_SELECTED} have_gtk_ skip_gtk_
@@ -702,6 +756,13 @@
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.
Added: trunk/src/uninst-gnutls.nsi
===================================================================
--- trunk/src/uninst-gnutls.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/uninst-gnutls.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Added: trunk/src/uninst-libgsasl.nsi
===================================================================
--- trunk/src/uninst-libgsasl.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/uninst-libgsasl.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Added: trunk/src/uninst-libtasn1.nsi
===================================================================
--- trunk/src/uninst-libtasn1.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/uninst-libtasn1.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
Added: trunk/src/uninst-opencdk.nsi
===================================================================
--- trunk/src/uninst-opencdk.nsi 2008-04-25 16:17:05 UTC (rev 790)
+++ trunk/src/uninst-opencdk.nsi 2008-04-25 21:36:33 UTC (rev 791)
@@ -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
More information about the Gpg4win-commits
mailing list