Date: Sat, 1 Mar 2008 07:01:17 -0500 (EST) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: novel@FreeBSD.org Subject: ports/121260: [PATCH] security/gnutls: update to 2.2.2 Message-ID: <20080301120117.7C451C1DF@kirby.cyberbotx.com> Resent-Message-ID: <200803011210.m21CA0oB063326@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121260
>Category: ports
>Synopsis: [PATCH] security/gnutls: update to 2.2.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 01 12:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 6.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Wed Jan 23 16:14:04 EST 2008
>Description:
- Update to 2.2.2
- Also make the port respect if the user wishes to not use OpenCDK or
TASN.1 from the ports but rather the internal ones, using WITHOUT_foo
knobs.
Port maintainer (novel@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
NOTE: This PR superceeds PR ports/120519 and that one should be closed
in favor of this one.
>How-To-Repeat:
>Fix:
--- gnutls-2.2.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/gnutls/Makefile /kirby/shared/ports/gnutls/Makefile
--- /usr/ports/security/gnutls/Makefile 2008-02-29 09:45:09.000000000 -0500
+++ /kirby/shared/ports/gnutls/Makefile 2008-03-01 06:59:35.000000000 -0500
@@ -6,14 +6,13 @@
#
PORTNAME= gnutls
-PORTVERSION= 2.0.2
-PORTREVISION= 2
+PORTVERSION= 2.2.2
CATEGORIES= security net
MASTER_SITES= http://josefsson.org/gnutls/releases/ \
- ftp://ftp.gnutls.org/pub/gnutls/ \
- ${MASTER_SITE_GNUPG} \
- http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
- ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/
+ ftp://ftp.gnutls.org/pub/gnutls/ \
+ ${MASTER_SITE_GNUPG} \
+ http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
+ ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/
MASTER_SITE_SUBDIR= alpha/gnutls
MAINTAINER= novel@FreeBSD.org
@@ -39,12 +38,17 @@
MANCOMPRESSED= no
.include <bsd.port.pre.mk>
-.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.10)
+
+.if (defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.10)) && !defined(WITHOUT_OPENCDK)
LIB_DEPENDS+= opencdk.10:${PORTSDIR}/security/opencdk
+.else
+CONFIGURE_ARGS+= --with-included-opencdk
.endif
-.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
+.if (defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)) && !defined(WITHOUT_LIBTASN1)
LIB_DEPENDS+= tasn1.3:${PORTSDIR}/security/libtasn1
+.else
+CONFIGURE_ARGS+= --with-included-libtasn1
.endif
.if ${OSVERSION} < 600000
@@ -54,21 +58,21 @@
.if defined(WITHOUT_CXX)
CONFIGURE_ARGS+= --disable-cxx
-PLIST_SUB+= CXX="@comment "
+PLIST_SUB+= CXX="@comment "
.else
-PLIST_SUB+= CXX=""
+PLIST_SUB+= CXX=""
.endif
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
+PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
.endif
.if !defined(NOPORTDOCS)
-PORTDOCS= AUTHORS NEWS README THANKS
+PORTDOCS= AUTHORS NEWS README THANKS
.endif
EXAMPLES= doc/examples/*.c
diff -ruN --exclude=CVS /usr/ports/security/gnutls/Makefile.man /kirby/shared/ports/gnutls/Makefile.man
--- /usr/ports/security/gnutls/Makefile.man 2007-10-30 09:13:48.000000000 -0400
+++ /kirby/shared/ports/gnutls/Makefile.man 2008-02-11 00:34:22.000000000 -0500
@@ -46,8 +46,6 @@
gnutls_certificate_set_openpgp_key_mem.3 \
gnutls_certificate_set_openpgp_keyring_file.3 \
gnutls_certificate_set_openpgp_keyring_mem.3 \
- gnutls_certificate_set_openpgp_keyserver.3 \
- gnutls_certificate_set_openpgp_trustdb.3 \
gnutls_certificate_set_params_function.3 \
gnutls_certificate_set_rsa_export_params.3 \
gnutls_certificate_set_verify_flags.3 \
@@ -63,6 +61,7 @@
gnutls_certificate_set_x509_trust_file.3 \
gnutls_certificate_set_x509_trust_mem.3 \
gnutls_certificate_type_get.3 \
+ gnutls_certificate_type_get_id.3 \
gnutls_certificate_type_get_name.3 \
gnutls_certificate_type_list.3 \
gnutls_certificate_type_set_priority.3 \
@@ -70,6 +69,7 @@
gnutls_certificate_verify_peers2.3 \
gnutls_check_version.3 \
gnutls_cipher_get.3 \
+ gnutls_cipher_get_id.3 \
gnutls_cipher_get_key_size.3 \
gnutls_cipher_get_name.3 \
gnutls_cipher_list.3 \
@@ -77,6 +77,7 @@
gnutls_cipher_suite_get_name.3 \
gnutls_cipher_suite_info.3 \
gnutls_compression_get.3 \
+ gnutls_compression_get_id.3 \
gnutls_compression_get_name.3 \
gnutls_compression_list.3 \
gnutls_compression_set_priority.3 \
@@ -120,6 +121,7 @@
gnutls_handshake_get_last_in.3 \
gnutls_handshake_get_last_out.3 \
gnutls_handshake_set_max_packet_length.3 \
+ gnutls_handshake_set_post_client_hello_function.3 \
gnutls_handshake_set_private_extensions.3 \
gnutls_hex_decode.3 \
gnutls_hex_encode.3 \
@@ -145,31 +147,32 @@
gnutls_ia_verify_endphase.3 \
gnutls_init.3 \
gnutls_kx_get.3 \
+ gnutls_kx_get_id.3 \
gnutls_kx_get_name.3 \
gnutls_kx_list.3 \
gnutls_kx_set_priority.3 \
gnutls_mac_get.3 \
+ gnutls_mac_get_id.3 \
+ gnutls_mac_get_key_size.3 \
gnutls_mac_get_name.3 \
gnutls_mac_list.3 \
gnutls_mac_set_priority.3 \
gnutls_malloc.3 \
- gnutls_openpgp_key_check_hostname.3 \
- gnutls_openpgp_key_deinit.3 \
- gnutls_openpgp_key_export.3 \
- gnutls_openpgp_key_get_creation_time.3 \
- gnutls_openpgp_key_get_expiration_time.3 \
- gnutls_openpgp_key_get_fingerprint.3 \
- gnutls_openpgp_key_get_id.3 \
- gnutls_openpgp_key_get_key_usage.3 \
- gnutls_openpgp_key_get_name.3 \
- gnutls_openpgp_key_get_pk_algorithm.3 \
- gnutls_openpgp_key_get_version.3 \
- gnutls_openpgp_key_import.3 \
- gnutls_openpgp_key_init.3 \
- gnutls_openpgp_key_to_xml.3 \
- gnutls_openpgp_key_verify_ring.3 \
- gnutls_openpgp_key_verify_self.3 \
- gnutls_openpgp_key_verify_trustdb.3 \
+ gnutls_openpgp_crt_check_hostname.3 \
+ gnutls_openpgp_crt_deinit.3 \
+ gnutls_openpgp_crt_export.3 \
+ gnutls_openpgp_crt_get_creation_time.3 \
+ gnutls_openpgp_crt_get_expiration_time.3 \
+ gnutls_openpgp_crt_get_fingerprint.3 \
+ gnutls_openpgp_crt_get_id.3 \
+ gnutls_openpgp_crt_get_key_usage.3 \
+ gnutls_openpgp_crt_get_name.3 \
+ gnutls_openpgp_crt_get_pk_algorithm.3 \
+ gnutls_openpgp_crt_get_version.3 \
+ gnutls_openpgp_crt_import.3 \
+ gnutls_openpgp_crt_init.3 \
+ gnutls_openpgp_crt_verify_ring.3 \
+ gnutls_openpgp_crt_verify_self.3 \
gnutls_openpgp_keyring_check_id.3 \
gnutls_openpgp_keyring_deinit.3 \
gnutls_openpgp_keyring_import.3 \
@@ -179,11 +182,10 @@
gnutls_openpgp_privkey_import.3 \
gnutls_openpgp_privkey_init.3 \
gnutls_openpgp_privkey_sign_hash.3 \
- gnutls_openpgp_send_key.3 \
+ gnutls_openpgp_send_cert.3 \
gnutls_openpgp_set_recv_key_function.3 \
- gnutls_openpgp_trustdb_deinit.3 \
- gnutls_openpgp_trustdb_import_file.3 \
- gnutls_openpgp_trustdb_init.3 \
+ gnutls_oprfi_enable_client.3 \
+ gnutls_oprfi_enable_server.3 \
gnutls_pem_base64_decode.3 \
gnutls_pem_base64_decode_alloc.3 \
gnutls_pem_base64_encode.3 \
@@ -228,6 +230,11 @@
gnutls_pkcs7_set_crt_raw.3 \
gnutls_prf.3 \
gnutls_prf_raw.3 \
+ gnutls_priority_deinit.3 \
+ gnutls_priority_init.3 \
+ gnutls_priority_set.3 \
+ gnutls_priority_set_direct.3 \
+ gnutls_protocol_get_id.3 \
gnutls_protocol_get_name.3 \
gnutls_protocol_get_version.3 \
gnutls_protocol_list.3 \
@@ -245,6 +252,7 @@
gnutls_psk_set_server_dh_params.3 \
gnutls_psk_set_server_params_function.3 \
gnutls_record_check_pending.3 \
+ gnutls_record_disable_padding.3 \
gnutls_record_get_direction.3 \
gnutls_record_get_max_size.3 \
gnutls_record_recv.3 \
@@ -263,6 +271,7 @@
gnutls_rsa_params_init.3 \
gnutls_server_name_get.3 \
gnutls_server_name_set.3 \
+ gnutls_session_enable_compatibility_mode.3 \
gnutls_session_get_client_random.3 \
gnutls_session_get_data.3 \
gnutls_session_get_data2.3 \
@@ -308,22 +317,16 @@
gnutls_x509_crl_get_crt_count.3 \
gnutls_x509_crl_get_crt_serial.3 \
gnutls_x509_crl_get_dn_oid.3 \
- gnutls_x509_crt_get_extension_info.3 \
- gnutls_x509_crt_get_extension_data.3 \
gnutls_x509_crl_get_issuer_dn.3 \
gnutls_x509_crl_get_issuer_dn_by_oid.3 \
gnutls_x509_crl_get_next_update.3 \
- gnutls_x509_crt_get_raw_issuer_dn.3 \
- gnutls_x509_crt_get_raw_dn.3 \
- gnutls_x509_crt_get_signature.3 \
+ gnutls_x509_crl_get_signature.3 \
gnutls_x509_crl_get_signature_algorithm.3 \
- gnutls_x509_crt_get_subject_alt_othername_oid.3 \
gnutls_x509_crl_get_this_update.3 \
gnutls_x509_crl_get_version.3 \
gnutls_x509_crl_import.3 \
gnutls_x509_crl_init.3 \
gnutls_x509_crl_print.3 \
- gnutls_x509_crt_print.3 \
gnutls_x509_crl_set_crt.3 \
gnutls_x509_crl_set_crt_serial.3 \
gnutls_x509_crl_set_next_update.3 \
@@ -363,6 +366,8 @@
gnutls_x509_crt_get_dn_by_oid.3 \
gnutls_x509_crt_get_dn_oid.3 \
gnutls_x509_crt_get_expiration_time.3 \
+ gnutls_x509_crt_get_extension_data.3 \
+ gnutls_x509_crt_get_extension_info.3 \
gnutls_x509_crt_get_extension_oid.3 \
gnutls_x509_crt_get_fingerprint.3 \
gnutls_x509_crt_get_issuer_dn.3 \
@@ -375,15 +380,20 @@
gnutls_x509_crt_get_pk_dsa_raw.3 \
gnutls_x509_crt_get_pk_rsa_raw.3 \
gnutls_x509_crt_get_proxy.3 \
+ gnutls_x509_crt_get_raw_dn.3 \
+ gnutls_x509_crt_get_raw_issuer_dn.3 \
gnutls_x509_crt_get_serial.3 \
- gnutls_x509_crl_get_signature.3 \
+ gnutls_x509_crt_get_signature.3 \
gnutls_x509_crt_get_signature_algorithm.3 \
gnutls_x509_crt_get_subject_alt_name.3 \
+ gnutls_x509_crt_get_subject_alt_name2.3 \
+ gnutls_x509_crt_get_subject_alt_othername_oid.3 \
gnutls_x509_crt_get_subject_key_id.3 \
gnutls_x509_crt_get_version.3 \
gnutls_x509_crt_import.3 \
gnutls_x509_crt_list_import.3 \
gnutls_x509_crt_list_verify.3 \
+ gnutls_x509_crt_print.3 \
gnutls_x509_crt_set_activation_time.3 \
gnutls_x509_crt_set_authority_key_id.3 \
gnutls_x509_crt_set_basic_constraints.3 \
@@ -402,7 +412,6 @@
gnutls_x509_crt_set_subject_alternative_name.3 \
gnutls_x509_crt_set_subject_key_id.3 \
gnutls_x509_crt_sign2.3 \
- gnutls_x509_crt_to_xml.3 \
gnutls_x509_crt_verify.3 \
gnutls_x509_dn_oid_known.3 \
gnutls_x509_privkey_cpy.3 \
@@ -426,16 +435,16 @@
gnutls_x509_rdn_get.3 \
gnutls_x509_rdn_get_by_oid.3 \
gnutls_x509_rdn_get_oid.3 \
- gnutls_alert_get.3 \
- gnutls_certificate_get_peers.3 \
- gnutls_x509_crt_check_revocation.3 \
- gnutls_x509_crt_get_ca_status.3 \
- gnutls_x509_crt_get_extension_by_oid.3 \
- gnutls_x509_crt_get_subject.3 \
+ gnutls_alert_get.3 \
+ gnutls_certificate_get_peers.3 \
+ gnutls_x509_crt_check_revocation.3 \
+ gnutls_x509_crt_get_ca_status.3 \
+ gnutls_x509_crt_get_extension_by_oid.3 \
+ gnutls_x509_crt_get_subject.3 \
gnutls_x509_crt_get_issuer.3 \
gnutls_x509_crt_init.3 \
- gnutls_x509_crt_set_crq.3 \
- gnutls_x509_crt_set_version.3 \
- gnutls_x509_crt_sign.3 \
- gnutls_x509_crt_verify_data.3 \
+ gnutls_x509_crt_set_crq.3 \
+ gnutls_x509_crt_set_version.3 \
+ gnutls_x509_crt_sign.3 \
+ gnutls_x509_crt_verify_data.3 \
gnutls_x509_dn_get_rdn_ava.3
diff -ruN --exclude=CVS /usr/ports/security/gnutls/distinfo /kirby/shared/ports/gnutls/distinfo
--- /usr/ports/security/gnutls/distinfo 2007-10-30 09:13:48.000000000 -0400
+++ /kirby/shared/ports/gnutls/distinfo 2008-03-01 06:52:45.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (gnutls-2.0.2.tar.bz2) = e22aafc38991dd6ed937376156ea2efc
-SHA256 (gnutls-2.0.2.tar.bz2) = 71b11b1668d9ac5df7387d3dd09f3339a958f135b9139ef93a78718ebdd383b7
-SIZE (gnutls-2.0.2.tar.bz2) = 4831867
+MD5 (gnutls-2.2.2.tar.bz2) = 90fb4b7c74d29bb6ee5bd8de85942f42
+SHA256 (gnutls-2.2.2.tar.bz2) = cbb0e76c28a8b8ee93d49e1fea4cb31549904d95cd8f488309126f7f5046d616
+SIZE (gnutls-2.2.2.tar.bz2) = 4923519
diff -ruN --exclude=CVS /usr/ports/security/gnutls/pkg-plist /kirby/shared/ports/gnutls/pkg-plist
--- /usr/ports/security/gnutls/pkg-plist 2007-10-30 09:13:49.000000000 -0400
+++ /kirby/shared/ports/gnutls/pkg-plist 2008-02-11 00:26:28.000000000 -0500
@@ -27,22 +27,22 @@
include/gnutls/pkcs12.h
include/gnutls/x509.h
%%CXX%%include/gnutls/gnutlsxx.h
-%%CXX%%lib/libgnutlsxx.so.13
+%%CXX%%lib/libgnutlsxx.so.26
%%CXX%%lib/libgnutlsxx.so
%%CXX%%lib/libgnutlsxx.la
%%CXX%%lib/libgnutlsxx.a
lib/libgnutls-extra.a
lib/libgnutls-extra.la
lib/libgnutls-extra.so
-lib/libgnutls-extra.so.13
+lib/libgnutls-extra.so.26
lib/libgnutls-openssl.a
lib/libgnutls-openssl.la
lib/libgnutls-openssl.so
-lib/libgnutls-openssl.so.13
+lib/libgnutls-openssl.so.26
lib/libgnutls.a
lib/libgnutls.la
lib/libgnutls.so
-lib/libgnutls.so.13
+lib/libgnutls.so.26
libdata/pkgconfig/gnutls-extra.pc
libdata/pkgconfig/gnutls.pc
share/aclocal/libgnutls-extra.m4
@@ -70,6 +70,7 @@
%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
%%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo
%%NLS%%share/locale/ms/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gnutls.mo
%%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo
%%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo
@dirrm %%EXAMPLESDIR%%
--- gnutls-2.2.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080301120117.7C451C1DF>