[Gpg4win-commits] r1402 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2010-04-21 04:28:26 +0200 (Wed, 21 Apr 2010)
New Revision: 1402

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/Makefile.am
   trunk/src/inst-libassuan.nsi
   trunk/src/uninst-libassuan.nsi
Log:
2010-04-21  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Update gpa, gpgol, gpgex, libassuan,
	gnupg, dirmngr, gpgme and scute.	
	* src/Makefile.am (gpg4win_pkg_libassuan_configure): Instead of
	disable-shared, use enable-static.  Also, don't set pth path.
	* src/inst-libassuan.nsi: Install libassuan-0.dll.
	* src/uninst-libassuan.nsi: Uninstall it.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-20 13:28:04 UTC (rev 1401)
+++ trunk/ChangeLog	2010-04-21 02:28:26 UTC (rev 1402)
@@ -1,3 +1,12 @@
+2010-04-21  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Update gpa, gpgol, gpgex, libassuan,
+	gnupg, dirmngr, gpgme and scute.	
+	* src/Makefile.am (gpg4win_pkg_libassuan_configure): Instead of
+	disable-shared, use enable-static.  Also, don't set pth path.
+	* src/inst-libassuan.nsi: Install libassuan-0.dll.
+	* src/uninst-libassuan.nsi: Uninstall it.	
+
 2010-04-16  Werner Koch  <wk at g10code.com>
 
 	* src/sha1sum.c: New.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2010-04-20 13:28:04 UTC (rev 1401)
+++ trunk/packages/packages.current	2010-04-21 02:28:26 UTC (rev 1402)
@@ -311,18 +311,19 @@
 #
 # GpgOL
 #
-server ftp://ftp.g10code.com/g10code/gpgol
+#server ftp://ftp.g10code.com/g10code/gpgol
+server ftp://ftp.g10code.com/g10code/scratch
 
-file gpgol-1.1.1.tar.bz2
-chk  4042b2106c1593a81db865138dede3fc530f2a93
+file gpgol-1.1.2-svn334.tar.bz2
+chk  3938a9971f9db3e0f9887e4c8e12b55ba3daa433
 
 #
 # GpgEX
 #
 server ftp://ftp.g10code.com/g10code/gpgex
 
-file gpgex-0.9.5.tar.bz2
-chk  8f42f3e5a5189c3c2c216f7ff924a1714a5fde6d
+file gpgex-0.9.6.tar.bz2
+chk  fe3fcd88888a2e68909d011c7d79f41ea22d3342
 
 #
 # Pth emulation
@@ -356,24 +357,24 @@
 file libgcrypt/libgcrypt-1.4.5.tar.bz2
 chk  ef7ecbd3a03a7978094366bcd1257b3654608d28
 
-file libassuan/libassuan-1.0.5.tar.bz2
-chk  f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
+file libassuan/libassuan-2.0.0.tar.bz2
+chk  b03c586a4eefdfc0bb1ec65ecf958b9890d429f7
 
-name gnupg2-2.0.14.tar.bz2
-file gnupg/gnupg-2.0.14.tar.bz2
-chk  cc5e4637f37f5bc82b00c73fc094ddadb7401821
+name gnupg2-2.0.15.tar.bz2
+file gnupg/gnupg-2.0.15.tar.bz2
+chk  3596668fb9cc8ec0714463a5009f990fc23434b0
 
-file dirmngr/dirmngr-1.0.3.tar.bz2
-chk  437d381c937b1f1d0699d1ed37cf50f14bfbcd32
+file alpha/dirmngr/dirmngr-1.1.0rc1.tar.bz2
+chk  9c403f2e785df38253c6f8a3e9a1d697cbfacff8
 
-file gpgme/gpgme-1.2.0.tar.bz2
-chk  2f4f6c4b85f2b5a2c4dcf2167342ed6c41efcd1c
+file gpgme/gpgme-1.3.0.tar.bz2
+chk  0db69082abfbbbaf86c3ab0906f5137de900da73
 
 file pinentry/pinentry-0.8.0.tar.gz
 chk  381f9ee47b9f198e1be5d3ec4e043067a7e97912
 
-file scute/scute-1.3.0.tar.bz2
-chk  0d20924a5411a6699f54ced11128029dedff3211
+file scute/scute-1.4.0.tar.bz2
+chk  e28141d2b03612c09512651795976c58ed3f8035
 
 # (Snapshots)
 # server ftp://ftp.g10code.com/g10code/scratch
@@ -398,12 +399,15 @@
 #
 # GPA
 #
-server http://wald.intevation.org/frs/download.php
+#server http://wald.intevation.org/frs/download.php
+#file 603/gpa-0.9.0.tar.bz2
 
-file 603/gpa-0.9.0.tar.bz2
-chk  ce7e6c5d34c7a1a5066f367f2b890c24197ea073
+server ftp://ftp.g10code.com/g10code/scratch
 
+file gpa-0.9.1-svn1024.tar.bz2
+chk  1bee8fbf774316a66c122284e79391abf79ecca9
 
+
 #
 # Qt
 #

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2010-04-20 13:28:04 UTC (rev 1401)
+++ trunk/src/Makefile.am	2010-04-21 02:28:26 UTC (rev 1402)
@@ -164,8 +164,7 @@
 endef
 
 gpg4win_pkg_libassuan_configure =  --silent \
-  --disable-shared \
-  --with-pth-prefix=$(idir)
+  --enable-static
 
 gpg4win_pkg_libksba_configure = --silent \
   --with-gpg-error-prefix=$(idir)

Modified: trunk/src/inst-libassuan.nsi
===================================================================
--- trunk/src/inst-libassuan.nsi	2010-04-20 13:28:04 UTC (rev 1401)
+++ trunk/src/inst-libassuan.nsi	2010-04-21 02:28:26 UTC (rev 1402)
@@ -34,7 +34,15 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_libassuan}"
 !else
-  # Nothing to install as we link statically.
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libassuan-0.dll"
 
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libassuan-0.dll.tmp "${prefix}/bin/libassuan-0.dll"
+      Rename /REBOOTOK libassuan-0.dll.tmp libassuan-0.dll
+
+
 !endif
 SectionEnd

Modified: trunk/src/uninst-libassuan.nsi
===================================================================
--- trunk/src/uninst-libassuan.nsi	2010-04-20 13:28:04 UTC (rev 1401)
+++ trunk/src/uninst-libassuan.nsi	2010-04-21 02:28:26 UTC (rev 1402)
@@ -31,7 +31,7 @@
   Push "${gpg4win_pkg_libassuan}"
   Call un.SourceDelete
 !else
-  # Nothing to uninstall as we link static.
+  Delete "$INSTDIR\libassuan-0.dll"
 
 !endif
 SectionEnd