Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Sep 2008 12:39:41 -0400 (EDT)
From:      Yarema <yds@CoolRat.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        novel@FreeBSD.org
Subject:   ports/127330: [PATCH] security/gnutls update to 2.5.4
Message-ID:  <20080912163941.34AFB6432DFD@orion.dppl.com>
Resent-Message-ID: <200809121640.m8CGe1w6086495@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         127330
>Category:       ports
>Synopsis:       [PATCH] security/gnutls update to 2.5.4
>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:   Fri Sep 12 16:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yarema
>Release:        FreeBSD 6.4-PRERELEASE amd64
>Organization:
NYCBUG.org
>Environment:
System:	FreeBSD 6.4-PRERELEASE amd64
	FreeBSD 7.1-PRERELEASE amd64
>Description:
Update to version 2.5.4

delete	files/patch-includes__gnutls__gnutls.h.in
add	gnutls/files/patch-lib__opencdk__Makefile.in

Won't build --with-included-libtasn1 without new patch.

WITH_OPENCDK tunable removed becasue as of version 2.5.0 GnuTLS was
rewritten to only use the internal OpenCDK.

WITH_LZO tunable added because --with-included-lzo no longer supported.

Added OPTIONS for all the tunables with defaults set based on installed
packages where appropriate.

Makefile.man updated, sorted and all leading whitespace converted to tabs.
>How-To-Repeat:

>Fix:
diff -u -r -N gnutls-2.4.1/Makefile gnutls/Makefile
--- gnutls-2.4.1/Makefile	2008-08-22 03:33:31.000000000 -0400
+++ gnutls/Makefile	2008-09-12 09:15:27.125608253 -0400
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.5.4
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 	ftp://ftp.gnutls.org/pub/gnutls/ \
@@ -33,40 +32,59 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=	--with-included-lzo --disable-guile
+CONFIGURE_ARGS+=	--disable-guile
 MANCOMPRESSED=	no
 
+OPTIONS=	CXX		"Install with the C++ library"	on \
+		NLS		"With Native Language Support"	on
+
 .include <bsd.port.pre.mk>
-.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)) && !defined(WITHOUT_LIBTASN1)
-LIB_DEPENDS+=	tasn1.3:${PORTSDIR}/security/libtasn1
+OPTIONS+=	LZO		"With LZO compression (experimental)"
+.if exists(${LOCALBASE}/lib/liblzo2.so) || defined(WITH_LZO)
+OPTIONS+=on
 .else
-CONFIGURE_ARGS+=	--with-included-libtasn1
+OPTIONS+=off
 .endif
 
-.if ${OSVERSION} < 600000
-BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
-CONFIGURE_ENV+=	MAKEINFO="${LOCALBASE}/bin/makeinfo"
+OPTIONS+=	LIBTASN1	"With system-wide Tiny ASN.1 library"
+.if exists(${LOCALBASE}/lib/libtasn1.so.3) || defined(WITH_LIBTASN1)
+OPTIONS+=on
+.else
+OPTIONS+=off
 .endif
 
-.if defined(WITHOUT_CXX)
+.if defined(WITH_CXX) && !defined(WITHOUT_CXX)
+PLIST_SUB+=		CXX=""
+.else
 CONFIGURE_ARGS+=	--disable-cxx
 PLIST_SUB+=		CXX="@comment "
-.else
-PLIST_SUB+=		CXX=""
 .endif
 
-.if defined(WITHOUT_NLS)
+.if defined(WITH_NLS) && !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
+.endif
+
+.if defined(WITH_LZO) || (exists(${LOCALBASE}/lib/liblzo2.so) && !defined(WITHOUT_LZO))
+LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
+CONFIGURE_ARGS+=	--with-lzo
 .else
-USE_GETTEXT=		yes
-PLIST_SUB+=		NLS=""
+CONFIGURE_ARGS+=	--with-lzo=no
+.endif
+
+.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
+BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+CONFIGURE_ENV+=	MAKEINFO="${LOCALBASE}/bin/makeinfo"
 .endif
 
 .if !defined(NOPORTDOCS)
diff -u -r -N gnutls-2.4.1/Makefile.man gnutls/Makefile.man
--- gnutls-2.4.1/Makefile.man	2008-06-24 03:58:41.000000000 -0400
+++ gnutls/Makefile.man	2008-09-12 09:20:18.178875496 -0400
@@ -37,8 +37,6 @@
 	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 \
@@ -48,7 +46,9 @@
 	gnutls_certificate_set_dh_params.3 \
 	gnutls_certificate_set_openpgp_key.3 \
 	gnutls_certificate_set_openpgp_key_file.3 \
+	gnutls_certificate_set_openpgp_key_file2.3 \
 	gnutls_certificate_set_openpgp_key_mem.3 \
+	gnutls_certificate_set_openpgp_key_mem2.3 \
 	gnutls_certificate_set_openpgp_keyring_file.3 \
 	gnutls_certificate_set_openpgp_keyring_mem.3 \
 	gnutls_certificate_set_params_function.3 \
@@ -88,10 +88,15 @@
 	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_crypto_bigint_register2.3 \
+	gnutls_crypto_cipher_register2.3 \
+	gnutls_crypto_digest_register2.3 \
+	gnutls_crypto_mac_register2.3 \
+	gnutls_crypto_pk_register2.3 \
+	gnutls_crypto_rnd_register2.3 \
+	gnutls_crypto_single_cipher_register2.3 \
+	gnutls_crypto_single_digest_register2.3 \
+	gnutls_crypto_single_mac_register2.3 \
 	gnutls_db_check_entry.3 \
 	gnutls_db_get_ptr.3 \
 	gnutls_db_remove_session.3 \
@@ -117,6 +122,7 @@
 	gnutls_dh_set_prime_bits.3 \
 	gnutls_error_is_fatal.3 \
 	gnutls_error_to_alert.3 \
+	gnutls_ext_register.3 \
 	gnutls_extra_check_version.3 \
 	gnutls_fingerprint.3 \
 	gnutls_free.3 \
@@ -168,68 +174,68 @@
 	gnutls_mac_list.3 \
 	gnutls_mac_set_priority.3 \
 	gnutls_malloc.3 \
-	gnutls_openpgp_crt_init.3 \
+	gnutls_openpgp_crt_check_hostname.3 \
 	gnutls_openpgp_crt_deinit.3 \
-	gnutls_openpgp_crt_import.3 \
 	gnutls_openpgp_crt_export.3 \
-	gnutls_openpgp_crt_get_fingerprint.3 \
-	gnutls_openpgp_crt_get_name.3 \
-	gnutls_openpgp_crt_get_pk_algorithm.3 \
-	gnutls_openpgp_crt_get_version.3 \
+	gnutls_openpgp_crt_get_auth_subkey.3 \
 	gnutls_openpgp_crt_get_creation_time.3 \
 	gnutls_openpgp_crt_get_expiration_time.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_fingerprint.3 \
 	gnutls_openpgp_crt_get_key_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_pk_dsa_raw.3 \
+	gnutls_openpgp_crt_get_pk_rsa_raw.3 \
+	gnutls_openpgp_crt_get_preferred_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_fingerprint.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_algorithm.3 \
 	gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3 \
-	gnutls_openpgp_crt_get_preferred_key_id.3 \
+	gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3 \
+	gnutls_openpgp_crt_get_subkey_revoked_status.3 \
+	gnutls_openpgp_crt_get_subkey_usage.3 \
+	gnutls_openpgp_crt_get_version.3 \
+	gnutls_openpgp_crt_import.3 \
+	gnutls_openpgp_crt_init.3 \
+	gnutls_openpgp_crt_print.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_crt_verify_ring.3 \
+	gnutls_openpgp_crt_verify_self.3 \
 	gnutls_openpgp_keyring_check_id.3 \
-	gnutls_openpgp_keyring_import.3 \
-	gnutls_openpgp_keyring_get_crt_count.3 \
+	gnutls_openpgp_keyring_deinit.3 \
 	gnutls_openpgp_keyring_get_crt.3 \
-	gnutls_openpgp_crt_print.3 \
-	gnutls_openpgp_privkey_init.3 \
+	gnutls_openpgp_keyring_get_crt_count.3 \
+	gnutls_openpgp_keyring_import.3 \
+	gnutls_openpgp_keyring_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_export_dsa_raw.3 \
+	gnutls_openpgp_privkey_export_rsa_raw.3 \
+	gnutls_openpgp_privkey_export_subkey_dsa_raw.3 \
+	gnutls_openpgp_privkey_export_subkey_rsa_raw.3 \
 	gnutls_openpgp_privkey_get_fingerprint.3 \
 	gnutls_openpgp_privkey_get_key_id.3 \
+	gnutls_openpgp_privkey_get_pk_algorithm.3 \
+	gnutls_openpgp_privkey_get_preferred_key_id.3 \
+	gnutls_openpgp_privkey_get_revoked_status.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_fingerprint.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_get_subkey_idx.3 \
+	gnutls_openpgp_privkey_get_subkey_pk_algorithm.3 \
+	gnutls_openpgp_privkey_get_subkey_revoked_status.3 \
+	gnutls_openpgp_privkey_import.3 \
+	gnutls_openpgp_privkey_init.3 \
 	gnutls_openpgp_privkey_set_preferred_key_id.3 \
+	gnutls_openpgp_privkey_sign_hash.3 \
 	gnutls_openpgp_send_cert.3 \
 	gnutls_openpgp_set_recv_key_function.3 \
 	gnutls_oprfi_enable_client.3 \
@@ -332,12 +338,13 @@
 	gnutls_session_get_server_random.3 \
 	gnutls_session_is_resumed.3 \
 	gnutls_session_set_data.3 \
+	gnutls_session_set_finished_function.3 \
 	gnutls_session_set_ptr.3 \
 	gnutls_set_default_export_priority.3 \
 	gnutls_set_default_priority.3 \
 	gnutls_sign_algorithm_get_name.3 \
-	gnutls_sign_callback_set.3 \
 	gnutls_sign_callback_get.3 \
+	gnutls_sign_callback_set.3 \
 	gnutls_srp_allocate_client_credentials.3 \
 	gnutls_srp_allocate_server_credentials.3 \
 	gnutls_srp_base64_decode.3 \
@@ -362,32 +369,22 @@
 	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 \
 	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 \
@@ -411,6 +408,7 @@
 	gnutls_x509_crq_set_challenge_password.3 \
 	gnutls_x509_crq_set_dn_by_oid.3 \
 	gnutls_x509_crq_set_key.3 \
+	gnutls_x509_crq_set_key_rsa_raw.3 \
 	gnutls_x509_crq_set_version.3 \
 	gnutls_x509_crq_sign.3 \
 	gnutls_x509_crq_sign2.3 \
@@ -427,8 +425,11 @@
 	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.3 \
 	gnutls_x509_crt_get_issuer_dn.3 \
 	gnutls_x509_crt_get_issuer_dn_by_oid.3 \
 	gnutls_x509_crt_get_issuer_dn_oid.3 \
@@ -439,16 +440,21 @@
 	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_init.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 \
@@ -468,6 +474,11 @@
 	gnutls_x509_crt_set_subject_key_id.3 \
 	gnutls_x509_crt_sign2.3 \
 	gnutls_x509_crt_verify.3 \
+	gnutls_x509_dn_deinit.3 \
+	gnutls_x509_dn_export.3 \
+	gnutls_x509_dn_get_rdn_ava.3 \
+	gnutls_x509_dn_import.3 \
+	gnutls_x509_dn_init.3 \
 	gnutls_x509_dn_oid_known.3 \
 	gnutls_x509_privkey_cpy.3 \
 	gnutls_x509_privkey_deinit.3 \
@@ -490,16 +501,13 @@
 	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_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_dn_get_rdn_ava.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_set_crq.3 \
+	gnutls_x509_crt_set_version.3 \
+	gnutls_x509_crt_sign.3 \
+	gnutls_x509_crt_verify_data.3
diff -u -r -N gnutls-2.4.1/distinfo gnutls/distinfo
--- gnutls-2.4.1/distinfo	2008-07-01 04:51:45.000000000 -0400
+++ gnutls/distinfo	2008-09-12 07:19:34.477097288 -0400
@@ -1,3 +1,3 @@
-MD5 (gnutls-2.4.1.tar.bz2) = 573db36cb3f8472b0293cfa1f52c607a
-SHA256 (gnutls-2.4.1.tar.bz2) = d91401a6828d7300dc2b1106ff99610479aa35af05d39746cacdab8cdc7be5fd
-SIZE (gnutls-2.4.1.tar.bz2) = 4940118
+MD5 (gnutls-2.5.4.tar.bz2) = 0bfb1752342d83908e25067c872bbdac
+SHA256 (gnutls-2.5.4.tar.bz2) = 5309671f0eef1fcb5599d975c544f91b7d8ab19330838e1da0bcd08b152d9ff4
+SIZE (gnutls-2.5.4.tar.bz2) = 5035669
diff -u -r -N gnutls-2.4.1/files/patch-includes__gnutls__gnutls.h.in gnutls/files/patch-includes__gnutls__gnutls.h.in
--- gnutls-2.4.1/files/patch-includes__gnutls__gnutls.h.in	2008-07-30 04:54:58.000000000 -0400
+++ gnutls/files/patch-includes__gnutls__gnutls.h.in	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
---- ./includes/gnutls/gnutls.h.in.orig	2008-06-30 13:45:51.000000000 -0700
-+++ ./includes/gnutls/gnutls.h.in	2008-07-30 01:39:55.348483886 -0700
-@@ -287,7 +287,7 @@
-     {
-       GNUTLS_CRT_PRINT_FULL,
-       GNUTLS_CRT_PRINT_ONELINE,
--      GNUTLS_CRT_PRINT_UNSIGNED_FULL,
-+      GNUTLS_CRT_PRINT_UNSIGNED_FULL
-     } gnutls_certificate_print_formats_t;
- 
-   typedef enum
diff -u -r -N gnutls-2.4.1/files/patch-lib__opencdk__Makefile.in gnutls/files/patch-lib__opencdk__Makefile.in
--- gnutls-2.4.1/files/patch-lib__opencdk__Makefile.in	1969-12-31 19:00:00.000000000 -0500
+++ gnutls/files/patch-lib__opencdk__Makefile.in	2008-08-18 18:42:32.000000000 -0400
@@ -0,0 +1,11 @@
+--- lib/opencdk/Makefile.in.orig	2008-08-18 18:42:32.000000000 -0400
++++ lib/opencdk/Makefile.in	2008-08-18 18:42:32.000000000 -0400
+@@ -540,7 +540,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CPPFLAGS = -I$(top_srcdir)/lib \
++AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/minitasn1 \
+ 	-I$(top_srcdir)/includes -I$(top_builddir)/includes \
+ 	-I$(top_srcdir)/lgl -I$(top_builddir)/lgl
+ 
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080912163941.34AFB6432DFD>