[Gpg4win-commits] [git] Gpg4win - branch, gpgex64, updated. gpg4win-2.1.1-11-g5ad82ff
by Werner Koch
cvs at cvs.gnupg.org
Mon Jul 1 11:11:24 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, gpgex64 has been updated
via 5ad82fffeb01881cf617243e1cb6250c24811380 (commit)
via 55ab939256f1bfacf1499138b0cdee0921ad4b78 (commit)
via 73e24d99440e1fc3087e96853d60b8ae4694f1d9 (commit)
via 056519ece198b747cf221a8bd341dfb3756b91e8 (commit)
from 40e4d067bd77c3e5d0c526d11d0c27f71cb5db9e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5ad82fffeb01881cf617243e1cb6250c24811380
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jul 1 10:47:43 2013 +0200
Final changes to install a 64 bit version of GpgEX.
* configure.ac: Drop unneeded dependencies for the 64 bit pekes.
Re-add those tools as regular SPKG modules.
* src/Makefile.am (gpg4win_pkg_libgpg_error_ex_configure)
(gpg4win_pkg_libassuan_ex_configure): Add to build static libraries.
* src/gpg4win.mk.in (ex_ipdir): New.
(stamps/stamp-directories, stamps/stamp-$(1)-ex-05-stow)
(clean-ex-$(1)): Use ex_ipdir.
* src/inst-gettext.nsi, src/uninst-gettext.nsi: Change name of the
installed DLL.
* src/inst-glib.nsi: Move installation of charset.alias to ..
* src/inst-libiconv.nsi: here.
* src/inst-libiconv.nsi, src/uninst-libiconv.nsi: Adjust name of
libiconv.dll but also install under the old name.
* src/installer.nsi: Include x64.nsh.
* src/inst-gpgex.nsi, src/uninst-gpgex.nsi: On 64 bit boxes, install
also the 64 bit version.
* src/gpg4win.nsi: Add RequestExecutionLevel directive.
* src/gpg4win.nsi: Use /SOLID for the compressor settings.
--
Some of the above changes are merely to avoid surprises regarding the
64 bit versions of the modules which used to be installed under
install-ex/ but stowed from the regular install/pkgs directory.
Using /SOLID shrinks the installer considerably (16 to 13 MB for the
light installer).
The use of RequestExecutionLevel is not really needed because Windows
seems to know about NSIS installer but it is nevertheless good style
to correctly mark the installer.
diff --git a/configure.ac b/configure.ac
index 62ed0ec..0fcd94a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,8 +363,10 @@ GPG4WIN_SPKG([enchant], [pkgconfig glib])
GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
+GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libgcrypt], [libgpg-error])
GPG4WIN_SPKG([libksba], [libgpg-error])
+GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
@@ -373,6 +375,7 @@ GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
w32pth zlib bzip2 adns pinentry])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
+GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([scute], [libgpg-error libassuan])
GPG4WIN_SPKG([paperkey])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
@@ -387,13 +390,14 @@ GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
gpgme pthreads-w32 crypt regex libetpan gnutls dnl
libxml2])
GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
+GPG4WIN_SPKG([w32pth])
+GPG4WIN_SPKG([libiconv])
+GPG4WIN_SPKG([gettext], [libiconv])
+
# Packages needed for gpgex
-GPG4WIN_SPKGEX([w32pth])
-GPG4WIN_SPKGEX([libiconv])
-GPG4WIN_SPKGEX([gettext], [libiconv])
-GPG4WIN_SPKGEX([libgpg-error], [libiconv gettext])
-GPG4WIN_SPKGEX([libassuan], [libgpg-error w32pth])
+GPG4WIN_SPKGEX([libgpg-error])
+GPG4WIN_SPKGEX([libassuan], [libgpg-error])
GPG4WIN_SPKGEX([gpgex], [libassuan])
GPG4WIN_IPKG([compendium])
diff --git a/src/Makefile.am b/src/Makefile.am
index b9d76bf..77ff1f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -186,6 +186,10 @@ gpg4win_pkg_libgpg_error_configure = --silent \
CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
--enable-static
+gpg4win_pkg_libgpg_error_ex_configure = --silent \
+ CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
+ --enable-static
+
# We convert the PO files to UTF-8. FIXME: This should be done in
# libgpg-error proper.
define gpg4win_pkg_libgpg_error_post_install
@@ -197,8 +201,9 @@ define gpg4win_pkg_libgpg_error_post_install
done)
endef
-gpg4win_pkg_libassuan_configure = --silent \
- --enable-static
+gpg4win_pkg_libassuan_configure = --silent --enable-static
+
+gpg4win_pkg_libassuan_ex_configure = --silent --enable-static
gpg4win_pkg_libksba_configure = --silent \
--with-gpg-error-prefix=$(idir)
diff --git a/src/gpg4win-src.nsi b/src/gpg4win-src.nsi
index 15db0c5..801f556 100644
--- a/src/gpg4win-src.nsi
+++ b/src/gpg4win-src.nsi
@@ -58,6 +58,7 @@
# The installation directory.
!define ipdir "playground/install/pkgs"
+!define exipdir "playground/install-ex/pkgs"
!define bpdir "playground/build"
# For source packages we use the standard zip method because it takes
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 6a8c349..a27d8b3 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -29,6 +29,7 @@ ipdir := $(root)/install/pkgs
tsdir := $(shell pwd)/${top_srcdir}
pdir := $(shell pwd)/${top_srcdir}/patches
ex_idir := $(root)/install-ex
+ex_ipdir := $(root)/install-ex/pkgs
# We collect the names of all pkg files used.
pkg_files =
@@ -42,6 +43,7 @@ stamps/stamp-directories:
$(MKDIR) $(idir)
$(MKDIR) $(ipdir)
$(if $GPGEX_ADD_HOST, $(MKDIR) $(ex_idir))
+ $(if $GPGEX_ADD_HOST, $(MKDIR) $(ex_ipdir))
touch $(bdir)/versioninfo.txt
touch stamps/stamp-directories
@@ -90,8 +92,8 @@ define SETVARS_EX
pkgbdir="$(bdir)/$$$${pkg_version}-ex-build"; \
pkgpdir="$(pdir)/$$$${pkg_version}-ex"; \
pkgpbdir="$(pdir)/$(1)-ex"; \
- pkgidir="$(ipdir)/$$$${pkg_version}-ex"; \
- pkgidir_dev="$(ipdir)/$$$${pkg_version_dev}"; \
+ pkgidir="$(ex_ipdir)/$$$${pkg_version}"; \
+ pkgidir_dev="$(ex_ipdir)/$$$${pkg_version_dev}"; \
pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_ex_configure)"; \
pkgextracflags="$(call GETVAR,gpg4win_pkg_$(1)_ex_extracflags)"; \
pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_args)"; \
@@ -211,7 +213,7 @@ stamps/stamp-$(1)-ex-04-install: stamps/stamp-$(1)-ex-03-make
stamps/stamp-$(1)-ex-05-stow: stamps/stamp-$(1)-ex-04-install
($(call SETVARS_EX,$(1)); \
- cd $(ipdir); \
+ cd $(ex_ipdir); \
$(STOW) -t $(ex_idir) "$$$${pkg_version}")
touch stamps/stamp-$(1)-ex-05-stow
@@ -221,7 +223,7 @@ stamps/stamp-final-ex-$(1): stamps/stamp-$(1)-ex-05-stow
.PHONY : clean-ex-$(1)
clean-ex-$(1):
($(call SETVARS_EX,$(1)); \
- (cd $(ipdir) && \
+ (cd $(ex_ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index d4be5be..bb07951 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -191,16 +191,24 @@
!define DEBUG
!endif
+# Most of the included software has implicit requirements for at least
+# NT4 if not even higher. To be sure require at least Windows XP.
+# Fixme: Enable if we have makensis 2.50
+#TargetMinimalOS 5.1
+
+# Admin privileges are required for installation
+RequestExecutionLevel admin
# The installation directory.
!define ipdir "playground/install/pkgs"
+!define exipdir "playground/install-ex/pkgs"
!define bpdir "playground/build"
# Select the best compression algorithm available. The dictionary
# size is the default (8 MB).
!ifndef DISABLE_LZMA
!ifndef SOURCES
-SetCompressor lzma
+SetCompressor /SOLID lzma
# SetCompressorDictSize 8
!endif
!endif
diff --git a/src/inst-gettext.nsi b/src/inst-gettext.nsi
index 4954f46..59b6227 100644
--- a/src/inst-gettext.nsi
+++ b/src/inst-gettext.nsi
@@ -1,18 +1,18 @@
# inst-gettext.nsi - Installer snippet for gettext. -*- coding: latin-1; -*-
# Copyright (C) 2005 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
@@ -32,7 +32,8 @@ Section "-gettext" SEC_gettext
!ifdef SOURCES
File ${gpg4win_pkg_gettext_src}
!else
- File ${prefix}/bin/intl.dll
+ File ${prefix}/bin/libintl-8.dll
+
!ifdef DEBUG
# We install a couple of binaries that may be useful for testing.
File ${prefix}/bin/gettext.exe
diff --git a/src/inst-glib.nsi b/src/inst-glib.nsi
index 737fd24..417ed51 100644
--- a/src/inst-glib.nsi
+++ b/src/inst-glib.nsi
@@ -50,9 +50,6 @@ Section "-glib" SEC_glib
File ${prefix}/bin/gspawn-win32-helper-console.exe
File ${prefix}/bin/gspawn-win32-helper.exe
- SetOutPath "$INSTDIR\lib"
- File ${prefix}/lib/charset.alias
-
SetOutPath "$INSTDIR\share\glib-2.0\schemas"
File ${prefix}/share/glib-2.0/schemas/gschema.dtd
diff --git a/src/inst-gpgex.nsi b/src/inst-gpgex.nsi
index 2523d17..9ba3996 100644
--- a/src/inst-gpgex.nsi
+++ b/src/inst-gpgex.nsi
@@ -1,18 +1,18 @@
# inst-gpgex.nsi - Installer snippet for gpgex. -*- 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
@@ -21,6 +21,7 @@
!undef prefix
!endif
!define prefix ${ipdir}/gpgex-${gpg4win_pkg_gpgex_version}
+!define exprefix ${exipdir}/gpgex-${gpg4win_pkg_gpgex_version}
Section "-removegpgee"
@@ -56,6 +57,7 @@ ${MementoSection} "GpgEX" SEC_gpgex
do_reg:
# Register the DLL.
+ ClearErrors
RegDLL "$INSTDIR\gpgex.dll"
ifErrors 0 +2
MessageBox MB_OK "$(T_GpgEX_RegFailed)"
@@ -75,6 +77,32 @@ ${MementoSection} "GpgEX" SEC_gpgex
File ${prefix}/share/doc/gpgex/gpgex-en.html
File ${prefix}/share/doc/gpgex/gpgex-de.html
+
+${If} ${RunningX64}
+
+ # Install the 64 bit version of the dll.
+ SetOutPath "$INSTDIR\bin"
+ ClearErrors
+ SetOverwrite try
+ File ${exprefix}/bin/gpgex.dll
+ SetOverwrite lastused
+ ifErrors 0 do_reg64
+ File /oname=gpgex.dll.tmp ${exprefix}/bin/gpgex.dll
+ Rename /REBOOTOK gpgex.dll.tmp gpgex.dll
+
+ do_reg64:
+ # Register the DLL. We need to register both versions. However
+ # RegDLL can't be used for 64 bit and InstallLib seems to be a
+ # registry hack.
+ ClearErrors
+ ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgex.dll"'
+ ifErrors 0 +2
+ MessageBox MB_OK "$(T_GpgEX_RegFailed) (64 bit)"
+
+ # Note: There is no need to install the help an mo files because
+ # they are identical to those installed by the 32 bit version.
+${EndIf}
+
!endif
${MementoSectionEnd}
diff --git a/src/inst-libiconv.nsi b/src/inst-libiconv.nsi
index b6e7bfc..96ec799 100644
--- a/src/inst-libiconv.nsi
+++ b/src/inst-libiconv.nsi
@@ -1,18 +1,18 @@
# inst-libiconv.nsi - Installer snippet for libiconv. -*- coding: latin-1; -*-
# Copyright (C) 2005 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
@@ -36,23 +36,34 @@ Section "-libiconv" SEC_libiconv
ClearErrors
SetOverwrite try
- File "${prefix}/bin/iconv.dll"
+ File "${prefix}/bin/libiconv-2.dll"
SetOverwrite lastused
ifErrors 0 +3
- File /oname=iconv.dll.tmp "${prefix}/bin/iconv.dll"
+ File /oname=libiconv-2.dll.tmp "${prefix}/bin/libiconv-2.dll"
+ Rename /REBOOTOK libiconv-2.dll.tmp libiconv-2.dll
+
+ # Also install it under the name GnuPG and maybe other software
+ # inspects since ages.
+ ClearErrors
+ SetOverwrite try
+ File /oname=iconv.dll "${prefix}/bin/libiconv-2.dll"
+ SetOverwrite lastused
+ ifErrors 0 +3
+ File /oname=iconv.dll.tmp "${prefix}/bin/libiconv-2.dll"
Rename /REBOOTOK iconv.dll.tmp iconv.dll
# Install a copy in pub; this is a bad hack and should be removed ASAP.
SetOutPath "$INSTDIR\pub"
ClearErrors
SetOverwrite try
- File "${prefix}/bin/iconv.dll"
+ File /oname=iconv.dll "${prefix}/bin/libiconv-2.dll"
SetOverwrite lastused
ifErrors 0 +3
- File /oname=iconv.dll.tmp "${prefix}/bin/iconv.dll"
+ File /oname=iconv.dll.tmp "${prefix}/bin/libiconv-2.dll"
Rename /REBOOTOK iconv.dll.tmp iconv.dll
- SetOutPath "$INSTDIR"
+ SetOutPath "$INSTDIR\lib"
+ File ${prefix}/lib/charset.alias
!ifdef DEBUG
# We install a couple of binaries that may be useful for testing.
diff --git a/src/installer.nsi b/src/installer.nsi
index 5a68c3b..1ec916a 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -49,6 +49,9 @@
# We use the modern UI.
!include "MUI.nsh"
+# We need to know wether we are installing to 64 bit.
+!include "x64.nsh"
+
# Set the package name. Note that this name should not be sufficed
# with the version because this would get displayed in the start menu.
Name "${PRETTY_PACKAGE}"
diff --git a/src/uninst-gettext.nsi b/src/uninst-gettext.nsi
index bf120fa..070078f 100644
--- a/src/uninst-gettext.nsi
+++ b/src/uninst-gettext.nsi
@@ -1,18 +1,18 @@
# uninst-gettext.nsi - Installer snippet for gettext. -*- coding: latin-1; -*-
# Copyright (C) 2005 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
@@ -30,6 +30,7 @@ Section "-un.gettext"
Push "${gpg4win_pkg_gettext_src}"
Call un.SourceDelete
!else
+ Delete "$INSTDIR\libintl-8.dll"
Delete "$INSTDIR\intl.dll"
!ifdef DEBUG
Delete "$INSTDIR\gettext.exe"
diff --git a/src/uninst-gpgex.nsi b/src/uninst-gpgex.nsi
index df90aa1..b0d0acb 100644
--- a/src/uninst-gpgex.nsi
+++ b/src/uninst-gpgex.nsi
@@ -1,18 +1,18 @@
# uninst-gpgex.nsi - Installer snippet for gpgex. -*- 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
@@ -56,6 +56,11 @@ Section "-un.gpgex"
UnRegDLL "$INSTDIR\gpgex.dll"
Delete /REBOOTOK "$INSTDIR\gpgex.dll"
- RMDir "$INSTDIR"
+
+${If} ${RunningX64}
+ ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgex.dll"'
+ Delete /REBOOTOK "$INSTDIR\bin\gpgex.dll"
+${EndIf}
+
!endif
SectionEnd
diff --git a/src/uninst-libiconv.nsi b/src/uninst-libiconv.nsi
index f7df575..19ecc6e 100644
--- a/src/uninst-libiconv.nsi
+++ b/src/uninst-libiconv.nsi
@@ -1,18 +1,18 @@
# uninst-libiconv.nsi - Installer snippet for libiconv.-*- coding: latin-1; -*-
# Copyright (C) 2005 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
@@ -30,6 +30,7 @@ Section "-un.libiconv"
Push "${gpg4win_pkg_libiconv_src}"
Call un.SourceDelete
!else
+ Delete "$INSTDIR\libiconv-2.dll"
Delete "$INSTDIR\iconv.dll"
Delete "$INSTDIR\pub\iconv.dll"
!ifdef DEBUG
commit 55ab939256f1bfacf1499138b0cdee0921ad4b78
Author: Werner Koch <wk at gnupg.org>
Date: Fri Jun 28 12:46:52 2013 +0200
Fix setting of the 64 bit toolkit.
* autogen.sh (myhostsub): Set default toolkit to x86_64-w64-mingw32.
diff --git a/autogen.sh b/autogen.sh
index 58a4082..731ef13 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -113,7 +113,7 @@ if [ "$myhost" = "w32" ]; then
toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
extraoptions="$w32_extraoptions"
- extratoolprefixes="$w64_toolprefixes amd64-mingw32msvc"
+ extratoolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
commit 73e24d99440e1fc3087e96853d60b8ae4694f1d9
Author: Werner Koch <wk at gnupg.org>
Date: Fri Jun 28 12:45:39 2013 +0200
Update GpgEX, libgpg-error and libassuan.
diff --git a/packages/packages.current b/packages/packages.current
index 5baff1a..056b695 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -21,7 +21,7 @@ server ftp://ftp.cs.tu-berlin.de/pub/gnu
file gettext/gettext-0.18.2.1.tar.gz
chk 86066950cac2fcc49cc7bd23f5ea16bed522b410
-# checked: 2013-06-28 ah - Latest release
+# checked: 2013-06-14 ah - Latest release
file libiconv/libiconv-1.14.tar.gz
chk be7d67e50d72ff067b2c0291311bc283add36965
@@ -354,9 +354,9 @@ chk dfeab6c99dff97ee8bedc6d428e220c11b565e9f
#
server ftp://ftp.g10code.com/g10code/gpgex
-# checked: 2012-03-28 wk
-file gpgex-0.9.7.tar.bz2
-chk 02ee561282ffd4a893e87be82a4a85b0435bc470
+# checked: 2013-06-28 wk
+file gpgex-1.0.0-beta24.tar.bz2
+chk e1b3ba2e8dc88aa550b0247ab93a97208825e270
#
@@ -384,9 +384,9 @@ chk 6e38be3377340a21a1f13ff84b5e6adce97cd1d4
#
server ftp://ftp.gnupg.org/gcrypt
-# checked: 2013-04-23 wk
-file libgpg-error/libgpg-error-1.11.tar.bz2
-chk be209b013652add5c7e2c473ea114f58203cc6cd
+# checked: 2013-06-28 wk
+file libgpg-error/libgpg-error-1.12.tar.bz2
+chk 259f359cd1440b21840c3a78e852afd549c709b8
# checked: 2013-04-23 wk
file libgcrypt/libgcrypt-1.5.2.tar.bz2
@@ -396,9 +396,9 @@ chk c9998383532ba3e8bcaf690f2f0d65e814b48d2f
file libksba/libksba-1.3.0.tar.bz2
chk 241afcb2dfbf3f3fc27891a53a33f12d9084d772
-# checked: 2013-04-23 wk
-file libassuan/libassuan-2.1.0.tar.bz2
-chk af114073610ce0b30961986c2741d5e7230c9880
+# checked: 2013-06-28 wk
+file libassuan/libassuan-2.1.1.tar.bz2
+chk 8bd3826de30651eb8f9b8673e2edff77cd70aca1
# checked: 2013-05-10 wk
name gnupg2-2.0.20.tar.bz2
commit 056519ece198b747cf221a8bd341dfb3756b91e8
Author: Werner Koch <wk at gnupg.org>
Date: Fri Jun 28 10:18:09 2013 +0200
Make git revision detection more robust.
* configure.ac (git_revision): Use git rev-parse for parsing.
diff --git a/configure.ac b/configure.ac
index 5bbca35..62ed0ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,8 @@ m4_define([my_version], [2.1.1])
# the decimalized short revision number, a beta version string and a
# flag indicating a development version (my_isgit). The latter works
# by requiring the final tag in the repository.
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
- | awk '/^\* / {printf "%s",$3}']))
+m4_define([git_revision],
+ m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
m4_define([git_revision_dec],
m4_esyscmd_s([echo $((0x$(echo ]git_revision[|head -c 4)))]))
m4_define([git_betastring],
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 2 +-
configure.ac | 18 +++++++++++-------
packages/packages.current | 20 ++++++++++----------
src/Makefile.am | 9 +++++++--
src/gpg4win-src.nsi | 1 +
src/gpg4win.mk.in | 10 ++++++----
src/gpg4win.nsi | 10 +++++++++-
src/inst-gettext.nsi | 11 ++++++-----
src/inst-glib.nsi | 3 ---
src/inst-gpgex.nsi | 36 ++++++++++++++++++++++++++++++++----
src/inst-libiconv.nsi | 29 ++++++++++++++++++++---------
src/installer.nsi | 3 +++
src/uninst-gettext.nsi | 9 +++++----
src/uninst-gpgex.nsi | 15 ++++++++++-----
src/uninst-libiconv.nsi | 9 +++++----
15 files changed, 126 insertions(+), 59 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list