4 files changed, 37 insertions, 30 deletions

diff --git a/security/gpgme/files/patch-assuan-Makefile.in b/security/gpgme/files/patch-assuan-Makefile.in
new file mode 100644
index 000000000000..bf43881aa660
--- /dev/null
+++ b/security/gpgme/files/patch-assuan-Makefile.in
@@ -0,0 +1,27 @@
+--- assuan/Makefile.in.orig	Wed Sep 13 16:14:57 2006
++++ assuan/Makefile.in	Wed Sep 13 16:15:11 2006
+@@ -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-socket.lo funopen.lo assuan-io.lo \
++	assuan-socket.lo assuan-io.lo \
+ 	assuan-domain-connect.lo assuan-domain-server.lo \
+ 	assuan-logging.lo
+ libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
+@@ -273,7 +273,6 @@
+ 	assuan-pipe-connect.c \
+ 	assuan-socket-connect.c  \
+ 	assuan-socket.c \
+-	funopen.c \
+ 	assuan-io.c \
+ 	assuan-domain-connect.c \
+ 	assuan-domain-server.c \
+@@ -348,7 +347,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket-server.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.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-assuan-assuan.h b/security/gpgme/files/patch-assuan-assuan.h
new file mode 100644
index 000000000000..b34e4b5ea7cc
--- /dev/null
+++ b/security/gpgme/files/patch-assuan-assuan.h
@@ -0,0 +1,10 @@
+--- assuan/assuan.h.orig	Wed Sep 13 15:55:53 2006
++++ assuan/assuan.h	Wed Sep 13 15:56:59 2006
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+ 
+ 
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
deleted file mode 100644
index f14d46e20fec..000000000000
--- a/security/gpgme/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Tue Dec 28 12:35:39 2004
-+++ configure	Mon Aug  8 16:26:11 2005
-@@ -19723,7 +19723,6 @@
- #define HAVE_PTH
- _ACEOF
- 
--	  CFLAGS="$CFLAGS $PTH_CFLAGS"
- 	fi
- 	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-@@ -22575,7 +22574,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-ath-pthread-compat.c b/security/gpgme/files/patch-gpgme-ath-pthread-compat.c
deleted file mode 100644
index 7fec8e8c55aa..000000000000
--- a/security/gpgme/files/patch-gpgme-ath-pthread-compat.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpgme/ath-pth-compat.c.orig	Tue Nov  1 10:25:41 2005
-+++ gpgme/ath-pth-compat.c	Tue Nov  1 10:25:55 2005
-@@ -20,7 +20,7 @@
- 
- #include <stdlib.h>
- #include <errno.h>
--#include <pth.h>
-+#include <pth/pth.h>
- 
- #include "ath.h"
-