update freeradius-server to latest stable

3 files changed, 204 insertions, 40 deletions

diff --git a/package/freeradius-server/patches/patch-acinclude_m4 b/package/freeradius-server/patches/patch-acinclude_m4
new file mode 100644
index 000000000..f1cefae77
--- /dev/null
+++ b/package/freeradius-server/patches/patch-acinclude_m4
@@ -0,0 +1,164 @@
+--- freeradius-server-3.0.8.orig/acinclude.m4	2015-04-22 19:21:34.000000000 +0200
++++ freeradius-server-3.0.8/acinclude.m4	2015-05-13 22:13:54.000000000 +0200
+@@ -218,22 +218,22 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'`
+ old_CPPFLAGS="$CPPFLAGS"
+ smart_include=
+ dnl #  The default directories we search in (in addition to the compilers search path)
+-smart_include_dir="/usr/local/include /opt/include"
++dnl smart_include_dir="/usr/local/include /opt/include"
+ 
+ dnl #  Our local versions
+ _smart_try_dir=
+ _smart_include_dir=
+ 
+ dnl #  Add variants with the different prefixes and one with no prefix
+-for _prefix in $smart_prefix ""; do
+-  for _dir in $smart_try_dir; do
+-    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
+-  done
+-
+-  for _dir in $smart_include_dir; do
+-    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
+-  done
+-done
++dnl for _prefix in $smart_prefix ""; do
++dnl   for _dir in $smart_try_dir; do
++dnl     _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
++dnl   done
++dnl 
++dnl   for _dir in $smart_include_dir; do
++dnl     _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
++dnl   done
++dnl done
+ 
+ dnl #
+ dnl #  Try any user-specified directory first otherwise we may pick up
+@@ -262,73 +262,73 @@ fi
+ dnl #
+ dnl #  Try using the default includes (with prefixes).
+ dnl #
+-if test "x$smart_include" = "x"; then
+-  for _prefix in $smart_prefix; do
+-    AC_MSG_CHECKING([for ${_prefix}/$1])
+-
+-    AC_TRY_COMPILE([$2
+-		    #include <$1>],
+-		   [int a = 1;],
+-		   [
+-		     smart_include="-isystem ${_prefix}/"
+-		     AC_MSG_RESULT(yes)
+-		     break
+-		   ],
+-		   [
+-		     smart_include=
+-		     AC_MSG_RESULT(no)
+-		   ])
+-  done
+-fi
++dnl if test "x$smart_include" = "x"; then
++dnl   for _prefix in $smart_prefix; do
++dnl     AC_MSG_CHECKING([for ${_prefix}/$1])
++dnl 
++dnl    AC_TRY_COMPILE([$2
++dnl 		    #include <$1>],
++dnl 		   [int a = 1;],
++dnl 		   [
++dnl 		     smart_include="-isystem ${_prefix}/"
++dnl 		     AC_MSG_RESULT(yes)
++dnl 		     break
++dnl 		   ],
++dnl 		   [
++dnl 		     smart_include=
++dnl 		     AC_MSG_RESULT(no)
++dnl 		   ])
++dnl   done
++dnl fi
+ 
+ dnl #
+ dnl #  Try using the default includes (without prefixes).
+ dnl #
+ if test "x$smart_include" = "x"; then
+-    AC_MSG_CHECKING([for $1])
+-
+-    AC_TRY_COMPILE([$2
++     AC_MSG_CHECKING([for $1])
++ 
++     AC_TRY_COMPILE([$2
+ 		    #include <$1>],
+-		   [int a = 1;],
+-		   [
+-		     smart_include=" "
+-		     AC_MSG_RESULT(yes)
+-		     break
+-		   ],
+-		   [
+-		     smart_include=
++ 		   [int a = 1;],
++ 		   [
++ 		     smart_include=" "
++ 		     AC_MSG_RESULT(yes)
++ 		     break
++ 		   ],
++ 		   [
++ 		     smart_include=
+ 		     AC_MSG_RESULT(no)
+-		   ])
++ 		   ])
+ fi
+ 
+ dnl #
+ dnl #  Try to guess possible locations.
+ dnl #
+-if test "x$smart_include" = "x"; then
+-
+-  for prefix in $smart_prefix; do
+-    FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}")
+-  done
+-  FR_LOCATE_DIR(_smart_include_dir, $1)
+-
+-  for try in $_smart_include_dir; do
+-    AC_MSG_CHECKING([for $1 in $try])
+-    CPPFLAGS="-isystem $try $old_CPPFLAGS"
+-    AC_TRY_COMPILE([$2
+-		    #include <$1>],
+-		   [int a = 1;],
+-		   [
+-		     smart_include="-isystem $try"
+-		     AC_MSG_RESULT(yes)
+-		     break
+-		   ],
+-		   [
+-		     smart_include=
+-		     AC_MSG_RESULT(no)
+-		   ])
+-  done
+-  CPPFLAGS="$old_CPPFLAGS"
+-fi
++dnl if test "x$smart_include" = "x"; then
++dnl 
++dnl   for prefix in $smart_prefix; do
++dnl     FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}")
++dnl   done
++dnl   FR_LOCATE_DIR(_smart_include_dir, $1)
++dnl 
++dnl   for try in $_smart_include_dir; do
++dnl    AC_MSG_CHECKING([for $1 in $try])
++dnl     CPPFLAGS="-isystem $try $old_CPPFLAGS"
++dnl     AC_TRY_COMPILE([$2
++dnl 		    #include <$1>],
++dnl 		   [int a = 1;],
++dnl 		   [
++dnl 		     smart_include="-isystem $try"
++dnl 		     AC_MSG_RESULT(yes)
++dnl 		     break
++dnl		   ],
++dnl		   [
++dnl		     smart_include=
++dnl		     AC_MSG_RESULT(no)
++dnl		   ])
++dnl done
++dnl  CPPFLAGS="$old_CPPFLAGS"
++dnl fi
+ 
+ dnl #
+ dnl #  Found it, set the appropriate variable.
diff --git a/package/freeradius-server/patches/patch-configure_ac b/package/freeradius-server/patches/patch-configure_ac
index c3901ee32..e107143de 100644
--- a/package/freeradius-server/patches/patch-configure_ac
+++ b/package/freeradius-server/patches/patch-configure_ac
@@ -1,38 +1,38 @@
---- freeradius-server-3.0.2.orig/configure.ac	2014-03-21 13:27:25.000000000 +0100
-+++ freeradius-server-3.0.2/configure.ac	2014-04-24 13:10:35.000000000 +0200
-@@ -932,35 +932,6 @@ if test "x$WITH_OPENSSL" = xyes; then
-     OPENSSL_INCLUDE="-DOPENSSL_NO_KRB5"
+--- freeradius-server-3.0.8.orig/configure.ac	2015-04-22 19:21:34.000000000 +0200
++++ freeradius-server-3.0.8/configure.ac	2015-05-13 12:57:21.000000000 +0200
+@@ -1146,35 +1146,6 @@ if test "x$WITH_OPENSSL" = xyes; then
+     dnl #
+     old_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$OPENSSL_CPPFLAGS $CPPFLAGS"
+-
+-    dnl #
+-    dnl #  Now check that the header versions match the library
+-    dnl #
+-    AC_MSG_CHECKING([OpenSSL library and header version consistency])
+-    AC_RUN_IFELSE(
+-      [AC_LANG_PROGRAM(
+-        [[
+-          #include <stdio.h>
+-          #include <openssl/opensslv.h>
+-          #include <openssl/crypto.h>
+-        ]],
+-        [[
+-          printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER);
+-          if (SSLeay() == OPENSSL_VERSION_NUMBER) {
+-            return 0;
+-          } else {
+-            return 1;
+-          }
+-        ]]
+-      )],
+-      [
+-        AC_MSG_RESULT(yes)
+-      ],
+-      [
+-        AC_MSG_RESULT(no)
+-        AC_MSG_FAILURE([OpenSSL library version does not match header version])
+-      ]
+-    )
+     CPPFLAGS="$old_CPPFLAGS"
    fi
  
--  dnl #
--  dnl #  Now check that the header versions match the library
--  dnl #
--  AC_MSG_CHECKING([OpenSSL library and header version consistency])
--  AC_RUN_IFELSE(
--    [AC_LANG_PROGRAM(
--      [[
--        #include <stdio.h>
--        #include <openssl/opensslv.h>
--        #include <openssl/crypto.h>
--      ]],
--      [[
--        if (SSLeay() == OPENSSL_VERSION_NUMBER) {
--          return 0;
--        } else {
--          printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER);
--          return 1;
--        }
--      ]]
--    )],
--    [
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--      AC_MSG_FAILURE([OpenSSL library version does not match header version])
--    ]
--  )
--
-   if test "x$OPENSSL_LIBS" = x; then
-     LIBS=$old_LIBS
-     LDFLAGS="$old_LDFLAGS"
diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk
index 957397302..94e30ed46 100644
--- a/package/freeradius-server/patches/patch-scripts_libtool_mk
+++ b/package/freeradius-server/patches/patch-scripts_libtool_mk
@@ -1,11 +1,11 @@
---- freeradius-server-3.0.2.orig/scripts/libtool.mk	2014-03-21 13:27:25.000000000 +0100
-+++ freeradius-server-3.0.2/scripts/libtool.mk	2014-04-24 15:58:56.000000000 +0200
+--- freeradius-server-3.0.8.orig/scripts/libtool.mk	2015-04-22 19:21:34.000000000 +0200
++++ freeradius-server-3.0.8/scripts/libtool.mk	2015-05-13 16:40:27.000000000 +0200
 @@ -33,7 +33,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
      ${JLIBTOOL}: ${top_makedir}/jlibtool.c
  	$(Q)mkdir -p $(dir $@)
  	$(Q)echo CC jlibtool.c
--	$(Q)${CC} $< -o $@ ${DARWIN_CFLAGS}
-+	$(Q)${CC_FOR_BUILD} $< -o $@ ${CFLAGS_FOR_BUILD}
+-	$(Q)${CC} $< -o $@
++	$(Q)${CC_FOR_BUILD} $< -o $@
  
      clean: jlibtool_clean