[Gpg4win-commits] r1123 - in trunk: . packages patches/gnupg2

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-03-03 12:41:24 +0100 (Tue, 03 Mar 2009)
New Revision: 1123

Removed:
   trunk/patches/gnupg2/02-default-3des.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/patches/gnupg2/01-version.patch.in
Log:
Ready for a release.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/ChangeLog	2009-03-03 11:41:24 UTC (rev 1123)
@@ -1,3 +1,13 @@
+2009-03-03  Werner Koch  <wk at g10code.com>
+
+	Release 1.9.14.
+
+	* packages/packages.current: Update GnuPG.
+
+2009-03-02  Werner Koch  <wk at g10code.com>
+
+	* patches/gnupg2/02-default-3des.patch: Remove.
+
 2009-03-02  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* NEWS: Change compendium version.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/Makefile.am	2009-03-03 11:41:24 UTC (rev 1123)
@@ -41,7 +41,6 @@
 	patches/winpt/01-gpg-path.patch \
 	patches/gpgex/01-no-checksums.patch \
 	patches/gnupg2/01-version.patch.in \
-	patches/gnupg2/02-default-3des.patch \
 	patches/gnupg2-2.0.9/01-close-all-handle.patch \
 	patches/gnupg2-2.0.9/02-de.po-fix.patch \
 	patches/gnupg2-2.0.9/03-i18n+etc.patch \

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/NEWS	2009-03-03 11:41:24 UTC (rev 1123)
@@ -3,7 +3,7 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
-Noteworthy changes in version 1.9.14 (unreleased)
+Noteworthy changes in version 1.9.14 (2009-03-03)
 -------------------------------------------------
 
 (en) This is a BETA version of the new Gpg4win/2 architecture.
@@ -13,9 +13,9 @@
      eingesetzt werden.
 
 ~~~~~~~~~~~~~~~
-GnuPG:        2.0.10
+GnuPG:        2.0.11
 DirMngr:      1.0.3-svn310
-Kleopatra:    20081128
+Kleopatra:    20090302
 GPA:          0.8.0
 GpgOL:        0.10.19
 GpgEX:        0.9.2

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/configure.ac	2009-03-03 11:41:24 UTC (rev 1123)
@@ -26,7 +26,7 @@
 # "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.14])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 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)]))

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/packages/packages.current	2009-03-03 11:41:24 UTC (rev 1123)
@@ -319,9 +319,9 @@
 #file gpgme/gpgme-1.1.7.tar.bz2
 #chk  c735bb90431667e3d020aa3adcf0efa858c992af
 
-name gnupg2-2.0.10.tar.bz2
-file gnupg/gnupg-2.0.10.tar.bz2
-chk  d25e41a8cc607334b707d13af819ceaa217800b5
+name gnupg2-2.0.11.tar.bz2
+file gnupg/gnupg-2.0.11.tar.bz2
+chk  9f71a342c5be686b0dcef082078af693802a558f
 
 
 # (Snapshots)
@@ -357,6 +357,7 @@
 file   491/gpa-0.8.0.tar.bz2
 chk    c519af3ccd3c7e518458e143b2001a8cc6d90467
 
+
 #
 # Qt
 #

Modified: trunk/patches/gnupg2/01-version.patch.in
===================================================================
--- trunk/patches/gnupg2/01-version.patch.in	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/patches/gnupg2/01-version.patch.in	2009-03-03 11:41:24 UTC (rev 1123)
@@ -5,11 +5,11 @@
 Make --version also print the version number of Gpg4win so that we 
 can see in bug reports what patches have been used.
 
+(For version < 2.0.11 chnage the patch line from 1023 to 868.)
 
-
 --- jnlib/argparse.c
 +++ jnlib/argparse.c
-@@ -868,7 +868,7 @@
+@@ -1023,7 +1023,7 @@
    fputs (strusage (11), stdout);
    if ((s=strusage (12)))
      printf (" (%s)", s );
@@ -19,4 +19,3 @@
    for (i=20; i < 30; i++)
      if ((s=strusage (i)))
 
-

Deleted: trunk/patches/gnupg2/02-default-3des.patch
===================================================================
--- trunk/patches/gnupg2/02-default-3des.patch	2009-03-03 08:19:11 UTC (rev 1122)
+++ trunk/patches/gnupg2/02-default-3des.patch	2009-03-03 11:41:24 UTC (rev 1123)
@@ -1,29 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-The native Outlook 2003 S/MIME can't cope with AES.  Thus we change
-the default back to 3DES.
-
-
---- sm/gpgsm.c  (revision 4923)
-+++ sm/gpgsm.c  (working copy)
-@@ -893,7 +893,7 @@
- 
-   /* Note: If you change this default cipher algorithm , please
-      remember to update the Gpgconflist entry as well.  */
--  opt.def_cipher_algoid = "AES";  /*des-EDE3-CBC*/
-+  opt.def_cipher_algoid = "3DES";
- 
-   opt.homedir = default_homedir ();
- 
-@@ -1607,7 +1607,7 @@
- #ifndef HAVE_W32_SYSTEM
-         printf ("prefer-system-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
- #endif
--        printf ("cipher-algo:%lu:\"AES:\n", GC_OPT_FLAG_DEFAULT);
-+        printf ("cipher-algo:%lu:\"3DES:\n", GC_OPT_FLAG_DEFAULT);
-         printf ("p12-charset:%lu:\n", GC_OPT_FLAG_DEFAULT);
-         printf ("default-key:%lu:\n", GC_OPT_FLAG_DEFAULT);
-         printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_DEFAULT);
-