update freeradius-server to latest stable

7 files changed, 314 insertions, 49 deletions

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 4a51b68cd..16e7b2ea8 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -4,13 +4,13 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-server
-PKG_VERSION:=		3.0.2
-PKG_RELEASE:=		3
-PKG_HASH:=		687f6ca9870709bd433c044947225e365f5099499abba51419bf77134223713b
+PKG_VERSION:=		3.0.8
+PKG_RELEASE:=		1
+PKG_HASH:=		c27252d7a86ba252904612d9b1f90e846f3ef1f4afee6a748f5287b730e87e3a
 PKG_DESCR:=		flexible radius server
 PKG_SECTION:=		net/radius
-PKG_DEPENDS:=		libltdl libopenssl libpthread libpcre
-PKG_BUILDDEP:=		libtool openssl samba pcre
+PKG_DEPENDS:=		libltdl libopenssl libpthread libpcre libtalloc
+PKG_BUILDDEP:=		libtool openssl pcre talloc
 PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 
@@ -136,6 +136,10 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,))
 AUTOTOOL_STYLE:=	autoreconf
 XAKE_FLAGS+=            GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
+			--libdir=/usr/lib/freeradius \
+			--libexecdir=/usr/lib/freeradius \
+			--disable-openssl-version-check \
+			--with-execinfo-include-dir=/dev/null \
 			--with-openssl-includes=${STAGING_TARGET_DIR}/usr/include \
 			--with-openssl-libraries=${STAGING_TARGET_DIR}/usr/lib \
 			--with-system-libltld \
@@ -160,6 +164,7 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 			--without-rlm_perl \
 			--without-rlm_python \
 			--without-rlm_radutmp \
+			--without-rlm_rest \
 			--without-rlm_ruby \
 			--without-rlm_smb \
 			--without-rlm_sqlcounter \
@@ -173,15 +178,18 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 			--without-rlm_unix \
 			--without-rlm_eap_ikev2 \
 			--without-rlm_eap_tnc \
+			--without-rlm_cache_memcached \
 			--without-rlm_opendirectory \
 			--without-rlm_sql_firebird \
-			--without-rlm_sql_sqlite \
-			--libdir=/usr/lib/freeradius \
-			--libexecdir=/usr/lib/freeradius
+			--without-rlm_sql_sqlite
+CONFIGURE_ENV+=		ax_cv_cc_builtin_choose_expr=yes \
+			ax_cv_cc_builtin_types_compatible_p=yes \
+			ax_cv_cc_builtin_bswap64=yes \
+			ax_cv_cc_bounded_attribute=yes
 FAKE_FLAGS+=		R="${WRKINST}" \
 			INSTALLSTRIP=""
 
-post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
+freeradius-server-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius
 	${CP} ./files/users ${IDIR_FREERADIUS_SERVER}/etc/freeradius/
 	${INSTALL_DATA} ./files/radiusd.conf \
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
  
diff --git a/package/talloc/Makefile b/package/talloc/Makefile
new file mode 100644
index 000000000..0af42b737
--- /dev/null
+++ b/package/talloc/Makefile
@@ -0,0 +1,42 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		talloc
+PKG_VERSION:=		2.1.2
+PKG_RELEASE:=		1
+PKG_HASH:=		230d78a3fca75a15ab0f5d76d7bbaeadd3c1e695adcbb085932d227f5c31838d
+PKG_DESCR:=		memory allocation library
+PKG_SECTION:=		libs/misc
+PKG_BUILDDEP:=		python2-host python2
+PKG_URL:=		https://talloc.samba.org/talloc/doc/html/index.html
+PKG_SITES:=		https://www.samba.org/ftp/talloc/
+PKG_LIBNAME:=		libtalloc
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBTALLOC,libtalloc,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		minimal
+CONFIGURE_ARGS+=	--prefix=/usr \
+			--cross-compile \
+			--cross-answers=$(WRKSRC)/cache.txt \
+			--hostcc=gcc
+
+CONFIGURE_ENV+=		PYTHON_CONFIG="$(STAGING_TARGET_DIR)/usr/bin/python-config" \
+			python_LDFLAGS="" \
+			python_LIBDIR=""
+
+pre-configure:
+	$(CP) ./files/cache.txt $(WRKSRC)
+	echo 'Checking uname machine type: "$(ADK_TARGET_ARCH)"' >>$(WRKSRC)/cache.txt
+
+libtalloc-install:
+	$(INSTALL_DIR) $(IDIR_LIBTALLOC)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libtalloc.so* \
+		$(IDIR_LIBTALLOC)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/talloc/files/cache.txt b/package/talloc/files/cache.txt
new file mode 100644
index 000000000..c9e34b630
--- /dev/null
+++ b/package/talloc/files/cache.txt
@@ -0,0 +1,38 @@
+Checking simple C program: OK
+rpath library support: OK
+-Wl,--version-script support: OK
+Checking getconf LFS_CFLAGS: NO
+Checking for large file support without additional flags: OK
+Checking for -D_LARGE_FILES: OK
+Checking correct behavior of strtoll: NO
+Checking for working strptime: OK
+Checking for C99 vsnprintf: OK
+Checking for HAVE_SHARED_MMAP: OK
+Checking for HAVE_MREMAP: OK
+Checking for HAVE_INCOHERENT_MMAP: NO
+Checking for HAVE_SECURE_MKSTEMP: OK
+Checking for HAVE_IFACE_GETIFADDRS: OK
+Checking for kernel change notify support: OK
+Checking for Linux kernel oplocks: OK
+Checking for kernel share modes: OK
+Checking if can we convert from CP850 to UCS-2LE: OK
+Checking if can we convert from UTF-8 to UCS-2LE: OK
+Checking whether we can use Linux thread-specific credentials with 32-bit system calls: OK
+Checking whether we can use Linux thread-specific credentials: OK
+Checking whether setreuid is available: OK
+Checking whether setresuid is available: OK
+Checking whether seteuid is available: OK
+Checking whether fcntl locking is available: OK
+Checking for the maximum value of the 'time_t' type: OK
+Checking whether the realpath function allows a NULL argument: OK
+Checking whether POSIX capabilities are available: OK
+Checking for ftruncate extend: OK
+vfs_fileid checking for statfs() and struct statfs.f_fsid: OK
+getcwd takes a NULL argument: OK
+Checking uname sysname type: "Linux"
+Checking uname release type: "3.0.0"
+Checking uname version type: "#1 Tue Nov 1 12:34:56 UTC 2013"
+Checking value of NSIG: "65"
+Checking value of _NSIG: "65"
+Checking value of SIGRTMAX: "64"
+Checking value of SIGRTMIN: "34"
diff --git a/package/talloc/patches/patch-buildtools_wafsamba_samba_autoconf_py b/package/talloc/patches/patch-buildtools_wafsamba_samba_autoconf_py
new file mode 100644
index 000000000..3c6833672
--- /dev/null
+++ b/package/talloc/patches/patch-buildtools_wafsamba_samba_autoconf_py
@@ -0,0 +1,13 @@
+--- talloc-2.1.2.orig/buildtools/wafsamba/samba_autoconf.py	2015-02-27 09:40:16.000000000 +0100
++++ talloc-2.1.2/buildtools/wafsamba/samba_autoconf.py	2015-05-13 11:22:52.000000000 +0200
+@@ -646,10 +646,6 @@ def SAMBA_CONFIG_H(conf, path=None):
+     if not IN_LAUNCH_DIR(conf):
+         return
+ 
+-    if conf.CHECK_CFLAGS(['-fstack-protector']) and conf.CHECK_LDFLAGS(['-fstack-protector']):
+-        conf.ADD_CFLAGS('-fstack-protector')
+-        conf.ADD_LDFLAGS('-fstack-protector')
+-
+     if Options.options.debug:
+         conf.ADD_CFLAGS('-g', testflags=True)
+