diff options
author | wiz <wiz> | 2012-09-12 06:32:45 +0000 |
---|---|---|
committer | wiz <wiz> | 2012-09-12 06:32:45 +0000 |
commit | 44a9b1932f14e42934c9615aedf98f2cdde247b5 (patch) | |
tree | cfc9c79aa41d48d6d35737fd95d4c6229fcda28f | |
parent | f96b4ba869691bb327e91ae7e4054581f0686cc1 (diff) | |
download | pkgsrc-44a9b1932f14e42934c9615aedf98f2cdde247b5.tar.gz |
Update to 1.1.4.
1.1.4:
This new release contains a lot of bug fixes, thank to many reports
from our users. It is also the first release compatible with GNUTLS
version 3.x.
1.1.3:
This new release is a minor bug fix release, addressing a few issues
in dbg_interactive.fdx, as well as a memory leak in the sessions
module.
-rw-r--r-- | net/freeDiameter/Makefile | 7 | ||||
-rw-r--r-- | net/freeDiameter/distinfo | 10 | ||||
-rw-r--r-- | net/freeDiameter/patches/patch-libfdcore_config.c | 23 | ||||
-rw-r--r-- | net/freeDiameter/patches/patch-libfdcore_fdcore-internal.h | 17 |
4 files changed, 9 insertions, 48 deletions
diff --git a/net/freeDiameter/Makefile b/net/freeDiameter/Makefile index 206876b99ba..5d47ab937aa 100644 --- a/net/freeDiameter/Makefile +++ b/net/freeDiameter/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2012/08/25 22:39:23 dholland Exp $ +# $NetBSD: Makefile,v 1.4 2012/09/12 06:32:45 wiz Exp $ # -DISTNAME= 1.1.2 +DISTNAME= 1.1.4 PKGNAME= freeDiameter-${DISTNAME} CATEGORIES= net MASTER_SITES= http://www.freediameter.net/hg/freeDiameter/archive/ @@ -22,6 +22,9 @@ USE_LANGUAGES= c c++ USE_TOOLS+= bison flex pkg-config FLEX_REQD= 2.5.35 +# needs libraries installed +#TEST_TARGET= test + .include "options.mk" INSTALLATION_DIRS= share/examples/freeDiameter/single_host diff --git a/net/freeDiameter/distinfo b/net/freeDiameter/distinfo index 2ffea236560..d01500d445d 100644 --- a/net/freeDiameter/distinfo +++ b/net/freeDiameter/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.2 2012/08/26 07:14:28 dholland Exp $ +$NetBSD: distinfo,v 1.3 2012/09/12 06:32:45 wiz Exp $ -SHA1 (freeDiameter/1.1.2.tar.gz) = 2cef81658e3700302a608d92dc1b78a328a0dcec -RMD160 (freeDiameter/1.1.2.tar.gz) = 1b84b19a08d03f1374f3564496a794458ff3bcfb -Size (freeDiameter/1.1.2.tar.gz) = 744424 bytes -SHA1 (patch-libfdcore_config.c) = 75d3e75f00bf93b1ad21821c7c2e7525c9068e31 -SHA1 (patch-libfdcore_fdcore-internal.h) = 040954d716cee4291c74c2c0f108683eba648ab6 +SHA1 (freeDiameter/1.1.4.tar.gz) = f62dcb09aee61e4f611c1f351d00c400d7f90a2f +RMD160 (freeDiameter/1.1.4.tar.gz) = b943c468bb69a43af46ec9adaeedae62919eb93a +Size (freeDiameter/1.1.4.tar.gz) = 757093 bytes diff --git a/net/freeDiameter/patches/patch-libfdcore_config.c b/net/freeDiameter/patches/patch-libfdcore_config.c deleted file mode 100644 index 1a0fc2e83ba..00000000000 --- a/net/freeDiameter/patches/patch-libfdcore_config.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-libfdcore_config.c,v 1.1 2012/08/20 12:17:20 wiz Exp $ - -Fix build against gnutls-3.x, based on feedback by Nikos Mavrogiannopou -on help-gnutls@gnu.org. - ---- libfdcore/config.c.orig 2012-02-21 17:46:14.000000000 +0000 -+++ libfdcore/config.c -@@ -358,9 +358,12 @@ int fd_conf_parse() - ASSERT(cert_max >= 1); - - /* Now, verify the list against the local CA and CRL */ -- GNUTLS_TRACE( gnutls_certificate_get_x509_cas (fd_g_config->cnf_sec_data.credentials, &CA_list, (unsigned int *) &CA_list_length) ); -- GNUTLS_TRACE( gnutls_certificate_get_x509_crls (fd_g_config->cnf_sec_data.credentials, &CRL_list, (unsigned int *) &CRL_list_length) ); -- CHECK_GNUTLS_DO( gnutls_x509_crt_list_verify(certs, cert_max, CA_list, CA_list_length, CRL_list, CRL_list_length, 0, &verify), -+ CHECK_GNUTLS_DO( gnutls_certificate_get_issuer(fd_g_config->cnf_sec_data.credentials, certs[cert_max-1], &CA_list, 0), -+ { -+ TRACE_DEBUG(INFO, "Cannot find issuer for local certificate '%s'. Please check your certificate is valid.", fd_g_config->cnf_sec_data.cert_file); -+ return EINVAL; -+ } ); -+ CHECK_GNUTLS_DO( gnutls_x509_crt_list_verify(certs, cert_max, CA_list, 1, NULL, 0, 0, &verify), - { - TRACE_DEBUG(INFO, "Failed to verify the local certificate '%s' against local credentials. Please check your certificate is valid.", fd_g_config->cnf_sec_data.cert_file); - return EINVAL; diff --git a/net/freeDiameter/patches/patch-libfdcore_fdcore-internal.h b/net/freeDiameter/patches/patch-libfdcore_fdcore-internal.h deleted file mode 100644 index 39ca9554c75..00000000000 --- a/net/freeDiameter/patches/patch-libfdcore_fdcore-internal.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-libfdcore_fdcore-internal.h,v 1.1 2012/08/26 07:14:28 dholland Exp $ - -Avoid build failure if AI_ADDRCONFIG isn't available. - ---- libfdcore/fdcore-internal.h~ 2012-02-21 17:46:14.000000000 +0000 -+++ libfdcore/fdcore-internal.h -@@ -41,6 +41,10 @@ - #include <freeDiameter/freeDiameter-host.h> - #include <freeDiameter/libfdcore.h> - -+#ifndef AI_ADDRCONFIG -+#define AI_ADDRCONFIG 0 -+#endif -+ - #ifdef DISABLE_SCTP - #undef IPPROTO_SCTP - #define IPPROTO_SCTP (2 = 4) /* some compilation error to spot the references */ |