summaryrefslogtreecommitdiff
path: root/package/freeradius-server
diff options
context:
space:
mode:
Diffstat (limited to 'package/freeradius-server')
-rw-r--r--package/freeradius-server/Makefile22
-rw-r--r--package/freeradius-server/files/freeradius-mod-files.conffiles3
-rw-r--r--package/freeradius-server/files/freeradius-mod-sql.conffiles1
-rw-r--r--package/freeradius-server/patches/patch-configure_ac38
-rw-r--r--package/freeradius-server/patches/patch-ltmain_sh11
-rw-r--r--package/freeradius-server/patches/patch-scripts_libtool_mk11
-rw-r--r--package/freeradius-server/patches/patch-src_main_event_c21
-rw-r--r--package/freeradius-server/patches/patch-src_main_modules_c11
-rw-r--r--package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in11
9 files changed, 61 insertions, 68 deletions
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 55b026055..a3f65af02 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -4,24 +4,24 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= freeradius-server
-PKG_VERSION:= 2.1.8
+PKG_VERSION:= 3.0.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= aa2ae711387af144df7c351b28b8789c
-PKG_DESCR:= a flexible RADIUS server
+PKG_MD5SUM:= 3532b6439270f9da0ebfc03d3623f962
+PKG_DESCR:= flexible RADIUS server
PKG_SECTION:= ppp
PKG_DEPENDS:= libltdl libopenssl libpthread
-PKG_BUILDDEP:= libtool openssl
+PKG_BUILDDEP:= autotool libtool openssl
PKG_URL:= http://www.freeradius.org/
PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/
PKG_MULTI:= 1
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_SUBPKGS:= FREERADIUS_SERVER FREERADIUS_DEMOCERTS FREERADIUS_MOD_CHAP FREERADIUS_MOD_DETAIL
PKG_SUBPKGS+= FREERADIUS_MOD_DIGEST FREERADIUS_MOD_FILES FREERADIUS_MOD_LDAP FREERADIUS_MOD_MSCHAP
PKG_SUBPKGS+= FREERADIUS_MOD_PAP FREERADIUS_MOD_PREPROCESS FREERADIUS_MOD_REALM FREERADIUS_MOD_SQL
PKG_SUBPKGS+= FREERADIUS_MOD_SQL_MYSQL FREERADIUS_MOD_SQL_PGSQL FREERADIUS_UTILS
-PKG_HOST_DEPENDS:= !cygwin
-
# sub package build dependencies
PKGSB_FREERADIUS_MOD_LDAP:= openldap
PKGSB_FREERADIUS_MOD_SQL_MYSQL:= mysql
@@ -81,7 +81,7 @@ INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install
${2}-install:
${INSTALL_DIR} $${IDIR_${1}}/usr/lib/freeradius
for m in ${2}; do \
- ${CP} ${WRKINST}/usr/lib/freeradius/$$$${m}{,-*}.so \
+ ${CP} ${WRKINST}/usr/lib/freeradius/$$$${m}.so \
$${IDIR_${1}}/usr/lib/freeradius/ ; \
done
${INSTALL_DIR} $${IDIR_${1}}/etc/freeradius
@@ -112,14 +112,16 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_DIGEST,rlm_digest,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_FILES,rlm_files,acct_users preproxy_users users))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_MSCHAP,rlm_mschap,))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_LDAP,rlm_ldap,ldap.attrmap))
+$(eval $(call PKG_mod_template,FREERADIUS_MOD_LDAP,rlm_ldap,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_PAP,rlm_pap,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_PREPROCESS,rlm_preprocess,hints huntgroups))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_REALM,rlm_realm,proxy.conf))
-$(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,sql.conf))
+$(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,))
+AUTOTOOL_STYLE:= autoreconf
+CONFIGURE_ENV+= LIBTOOL=
CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \
--with-openssl-includes=${STAGING_TARGET_DIR}/usr/include \
--with-openssl-libraries=${STAGING_TARGET_DIR}/usr/lib \
@@ -185,7 +187,7 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/ ; \
done
${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/lib/freeradius
- ${CP} ${WRKINST}/usr/lib/freeradius/libfreeradius-radius{,-*}.so \
+ ${CP} ${WRKINST}/usr/lib/freeradius/libfreeradius-radius.so \
${IDIR_FREERADIUS_SERVER}/usr/lib
${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/sbin
${CP} ${WRKINST}/usr/sbin/radiusd \
diff --git a/package/freeradius-server/files/freeradius-mod-files.conffiles b/package/freeradius-server/files/freeradius-mod-files.conffiles
deleted file mode 100644
index 4fcd92bff..000000000
--- a/package/freeradius-server/files/freeradius-mod-files.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/freeradius/acct_users
-/etc/freeradius/preproxy_users
-/etc/freeradius/users
diff --git a/package/freeradius-server/files/freeradius-mod-sql.conffiles b/package/freeradius-server/files/freeradius-mod-sql.conffiles
deleted file mode 100644
index 8ab119d07..000000000
--- a/package/freeradius-server/files/freeradius-mod-sql.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/freeradius/sql.conf
diff --git a/package/freeradius-server/patches/patch-configure_ac b/package/freeradius-server/patches/patch-configure_ac
new file mode 100644
index 000000000..c3901ee32
--- /dev/null
+++ b/package/freeradius-server/patches/patch-configure_ac
@@ -0,0 +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"
+ 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-ltmain_sh b/package/freeradius-server/patches/patch-ltmain_sh
deleted file mode 100644
index 2730428cd..000000000
--- a/package/freeradius-server/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeradius-server-2.1.8.orig/ltmain.sh 2009-12-30 16:44:35.000000000 +0100
-+++ freeradius-server-2.1.8/ltmain.sh 2011-01-15 13:13:33.000000000 +0100
-@@ -1623,7 +1623,7 @@ EOF
- # -pg pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk
new file mode 100644
index 000000000..957397302
--- /dev/null
+++ b/package/freeradius-server/patches/patch-scripts_libtool_mk
@@ -0,0 +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
+@@ -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}
+
+ clean: jlibtool_clean
+
diff --git a/package/freeradius-server/patches/patch-src_main_event_c b/package/freeradius-server/patches/patch-src_main_event_c
deleted file mode 100644
index 1750f53d5..000000000
--- a/package/freeradius-server/patches/patch-src_main_event_c
+++ /dev/null
@@ -1,21 +0,0 @@
---- freeradius-server-2.1.8.orig/src/main/event.c 2009-12-30 16:44:35.000000000 +0100
-+++ freeradius-server-2.1.8/src/main/event.c 2010-02-05 19:43:55.803074411 +0100
-@@ -1177,7 +1177,7 @@ static void wait_a_bit(void *ctx)
- }
-
- stop_processing:
--#if defined(HAVE_PTHREAD_H) || defined(WITH_PROXY)
-+#if defined(HAVE_PTHREAD_H)
- /*
- * A child thread MAY still be running on the
- * request. Ask the thread to stop working on
-@@ -1646,7 +1646,9 @@ static int originated_coa_request(REQUES
- */
- request->num_proxied_requests = 1;
- request->num_proxied_responses = 0;
-+#ifdef HAVE_PTHREAD_H
- request->child_pid = NO_SUCH_CHILD_PID;
-+#endif
-
- update_event_timestamp(request->proxy, request->proxy_when.tv_sec);
-
diff --git a/package/freeradius-server/patches/patch-src_main_modules_c b/package/freeradius-server/patches/patch-src_main_modules_c
deleted file mode 100644
index c72807f5c..000000000
--- a/package/freeradius-server/patches/patch-src_main_modules_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeradius-server-2.1.8.orig/src/main/modules.c 2009-12-30 16:44:35.000000000 +0100
-+++ freeradius-server-2.1.8/src/main/modules.c 2010-02-05 20:05:22.174324929 +0100
-@@ -22,6 +22,8 @@
- * Copyright 2000 Alan Curry <pacman@world.std.com>
- */
-
-+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
-+
- #include <freeradius-devel/ident.h>
- RCSID("$Id$")
-
diff --git a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in
deleted file mode 100644
index da95c44c1..000000000
--- a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeradius-server-2.1.8.orig/src/modules/rlm_eap/Makefile.in 2009-12-30 16:44:35.000000000 +0100
-+++ freeradius-server-2.1.8/src/modules/rlm_eap/Makefile.in 2010-02-05 20:33:01.401922559 +0100
-@@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER
-
- install-subdirs:
- @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=install common
-- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir)
-+ #$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir)
-
- common:
- @for dir in $(RLM_SUBDIRS); do \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 15:49:57 +0000