Pullup ticket #4001 - requested by kleink
textproc/p5-Text-vCard: build fix

Revisions pulled up:
- textproc/p5-Text-vCard/Makefile                               1.18

---
   Module Name:	pkgsrc
   Committed By:	kleink
   Date:		Sun Jan  6 14:21:16 UTC 2013

   Modified Files:
   	pkgsrc/textproc/p5-Text-vCard: Makefile

   Log Message:
   Simplify MASTER_SITES by staying in the by-module hierarchy as
   implied by MASTER_SITE_PERL_CPAN, rather than traversing ../by-authors.

   Fixes a distfile fetch problem experienced by wiz.
Pullup ticket #4002 - requested by spz
security/gnupg: security update

Revisions pulled up:
- security/gnupg/Makefile                                       1.115
- security/gnupg/distinfo                                       1.56
- security/gnupg/patches/patch-ak                               deleted
- security/gnupg/patches/patch-cipher_idea-stub.c               deleted
- security/gnupg/patches/patch-mpi_mpi-inline.h                 deleted

---
   Module Name:	pkgsrc
   Committed By:	spz
   Date:		Sun Jan  6 14:50:48 UTC 2013

   Modified Files:
   	pkgsrc/security/gnupg: Makefile distinfo
   Removed Files:
   	pkgsrc/security/gnupg/patches: patch-ak patch-cipher_idea-stub.c
   	    patch-mpi_mpi-inline.h

   Log Message:
   update of gnupg
   Fixes CVE-2012-6085

   Upstream Changes:
       * Add support for the old cipher algorithm IDEA.

       * Minor bug fixes.

       * Small changes to better cope with future OpenPGP and GnuPG
         features.
Pullup tickets #4001 and #4002.