From 91cf90782c1a2f229aaf4e76c3b090901a7696f3 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Mon, 23 Jun 2008 16:50:25 +0000 Subject: Update to 2.4.0. Unlike previous major version bumps, this time ABI hasn't changed, so the shared libraries' versions stayed the same. Therefore, this update doesn't requite any special handling. --- security/gnutls/Makefile | 7 ++- security/gnutls/Makefile.man | 57 +++++++++++++++++++++++- security/gnutls/distinfo | 6 +-- security/gnutls/files/patch-lib-Makefile.am | 30 +++++++++++++ security/gnutls/files/patch-libextra-Makefile.am | 11 +++++ security/gnutls/pkg-plist | 4 ++ 6 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 security/gnutls/files/patch-lib-Makefile.am create mode 100644 security/gnutls/files/patch-libextra-Makefile.am (limited to 'security/gnutls') diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 1c2ccbe50fc2..740d41c7604d 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnutls -PORTVERSION= 2.2.5 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= security net MASTER_SITES= http://josefsson.org/gnutls/releases/ \ ftp://ftp.gnutls.org/pub/gnutls/ \ @@ -29,7 +28,7 @@ USE_ICONV= yes USE_GNOME= pkgconfig ltverhack GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 autoconf:261 automake:110 USE_GCC= 3.4+ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -76,7 +75,7 @@ PORTDOCS= AUTHORS NEWS README THANKS .endif EXAMPLES= doc/examples/*.c -post-patch: +pre-configure: @${REINPLACE_CMD} -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \ ${WRKSRC}/lib/Makefile.in ${WRKSRC}/libextra/Makefile.in diff --git a/security/gnutls/Makefile.man b/security/gnutls/Makefile.man index f616f9fd478d..87f6912175a1 100644 --- a/security/gnutls/Makefile.man +++ b/security/gnutls/Makefile.man @@ -36,7 +36,12 @@ MAN3= \ gnutls_certificate_free_credentials.3 \ gnutls_certificate_free_crls.3 \ gnutls_certificate_free_keys.3 \ + gnutls_certificate_get_openpgp_keyring.3 \ + gnutls_certificate_set_openpgp_key_mem2.3 \ + gnutls_certificate_set_openpgp_key_file2.3 \ gnutls_certificate_get_ours.3 \ + gnutls_certificate_get_x509_cas.3 \ + gnutls_certificate_get_x509_crls.3 \ gnutls_certificate_send_x509_rdn_sequence.3 \ gnutls_certificate_server_set_request.3 \ gnutls_certificate_server_set_retrieve_function.3 \ @@ -83,6 +88,10 @@ MAN3= \ gnutls_compression_set_priority.3 \ gnutls_credentials_clear.3 \ gnutls_credentials_set.3 \ + gnutls_crypto_cipher_register.3 \ + gnutls_crypto_digest_register.3 \ + gnutls_crypto_mac_register.3 \ + gnutls_crypto_rnd_register.3 \ gnutls_db_check_entry.3 \ gnutls_db_get_ptr.3 \ gnutls_db_remove_session.3 \ @@ -123,6 +132,7 @@ MAN3= \ gnutls_handshake_set_max_packet_length.3 \ gnutls_handshake_set_post_client_hello_function.3 \ gnutls_handshake_set_private_extensions.3 \ + gnutls_hex2bin.3 \ gnutls_hex_decode.3 \ gnutls_hex_encode.3 \ gnutls_ia_allocate_client_credentials.3 \ @@ -168,20 +178,58 @@ MAN3= \ gnutls_openpgp_crt_get_version.3 \ gnutls_openpgp_crt_get_creation_time.3 \ gnutls_openpgp_crt_get_expiration_time.3 \ - gnutls_openpgp_crt_get_id.3 \ gnutls_openpgp_crt_check_hostname.3 \ gnutls_openpgp_crt_get_key_usage.3 \ gnutls_openpgp_crt_verify_ring.3 \ gnutls_openpgp_crt_verify_self.3 \ + gnutls_openpgp_crt_get_key_id.3 \ + gnutls_openpgp_crt_get_revoked_status.3 \ + gnutls_openpgp_crt_get_subkey_count.3 \ + gnutls_openpgp_crt_get_subkey_fingerprint.3 \ + gnutls_openpgp_crt_get_subkey_revoked_status.3 \ + gnutls_openpgp_crt_get_subkey_pk_algorithm.3 \ + gnutls_openpgp_crt_get_subkey_creation_time.3 \ + gnutls_openpgp_crt_get_subkey_expiration_time.3 \ + gnutls_openpgp_crt_get_subkey_id.3 \ + gnutls_openpgp_crt_get_subkey_idx.3 \ + gnutls_openpgp_crt_get_subkey_usage.3 \ + gnutls_openpgp_crt_get_pk_rsa_raw.3 \ + gnutls_openpgp_crt_get_pk_dsa_raw.3 \ + gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3 \ + gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3 \ + gnutls_openpgp_crt_get_preferred_key_id.3 \ + gnutls_openpgp_crt_set_preferred_key_id.3 \ + gnutls_openpgp_crt_get_auth_subkey.3 \ gnutls_openpgp_keyring_init.3 \ gnutls_openpgp_keyring_deinit.3 \ gnutls_openpgp_keyring_check_id.3 \ gnutls_openpgp_keyring_import.3 \ + gnutls_openpgp_keyring_get_crt_count.3 \ + gnutls_openpgp_keyring_get_crt.3 \ + gnutls_openpgp_crt_print.3 \ gnutls_openpgp_privkey_init.3 \ gnutls_openpgp_privkey_deinit.3 \ gnutls_openpgp_privkey_import.3 \ gnutls_openpgp_privkey_get_pk_algorithm.3 \ gnutls_openpgp_privkey_sign_hash.3 \ + gnutls_openpgp_privkey_export.3 \ + gnutls_openpgp_privkey_get_revoked_status.3 \ + gnutls_openpgp_privkey_get_fingerprint.3 \ + gnutls_openpgp_privkey_get_key_id.3 \ + gnutls_openpgp_privkey_get_subkey_count.3 \ + gnutls_openpgp_privkey_get_subkey_fingerprint.3 \ + gnutls_openpgp_privkey_get_subkey_idx.3 \ + gnutls_openpgp_privkey_get_subkey_revoked_status.3 \ + gnutls_openpgp_privkey_get_subkey_pk_algorithm.3 \ + gnutls_openpgp_privkey_get_subkey_creation_time.3 \ + gnutls_openpgp_privkey_get_subkey_expiration_time.3 \ + gnutls_openpgp_privkey_get_subkey_id.3 \ + gnutls_openpgp_privkey_export_rsa_raw.3 \ + gnutls_openpgp_privkey_export_dsa_raw.3 \ + gnutls_openpgp_privkey_export_subkey_rsa_raw.3 \ + gnutls_openpgp_privkey_export_subkey_dsa_raw.3 \ + gnutls_openpgp_privkey_get_preferred_key_id.3 \ + gnutls_openpgp_privkey_set_preferred_key_id.3 \ gnutls_openpgp_send_cert.3 \ gnutls_openpgp_set_recv_key_function.3 \ gnutls_oprfi_enable_client.3 \ @@ -241,14 +289,17 @@ MAN3= \ gnutls_protocol_set_priority.3 \ gnutls_psk_allocate_client_credentials.3 \ gnutls_psk_allocate_server_credentials.3 \ + gnutls_psk_client_get_hint.3 \ gnutls_psk_free_client_credentials.3 \ gnutls_psk_free_server_credentials.3 \ + gnutls_psk_netconf_derive_key.3 \ gnutls_psk_server_get_username.3 \ gnutls_psk_set_client_credentials.3 \ gnutls_psk_set_client_credentials_function.3 \ gnutls_psk_set_params_function.3 \ gnutls_psk_set_server_credentials_file.3 \ gnutls_psk_set_server_credentials_function.3 \ + gnutls_psk_set_server_credentials_hint.3 \ gnutls_psk_set_server_dh_params.3 \ gnutls_psk_set_server_params_function.3 \ gnutls_record_check_pending.3 \ @@ -311,6 +362,10 @@ MAN3= \ gnutls_transport_set_ptr2.3 \ gnutls_transport_set_pull_function.3 \ gnutls_transport_set_push_function.3 \ + gnutls_x509_dn_deinit.3 \ + gnutls_x509_dn_export.3 \ + gnutls_x509_dn_init.3 \ + gnutls_x509_dn_import.3 \ gnutls_x509_crl_check_issuer.3 \ gnutls_x509_crl_deinit.3 \ gnutls_x509_crl_export.3 \ diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index e4b148ce96f2..c121ef75caa9 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,3 +1,3 @@ -MD5 (gnutls-2.2.5.tar.bz2) = ebd3dc3ed4dffde781a2dc4eb4e39f3b -SHA256 (gnutls-2.2.5.tar.bz2) = cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57 -SIZE (gnutls-2.2.5.tar.bz2) = 4920322 +MD5 (gnutls-2.4.0.tar.bz2) = dce4000841ba5f80d310c4972b5f3efe +SHA256 (gnutls-2.4.0.tar.bz2) = c682bca6f1ccc28bdc15751168893e0b28107217b275168b456d519292e44d87 +SIZE (gnutls-2.4.0.tar.bz2) = 4942092 diff --git a/security/gnutls/files/patch-lib-Makefile.am b/security/gnutls/files/patch-lib-Makefile.am new file mode 100644 index 000000000000..99688a111a62 --- /dev/null +++ b/security/gnutls/files/patch-lib-Makefile.am @@ -0,0 +1,30 @@ +--- lib/Makefile.am.orig 2008-06-04 12:25:18.000000000 +0400 ++++ lib/Makefile.am 2008-06-23 07:31:35.000000000 +0400 +@@ -32,8 +32,7 @@ + -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \ + -I$(top_srcdir)/includes -I../includes \ + -I$(srcdir)/x509 \ +- -I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/ \ +- $(LIBGCRYPT_CFLAGS) ++ -I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/ + + if ENABLE_OPENPGP + SUBDIRS += opencdk +@@ -41,6 +40,8 @@ + AM_CPPFLAGS += -I$(srcdir)/opencdk -I$(top_srcdir)/lib/opencdk + endif + ++AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) ++ + if ENABLE_MINITASN1 + AM_CPPFLAGS += -I$(srcdir)/minitasn1 + else +@@ -53,7 +54,7 @@ + dist_m4data_DATA = libgnutls.m4 + + # Pkg-config script. +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = gnutls.pc + DISTCLEANFILES = $(pkgconfig_DATA) + diff --git a/security/gnutls/files/patch-libextra-Makefile.am b/security/gnutls/files/patch-libextra-Makefile.am new file mode 100644 index 000000000000..264b8b7da020 --- /dev/null +++ b/security/gnutls/files/patch-libextra-Makefile.am @@ -0,0 +1,11 @@ +--- libextra/Makefile.am.orig 2008-06-23 07:45:46.000000000 +0400 ++++ libextra/Makefile.am 2008-06-23 07:46:28.000000000 +0400 +@@ -39,7 +39,7 @@ + dist_m4data_DATA = libgnutls-extra.m4 + + # Pkg-config script. +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = gnutls-extra.pc + DISTCLEANFILES = $(pkgconfig_DATA) + diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist index e699255ef96b..e97ba6137e00 100644 --- a/security/gnutls/pkg-plist +++ b/security/gnutls/pkg-plist @@ -20,6 +20,7 @@ info/gnutls-logo.png info/gnutls-objects.png info/gnutls-x509.png include/gnutls/compat.h +include/gnutls/crypto.h include/gnutls/extra.h include/gnutls/gnutls.h include/gnutls/openpgp.h @@ -49,6 +50,7 @@ share/aclocal/libgnutls-extra.m4 share/aclocal/libgnutls.m4 %%EXAMPLESDIR%%/ex-alert.c %%EXAMPLESDIR%%/ex-cert-select.c +%%EXAMPLESDIR%%/ex-client-psk.c %%EXAMPLESDIR%%/ex-client-resume.c %%EXAMPLESDIR%%/ex-client-srp.c %%EXAMPLESDIR%%/ex-client-tlsia.c @@ -60,6 +62,7 @@ share/aclocal/libgnutls.m4 %%EXAMPLESDIR%%/ex-serv-anon.c %%EXAMPLESDIR%%/ex-serv-export.c %%EXAMPLESDIR%%/ex-serv-pgp.c +%%EXAMPLESDIR%%/ex-serv-psk.c %%EXAMPLESDIR%%/ex-serv-srp.c %%EXAMPLESDIR%%/ex-serv1.c %%EXAMPLESDIR%%/ex-session-info.c @@ -73,5 +76,6 @@ share/aclocal/libgnutls.m4 %%NLS%%share/locale/nl/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/vi/LC_MESSAGES/gnutls.mo @dirrm %%EXAMPLESDIR%% @dirrm include/gnutls -- cgit v1.2.3