bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] freeradius: update to v1.1.8, force use of system libtool & libltdl

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17958 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-10-06 19:47:33 +00:00
parent df8f353edb
commit b9e776e727
8 changed files with 2858 additions and 5009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/freeradius/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2008 OpenWrt.org # Copyright (C) 2006-2009 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=freeradius PKG_NAME:=freeradius
PKG_VERSION:=1.1.6 PKG_VERSION:=1.1.8
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/old/ \ PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/old/ \
http://freeradius.portal-to-web.de/ \ http://freeradius.portal-to-web.de/ \
ftp://ftp.uk.freeradius.org/pub/radius/ ftp://ftp.uk.freeradius.org/pub/radius/
PKG_MD5SUM:=2c29ab90cc30aa3b92fbd78030ccc198 PKG_MD5SUM:=d367452a837bbe8d9c8731e21dc43593
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -212,6 +212,8 @@ CONFIGURE_ARGS+= \
--disable-developer \ --disable-developer \
--with-openssl-includes="$(STAGING_DIR)/usr/include" \ --with-openssl-includes="$(STAGING_DIR)/usr/include" \
--with-openssl-libraries="$(STAGING_DIR)/usr/lib" \ --with-openssl-libraries="$(STAGING_DIR)/usr/lib" \
--with-system-libtool \
--disable-ltdl-install \
--enable-strict-dependencies \ --enable-strict-dependencies \
--with-raddbdir=/etc/freeradius \ --with-raddbdir=/etc/freeradius \
--without-edir \ --without-edir \

56
net/freeradius/patches/002-config.patch
View File

@ -1,7 +1,5 @@
Index: freeradius-1.1.6/raddb/eap.conf --- a/raddb/eap.conf
=================================================================== +++ b/raddb/eap.conf
--- freeradius-1.1.6.orig/raddb/eap.conf 2007-07-30 14:17:42.000000000 -0500
+++ freeradius-1.1.6/raddb/eap.conf 2007-07-30 14:17:42.000000000 -0500
@@ -73,8 +73,8 @@ @@ -73,8 +73,8 @@
# User-Password, or the NT-Password attributes. # User-Password, or the NT-Password attributes.
# 'System' authentication is impossible with LEAP. # 'System' authentication is impossible with LEAP.
@ -33,7 +31,7 @@ Index: freeradius-1.1.6/raddb/eap.conf
## EAP-TLS ## EAP-TLS
# #
@@ -329,7 +329,7 @@ @@ -336,7 +336,7 @@
# of MS-CHAPv2 in EAP by Cisco, which FreeRADIUS does not # of MS-CHAPv2 in EAP by Cisco, which FreeRADIUS does not
# currently support. # currently support.
# #
@ -43,11 +41,9 @@ Index: freeradius-1.1.6/raddb/eap.conf
+# } +# }
} }
Index: freeradius-1.1.6/raddb/radiusd.conf.in --- a/raddb/radiusd.conf.in
=================================================================== +++ b/raddb/radiusd.conf.in
--- freeradius-1.1.6.orig/raddb/radiusd.conf.in 2007-07-30 14:17:42.000000000 -0500 @@ -31,13 +31,13 @@ radacctdir = @radacctdir@
+++ freeradius-1.1.6/raddb/radiusd.conf.in 2007-07-30 14:17:42.000000000 -0500
@@ -31,13 +31,13 @@
# Location of config and logfiles. # Location of config and logfiles.
confdir = ${raddbdir} confdir = ${raddbdir}
@ -63,7 +59,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# libdir: Where to find the rlm_* modules. # libdir: Where to find the rlm_* modules.
@@ -353,7 +353,7 @@ @@ -353,7 +353,7 @@ nospace_user = no
nospace_pass = no nospace_pass = no
# The program to execute to do concurrency checks. # The program to execute to do concurrency checks.
@ -72,7 +68,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# SECURITY CONFIGURATION # SECURITY CONFIGURATION
# #
@@ -425,8 +425,8 @@ @@ -425,8 +425,8 @@ security {
# #
# allowed values: {no, yes} # allowed values: {no, yes}
# #
@ -83,7 +79,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# CLIENTS CONFIGURATION # CLIENTS CONFIGURATION
@@ -454,7 +454,7 @@ @@ -454,7 +454,7 @@ $INCLUDE ${confdir}/clients.conf
# 'snmp' attribute to 'yes' # 'snmp' attribute to 'yes'
# #
snmp = no snmp = no
@ -92,7 +88,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# THREAD POOL CONFIGURATION # THREAD POOL CONFIGURATION
@@ -665,7 +665,7 @@ @@ -665,7 +665,7 @@ modules {
# For all EAP related authentications. # For all EAP related authentications.
# Now in another file, because it is very large. # Now in another file, because it is very large.
# #
@ -101,7 +97,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# Microsoft CHAP authentication # Microsoft CHAP authentication
# #
@@ -1066,8 +1066,8 @@ @@ -1066,8 +1066,8 @@ $INCLUDE ${confdir}/eap.conf
# #
files { files {
usersfile = ${confdir}/users usersfile = ${confdir}/users
@ -112,7 +108,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# If you want to use the old Cistron 'users' file # If you want to use the old Cistron 'users' file
# with FreeRADIUS, you should change the next line # with FreeRADIUS, you should change the next line
@@ -1253,7 +1253,7 @@ @@ -1253,7 +1253,7 @@ $INCLUDE ${confdir}/eap.conf
# For MS-SQL, use: ${confdir}/mssql.conf # For MS-SQL, use: ${confdir}/mssql.conf
# For Oracle, use: ${confdir}/oraclesql.conf # For Oracle, use: ${confdir}/oraclesql.conf
# #
@ -121,7 +117,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# For Cisco VoIP specific accounting with Postgresql, # For Cisco VoIP specific accounting with Postgresql,
@@ -1755,7 +1755,7 @@ @@ -1756,7 +1756,7 @@ instantiate {
# The entire command line (and output) must fit into 253 bytes. # The entire command line (and output) must fit into 253 bytes.
# #
# e.g. Framed-Pool = `%{exec:/bin/echo foo}` # e.g. Framed-Pool = `%{exec:/bin/echo foo}`
@ -130,7 +126,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# The expression module doesn't do authorization, # The expression module doesn't do authorization,
@@ -1768,7 +1768,7 @@ @@ -1769,7 +1769,7 @@ instantiate {
# listed in any other section. See 'doc/rlm_expr' for # listed in any other section. See 'doc/rlm_expr' for
# more information. # more information.
# #
@ -139,7 +135,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# We add the counter module here so that it registers # We add the counter module here so that it registers
@@ -1795,7 +1795,7 @@ @@ -1796,7 +1796,7 @@ authorize {
# 'raddb/huntgroups' files. # 'raddb/huntgroups' files.
# #
# It also adds the %{Client-IP-Address} attribute to the request. # It also adds the %{Client-IP-Address} attribute to the request.
@ -148,7 +144,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# If you want to have a log of authentication requests, # If you want to have a log of authentication requests,
@@ -1808,7 +1808,7 @@ @@ -1809,7 +1809,7 @@ authorize {
# #
# The chap module will set 'Auth-Type := CHAP' if we are # The chap module will set 'Auth-Type := CHAP' if we are
# handling a CHAP request and Auth-Type has not already been set # handling a CHAP request and Auth-Type has not already been set
@ -157,7 +153,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# If the users are logging in with an MS-CHAP-Challenge # If the users are logging in with an MS-CHAP-Challenge
@@ -1836,7 +1836,7 @@ @@ -1837,7 +1837,7 @@ authorize {
# Otherwise, when the first style of realm doesn't match, # Otherwise, when the first style of realm doesn't match,
# the other styles won't be checked. # the other styles won't be checked.
# #
@ -166,7 +162,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# ntdomain # ntdomain
# #
@@ -1845,11 +1845,11 @@ @@ -1846,11 +1846,11 @@ authorize {
# #
# It also sets the EAP-Type attribute in the request # It also sets the EAP-Type attribute in the request
# attribute list to the EAP type from the packet. # attribute list to the EAP type from the packet.
@ -180,7 +176,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# Look in an SQL database. The schema of the database # Look in an SQL database. The schema of the database
@@ -1908,24 +1908,24 @@ @@ -1909,24 +1909,24 @@ authenticate {
# PAP authentication, when a back-end database listed # PAP authentication, when a back-end database listed
# in the 'authorize' section supplies a password. The # in the 'authorize' section supplies a password. The
# password can be clear-text, or encrypted. # password can be clear-text, or encrypted.
@ -214,7 +210,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# If you have a Cisco SIP server authenticating against # If you have a Cisco SIP server authenticating against
@@ -1943,7 +1943,7 @@ @@ -1944,7 +1944,7 @@ authenticate {
# containing CHAP-Password attributes CANNOT be authenticated # containing CHAP-Password attributes CANNOT be authenticated
# against /etc/passwd! See the FAQ for details. # against /etc/passwd! See the FAQ for details.
# #
@ -223,7 +219,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# Uncomment it if you want to use ldap for authentication # Uncomment it if you want to use ldap for authentication
# #
@@ -1956,7 +1956,7 @@ @@ -1957,7 +1957,7 @@ authenticate {
# #
# Allow EAP authentication. # Allow EAP authentication.
@ -232,7 +228,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
} }
@@ -1964,12 +1964,12 @@ @@ -1965,12 +1965,12 @@ authenticate {
# Pre-accounting. Decide which accounting type to use. # Pre-accounting. Decide which accounting type to use.
# #
preacct { preacct {
@ -247,7 +243,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# Look for IPASS-style 'realm/', and if not found, look for # Look for IPASS-style 'realm/', and if not found, look for
@@ -1979,12 +1979,12 @@ @@ -1980,12 +1980,12 @@ preacct {
# Accounting requests are generally proxied to the same # Accounting requests are generally proxied to the same
# home server as authentication requests. # home server as authentication requests.
# IPASS # IPASS
@ -262,7 +258,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
} }
# #
@@ -1995,20 +1995,20 @@ @@ -1996,20 +1996,20 @@ accounting {
# Create a 'detail'ed log of the packets. # Create a 'detail'ed log of the packets.
# Note that accounting requests which are proxied # Note that accounting requests which are proxied
# are also logged in the detail file. # are also logged in the detail file.
@ -286,7 +282,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# sradutmp # sradutmp
# Return an address to the IP Pool when we see a stop record. # Return an address to the IP Pool when we see a stop record.
@@ -2036,7 +2036,7 @@ @@ -2038,7 +2038,7 @@ accounting {
# or rlm_sql module can handle this. # or rlm_sql module can handle this.
# The rlm_sql module is *much* faster # The rlm_sql module is *much* faster
session { session {
@ -295,7 +291,7 @@ Index: freeradius-1.1.6/raddb/radiusd.conf.in
# #
# See "Simultaneous Use Checking Querie" in sql.conf # See "Simultaneous Use Checking Querie" in sql.conf
@@ -2139,5 +2139,5 @@ @@ -2142,5 +2142,5 @@ post-proxy {
# hidden inside of the EAP packet, and the end server will # hidden inside of the EAP packet, and the end server will
# reject the EAP request. # reject the EAP request.
# #

7739
net/freeradius/patches/004-ldap_configure.patch
View File

File diff suppressed because it is too large Load Diff

8
net/freeradius/patches/005-create_libdir_at_install.patch
View File

@ -1,8 +1,6 @@
Index: freeradius-1.1.6/Makefile --- a/Makefile
=================================================================== +++ b/Makefile
--- freeradius-1.1.6.orig/Makefile 2007-07-30 14:17:42.000000000 -0500 @@ -42,6 +42,7 @@ export DESTDIR := $(R)
+++ freeradius-1.1.6/Makefile 2007-07-30 14:17:43.000000000 -0500
@@ -42,6 +42,7 @@
install: install:
$(INSTALL) -d -m 755 $(R)$(sbindir) $(INSTALL) -d -m 755 $(R)$(sbindir)
$(INSTALL) -d -m 755 $(R)$(bindir) $(INSTALL) -d -m 755 $(R)$(bindir)

16
net/freeradius/patches/007-no_openssl_engine_check.patch
View File

@ -1,8 +1,6 @@
Index: freeradius-1.1.6/configure --- a/configure
=================================================================== +++ b/configure
--- freeradius-1.1.6.orig/configure 2007-07-30 14:17:42.000000000 -0500 @@ -21579,7 +21579,7 @@ for ac_header in \
+++ freeradius-1.1.6/configure 2007-07-30 14:17:43.000000000 -0500
@@ -22454,7 +22454,7 @@
openssl/ssl.h \ openssl/ssl.h \
openssl/crypto.h \ openssl/crypto.h \
openssl/err.h \ openssl/err.h \
@ -11,11 +9,9 @@ Index: freeradius-1.1.6/configure
do do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
Index: freeradius-1.1.6/configure.in --- a/configure.in
=================================================================== +++ b/configure.in
--- freeradius-1.1.6.orig/configure.in 2007-07-30 14:17:42.000000000 -0500 @@ -644,7 +644,7 @@ if test "x$WITH_OPENSSL" = xyes; then
+++ freeradius-1.1.6/configure.in 2007-07-30 14:17:43.000000000 -0500
@@ -616,7 +616,7 @@
openssl/ssl.h \ openssl/ssl.h \
openssl/crypto.h \ openssl/crypto.h \
openssl/err.h \ openssl/err.h \

8
net/freeradius/patches/008-honor_ccpflags.patch
View File

@ -1,8 +1,6 @@
Index: freeradius-1.1.6/src/modules/rules.mak --- a/src/modules/rules.mak
=================================================================== +++ b/src/modules/rules.mak
--- freeradius-1.1.6.orig/src/modules/rules.mak 2007-07-30 14:17:42.000000000 -0500 @@ -62,10 +62,10 @@ $(LT_OBJS): $(SERVER_HEADERS)
+++ freeradius-1.1.6/src/modules/rules.mak 2007-07-30 14:17:43.000000000 -0500
@@ -62,10 +62,10 @@
# #
####################################################################### #######################################################################
%.lo: %.c %.lo: %.c

8
net/freeradius/patches/009-no_pie.patch
View File

@ -1,8 +1,6 @@
Index: freeradius-1.1.6/src/main/Makefile.in --- a/src/main/Makefile.in
=================================================================== +++ b/src/main/Makefile.in
--- freeradius-1.1.6.orig/src/main/Makefile.in 2007-07-30 14:17:42.000000000 -0500 @@ -61,7 +61,7 @@ $(SERVER_OBJS): $(INCLUDES)
+++ freeradius-1.1.6/src/main/Makefile.in 2007-07-30 14:17:43.000000000 -0500
@@ -61,7 +61,7 @@
radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \ $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \

24
net/freeradius/patches/010-ltdl.patch
View File

@ -1,24 +0,0 @@
diff -urN freeradius-1.1.6.old/src/include/modpriv.h freeradius-1.1.6/src/include/modpriv.h
--- freeradius-1.1.6.old/src/include/modpriv.h 2008-02-16 11:27:01.000000000 -0500
+++ freeradius-1.1.6/src/include/modpriv.h 2008-02-16 11:26:24.000000000 -0500
@@ -4,7 +4,7 @@
* Version: $Id: modpriv.h,v 1.3 2004/02/26 19:04:19 aland Exp $ */
#include "radiusd.h"
#include "modules.h"
-#include "ltdl.h"
+#include "../../libltdl/ltdl.h"
/*
* Keep track of which modules we've loaded.
diff -urN freeradius-1.1.6/src/main/modules.c freeradius-1.1.6.old/src/main/modules.c
--- freeradius-1.1.6/src/main/modules.c 2008-02-16 11:42:36.000000000 -0500
+++ freeradius-1.1.6.old/src/main/modules.c 2008-02-16 11:42:14.000000000 -0500
@@ -36,7 +36,7 @@
#include "modules.h"
#include "modcall.h"
#include "conffile.h"
-#include "ltdl.h"
+#include "../../libltdl/ltdl.h"
#include "rad_assert.h"
/*