From 5853c88682beeec9e428a543f45090a8c7448a73 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Fri, 24 Jun 2005 20:21:09 +0000 Subject: [PATCH] Update to 1.9.17 --- security/gnupg-devel/Makefile | 17 +++-------------- security/gnupg-devel/distinfo | 4 ++-- .../gnupg-devel/files/patch-agent-command_ssh.c | 11 +++++++++++ security/gnupg-devel/files/patch-configure | 11 ----------- security/gnupg-devel/pkg-plist | 7 ++++--- 5 files changed, 20 insertions(+), 30 deletions(-) create mode 100644 security/gnupg-devel/files/patch-agent-command_ssh.c delete mode 100644 security/gnupg-devel/files/patch-configure diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile index 115c8536f952..221f89b971c4 100644 --- a/security/gnupg-devel/Makefile +++ b/security/gnupg-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnupg -PORTVERSION= 1.9.16 +PORTVERSION= 1.9.17 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= alpha/gnupg @@ -18,7 +18,8 @@ COMMENT= Prerelease package of GnuPG extensions for GnuPG 2.0 BUILD_DEPENDS= ${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \ ksba.14:${PORTSDIR}/security/libksba \ - pth.20:${PORTSDIR}/devel/pth + pth.20:${PORTSDIR}/devel/pth \ + usb:${PORTSDIR}/devel/libusb RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ dirmngr:${PORTSDIR}/security/dirmngr @@ -36,18 +37,6 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/pth" \ .include -.if exists(${LOCALBASE}/bin/opensc-config) -WITH_OPENSC= yes -.endif - -.if defined(WITH_OPENSC) -BUILD_DEPENDS+= opensc-config:${PORTSDIR}/security/opensc -PLIST_SUB+= WITH_OPENSC="" -.else -CONFIGURE_ARGS+= --disable-scdaemon -PLIST_SUB+= WITH_OPENSC="@comment " -.endif - .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo index 3c44aef68493..b1e6b8eb8a6b 100644 --- a/security/gnupg-devel/distinfo +++ b/security/gnupg-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnupg-1.9.16.tar.bz2) = 1282755dce9cf4a84e904ca0191017a3 -SIZE (gnupg-1.9.16.tar.bz2) = 1707356 +MD5 (gnupg-1.9.17.tar.bz2) = a1bf98c5ec0c5c316b4ae6f017f02fa3 +SIZE (gnupg-1.9.17.tar.bz2) = 1750557 diff --git a/security/gnupg-devel/files/patch-agent-command_ssh.c b/security/gnupg-devel/files/patch-agent-command_ssh.c new file mode 100644 index 000000000000..23964bac22b4 --- /dev/null +++ b/security/gnupg-devel/files/patch-agent-command_ssh.c @@ -0,0 +1,11 @@ +--- agent/command-ssh.c.orig Fri Jun 24 17:04:13 2005 ++++ agent/command-ssh.c Fri Jun 24 17:04:23 2005 +@@ -1988,7 +1988,7 @@ + gcry_sexp_t valuelist = NULL; + gcry_sexp_t sublist = NULL; + gcry_mpi_t sig_value = NULL; +- unsigned char *sig_blob = NULL;; ++ unsigned char *sig_blob = NULL; + size_t sig_blob_n = 0; + char *identifier = NULL; + const char *identifier_raw; diff --git a/security/gnupg-devel/files/patch-configure b/security/gnupg-devel/files/patch-configure deleted file mode 100644 index 38045589f146..000000000000 --- a/security/gnupg-devel/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Thu Apr 21 20:28:05 2005 -+++ configure Thu Apr 21 20:28:28 2005 -@@ -20141,7 +20141,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/gnupg-devel/pkg-plist b/security/gnupg-devel/pkg-plist index 9f0b2091a31b..55da70e3f312 100644 --- a/security/gnupg-devel/pkg-plist +++ b/security/gnupg-devel/pkg-plist @@ -1,14 +1,15 @@ bin/gpg-agent bin/gpg-connect-agent bin/gpgconf +bin/gpgkey2ssh bin/gpgsm bin/gpgsm-gencert.sh bin/kbxutil -%%WITH_OPENSC%%bin/scdaemon +bin/scdaemon bin/watchgnupg +lib/gnupg/pcsc-wrapper libexec/gpg-preset-passphrase libexec/gpg-protect-tool sbin/addgnupghome %%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo -%%NLS%%@dirrm share/locale/de/LC_MESSAGES -@dirrm share/gnupg +@dirrm lib/gnupg