Adapted recipe and patches to freeradius-2.2.1

diff --git a/testing/scripts/recipes/003_freeradius.mk b/testing/scripts/recipes/003_freeradius.mk
index 7b7a5fe82bb416540728eb93a59958841bd78b88..631c8b68a3bbe805924f1d04d65929d5b3b06cdc 100644 (file)
--- a/testing/scripts/recipes/003_freeradius.mk
+++ b/testing/scripts/recipes/003_freeradius.mk
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-PV  = 2.2.0
+PV  = 2.2.1
 PKG = freeradius-server-$(PV)
 TAR = $(PKG).tar.bz2
 SRC = ftp://ftp.freeradius.org/pub/freeradius/$(TAR)
@@ -16,7 +16,6 @@ CONFIG_OPTS = \
 
 PATCHES = \
        freeradius-eap-sim-identity \
-       freeradius-avp-size \
        freeradius-tnc-fhh
 
 all: install

diff --git a/testing/scripts/recipes/patches/freeradius-avp-size b/testing/scripts/recipes/patches/freeradius-avp-size
deleted file mode 100644 (file)
index e7e1f63..0000000
--- a/testing/scripts/recipes/patches/freeradius-avp-size
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
-index 6c9bd13..3344c53 100644
---- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
-@@ -201,8 +201,11 @@ static VALUE_PAIR *diameter2vp(REQUEST *request, SSL *ssl,
-                       goto next_attr;
-               }
- 
--              if (size > 253) {
--                      RDEBUG2("WARNING: diameter2vp skipping long attribute %u, attr");
-+              /*
-+               * EAP-Message AVPs can be larger than 253 octets.
-+               */
-+              if ((size > 253) && !((VENDOR(attr) == 0) && (attr == PW_EAP_MESSAGE))) {
-+                      RDEBUG2("WARNING: diameter2vp skipping long attribute %u", attr);
-                       goto next_attr;
-               }
- 

diff --git a/testing/scripts/recipes/patches/freeradius-tnc-fhh b/testing/scripts/recipes/patches/freeradius-tnc-fhh
index 5abc6b25f921cfb8a1c0605a74917a10066f35c8..785538323a5740678c0c6a24d1e3382c39394754 100644 (file)
--- a/testing/scripts/recipes/patches/freeradius-tnc-fhh
+++ b/testing/scripts/recipes/patches/freeradius-tnc-fhh
@@ -5074,7 +5074,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
   *
   */
 -#include <freeradius-devel/ident.h>
--RCSID("$Id$")
+-RCSID("$Id: 213ede51c46a8c533961be8715395c0ab1f6b5c9 $")
 -
 -
 -/*
@@ -5489,7 +5489,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
   */
  
 -#include <freeradius-devel/ident.h>
--RCSID("$Id$")
+-RCSID("$Id: 985ac01f384110b9a46ec8e84592351c21b3f09a $")
 +/*
 + * EAP-TNC Packet with EAP Header, general structure
 + *
@@ -6180,7 +6180,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
 - *
 - */
 -#include <freeradius-devel/ident.h>
--RCSID("$Id$")
+-RCSID("$Id: 6077f6d2bdc2ebdea6575678e80e255f57215900 $")
 -
 -#include "tncs_connect.h"
 -#include <ltdl.h>