From scm-commit at wald.intevation.org Fri Jul 3 16:30:55 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 3 Jul 2009 16:30:55 +0200 (CEST) Subject: [Gpg4win-commits] r1209 - trunk/packages Message-ID: <20090703143055.AEE1F7A18D@pyrosoma.intevation.org> Author: werner Date: 2009-07-03 16:30:55 +0200 (Fri, 03 Jul 2009) New Revision: 1209 Modified: trunk/packages/packages.current Log: Update libksba Modified: trunk/packages/packages.current =================================================================== --- trunk/packages/packages.current 2009-06-26 12:47:04 UTC (rev 1208) +++ trunk/packages/packages.current 2009-07-03 14:30:55 UTC (rev 1209) @@ -350,8 +350,8 @@ file libgpg-error/libgpg-error-1.7.tar.bz2 chk bf8c6babe1e28cae7dd6374ca24ddcc42d57e902 -file libksba/libksba-1.0.6.tar.bz2 -chk a15b7676b08876f9629bb2676b6466151c6976b8 +file libksba/libksba-1.0.7.tar.bz2 +chk c8d269fb15869b59204ef3f5d46ceb2c44dbeab3 file libgcrypt/libgcrypt-1.4.4.tar.bz2 chk 3987f0efcbb7048c136d5c859e88eee1763a14f6 From scm-commit at wald.intevation.org Thu Jul 9 11:57:39 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 9 Jul 2009 11:57:39 +0200 (CEST) Subject: [Gpg4win-commits] r1210 - in trunk/doc: . website Message-ID: <20090709095739.F3D0E7A15D@pyrosoma.intevation.org> Author: emanuel Date: 2009-07-09 11:57:38 +0200 (Thu, 09 Jul 2009) New Revision: 1210 Modified: trunk/doc/ChangeLog trunk/doc/website/build-history.awk trunk/doc/website/index.htm4 Log: fixed typos Modified: trunk/doc/ChangeLog =================================================================== --- trunk/doc/ChangeLog 2009-07-03 14:30:55 UTC (rev 1209) +++ trunk/doc/ChangeLog 2009-07-09 09:57:38 UTC (rev 1210) @@ -1,3 +1,7 @@ +2009-07-09 Emanuel Schuetze + + * website/index.htm4, website/build-history.awk: Fixed typo. + 2009-06-26 Emanuel Schuetze * website/download.htm4, website/download-de.htm4: Modified: trunk/doc/website/build-history.awk =================================================================== --- trunk/doc/website/build-history.awk 2009-07-03 14:30:55 UTC (rev 1209) +++ trunk/doc/website/build-history.awk 2009-07-09 09:57:38 UTC (rev 1210) @@ -62,7 +62,7 @@ "m4_define(`DE_FILE', `change-history-de.html')\n" \ "PAGE_START\n" \ "

Change History of Gpg4win

\n" \ - "

Please note that old release still contain meanwhile fixed\n" \ + "

Please note that old releases still contain meanwhile fixed\n" \ "security issues.

\n" ; header_text["de"] = "" \ Modified: trunk/doc/website/index.htm4 =================================================================== --- trunk/doc/website/index.htm4 2009-07-03 14:30:55 UTC (rev 1209) +++ trunk/doc/website/index.htm4 2009-07-09 09:57:38 UTC (rev 1210) @@ -141,7 +141,7 @@

-The contents has been created and is being maintained by the changing +The content has been created and is being maintained by the changing active team members of the Gpg4win project.

From scm-commit at wald.intevation.org Thu Jul 9 16:12:16 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 9 Jul 2009 16:12:16 +0200 (CEST) Subject: [Gpg4win-commits] r1211 - in trunk: . patches/gnupg2-2.0.12 Message-ID: <20090709141216.12BD47A165@pyrosoma.intevation.org> Author: werner Date: 2009-07-09 16:12:15 +0200 (Thu, 09 Jul 2009) New Revision: 1211 Added: trunk/patches/gnupg2-2.0.12/03-opgp-writekey.patch trunk/patches/gnupg2-2.0.12/04-hash-prefs.patch trunk/patches/gnupg2-2.0.12/05-dns-sd.patch Modified: trunk/ChangeLog trunk/Makefile.am Log: Add a few pacthes for GnuPG. Note that we do not want to update to a newer GnuPG version for 2.0.0 due to a lot of changes for Unix with no functionality for Windows. However, these changes are important for the v2 card and for new gpg keys. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-09 09:57:38 UTC (rev 1210) +++ trunk/ChangeLog 2009-07-09 14:12:15 UTC (rev 1211) @@ -1,3 +1,10 @@ +2009-07-09 Werner Koch + + * patches/gnupg2-2.0.12/03-opgp-writekey.patch: New. + * patches/gnupg2-2.0.12/04-hash-prefs.patch: New. + * patches/gnupg2-2.0.12/05-dns-sd.patch: New. + * Makefile.am (EXTRA_DIST): Add them. + 2009-06-26 Emanuel Schuetze * packages/packages.current: Update kdesupport. Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-07-09 09:57:38 UTC (rev 1210) +++ trunk/Makefile.am 2009-07-09 14:12:15 UTC (rev 1211) @@ -45,6 +45,9 @@ patches/gnupg2-2.0.9/05-w32-http.patch \ patches/gnupg2-2.0.12/01-scd-pw2.patch \ patches/gnupg2-2.0.12/02-pth-estream.patch \ + patches/gnupg2-2.0.12/03-opgp-writekey.patch \ + patches/gnupg2-2.0.12/04-hash-prefs.patch \ + patches/gnupg2-2.0.12/05-dns-sd.patch \ patches/gpgol-0.9.91/01-gpgme.patch \ patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch \ patches/claws-mail-3.7.1/02-3.7.1cvs22.patch \ Added: trunk/patches/gnupg2-2.0.12/03-opgp-writekey.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/03-opgp-writekey.patch 2009-07-09 09:57:38 UTC (rev 1210) +++ trunk/patches/gnupg2-2.0.12/03-opgp-writekey.patch 2009-07-09 14:12:15 UTC (rev 1211) @@ -0,0 +1,189 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +[scd] +2009-07-09 Werner Koch + + * app-openpgp.c (change_keyattr): New. + (do_writekey): Call it. + + * app-openpgp.c (does_key_exist): Add arg GENERATING. Change + callers. + +[g10] +2009-07-09 Werner Koch + + * card-util.c (card_store_subkey): Do not restrict to 1024 bit keys. + Print an error message on write errors. + + + +--- scd/app-openpgp.c (revision 5068) ++++ scd/app-openpgp.c (working copy) +@@ -213,6 +213,7 @@ + void *pincb_arg, + const void *indata, size_t indatalen, + unsigned char **outdata, size_t *outdatalen); ++static void parse_algorithm_attribute (app_t app, int keyno); + + + +@@ -2144,9 +2145,10 @@ + + /* Check whether a key already exists. KEYIDX is the index of the key + (0..2). If FORCE is TRUE a diagnositic will be printed but no +- error returned if the key already exists. */ ++ error returned if the key already exists. The flag GENERATING is ++ only used to print correct messages. */ + static gpg_error_t +-does_key_exist (app_t app, int keyidx, int force) ++does_key_exist (app_t app, int keyidx, int generating, int force) + { + const unsigned char *fpr; + unsigned char *buffer; +@@ -2178,8 +2180,10 @@ + } + else if (i!=20) + log_info (_("existing key will be replaced\n")); ++ else if (generating) ++ log_info (_("generating new key\n")); + else +- log_info (_("generating new key\n")); ++ log_info (_("writing new key\n")); + return 0; + } + +@@ -2340,7 +2344,64 @@ + } + + ++/* Helper for do_writekley to change the size of a key. Not ethat ++ this deletes the entire key without asking. */ ++static gpg_error_t ++change_keyattr (app_t app, int keyno, unsigned int nbits, ++ gpg_error_t (*pincb)(void*, const char *, char **), ++ void *pincb_arg) ++{ ++ gpg_error_t err; ++ unsigned char *buffer; ++ size_t buflen; ++ void *relptr; + ++ assert (keyno >=0 && keyno <= 2); ++ ++ if (nbits > 3072) ++ return gpg_error (GPG_ERR_TOO_LARGE); ++ ++ /* Read the current attributes into a buffer. */ ++ relptr = get_one_do (app, 0xC1+keyno, &buffer, &buflen, NULL); ++ if (!relptr) ++ return gpg_error (GPG_ERR_CARD); ++ if (buflen < 6 || buffer[0] != 1) ++ { ++ /* Attriutes too short or not an RSA key. */ ++ xfree (relptr); ++ return gpg_error (GPG_ERR_CARD); ++ } ++ ++ /* We only change n_bits and don't touch anything else. Before we ++ do so, we round up NBITS to a sensible way in the same way as ++ gpg's key generation does it. This may help to sort out problems ++ with a few bits too short keys. */ ++ nbits = ((nbits + 31) / 32) * 32; ++ buffer[1] = (nbits >> 8); ++ buffer[2] = nbits; ++ ++ /* Prepare for storing the key. */ ++ err = verify_chv3 (app, pincb, pincb_arg); ++ if (err) ++ { ++ xfree (relptr); ++ return err; ++ } ++ ++ /* Change the attribute. */ ++ err = iso7816_put_data (app->slot, 0, 0xC1+keyno, buffer, buflen); ++ xfree (relptr); ++ if (err) ++ log_error ("error changing size of key %d to %u bits\n", keyno+1, nbits); ++ else ++ log_info ("size of key %d changed to %u bits\n", keyno+1, nbits); ++ flush_cache (app); ++ parse_algorithm_attribute (app, keyno); ++ return err; ++} ++ ++ ++ + /* Handle the WRITEKEY command for OpenPGP. This function expects a + canonical encoded S-expression with the secret key in KEYDATA and + its length (for assertions) in KEYDATALEN. KEYID needs to be the +@@ -2385,7 +2446,7 @@ + else + return gpg_error (GPG_ERR_INV_ID); + +- err = does_key_exist (app, keyno, force); ++ err = does_key_exist (app, keyno, 0, force); + if (err) + return err; + +@@ -2515,6 +2576,14 @@ + if (opt.verbose) + log_info ("RSA modulus size is %u bits (%u bytes)\n", + nbits, (unsigned int)rsa_n_len); ++ if (nbits && nbits != maxbits ++ && app->app_local->extcap.algo_attr_change) ++ { ++ /* Try to switch the key to a new length. */ ++ err = change_keyattr (app, keyno, nbits, pincb, pincb_arg); ++ if (!err) ++ maxbits = app->app_local->keyattr[keyno].n_bits; ++ } + if (nbits != maxbits) + { + log_error (_("RSA modulus missing or not of size %d bits\n"), +@@ -2696,7 +2765,7 @@ + app->app_local->pk[keyno].read_done = 0; + + /* Check whether a key already exists. */ +- rc = does_key_exist (app, keyno, force); ++ rc = does_key_exist (app, keyno, 1, force); + if (rc) + return rc; + + + +--- g10/card-util.c (revision 5068) ++++ g10/card-util.c (working copy) +@@ -1,5 +1,5 @@ + /* card-util.c - Utility functions for the OpenPGP card. +- * Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++ * Copyright (C) 2003, 2004, 2005, 2009 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * +@@ -1393,7 +1393,8 @@ + + show_card_key_info (&info); + +- if (!is_RSA (sk->pubkey_algo) || nbits_from_sk (sk) != 1024 ) ++ if (!is_RSA (sk->pubkey_algo) ++ || (!info.is_v2 && nbits_from_sk (sk) != 1024) ) + { + tty_printf ("You may only store a 1024 bit RSA key on the card\n"); + tty_printf ("\n"); +@@ -1461,7 +1462,10 @@ + + rc = save_unprotected_key_to_card (sk, keyno); + if (rc) +- goto leave; ++ { ++ log_error (_("error writing key to card: %s\n"), gpg_strerror (rc)); ++ goto leave; ++ } + + /* Get back to the maybe protected original secret key. */ + if (copied_sk) + + Property changes on: trunk/patches/gnupg2-2.0.12/03-opgp-writekey.patch ___________________________________________________________________ Name: svn:executable + * Added: trunk/patches/gnupg2-2.0.12/04-hash-prefs.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/04-hash-prefs.patch 2009-07-09 09:57:38 UTC (rev 1210) +++ trunk/patches/gnupg2-2.0.12/04-hash-prefs.patch 2009-07-09 14:12:15 UTC (rev 1211) @@ -0,0 +1,133 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +[g10] +2009-07-09 Werner Koch + + * gpg.c (main): Remove the SHA-1 default from the personal digest + list. This was used in the past as a hack to avoid preferring + RMD-160. + + * keygen.c (keygen_set_std_prefs): Remove RMD-160 from the list. + Change order to SHA-256, SHA-1, SHA-384, SHA-512, SHA-224. + (gen_dsa): Use a 256 bit Q for 2048 bit P. Runt to FIPS allowed + values in non-expert mode. + + +Index: g10/keygen.c +=================================================================== +--- g10/keygen.c (revision 5068) ++++ g10/keygen.c (working copy) +@@ -1,6 +1,6 @@ + /* keygen.c - generate a key pair + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +- * 2006, 2007 Free Software Foundation, Inc. ++ * 2006, 2007, 2009 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * +@@ -301,7 +301,7 @@ + byte sym[MAX_PREFS], hash[MAX_PREFS], zip[MAX_PREFS]; + int nsym=0, nhash=0, nzip=0, val, rc=0; + int mdc=1, modify=0; /* mdc defaults on, modify defaults off. */ +- char dummy_string[45+1]; /* Enough for 15 items. */ ++ char dummy_string[20*4+1]; /* Enough for 20 items. */ + + if (!string || !ascii_strcasecmp (string, "default")) + { +@@ -345,16 +345,30 @@ + if ( !openpgp_cipher_test_algo (CIPHER_ALGO_IDEA) ) + strcat(dummy_string,"S1 "); + +- /* SHA-1 */ +- strcat(dummy_string,"H2 "); + +- if (!openpgp_md_test_algo(DIGEST_ALGO_SHA256)) +- strcat(dummy_string,"H8 "); ++ /* The default hash algo order is: ++ SHA-256, SHA-1, SHA-384, SHA-512, SHA-224. ++ Ordering SHA-1 before SHA-384 might be viewed as a bit ++ strange; it is done because we expect that soon enough ++ SHA-3 will be available and at that point there should ++ be no more need for SHA-384 etc. Anyway this order is ++ just a default and can easily be changed by a config ++ option. */ ++ if (!openpgp_md_test_algo (DIGEST_ALGO_SHA256)) ++ strcat (dummy_string, "H8 "); + +- /* RIPEMD160 */ +- if (!openpgp_md_test_algo(DIGEST_ALGO_RMD160)) +- strcat(dummy_string,"H3 "); ++ strcat (dummy_string, "H2 "); /* SHA-1 */ + ++ if (!openpgp_md_test_algo (DIGEST_ALGO_SHA384)) ++ strcat (dummy_string, "H9 "); ++ ++ if (!openpgp_md_test_algo (DIGEST_ALGO_SHA512)) ++ strcat (dummy_string, "H10 "); ++ ++ if (!openpgp_md_test_algo (DIGEST_ALGO_SHA224)) ++ strcat (dummy_string, "H11 "); ++ ++ + /* ZLIB */ + strcat(dummy_string,"Z2 "); + +@@ -507,7 +521,8 @@ + + /* Return a fake user ID containing the preferences. Caller must + free. */ +-PKT_user_id *keygen_get_std_prefs(void) ++PKT_user_id * ++keygen_get_std_prefs(void) + { + int i,j=0; + PKT_user_id *uid=xmalloc_clear(sizeof(PKT_user_id)); +@@ -1280,6 +1295,14 @@ + log_info(_("keysize rounded up to %u bits\n"), nbits ); + } + ++ /* To comply with FIPS rules we round up to the next value unless in ++ expert mode. */ ++ if (!opt.expert && nbits > 1024 && (nbits % 1024)) ++ { ++ nbits = ((nbits + 1023) / 1024) * 1024; ++ log_info(_("keysize rounded up to %u bits\n"), nbits ); ++ } ++ + /* + Figure out a q size based on the key size. FIPS 180-3 says: + +@@ -1291,11 +1314,11 @@ + 2048/256 is an odd pair since there is also a 2048/224 and + 3072/256. Matching sizes is not a very exact science. + +- We'll do 256 qbits for nbits over 2048, 224 for nbits over 1024 ++ We'll do 256 qbits for nbits over 2047, 224 for nbits over 1024 + but less than 2048, and 160 for 1024 (DSA1). + */ + +- if (nbits > 2048) ++ if (nbits > 2047) + qbits = 256; + else if ( nbits > 1024) + qbits = 224; +Index: g10/gpg.c +=================================================================== +--- g10/gpg.c (revision 5068) ++++ g10/gpg.c (working copy) +@@ -3195,11 +3195,6 @@ + keygen_set_std_prefs(opt.def_preference_list,0)) + log_error(_("invalid default preferences\n")); + +- /* We provide defaults for the personal digest list. This is +- SHA-1. */ +- if(!pers_digest_list) +- pers_digest_list="h2"; +- + if(pers_cipher_list && + keygen_set_std_prefs(pers_cipher_list,PREFTYPE_SYM)) + log_error(_("invalid personal cipher preferences\n")); + + Property changes on: trunk/patches/gnupg2-2.0.12/04-hash-prefs.patch ___________________________________________________________________ Name: svn:executable + * Added: trunk/patches/gnupg2-2.0.12/05-dns-sd.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/05-dns-sd.patch 2009-07-09 09:57:38 UTC (rev 1210) +++ trunk/patches/gnupg2-2.0.12/05-dns-sd.patch 2009-07-09 14:12:15 UTC (rev 1211) @@ -0,0 +1,70 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +[keyserver] +2009-07-06 David Shaw + + * gpgkeys_hkp.c (main, srv_replace): Minor tweaks to use the + DNS-SD names ("pgpkey-http" and "pgpkey-https") in SRV lookups + instead of "hkp" and "hkps". + + +Index: keyserver/gpgkeys_hkp.c +=================================================================== +--- keyserver/gpgkeys_hkp.c (revision 5068) ++++ keyserver/gpgkeys_hkp.c (working copy) +@@ -489,18 +489,21 @@ + /* If there is a SRV record, take the highest ranked possibility. + This is a hack, as we don't proceed downwards. */ + static void +-srv_replace(void) ++srv_replace(const char *srvtag) + { + #ifdef USE_DNS_SRV + struct srventry *srvlist=NULL; + int srvcount; + +- if(1+strlen(opt->scheme)+6+strlen(opt->host)+1<=MAXDNAME) ++ if(!srvtag) ++ return; ++ ++ if(1+strlen(srvtag)+6+strlen(opt->host)+1<=MAXDNAME) + { + char srvname[MAXDNAME]; + + strcpy(srvname,"_"); +- strcat(srvname,opt->scheme); ++ strcat(srvname,srvtag); + strcat(srvname,"._tcp."); + strcat(srvname,opt->host); + srvcount=getsrv(srvname,&srvlist); +@@ -714,17 +717,26 @@ + port=opt->port; + else if(try_srv) + { ++ char *srvtag; ++ ++ if(ks_strcasecmp(opt->scheme,"hkp")==0) ++ srvtag="pgpkey-http"; ++ else if(ks_strcasecmp(opt->scheme,"hkps")==0) ++ srvtag="pgpkey-https"; ++ else ++ srvtag=NULL; ++ + #ifdef HAVE_LIBCURL + /* We're using libcurl, so fake SRV support via our wrapper. + This isn't as good as true SRV support, as we do not try all + possible targets at one particular level and work our way + down the list, but it's better than nothing. */ +- srv_replace(); ++ srv_replace(srvtag); + #else + /* We're using our internal curl shim, so we can use its (true) + SRV support. Obviously, CURLOPT_SRVTAG_GPG_HACK isn't a real + libcurl option. It's specific to our shim. */ +- curl_easy_setopt(curl,CURLOPT_SRVTAG_GPG_HACK,opt->scheme); ++ curl_easy_setopt(curl,CURLOPT_SRVTAG_GPG_HACK,srvtag); + #endif + } + Property changes on: trunk/patches/gnupg2-2.0.12/05-dns-sd.patch ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Fri Jul 10 10:56:50 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 10 Jul 2009 10:56:50 +0200 (CEST) Subject: [Gpg4win-commits] r1212 - in trunk: . packages Message-ID: <20090710085650.A1C987A15A@pyrosoma.intevation.org> Author: emanuel Date: 2009-07-10 10:56:47 +0200 (Fri, 10 Jul 2009) New Revision: 1212 Modified: trunk/ChangeLog trunk/packages/packages.current Log: update kdesupport Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-09 14:12:15 UTC (rev 1211) +++ trunk/ChangeLog 2009-07-10 08:56:47 UTC (rev 1212) @@ -1,3 +1,7 @@ +2009-07-10 Emanuel Schuetze + + * packages/packages.current: Update kdesupport. + 2009-07-09 Werner Koch * patches/gnupg2-2.0.12/03-opgp-writekey.patch: New. Modified: trunk/packages/packages.current =================================================================== --- trunk/packages/packages.current 2009-07-09 14:12:15 UTC (rev 1211) +++ trunk/packages/packages.current 2009-07-10 08:56:47 UTC (rev 1212) @@ -428,20 +428,20 @@ server ftp://ftp.kdab.net/pub/gpg4win -name kdesupport-20090612-2-bin.zip -file kdesupport-20090612-2-dbus4win-bin.zip +name kdesupport-20090701-bin.zip +file kdesupport-20090701-dbus4win-bin.zip chk 02bc4fab05ccf037daad184c06a13c00d3f0d542 -name kdesupport-20090612-2-dev.zip -file kdesupport-20090612-2-dbus4win-dev.zip +name kdesupport-20090701-dev.zip +file kdesupport-20090701-dbus4win-dev.zip chk ddc85461dd0e358b6e5289a93c02ac5310491bb8 -name kdesupport-20090612-2-lib.zip -file kdesupport-20090612-2-dbus4win-lib.zip -chk aa636f23978fef3875506ab2232a121b4d7ec9da +name kdesupport-20090701-lib.zip +file kdesupport-20090701-dbus4win-lib.zip +chk 25124ee9a77ea5a4812026fca0b2b395e00a1f74 -name kdesupport-20090612-2-src.zip -file kdesupport-20090612-2-dbus4win-src.zip +name kdesupport-20090701-src.zip +file kdesupport-20090701-dbus4win-src.zip chk 2fa67502e00872d5e3ece1682d71383ca8cbf1e0 # oxygen-icons From scm-commit at wald.intevation.org Mon Jul 13 18:32:12 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 13 Jul 2009 18:32:12 +0200 (CEST) Subject: [Gpg4win-commits] r1213 - in trunk: . patches/gnupg2-2.0.12 Message-ID: <20090713163212.61A0E7A14F@pyrosoma.intevation.org> Author: werner Date: 2009-07-13 18:32:11 +0200 (Mon, 13 Jul 2009) New Revision: 1213 Added: trunk/patches/gnupg2-2.0.12/06-opgp-sign3072.patch trunk/patches/gnupg2-2.0.12/07-gpg-no-detached.patch Modified: trunk/ChangeLog trunk/Makefile.am Log: More gnupg patches to backport stuff from the current develop version. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-10 08:56:47 UTC (rev 1212) +++ trunk/ChangeLog 2009-07-13 16:32:11 UTC (rev 1213) @@ -1,3 +1,9 @@ +2009-07-13 Werner Koch + + * patches/gnupg2-2.0.12/06-opgp-sign3072.patch: New. + * patches/gnupg2-2.0.12/07-gpg-no-detached.patch: New. + * Makefile.am (EXTRA_DIST): Add them.. + 2009-07-10 Emanuel Schuetze * packages/packages.current: Update kdesupport. Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-07-10 08:56:47 UTC (rev 1212) +++ trunk/Makefile.am 2009-07-13 16:32:11 UTC (rev 1213) @@ -48,6 +48,8 @@ patches/gnupg2-2.0.12/03-opgp-writekey.patch \ patches/gnupg2-2.0.12/04-hash-prefs.patch \ patches/gnupg2-2.0.12/05-dns-sd.patch \ + patches/gnupg2-2.0.12/06-opgp-sign3072.patch \ + patches/gnupg2-2.0.12/07-gpg-no-detached.patch \ patches/gpgol-0.9.91/01-gpgme.patch \ patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch \ patches/claws-mail-3.7.1/02-3.7.1cvs22.patch \ Added: trunk/patches/gnupg2-2.0.12/06-opgp-sign3072.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/06-opgp-sign3072.patch 2009-07-10 08:56:47 UTC (rev 1212) +++ trunk/patches/gnupg2-2.0.12/06-opgp-sign3072.patch 2009-07-13 16:32:11 UTC (rev 1213) @@ -0,0 +1,225 @@ +#! /bin/sh +cd scd && patch -p0 -f $* < $0 +exit $? + +2009-07-10 Werner Koch + + * iso7816.c (iso7816_compute_ds): Add args EXTENDED_MODE and LE. + Change all callers to use 0. + (iso7816_internal_authenticate): Add args EXTENDED_MODE and LE. + * app-openpgp.c (do_sign): Take exmode and Le from card + capabilities and pass them to iso7816_compute_ds. + (do_auth): Ditto for iso7816_internal_authenticate. + (change_keyattr): Reset CHV verification status. + + +Index: iso7816.c +=================================================================== +--- iso7816.c (revision 5072) ++++ iso7816.c (working copy) +@@ -505,9 +505,10 @@ + /* Perform the security operation COMPUTE DIGITAL SIGANTURE. On + success 0 is returned and the data is availavle in a newly + allocated buffer stored at RESULT with its length stored at +- RESULTLEN. */ ++ RESULTLEN. For LE see do_generate_keypair. */ + gpg_error_t +-iso7816_compute_ds (int slot, const unsigned char *data, size_t datalen, ++iso7816_compute_ds (int slot, int extended_mode, ++ const unsigned char *data, size_t datalen, int le, + unsigned char **result, size_t *resultlen) + { + int sw; +@@ -517,9 +518,16 @@ + *result = NULL; + *resultlen = 0; + +- sw = apdu_send (slot, 0, +- 0x00, CMD_PSO, 0x9E, 0x9A, datalen, (const char*)data, +- result, resultlen); ++ if (!extended_mode) ++ le = 256; /* Ignore provided Le and use what apdu_send uses. */ ++ else if (le >= 0 && le < 256) ++ le = 256; ++ ++ sw = apdu_send_le (slot, extended_mode, ++ 0x00, CMD_PSO, 0x9E, 0x9A, ++ datalen, (const char*)data, ++ le, ++ result, resultlen); + if (sw != SW_SUCCESS) + { + /* Make sure that pending buffers are released. */ +@@ -586,9 +594,11 @@ + } + + ++/* For LE see do_generate_keypair. */ + gpg_error_t +-iso7816_internal_authenticate (int slot, ++iso7816_internal_authenticate (int slot, int extended_mode, + const unsigned char *data, size_t datalen, ++ int le, + unsigned char **result, size_t *resultlen) + { + int sw; +@@ -598,8 +608,16 @@ + *result = NULL; + *resultlen = 0; + +- sw = apdu_send (slot, 0, 0x00, CMD_INTERNAL_AUTHENTICATE, 0, 0, +- datalen, (const char*)data, result, resultlen); ++ if (!extended_mode) ++ le = 256; /* Ignore provided Le and use what apdu_send uses. */ ++ else if (le >= 0 && le < 256) ++ le = 256; ++ ++ sw = apdu_send_le (slot, extended_mode, ++ 0x00, CMD_INTERNAL_AUTHENTICATE, 0, 0, ++ datalen, (const char*)data, ++ le, ++ result, resultlen); + if (sw != SW_SUCCESS) + { + /* Make sure that pending buffers are released. */ +Index: app-openpgp.c +=================================================================== +--- app-openpgp.c (revision 5072) ++++ app-openpgp.c (working copy) +@@ -2397,6 +2397,9 @@ + log_info ("size of key %d changed to %u bits\n", keyno+1, nbits); + flush_cache (app); + parse_algorithm_attribute (app, keyno); ++ app->did_chv1 = 0; ++ app->did_chv2 = 0; ++ app->did_chv3 = 0; + return err; + } + +@@ -3008,6 +3011,7 @@ + const char *fpr = NULL; + unsigned long sigcount; + int use_auth = 0; ++ int exmode, le_value; + + if (!keyidstr || !*keyidstr) + return gpg_error (GPG_ERR_INV_VALUE); +@@ -3148,7 +3152,19 @@ + xfree (pinvalue); + } + +- rc = iso7816_compute_ds (app->slot, data, datalen, outdata, outdatalen); ++ ++ if (app->app_local->cardcap.ext_lc_le) ++ { ++ exmode = 1; /* Use extended length. */ ++ le_value = app->app_local->extcap.max_rsp_data; ++ } ++ else ++ { ++ exmode = 0; ++ le_value = 0; ++ } ++ rc = iso7816_compute_ds (app->slot, exmode, data, datalen, le_value, ++ outdata, outdatalen); + return rc; + } + +@@ -3219,8 +3235,23 @@ + + rc = verify_chv2 (app, pincb, pincb_arg); + if (!rc) +- rc = iso7816_internal_authenticate (app->slot, indata, indatalen, +- outdata, outdatalen); ++ { ++ int exmode, le_value; ++ ++ if (app->app_local->cardcap.ext_lc_le) ++ { ++ exmode = 1; /* Use extended length. */ ++ le_value = app->app_local->extcap.max_rsp_data; ++ } ++ else ++ { ++ exmode = 0; ++ le_value = 0; ++ } ++ rc = iso7816_internal_authenticate (app->slot, exmode, ++ indata, indatalen, le_value, ++ outdata, outdatalen); ++ } + return rc; + } + +Index: iso7816.h +=================================================================== +--- iso7816.h (revision 5072) ++++ iso7816.h (working copy) +@@ -93,15 +93,17 @@ + gpg_error_t iso7816_manage_security_env (int slot, int p1, int p2, + const unsigned char *data, + size_t datalen); +-gpg_error_t iso7816_compute_ds (int slot, ++gpg_error_t iso7816_compute_ds (int slot, int extended_mode, + const unsigned char *data, size_t datalen, ++ int le, + unsigned char **result, size_t *resultlen); + gpg_error_t iso7816_decipher (int slot, int extended_mode, + const unsigned char *data, size_t datalen, + int padind, + unsigned char **result, size_t *resultlen); +-gpg_error_t iso7816_internal_authenticate (int slot, ++gpg_error_t iso7816_internal_authenticate (int slot, int extended_mode, + const unsigned char *data, size_t datalen, ++ int le, + unsigned char **result, size_t *resultlen); + gpg_error_t iso7816_generate_keypair (int slot, int extended_mode, + const unsigned char *data, size_t datalen, + +Index: app-dinsig.c +=================================================================== +--- app-dinsig.c (revision 5072) ++++ app-dinsig.c (working copy) +@@ -483,7 +483,8 @@ + + rc = verify_pin (app, pincb, pincb_arg); + if (!rc) +- rc = iso7816_compute_ds (app->slot, data, datalen, outdata, outdatalen); ++ rc = iso7816_compute_ds (app->slot, 0, data, datalen, 0, ++ outdata, outdatalen); + return rc; + } + +Index: app-nks.c +=================================================================== +--- app-nks.c (revision 5072) ++++ app-nks.c (working copy) +@@ -969,7 +969,8 @@ + rc = verify_pin (app, 0, NULL, pincb, pincb_arg); + /* Compute the signature. */ + if (!rc) +- rc = iso7816_compute_ds (app->slot, data, datalen, outdata, outdatalen); ++ rc = iso7816_compute_ds (app->slot, 0, data, datalen, 0, ++ outdata, outdatalen); + return rc; + } + +Index: app-p15.c +=================================================================== +--- app-p15.c (revision 5072) ++++ app-p15.c (working copy) +@@ -3180,11 +3180,11 @@ + } + + if (hashalgo == MD_USER_TLS_MD5SHA1) +- err = iso7816_compute_ds (app->slot, data, 36, outdata, outdatalen); ++ err = iso7816_compute_ds (app->slot, 0, data, 36, 0, outdata, outdatalen); + else if (no_data_padding) +- err = iso7816_compute_ds (app->slot, data+15, 20, outdata, outdatalen); ++ err = iso7816_compute_ds (app->slot, 0, data+15, 20, 0,outdata,outdatalen); + else +- err = iso7816_compute_ds (app->slot, data, 35, outdata, outdatalen); ++ err = iso7816_compute_ds (app->slot, 0, data, 35, 0, outdata, outdatalen); + return err; + } + Property changes on: trunk/patches/gnupg2-2.0.12/06-opgp-sign3072.patch ___________________________________________________________________ Name: svn:executable + * Added: trunk/patches/gnupg2-2.0.12/07-gpg-no-detached.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/07-gpg-no-detached.patch 2009-07-10 08:56:47 UTC (rev 1212) +++ trunk/patches/gnupg2-2.0.12/07-gpg-no-detached.patch 2009-07-13 16:32:11 UTC (rev 1213) @@ -0,0 +1,226 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +[g10] +2009-07-13 Werner Koch + + * exec.c: Fix function name indentation. + (expand_args): Simplify by using membuf functions. + (exec_write): Fix memory leak on error. + (w32_system): Use DETACHED_PROCESS so that a new console is not + created. + + +Index: g10/exec.c +=================================================================== +--- g10/exec.c (revision 5069) ++++ g10/exec.c (working copy) +@@ -17,6 +17,12 @@ + * along with this program; if not, see . + */ + ++/* ++ FIXME: We should replace most code in this module by our ++ spawn implementation from common/exechelp.c. ++ */ ++ ++ + #include + #include + #include +@@ -40,19 +46,24 @@ + #include "iobuf.h" + #include "util.h" + #include "mkdtemp.h" /* From gnulib. */ ++#include "membuf.h" + #include "exec.h" + + #ifdef NO_EXEC +-int exec_write(struct exec_info **info,const char *program, ++int ++exec_write(struct exec_info **info,const char *program, + const char *args_in,const char *name,int writeonly,int binary) + { + log_error(_("no remote program execution supported\n")); + return G10ERR_GENERAL; + } + +-int exec_read(struct exec_info *info) { return G10ERR_GENERAL; } +-int exec_finish(struct exec_info *info) { return G10ERR_GENERAL; } +-int set_exec_path(const char *path) { return G10ERR_GENERAL; } ++int ++exec_read(struct exec_info *info) { return G10ERR_GENERAL; } ++int ++exec_finish(struct exec_info *info) { return G10ERR_GENERAL; } ++int ++set_exec_path(const char *path) { return G10ERR_GENERAL; } + + #else /* ! NO_EXEC */ + +@@ -60,7 +71,8 @@ + /* This is a nicer system() for windows that waits for programs to + return before returning control to the caller. I hate helpful + computers. */ +-static int w32_system(const char *command) ++static int ++w32_system(const char *command) + { + PROCESS_INFORMATION pi; + STARTUPINFO si; +@@ -74,7 +86,9 @@ + memset(&si,0,sizeof(si)); + si.cb=sizeof(si); + +- if(!CreateProcess(NULL,string,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) ++ if(!CreateProcess(NULL,string,NULL,NULL,FALSE, ++ DETACHED_PROCESS, ++ NULL,NULL,&si,&pi)) + return -1; + + /* Wait for the child to exit */ +@@ -89,7 +103,8 @@ + #endif + + /* Replaces current $PATH */ +-int set_exec_path(const char *path) ++int ++set_exec_path(const char *path) + { + char *p; + +@@ -111,7 +126,8 @@ + } + + /* Makes a temp directory and filenames */ +-static int make_tempdir(struct exec_info *info) ++static int ++make_tempdir(struct exec_info *info) + { + char *tmp=opt.temp_dir,*namein=info->name,*nameout; + +@@ -192,10 +208,11 @@ + + /* Expands %i and %o in the args to the full temp files within the + temp directory. */ +-static int expand_args(struct exec_info *info,const char *args_in) ++static int ++expand_args(struct exec_info *info,const char *args_in) + { +- const char *ch=args_in; +- unsigned int size,len; ++ const char *ch = args_in; ++ membuf_t command; + + info->flags.use_temp_files=0; + info->flags.keep_temp_files=0; +@@ -203,10 +220,7 @@ + if(DBG_EXTPROG) + log_debug("expanding string \"%s\"\n",args_in); + +- size=100; +- info->command=xmalloc(size); +- len=0; +- info->command[0]='\0'; ++ init_membuf (&command, 100); + + while(*ch!='\0') + { +@@ -252,37 +266,20 @@ + } + + if(append) +- { +- size_t applen=strlen(append); +- +- if(applen+len>size-1) +- { +- if(applen<100) +- applen=100; +- +- size+=applen; +- info->command=xrealloc(info->command,size); +- } +- +- strcat(info->command,append); +- len+=strlen(append); +- } ++ put_membuf_str (&command, append); + } + else +- { +- if(len==size-1) /* leave room for the \0 */ +- { +- size+=100; +- info->command=xrealloc(info->command,size); +- } ++ put_membuf (&command, ch, 1); + +- info->command[len++]=*ch; +- info->command[len]='\0'; +- } +- + ch++; + } + ++ put_membuf (&command, "", 1); /* Terminate string. */ ++ ++ info->command = get_membuf (&command, NULL); ++ if (!info->command) ++ return gpg_error_from_syserror (); ++ + if(DBG_EXTPROG) + log_debug("args expanded to \"%s\", use %u, keep %u\n",info->command, + info->flags.use_temp_files,info->flags.keep_temp_files); +@@ -290,10 +287,7 @@ + return 0; + + fail: +- +- xfree(info->command); +- info->command=NULL; +- ++ xfree (get_membuf (&command, NULL)); + return G10ERR_GENERAL; + } + +@@ -303,8 +297,9 @@ + If there are args, but no tempfiles, then it's a fork/exec/pipe via + shell -c. If there are tempfiles, then it's a system. */ + +-int exec_write(struct exec_info **info,const char *program, +- const char *args_in,const char *name,int writeonly,int binary) ++int ++exec_write(struct exec_info **info,const char *program, ++ const char *args_in,const char *name,int writeonly,int binary) + { + int ret=G10ERR_GENERAL; + +@@ -483,10 +478,16 @@ + ret=0; + + fail: ++ if (ret) ++ { ++ xfree (*info); ++ *info = NULL; ++ } + return ret; + } + +-int exec_read(struct exec_info *info) ++int ++exec_read(struct exec_info *info) + { + int ret=G10ERR_GENERAL; + +@@ -565,7 +566,8 @@ + return ret; + } + +-int exec_finish(struct exec_info *info) ++int ++exec_finish(struct exec_info *info) + { + int ret=info->progreturn; + Property changes on: trunk/patches/gnupg2-2.0.12/07-gpg-no-detached.patch ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Fri Jul 17 23:25:39 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 17 Jul 2009 23:25:39 +0200 (CEST) Subject: [Gpg4win-commits] r1214 - in trunk: . patches patches/gpgex-0.9.3 Message-ID: <20090717212539.540C0865F47C@pyrosoma.intevation.org> Author: marcus Date: 2009-07-17 23:25:38 +0200 (Fri, 17 Jul 2009) New Revision: 1214 Added: trunk/patches/gpgex-0.9.3/ trunk/patches/gpgex-0.9.3/01-full-browser.patch Modified: trunk/ChangeLog trunk/Makefile.am Log: 2009-07-17 Marcus Brinkmann * patches/gpgex-0.9.3/01-full-browser.patch: New file. * Makefile.am (EXTRA_DIST): Add this file. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-13 16:32:11 UTC (rev 1213) +++ trunk/ChangeLog 2009-07-17 21:25:38 UTC (rev 1214) @@ -1,3 +1,8 @@ +2009-07-17 Marcus Brinkmann + + * patches/gpgex-0.9.3/01-full-browser.patch: New file. + * Makefile.am (EXTRA_DIST): Add this file. + 2009-07-13 Werner Koch * patches/gnupg2-2.0.12/06-opgp-sign3072.patch: New. Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-07-13 16:32:11 UTC (rev 1213) +++ trunk/Makefile.am 2009-07-17 21:25:38 UTC (rev 1214) @@ -37,6 +37,7 @@ patches/libetpan-0.54/02-index.patch \ patches/winpt/01-gpg-path.patch \ patches/gpgex/01-no-checksums.patch \ + patches/gpgex-0.9.3/01-full-browser.patch \ patches/gnupg2/01-version.patch.in \ patches/gnupg2-2.0.9/01-close-all-handle.patch \ patches/gnupg2-2.0.9/02-de.po-fix.patch \ Added: trunk/patches/gpgex-0.9.3/01-full-browser.patch =================================================================== --- trunk/patches/gpgex-0.9.3/01-full-browser.patch 2009-07-13 16:32:11 UTC (rev 1213) +++ trunk/patches/gpgex-0.9.3/01-full-browser.patch 2009-07-17 21:25:38 UTC (rev 1214) @@ -0,0 +1,27 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +2009-07-17 Marcus Brinkmann + + * gpgex.cc (start_help): Do not cripple the browser window. + +Index: src/gpgex.cc +=================================================================== +--- src/gpgex.cc (revision 68) ++++ src/gpgex.cc (working copy) +@@ -505,10 +505,10 @@ + /* FIXME: Pick a good configuration. */ + // Only for IE7? + // web->put_Resizable (VARIANT_TRUE); +- web->put_ToolBar (FALSE); +- web->put_AddressBar (VARIANT_FALSE); +- web->put_MenuBar (VARIANT_FALSE); +- web->put_StatusBar (VARIANT_FALSE); ++ // web->put_ToolBar (FALSE); ++ // web->put_AddressBar (VARIANT_FALSE); ++ // web->put_MenuBar (VARIANT_FALSE); ++ // web->put_StatusBar (VARIANT_FALSE); + // width, height + web->put_Visible (VARIANT_TRUE); + Property changes on: trunk/patches/gpgex-0.9.3/01-full-browser.patch ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Mon Jul 27 14:30:44 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 27 Jul 2009 14:30:44 +0200 (CEST) Subject: [Gpg4win-commits] r1215 - in trunk/doc: . website Message-ID: <20090727123044.F2E818C4DB5B@pyrosoma.intevation.org> Author: werner Date: 2009-07-27 14:30:44 +0200 (Mon, 27 Jul 2009) New Revision: 1215 Modified: trunk/doc/ChangeLog trunk/doc/website/index-de.htm4 trunk/doc/website/index.htm4 Log: Explain "Free Software" Modified: trunk/doc/ChangeLog =================================================================== --- trunk/doc/ChangeLog 2009-07-17 21:25:38 UTC (rev 1214) +++ trunk/doc/ChangeLog 2009-07-27 12:30:44 UTC (rev 1215) @@ -1,3 +1,8 @@ +2009-07-27 Werner Koch + + * website/index.htm4: Explain "Free Software". + * website/index-de.htm4: Ditto. + 2009-07-09 Emanuel Schuetze * website/index.htm4, website/build-history.awk: Fixed typo. Modified: trunk/doc/website/index-de.htm4 =================================================================== --- trunk/doc/website/index-de.htm4 2009-07-17 21:25:38 UTC (rev 1214) +++ trunk/doc/website/index-de.htm4 2009-07-27 12:30:44 UTC (rev 1215) @@ -14,8 +14,9 @@ unterst�tzt (letzterer ist in Arbeit und funktioniert aktuell mit GnuPG2 und Claws Mail). Gpg4win und die in Gpg4win enthaltene Software sind Freie -Software. +Software Software (u.a. kostenlose gewerbliche und private Nutzung). +

Wahlweise k�nnen alle oder einige der folgenden Module installiert werden:

Modified: trunk/doc/website/index.htm4 =================================================================== --- trunk/doc/website/index.htm4 2009-07-17 21:25:38 UTC (rev 1214) +++ trunk/doc/website/index.htm4 2009-07-27 12:30:44 UTC (rev 1215) @@ -8,13 +8,14 @@ PAGE_START

New User?

-Gpg4win is a installer package for Windows (2000/XP/2003/Vista) -with computer programs and handbooks for EMail and file encryption. -Both relevant cryptography standards are supported, OpenPGP and S/MIME -(the latter is in progress and currently works with GnuPG2 and Claws Mail). +Gpg4win is a installer package for Windows (2000/XP/2003/Vista) with +computer programs and handbooks for EMail and file encryption. Both +relevant cryptography standards are supported, OpenPGP and S/MIME (the +latter is in progress and currently works with GnuPG2 and Claws Mail). Gpg4win and the software included with Gpg4win are Free -Software. +Software (among other things free of charge for all commercial and +non-commercial purposes).

You can choose all or some of the following modules during installation: From scm-commit at wald.intevation.org Tue Jul 28 10:40:53 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Tue, 28 Jul 2009 10:40:53 +0200 (CEST) Subject: [Gpg4win-commits] r1216 - in trunk: . packages patches patches/libetpan-0.57 Message-ID: <20090728084053.6B355865F47C@pyrosoma.intevation.org> Author: colinleroy Date: 2009-07-28 10:40:52 +0200 (Tue, 28 Jul 2009) New Revision: 1216 Added: trunk/patches/libetpan-0.57/ trunk/patches/libetpan-0.57/01-gnutls_compat.patch Removed: trunk/patches/claws-mail-3.7.0/ trunk/patches/claws-mail-3.7.1/ trunk/patches/libetpan-0.54/ Modified: trunk/ChangeLog trunk/Makefile.am trunk/packages/packages.current Log: 2009-07-28 Colin Leroy * patches/libetpan-0.54: Removed * patches/claws-mail-3.7.0: Removed * patches/claws-mail-3.7.1: Removed * patches/libetpan-0.57/01-gnutls_compat.patch: New. Fixes connection to some non-compliant servers * Makefile.am: Reflect patches/ changes * packages/packages.current: Update Claws Mail and its plugins Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-27 12:30:44 UTC (rev 1215) +++ trunk/ChangeLog 2009-07-28 08:40:52 UTC (rev 1216) @@ -1,3 +1,14 @@ +2009-07-28 Colin Leroy + + * patches/libetpan-0.54: Removed + * patches/claws-mail-3.7.0: Removed + * patches/claws-mail-3.7.1: Removed + * patches/libetpan-0.57/01-gnutls_compat.patch: New. Fixes + connection to some non-compliant servers + * Makefile.am: Reflect patches/ changes + * packages/packages.current: Update Claws Mail and its + plugins + 2009-07-17 Marcus Brinkmann * patches/gpgex-0.9.3/01-full-browser.patch: New file. Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-07-27 12:30:44 UTC (rev 1215) +++ trunk/Makefile.am 2009-07-28 08:40:52 UTC (rev 1216) @@ -33,8 +33,6 @@ patches/gpgme-1.1.7/02-extern-umlaute.patch \ patches/gpgme-1.1.7/03-error-parsing.patch \ patches/gpgme-1.2.0/01-w32-io-threads.patch \ - patches/libetpan-0.54/01-config.patch \ - patches/libetpan-0.54/02-index.patch \ patches/winpt/01-gpg-path.patch \ patches/gpgex/01-no-checksums.patch \ patches/gpgex-0.9.3/01-full-browser.patch \ @@ -52,10 +50,8 @@ patches/gnupg2-2.0.12/06-opgp-sign3072.patch \ patches/gnupg2-2.0.12/07-gpg-no-detached.patch \ patches/gpgol-0.9.91/01-gpgme.patch \ - patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch \ - patches/claws-mail-3.7.1/02-3.7.1cvs22.patch \ - patches/claws-mail-3.7.1/03-pipe.patch \ patches/gpa-0.9.0/01-title-prop.patch \ + patches/libetpan-0.57/01-gnutls_compat.patch \ patches/scute-1.2.0/01-bugfixes.patch copy-news: Modified: trunk/packages/packages.current =================================================================== --- trunk/packages/packages.current 2009-07-27 12:30:44 UTC (rev 1215) +++ trunk/packages/packages.current 2009-07-28 08:40:52 UTC (rev 1216) @@ -127,36 +127,36 @@ # (Kept on our own mirror due to Sourceforge peculiarities.) server http://www.claws-mail.org/win32 -file claws-mail-3.7.1.tar.bz2 -chk 58a88e705b6f27c4f3c1f44fec9dd250e7e86bb0 +file claws-mail-3.7.2cvs11.tar.bz2 +chk 565960bfb5540983c78551f31176bbf92f14c3a6 server http://www.claws-mail.org/win32 -file attachwarner-0.2.16.tar.gz -chk 3d44c09965d8da419f2b4e6543cb2bdc61142add +file attachwarner-0.2.17.tar.gz +chk 65d92cfb41f48679cadc8fa8db17a55fdc0d6c0b server http://www.claws-mail.org/win32 -file bsfilter_plugin-1.0cvs1.tar.gz -chk c5858b797820500174b67be7ed20ccafdd785581 +file bsfilter_plugin-1.0.1cvs1.tar.gz +chk 179f5e83431376a8914b349d51c85a733e4eb780 server http://www.claws-mail.org/win32 -file gtkhtml2_viewer-0.23cvs2.tar.gz -chk 7b5a284f0a8c52790e216b2dbef711f068fecf22 +file gtkhtml2_viewer-0.24cvs2.tar.gz +chk c6224101ba8d4e4a59112a5235567b4ca162e802 server http://www.claws-mail.org/win32 -file notification_plugin-0.21.tar.gz -chk a40dc1af268e665d0c8d5ca3ee5b72b07314548e +file notification_plugin-0.22cvs3.tar.gz +chk 9def3108dab352b170eaf9b0a346d83b80c0a419 server http://www.claws-mail.org/win32 -file rssyl-0.24.tar.gz -chk 98924a761d0dbc11bb6b150ca8296b92d6eb7526 +file rssyl-0.25.tar.gz +chk 3a2a652907c163abda7f2a7dbae1c0ba157a8728 server http://www.claws-mail.org/win32 -file tnef_parse-0.3.4.tar.gz -chk cf6c7abc320526cc4437763f9cb71d8a349de454 +file tnef_parse-0.3.5cvs1.tar.gz +chk e7e07be77878f83ed91331eb79e99303f4302b95 server http://www.claws-mail.org/win32 -file vcalendar-2.0.4.tar.gz -chk 6969a9500cf995e9f0e87a29ac4245363600b256 +file vcalendar-2.0.5.tar.gz +chk b2b6e3ada7b36a5fdd9e1cb263249b6929efbf45 # # Pthreads for Windows. Added: trunk/patches/libetpan-0.57/01-gnutls_compat.patch =================================================================== --- trunk/patches/libetpan-0.57/01-gnutls_compat.patch 2009-07-27 12:30:44 UTC (rev 1215) +++ trunk/patches/libetpan-0.57/01-gnutls_compat.patch 2009-07-28 08:40:52 UTC (rev 1216) @@ -0,0 +1,23 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +Fix connection to servers not implementing random padding + +Index: src/data-types/mailstream_ssl.c +=================================================================== +RCS file: /cvsroot/libetpan/libetpan/src/data-types/mailstream_ssl.c,v +retrieving revision 1.69 +retrieving revision 1.71 +diff -u -p -u -r1.69 -r1.71 +--- src/data-types/mailstream_ssl.c 21 Nov 2008 17:29:43 -0000 1.69 ++++ src/data-types/mailstream_ssl.c 12 Jun 2009 07:28:38 -0000 1.71 +@@ -460,7 +460,7 @@ static struct mailstream_ssl_data * ssl_ + gnutls_cipher_set_priority (session, cipher_prio); + gnutls_kx_set_priority (session, kx_prio); + gnutls_mac_set_priority (session, mac_prio); +- ++ gnutls_record_disable_padding(session); + gnutls_dh_set_prime_bits(session, 512); + + gnutls_transport_set_ptr(session, (gnutls_transport_ptr) fd); Property changes on: trunk/patches/libetpan-0.57/01-gnutls_compat.patch ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Wed Jul 29 08:15:04 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 29 Jul 2009 08:15:04 +0200 (CEST) Subject: [Gpg4win-commits] r1217 - trunk Message-ID: <20090729061504.8638F865F477@pyrosoma.intevation.org> Author: colinleroy Date: 2009-07-29 08:15:03 +0200 (Wed, 29 Jul 2009) New Revision: 1217 Modified: trunk/configure.ac Log: Put back svn mode Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-07-28 08:40:52 UTC (rev 1216) +++ trunk/configure.ac 2009-07-29 06:15:03 UTC (rev 1217) @@ -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], [2.0.0rc1]) -m4_define([my_issvn], [no]) +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)])) From scm-commit at wald.intevation.org Wed Jul 29 09:55:10 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 29 Jul 2009 09:55:10 +0200 (CEST) Subject: [Gpg4win-commits] r1218 - trunk Message-ID: <20090729075510.92AE2865F499@pyrosoma.intevation.org> Author: werner Date: 2009-07-29 09:55:07 +0200 (Wed, 29 Jul 2009) New Revision: 1218 Modified: trunk/ChangeLog trunk/README trunk/configure.ac Log: Explain version numbers. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-29 06:15:03 UTC (rev 1217) +++ trunk/ChangeLog 2009-07-29 07:55:07 UTC (rev 1218) @@ -1,3 +1,7 @@ +2009-07-29 Werner Koch + + * README: Explain version numbering. + 2009-07-28 Colin Leroy * patches/libetpan-0.54: Removed Modified: trunk/README =================================================================== --- trunk/README 2009-07-29 06:15:03 UTC (rev 1217) +++ trunk/README 2009-07-29 07:55:07 UTC (rev 1218) @@ -111,6 +111,27 @@ and run configure as described above. +Version numbers +=============== + +We use a specific order of version numbers. This is best shown by an +example: + + 1.0.0 - The final 1.0.0 release. + 1.0.1-svn1234 - A snapshot based on SVN revision 1234 + 1.0.1-svn1235 - A newer snapshot + 1.0.1rc1-svn1236 - A snapshot while preparing for a release candidate + 1.0.1rc1 - The first release candidate for 1.0.1 + 1.0.1-svn1240 - yet another snapshot + 1.0.1 - The final 1.0.1 release + +The important point is that we bump up the version number before we do +an release and append a suffix to mark it as a development version. +This allows other software to use a configure check for the next to be +released version of gpg4win. + + + Copyright ========= Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-07-29 06:15:03 UTC (rev 1217) +++ trunk/configure.ac 2009-07-29 07:55:07 UTC (rev 1218) @@ -25,7 +25,7 @@ # 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], [2.0.0rc1]) +m4_define([my_version], [2.0.0]) m4_define([my_issvn], [yes]) m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \ From scm-commit at wald.intevation.org Wed Jul 29 09:59:25 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 29 Jul 2009 09:59:25 +0200 (CEST) Subject: [Gpg4win-commits] r1219 - in trunk: . packages Message-ID: <20090729075925.2FAFC865F465@pyrosoma.intevation.org> Author: colinleroy Date: 2009-07-29 09:59:24 +0200 (Wed, 29 Jul 2009) New Revision: 1219 Modified: trunk/ChangeLog trunk/packages/packages.current Log: 2009-07-29 Colin Leroy * packages/packages.current: Update Claws Mail (focus problem fix) Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-29 07:55:07 UTC (rev 1218) +++ trunk/ChangeLog 2009-07-29 07:59:24 UTC (rev 1219) @@ -1,3 +1,8 @@ +2009-07-29 Colin Leroy + + * packages/packages.current: Update Claws Mail (focus + problem fix) + 2009-07-29 Werner Koch * README: Explain version numbering. Modified: trunk/packages/packages.current =================================================================== --- trunk/packages/packages.current 2009-07-29 07:55:07 UTC (rev 1218) +++ trunk/packages/packages.current 2009-07-29 07:59:24 UTC (rev 1219) @@ -127,8 +127,8 @@ # (Kept on our own mirror due to Sourceforge peculiarities.) server http://www.claws-mail.org/win32 -file claws-mail-3.7.2cvs11.tar.bz2 -chk 565960bfb5540983c78551f31176bbf92f14c3a6 +file claws-mail-3.7.2cvs15.tar.bz2 +chk e5264b6228c93cdeaf753976d89a729e2297ac16 server http://www.claws-mail.org/win32 file attachwarner-0.2.17.tar.gz From scm-commit at wald.intevation.org Thu Jul 30 17:34:00 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 30 Jul 2009 17:34:00 +0200 (CEST) Subject: [Gpg4win-commits] r1220 - in trunk: . patches/gnupg2-2.0.12 Message-ID: <20090730153400.7E78785D9191@pyrosoma.intevation.org> Author: werner Date: 2009-07-30 17:33:59 +0200 (Thu, 30 Jul 2009) New Revision: 1220 Added: trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch Modified: trunk/ChangeLog trunk/Makefile.am Log: Add learn-card patch Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-29 07:59:24 UTC (rev 1219) +++ trunk/ChangeLog 2009-07-30 15:33:59 UTC (rev 1220) @@ -1,3 +1,7 @@ +2009-07-30 Werner Koch + + * patches/gnupg2-2.0.12/08-sm-learn-card.patch: New. + 2009-07-29 Colin Leroy * packages/packages.current: Update Claws Mail (focus Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-07-29 07:59:24 UTC (rev 1219) +++ trunk/Makefile.am 2009-07-30 15:33:59 UTC (rev 1220) @@ -49,6 +49,7 @@ patches/gnupg2-2.0.12/05-dns-sd.patch \ patches/gnupg2-2.0.12/06-opgp-sign3072.patch \ patches/gnupg2-2.0.12/07-gpg-no-detached.patch \ + patches/gnupg2-2.0.12/08-sm-learn-card.patch \ patches/gpgol-0.9.91/01-gpgme.patch \ patches/gpa-0.9.0/01-title-prop.patch \ patches/libetpan-0.57/01-gnutls_compat.patch \ Added: trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch 2009-07-29 07:59:24 UTC (rev 1219) +++ trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch 2009-07-30 15:33:59 UTC (rev 1220) @@ -0,0 +1,33 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +[sm] +2009-07-30 Werner Koch + + * call-agent.c (learn_cb): Do not store as ephemeral. + + + +--- sm/call-agent.c (revision 5101) ++++ sm/call-agent.c (working copy) +@@ -875,13 +875,11 @@ + return 0; + } + ++ /* We do not store a certifciate with missing issuers as ephemeral ++ because we can assume that the --learn-card command has been used ++ on purpose. */ + rc = gpgsm_basic_cert_check (parm->ctrl, cert); +- if (gpg_err_code (rc) == GPG_ERR_MISSING_CERT) +- { /* For later use we store it in the ephemeral database. */ +- log_info ("issuer certificate missing - storing as ephemeral\n"); +- keydb_store_cert (cert, 1, NULL); +- } +- else if (rc) ++ if (rc && gpg_err_code (rc) != GPG_ERR_MISSING_CERT) + log_error ("invalid certificate: %s\n", gpg_strerror (rc)); + else + { + + From scm-commit at wald.intevation.org Fri Jul 31 10:40:09 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 31 Jul 2009 10:40:09 +0200 (CEST) Subject: [Gpg4win-commits] r1221 - trunk/patches/gnupg2-2.0.12 Message-ID: <20090731084009.42D8286415E2@pyrosoma.intevation.org> Author: werner Date: 2009-07-31 10:40:08 +0200 (Fri, 31 Jul 2009) New Revision: 1221 Modified: trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch Log: Add executable property. Property changes on: trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Fri Jul 31 13:03:27 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 31 Jul 2009 13:03:27 +0200 (CEST) Subject: [Gpg4win-commits] r1222 - in trunk: . patches/gnupg2-2.0.12 src Message-ID: <20090731110327.A3A85852FE20@pyrosoma.intevation.org> Author: marcus Date: 2009-07-31 13:03:26 +0200 (Fri, 31 Jul 2009) New Revision: 1222 Added: trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch Modified: trunk/ChangeLog trunk/Makefile.am trunk/src/make-msi.bat trunk/src/make-msi.pl Log: 2009-07-31 Marcus Brinkmann * patches/gnupg2-2.0.12/09-sm-keylist.patch: New file. * Makefile.am (EXTRA_DIST): Add it. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-31 08:40:08 UTC (rev 1221) +++ trunk/ChangeLog 2009-07-31 11:03:26 UTC (rev 1222) @@ -1,3 +1,8 @@ +2009-07-31 Marcus Brinkmann + + * patches/gnupg2-2.0.12/09-sm-keylist.patch: New file. + * Makefile.am (EXTRA_DIST): Add it. + 2009-07-30 Werner Koch * patches/gnupg2-2.0.12/08-sm-learn-card.patch: New. Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-07-31 08:40:08 UTC (rev 1221) +++ trunk/Makefile.am 2009-07-31 11:03:26 UTC (rev 1222) @@ -50,6 +50,7 @@ patches/gnupg2-2.0.12/06-opgp-sign3072.patch \ patches/gnupg2-2.0.12/07-gpg-no-detached.patch \ patches/gnupg2-2.0.12/08-sm-learn-card.patch \ + patches/gnupg2-2.0.12/09-sm-keylist.patch \ patches/gpgol-0.9.91/01-gpgme.patch \ patches/gpa-0.9.0/01-title-prop.patch \ patches/libetpan-0.57/01-gnutls_compat.patch \ Added: trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch =================================================================== --- trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch 2009-07-31 08:40:08 UTC (rev 1221) +++ trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch 2009-07-31 11:03:26 UTC (rev 1222) @@ -0,0 +1,22 @@ +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +[sm] +2009-07-29 Marcus Brinkmann + + * keylist.c (print_capabilities): Print a trailing colon. + +Index: keylist.c +=================================================================== +--- sm/keylist.c (revision 5080) ++++ sm/keylist.c (working copy) +@@ -286,6 +286,8 @@ + es_putc ('S', fp); + if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN)) + es_putc ('C', fp); ++ ++ es_putc (':', fp); + } + + Property changes on: trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/make-msi.bat =================================================================== --- trunk/src/make-msi.bat 2009-07-31 08:40:08 UTC (rev 1221) +++ trunk/src/make-msi.bat 2009-07-31 11:03:26 UTC (rev 1222) @@ -1,7 +1,7 @@ REM Usage: make-msi.bat [-L{de|en}] [FILE] REM Defaults: -Len gpg4win.wix REM -set WIXPATH=C:\"Program Files"\"Windows Installer XML v3"\bin +set WIXPATH=%ProgramFiles%\"Windows Installer XML v3"\bin set LANG=en-us IF NOT "%1"=="-Lde" GOTO langde @@ -23,5 +23,21 @@ set FILE=%1 :nofile -%WIXPATH%\candle.exe %FILE% -%WIXPATH%\light.exe -ext WixUIExtension -cultures:%LANG% %FILE%obj + +REM We want to catch error, so always clean. +del msi-custom-license.wixobj +del msi-custom-ui.wixobj +del %FILE%.wixobj +del %FILE%.msi + +%WIXPATH%\candle.exe msi-custom-license.wxs +IF ERRORLEVEL 1 GOTO End +%WIXPATH%\candle.exe msi-custom-ui.wxs +IF ERRORLEVEL 1 GOTO End +%WIXPATH%\candle.exe %FILE%.wxs +IF ERRORLEVEL 1 GOTO End +REM Validity tests disabled with -sval due to non-advertised shortcuts. +%WIXPATH%\light.exe -sval -ext WixUIExtension -ext WixUtilExtension -cultures:%LANG% msi-custom-license.wixobj msi-custom-ui.wixobj %FILE%.wixobj -out %FILE%.msi +IF ERRORLEVEL 1 GOTO End + +:End Modified: trunk/src/make-msi.pl =================================================================== --- trunk/src/make-msi.pl 2009-07-31 08:40:08 UTC (rev 1221) +++ trunk/src/make-msi.pl 2009-07-31 11:03:26 UTC (rev 1222) @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # make-msi.pl - MSI Installer for GnuPG 4 Windows. -# Copyright (C) 2007 g10 Code GmbH +# Copyright (C) 2007, 2008 g10 Code GmbH # # This file is part of Gpg4win. # @@ -1591,11 +1591,23 @@ # Removed this, because it is not localized: # +# We could do this, but we how to select on language? +# Probably some conditional can be used. +# +# +# +# +# WIXUI_EXITDIALOGOPTIONALCHECKBOX +# + print < - + From scm-commit at wald.intevation.org Fri Jul 31 15:48:17 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 31 Jul 2009 15:48:17 +0200 (CEST) Subject: [Gpg4win-commits] r1223 - in trunk: . po Message-ID: <20090731134817.3AF6A85D918A@pyrosoma.intevation.org> Author: emanuel Date: 2009-07-31 15:48:16 +0200 (Fri, 31 Jul 2009) New Revision: 1223 Modified: trunk/ChangeLog trunk/po/de.po Log: fix typo in german installer Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-31 11:03:26 UTC (rev 1222) +++ trunk/ChangeLog 2009-07-31 13:48:16 UTC (rev 1223) @@ -1,3 +1,7 @@ +2009-07-31 Emanuel Schuetze + + * po/de.po: Fix typo in german installer. + 2009-07-31 Marcus Brinkmann * patches/gnupg2-2.0.12/09-sm-keylist.patch: New file. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2009-07-31 11:03:26 UTC (rev 1222) +++ trunk/po/de.po 2009-07-31 13:48:16 UTC (rev 1223) @@ -174,7 +174,7 @@ msgctxt "T_InstOptLabelB" msgid "(Only programs will be linked into the quick launch bar.)" msgstr "" -"(In die Schnellstartleiste werden nur Verkn�pfungen f�r Programme angelegt.)" +"(In der Schnellstartleiste werden nur Verkn�pfungen f�r Programme angelegt.)" #: src/installer.nsi:471 msgctxt "T_InstOptFieldA"