5 files changed, 7 insertions, 109 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 8bf87ba096b0..fa543a6d4c47 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpgme
-PORTVERSION=	1.1.3
-PORTREVISION=	3
+PORTVERSION=	1.1.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -25,8 +24,10 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
-		--includedir=${PREFIX}/include/gpgme
+		--includedir=${PREFIX}/include/gpgme \
+		--infodir=${PREFIX}/${INFO_PATH}
 
+INFODIR=	${LOCALBASE}/share/info
 INFO=		gpgme
 
 OPTIONS=	PTH "Enable alternative libgpgme using GNU portable threads" off
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 98322b329e18..f1c5025b3fda 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpgme-1.1.3.tar.gz) = cfb1f709b1ebfed51dc4e5045c2d25a8
-SHA256 (gpgme-1.1.3.tar.gz) = ecdec0b5c941a97ae812a9daa30c02b4dcce495bf0b2f6d5c2e4d245fbdac623
-SIZE (gpgme-1.1.3.tar.gz) = 918658
+MD5 (gpgme-1.1.5.tar.gz) = 4ce6d6c0e4170a0dfba4c051465f2b31
+SHA256 (gpgme-1.1.5.tar.gz) = 4ffb19d69b7cf9179252fa7f0a5f0db9064417024da260770d959dcf7bc3492a
+SIZE (gpgme-1.1.5.tar.gz) = 929270
diff --git a/security/gpgme/files/patch-assuan-Makefile.in b/security/gpgme/files/patch-assuan-Makefile.in
deleted file mode 100644
index 206f27cc1e9a..000000000000
--- a/security/gpgme/files/patch-assuan-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- assuan/Makefile.in.orig	Mon Jan 29 21:16:58 2007
-+++ assuan/Makefile.in	Tue Feb  6 17:51:48 2007
-@@ -74,7 +74,7 @@
- 	assuan-listen.lo assuan-connect.lo assuan-client.lo \
- 	assuan-pipe-server.lo assuan-socket-server.lo \
- 	assuan-pipe-connect.lo assuan-socket-connect.lo assuan-uds.lo \
--	funopen.lo assuan-io.lo assuan-logging.lo assuan-socket.lo
-+	assuan-io.lo assuan-logging.lo assuan-socket.lo
- libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -274,7 +274,6 @@
- 	assuan-pipe-connect.c \
- 	assuan-socket-connect.c  \
- 	assuan-uds.c \
--	funopen.c \
- 	assuan-io.c \
- 	assuan-logging.c \
- 	assuan-socket.c
-@@ -347,7 +346,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-uds.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-util.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/funopen.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
deleted file mode 100644
index 0e6bf759748d..000000000000
--- a/security/gpgme/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Feb  6 17:52:35 2007
-+++ configure	Tue Feb  6 17:53:24 2007
-@@ -23622,7 +23622,7 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
-+eval "$as_ac_var=yes"
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
diff --git a/security/gpgme/files/patch-gpgme-1.1.3-multiple-message.patch b/security/gpgme/files/patch-gpgme-1.1.3-multiple-message.patch
deleted file mode 100644
index b1792efc0c34..000000000000
--- a/security/gpgme/files/patch-gpgme-1.1.3-multiple-message.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: gpgme/verify.c
-===================================================================
---- gpgme/verify.c	(revision 1208)
-+++ gpgme/verify.c	(working copy)
-@@ -40,6 +40,7 @@
-   gpgme_signature_t current_sig;
-   int did_prepare_new_sig;
-   int only_newsig_seen;
-+  int plaintext_seen;
- } *op_data_t;
- 
- 
-@@ -549,8 +550,11 @@
- }
- 
- 
-+/* Parse an error status line and if SET_STATUS is true update the
-+   result status as appropriate.  With SET_STATUS being false, only
-+   check for an error.  */
- static gpgme_error_t
--parse_error (gpgme_signature_t sig, char *args)
-+parse_error (gpgme_signature_t sig, char *args, int set_status)
- {
-   gpgme_error_t err;
-   char *where = strchr (args, ' ');
-@@ -572,7 +576,16 @@
- 
-   err = _gpgme_map_gnupg_error (which);
- 
--  if (!strcmp (where, "verify.findkey"))
-+  if (!strcmp (where, "proc_pkt.plaintext")
-+      && gpg_err_code (err) == GPG_ERR_BAD_DATA)
-+    {
-+      /* This indicates a double plaintext.  The only solid way to
-+         handle this is by failing the oepration.  */
-+      return gpg_error (GPG_ERR_BAD_DATA);
-+    }
-+  else if (!set_status)
-+    ;
-+  else if (!strcmp (where, "verify.findkey"))
-     sig->status = err;
-   else if (!strcmp (where, "verify.keyusage")
- 	   && gpg_err_code (err) == GPG_ERR_WRONG_KEY_USAGE)
-@@ -670,9 +683,9 @@
- 
-     case GPGME_STATUS_ERROR:
-       opd->only_newsig_seen = 0;
--      /* The error status is informational, so we don't return an
--         error code if we are not ready to process this status. */
--      return sig ? parse_error (sig, args) : 0;
-+      /* Some  error stati are informational, so we don't return an
-+         error code if we are not ready to process this status.  */
-+      return parse_error (sig, args, !!sig );
- 
-     case GPGME_STATUS_EOF:
-       if (sig && !opd->did_prepare_new_sig)
-@@ -703,6 +716,8 @@
-       break;
- 
-     case GPGME_STATUS_PLAINTEXT:
-+      if (++opd->plaintext_seen > 1)
-+        return gpg_error (GPG_ERR_BAD_DATA);
-       err = _gpgme_parse_plaintext (args, &opd->result.file_name);
-       if (err)
- 	return err;