2008-10-23 Marcus Brinkmann <marcus@g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 23 Oct 2008 09:05:05 +0000 (09:05 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 23 Oct 2008 09:05:05 +0000 (09:05 +0000)
* packages/packages.current: Update libtasn1, libgsasl, gnutls.
Remove opencdk, which is now included in gnutls.
* include/config.nsi.in: Remove opencdk support.
* src/inst-sections.nsi: Likewise.
* src/Makefile.in (gpg4win_spkgs, EXTRA_DIST): Remove opencdk.
* src/inst-opencdk.nsi, src/uninst-opencdk.nsi: Removed.

ChangeLog
configure.ac
include/config.nsi.in
packages/packages.current
src/inst-opencdk.nsi [deleted file]
src/inst-sections.nsi
src/uninst-opencdk.nsi [deleted file]

index 62ec37f..f685e5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-23  Marcus Brinkmann  <marcus@g10code.com>
+
+       * packages/packages.current: Update libtasn1, libgsasl, gnutls.
+       Remove opencdk, which is now included in gnutls.
+       * include/config.nsi.in: Remove opencdk support.
+       * src/inst-sections.nsi: Likewise.
+       * src/Makefile.in (gpg4win_spkgs, EXTRA_DIST): Remove opencdk.
+       * src/inst-opencdk.nsi, src/uninst-opencdk.nsi: Removed.
+
 2008-10-22  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
 
        * configure.ac: Change COMPENDIUM_DATE_DE for 
index 5a6ab46..e532ab6 100644 (file)
@@ -207,8 +207,7 @@ GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
 GPG4WIN_SPKG([winpt], [gpgme gnupg2])
 GPG4WIN_SPKG([libgsasl])
 GPG4WIN_SPKG([libtasn1])
-GPG4WIN_SPKG([opencdk], [libgpg-error libgcrypt])
-GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 opencdk])
+GPG4WIN_SPKG([gnutls], [libgsasl libtasn1])
 GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
 GPG4WIN_SPKG([libxml2], [zlib])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
index d6155a0..e7b0c06 100644 (file)
 !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@
index 8214a18..3d2e17c 100644 (file)
@@ -69,21 +69,18 @@ chk  b9faae10efae552f23c213891a3ed8187cb7d017
 # GNU TLS and support libraries
 #
 
-server http://josefsson.org/gsasl/releases
+server ftp://alpha.gnu.org/gnu/gsasl
 
-file libgsasl-0.2.25.tar.gz
-chk  aa38392b835adb7a4102970f9c262a83e2f75f3d
+file libgsasl-0.2.29.tar.gz
+chk  188c9a18db481f968cadb7c77a5a24f4cbf3d03d
 
-server http://josefsson.org/gnutls/releases
+server ftp://ftp.gnu.org/pub/gnu/gnutls
 
-file libtasn1/libtasn1-1.4.tar.gz
-chk  684c9dc343b0155a074c2127ac8050f983528bc8
+file libtasn1-1.5.tar.gz
+chk  b60dafd5c25af38f434175faf5efa82767653d05
 
-file opencdk/opencdk-0.6.6.tar.bz2
-chk  ad333a55632eca9b7d035d3cc5c7f0b0342cb14e
-
-file gnutls-2.3.7.tar.bz2
-chk  ee059b846b6a4a969afaa104b677b42d2270be2f
+file gnutls-2.6.0.tar.bz2
+chk  bbd9e5f3a77bfcbef5a769c67d1576e7a6e4bda5
 
 
 #
diff --git a/src/inst-opencdk.nsi b/src/inst-opencdk.nsi
deleted file mode 100644 (file)
index cb46f2f..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 3f4c9aa..179af43 100644 (file)
 !ifdef HAVE_PKG_ATK
 !include "inst-atk.nsi"
 !endif
-!ifdef HAVE_PKG_OPENCDK
-!include "inst-opencdk.nsi"
-!endif
 !ifdef HAVE_PKG_DIRMNGR
 !include "inst-dirmngr.nsi"
 !endif
 !ifdef HAVE_PKG_DIRMNGR
 !include "uninst-dirmngr.nsi"
 !endif
-!ifdef HAVE_PKG_OPENCDK
-!include "uninst-opencdk.nsi"
-!endif
 !ifdef HAVE_PKG_ATK
 !include "uninst-atk.nsi"
 !endif
@@ -629,9 +623,6 @@ Function CalcDepends
 !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
@@ -868,18 +859,9 @@ Function CalcDepends
   have_gnutls:
   !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
-
   # Package "libtasn1" has no dependencies.
   # Package "libgsasl" has no dependencies.
   # Package "pthreads-w32" has no dependencies.
diff --git a/src/uninst-opencdk.nsi b/src/uninst-opencdk.nsi
deleted file mode 100644 (file)
index 2fe9441..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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