[Gpg4win-commits] r797 - in trunk: . doc include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue May 6 09:54:13 CEST 2008
Author: werner
Date: 2008-05-06 09:54:13 +0200 (Tue, 06 May 2008)
New Revision: 797
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/doc/pkg-copyright.txt
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
Add adns.
Fix problem in gpgme's engine version parser.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/ChangeLog 2008-05-06 07:54:13 UTC (rev 797)
@@ -1,3 +1,15 @@
+2008-05-06 Werner Koch <wk at g10code.com>
+
+ * packages/packages.current: Update gpgme.
+
+2008-04-30 Werner Koch <wk at g10code.com>
+
+ * packages/packages.current: Add adns.
+ * configure.ac: Add support for adns.
+ * src/uninst-libadns.nsi, src/inst-libadns.nsi: New.
+ * include/config.nsi.in, src/Makefile.am, src/inst-sections.nsi:
+ Add adns.
+
2008-04-28 Marcus Brinkmann <marcus at ulysses.g10code.com>
* packages/packages.current: Update kdelibs and kleopatra.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/NEWS 2008-05-06 07:54:13 UTC (rev 797)
@@ -3,6 +3,10 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 1.9.1
+------------------------------------------------
+
+
Noteworthy changes in version 1.9.0 (2008-04-23)
------------------------------------------------
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/configure.ac 2008-05-06 07:54:13 UTC (rev 797)
@@ -25,8 +25,8 @@
# 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.9.0])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.9.1])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -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,7 +196,7 @@
GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib qt])
GPG4WIN_SPKG([gnupg], [libiconv bzip2])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
- w32pth zlib bzip2 pinentry])
+ w32pth zlib bzip2 adns pinentry])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
Modified: trunk/doc/pkg-copyright.txt
===================================================================
--- trunk/doc/pkg-copyright.txt 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/doc/pkg-copyright.txt 2008-05-06 07:54:13 UTC (rev 797)
@@ -284,3 +284,24 @@
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.
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/include/config.nsi.in 2008-05-06 07:54:13 UTC (rev 797)
@@ -80,6 +80,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@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/packages/packages.current 2008-05-06 07:54:13 UTC (rev 797)
@@ -294,13 +294,21 @@
file dirmngr-1.0.2-svn297.tar.bz2
chk 6140c65d71af3349bfaccdccdc4d89f25399f2f9
-file gpgme-1.1.7-svn1309.tar.bz2
-chk 13041f9aa9bcfe3ce293ea3d4b947f8e9cf5d115
+file gpgme-1.1.7-svn1311.tar.bz2
+chk a32365721eddd4d9c854fd05aac25efafbab5847
file libassuan-1.0.5-svn284.tar.bz2
chk be26eeb3f73c2eafb0e65e94b341092cf90267e1
+#
+# adns
+#
+server ftp://ftp.g10code.com/g10code/adns
+file adns-1.4-g10-1.tar.bz2
+chk 631ee88b7665b958f5734d736f327fadeb059ee0
+
+
#
# GPA
#
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/src/Makefile.am 2008-05-06 07:54:13 UTC (rev 797)
@@ -50,6 +50,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 \
@@ -79,7 +80,7 @@
gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
gpa winpt libgsasl libtasn1 opencdk gnutls \
libetpan claws-mail gnupg2 pinentry \
- libassuan libksba libgcrypt dirmngr w32pth
+ libassuan libksba libgcrypt adns dirmngr w32pth
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -138,6 +139,8 @@
gpg4win_pkg_libgcrypt_configure = --silent \
--with-gpg-error-prefix=$(idir)
+gpg4win_pkg_adns_configure = --silent
+
gpg4win_pkg_dirmngr_configure = \
--with-gpg-error-prefix=$(idir) \
--with-ksba-prefix=$(idir) \
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2008-05-05 07:24:57 UTC (rev 796)
+++ trunk/src/inst-sections.nsi 2008-05-06 07:54:13 UTC (rev 797)
@@ -47,6 +47,9 @@
!ifdef HAVE_PKG_LIBGCRYPT
!include "inst-libgcrypt.nsi"
!endif
+!ifdef HAVE_PKG_ADNS
+!include "inst-adns.nsi"
+!endif
!ifdef HAVE_PKG_LIBICONV
!include "inst-libiconv.nsi"
!endif
@@ -273,6 +276,9 @@
!ifdef HAVE_PKG_LIBICONV
!include "uninst-libiconv.nsi"
!endif
+!ifdef HAVE_PKG_ADNS
+!include "uninst-adns.nsi"
+!endif
!ifdef HAVE_PKG_LIBGCRYPT
!include "uninst-libgcrypt.nsi"
!endif
@@ -535,6 +541,9 @@
!ifdef HAVE_PKG_LIBGCRYPT
!insertmacro UnselectSection ${SEC_libgcrypt}
!endif
+!ifdef HAVE_PKG_ADNS
+ !insertmacro UnselectSection ${SEC_adns}
+!endif
!ifdef HAVE_PKG_PINENTRY
!insertmacro UnselectSection ${SEC_pinentry}
!endif
@@ -596,6 +605,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}
# Because we need pinnetry, we also need to install GTK+
More information about the Gpg4win-commits
mailing list