diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/gpa/Makefile | 2 | ||||
-rw-r--r-- | security/gpgme/Makefile | 4 | ||||
-rw-r--r-- | security/gpgme/distinfo | 6 | ||||
-rw-r--r-- | security/gpgme/files/patch-assuan-Makefile.in | 27 | ||||
-rw-r--r-- | security/gpgme/files/patch-assuan-assuan.h | 10 | ||||
-rw-r--r-- | security/gpgme/files/patch-configure | 19 | ||||
-rw-r--r-- | security/gpgme/files/patch-gpgme-ath-pthread-compat.c | 11 | ||||
-rw-r--r-- | security/gpgme/pkg-plist | 6 | ||||
-rw-r--r-- | security/pecl-gnupg/Makefile | 3 | ||||
-rw-r--r-- | security/pinentry/Makefile | 4 | ||||
-rw-r--r-- | security/seahorse/Makefile | 3 |
11 files changed, 52 insertions, 43 deletions
diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 139f8ab009cb..b6e76b690516 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -7,7 +7,7 @@ PORTNAME= gpa PORTVERSION= 0.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= alpha/gpa diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index d377b13d5c60..52c99da52630 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gpgme -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gpgme @@ -42,6 +41,7 @@ PLIST_SUB+= WITH_PTH='@comment ' .endif post-patch: + @${REINPLACE_CMD} -e 's|EOF||g' ${WRKSRC}/assuan/assuan-errors.c @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} \ ${WRKSRC}/gpgme/Makefile.in \ diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index e7c610c4e2e0..4ed9db0a3a6f 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,3 +1,3 @@ -MD5 (gpgme-1.0.3.tar.gz) = 4d33cbdf844fcee1c724e4cf2a32dd11 -SHA256 (gpgme-1.0.3.tar.gz) = 376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f -SIZE (gpgme-1.0.3.tar.gz) = 837866 +MD5 (gpgme-1.1.2.tar.gz) = c712ca39c3553573f15cd01e6edb8b68 +SHA256 (gpgme-1.1.2.tar.gz) = 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5 +SIZE (gpgme-1.1.2.tar.gz) = 881432 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" - diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist index bb8b55eb6663..bf9c32badaa3 100644 --- a/security/gpgme/pkg-plist +++ b/security/gpgme/pkg-plist @@ -3,14 +3,14 @@ include/gpgme/gpgme.h %%WITH_PTH%%lib/libgpgme-pth.a %%WITH_PTH%%lib/libgpgme-pth.la %%WITH_PTH%%lib/libgpgme-pth.so -%%WITH_PTH%%lib/libgpgme-pth.so.15 +%%WITH_PTH%%lib/libgpgme-pth.so.17 lib/libgpgme-pthread.a lib/libgpgme-pthread.la lib/libgpgme-pthread.so -lib/libgpgme-pthread.so.15 +lib/libgpgme-pthread.so.17 lib/libgpgme.a lib/libgpgme.la lib/libgpgme.so -lib/libgpgme.so.15 +lib/libgpgme.so.17 share/aclocal/gpgme.m4 @dirrm include/gpgme diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile index 2847e9bbf0d3..93d6cab420bc 100644 --- a/security/pecl-gnupg/Makefile +++ b/security/pecl-gnupg/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -16,7 +17,7 @@ DIST_SUBDIR= PECL MAINTAINER= mnag@FreeBSD.org COMMENT= A pecl wrapper around the gpgme library -LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme +LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme USE_PHP= yes USE_PHPEXT= yes diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index e9f72b27a534..24a1220199d2 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -7,7 +7,7 @@ PORTNAME= pinentry PORTVERSION= 0.7.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= pinentry @@ -16,7 +16,7 @@ MAINTAINER= lofi@freebsd.org COMMENT?= A collection of simple PIN or passphrase entry dialogs LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \ - ksba.15:${PORTSDIR}/security/libksba + ksba.17:${PORTSDIR}/security/libksba CONFLICTS?= pinentry-[a-z]*-[0.9]* diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index fb742bb7d5e8..3819c0ea8041 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -8,6 +8,7 @@ PORTNAME= seahorse PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8 @@ -18,7 +19,7 @@ COMMENT= A front end for GnuPG BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg RUN_DEPENDS= ${BUILD_DEPENDS} -LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme +LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme USE_BZIP2= yes USE_GETTEXT= yes |