Merge pull request #595 from linuxmaniac/vseva/radius

pkg/kamailio/deb: use libradcli-dev for radius

Makefile.radius

@@ -28,7 +28,13 @@ DEFS+= -DUSE_FREERADIUS
 RADIUSCLIENT_LIB=freeradius-client
 
 else
+ifeq ($(RADCLI),1)
 
+# - radcli library
+DEFS+= -DUSE_RADCLI
+RADIUSCLIENT_LIB=radcli
+
+else
 # - radiusclient-ng v5 or v4 library
 ifneq ($(radiusclient_ng), 4)
 
@@ -41,6 +47,7 @@ else
 DEFS+=-DRADIUSCLIENT_NG_4
 RADIUSCLIENT_LIB=radiusclient
 
+endif
 endif
 
 endif

lib/kcore/radius.h

@@ -32,9 +32,14 @@
 #define _RADIUS_CORE_H
 
 #ifndef USE_FREERADIUS
-	#include <radiusclient-ng.h>
-	#define DEFAULT_RADIUSCLIENT_CONF \
-		"/usr/local/etc/radiusclient-ng/radiusclient.conf"
+	#ifdef USE_RADCLI
+		#include <radcli/radcli.h>
+		#define DEFAULT_RADIUSCLIENT_CONF ""
+	#else
+		#include <radiusclient-ng.h>
+		#define DEFAULT_RADIUSCLIENT_CONF \
+			"/usr/local/etc/radiusclient-ng/radiusclient.conf"
+	#endif
 #else
 	#include <freeradius-client.h>
 	#define DEFAULT_RADIUSCLIENT_CONF ""

modules/acc_radius/doc/acc_radius_admin.xml

@@ -50,11 +50,13 @@
 			</para>
 			<itemizedlist>
 				<listitem>
-				<para><emphasis>radiusclient-ng</emphasis> 0.5.0 or freeradius-client 
-				or higher.
-				See <ulink 
+				<para><emphasis>radiusclient-ng</emphasis> 0.5.0 or higher,
+				<emphasis>freeradius-client</emphasis> <ulink
 				url='https://github.com/FreeRADIUS/freeradius-client/'>
-				https://github.com/FreeRADIUS/freeradius-client/</ulink>.
+				https://github.com/FreeRADIUS/freeradius-client/</ulink> or
+				<emphasis>radcli</emphasis> <ulink
+				url='http://radcli.github.io/radcli/'
+				http://radcli.github.io/radcli/</ulink>.
 				</para>
 				</listitem>
 				<listitem>
@@ -64,6 +66,13 @@
 				<emphasis>'export FREERADIUS=1'</emphasis> before compile.
 				</para>
 				</listitem>
+				<listitem>
+				<para>
+				<emphasis>radcli</emphasis> library can be used after
+				setting RADCLI variable in source code with
+				<emphasis>'export RADCLI=1'</emphasis> before compile.
+				</para>
+				</listitem>
 			</itemizedlist>
 		</section>
 	</section>

modules/misc_radius/doc/misc_radius_admin.xml

@@ -89,25 +89,34 @@
 		<section>
 			<title>External Libraries or Applications</title>
 			<para>
-			The following libraries or applications must be installed 
-			before compilling &kamailio; with this module loaded:
+			The following libraries or applications must be installed
+			before running &kamailio; with this module loaded:
 			</para>
 			<itemizedlist>
 				<listitem>
-				<para><emphasis>radiusclient-ng</emphasis> 0.5.0 or freeradius-client 
-+				or higher. 
-				library and development files. See <ulink 
+				<para><emphasis>radiusclient-ng</emphasis> 0.5.0 or higher,
+				<emphasis>freeradius-client</emphasis> <ulink
 				url='https://github.com/FreeRADIUS/freeradius-client/'>
-+				https://github.com/FreeRADIUS/freeradius-client/</ulink>.
+				https://github.com/FreeRADIUS/freeradius-client/</ulink> or
+				<emphasis>radcli</emphasis> <ulink
+				url='http://radcli.github.io/radcli/'
+				http://radcli.github.io/radcli/</ulink>.
 				</para>
 				</listitem>
 				<listitem>
-+				<para>
-+				<emphasis>freeradius-client</emphasis> library can be used after 
-+				setting FREERADIUS variable in source code with 
-+				<emphasis>'export FREERADIUS=1'</emphasis> command before compile.
- 				</para>
- 				</listitem>
+				<para>
+				<emphasis>freeradius-client</emphasis> library can be used after
+				setting FREERADIUS variable in source code with
+				<emphasis>'export FREERADIUS=1'</emphasis> before compile.
+				</para>
+				</listitem>
+				<listitem>
+				<para>
+				<emphasis>radcli</emphasis> library can be used after
+				setting RADCLI variable in source code with
+				<emphasis>'export RADCLI=1'</emphasis> before compile.
+				</para>
+				</listitem>
 			</itemizedlist>
 		</section>
 	</section>

pkg/kamailio/deb/debian/backports/jessie

@@ -14,6 +14,10 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules
 
+# use old libfreeradius
+sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control
+sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules
+
 # clean backports scripts
 rm -rf ${DIST}/backports
 exit 0

pkg/kamailio/deb/debian/backports/precise

@@ -26,8 +26,8 @@ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control
-sed -i -e '/FREERADIUS/d' ${DIST}/rules
+sed -i 's/libradcli-dev/libradiusclient-ng-dev/' ${DIST}/control
+sed -i -e '/RADCLI/d' ${DIST}/rules
 
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control

pkg/kamailio/deb/debian/backports/squeeze

@@ -72,8 +72,8 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mono/' ${DIST}/rules
 sed -i -e 's/db-util/db4.8-util/' ${DIST}/control
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control
-sed -i -e '/FREERADIUS/d' ${DIST}/rules
+sed -i 's/libradcli-dev/libradiusclient-ng-dev/' ${DIST}/control
+sed -i -e '/RADCLI/d' ${DIST}/rules
 
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control

pkg/kamailio/deb/debian/backports/trusty

@@ -19,6 +19,10 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules
 
+# use old libfreeradius
+sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control
+sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules
+
 # clean backports scripts
 rm -rf ${DIST}/backports
 exit 0

pkg/kamailio/deb/debian/backports/wheezy

@@ -32,8 +32,8 @@ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control
-sed -i -e '/FREERADIUS/d' ${DIST}/rules
+sed -i 's/libradcli-dev/libradiusclient-ng-dev/' ${DIST}/control
+sed -i -e '/RADCLI/d' ${DIST}/rules
 
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control

pkg/kamailio/deb/debian/control

@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libradcli-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/debian/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/debian/rules

@@ -19,9 +19,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
-export FREERADIUS=1
+export RADCLI=1
 
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=

pkg/kamailio/deb/jessie/control

@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libfreeradius-client-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/jessie/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/jessie/rules

@@ -19,8 +19,6 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
 export FREERADIUS=1
 
 # modules not in the "main" kamailio package

pkg/kamailio/deb/precise/control

@@ -17,7 +17,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -32,6 +31,7 @@ Build-Depends: bison,
                libperl-dev,
                libpq-dev,
                libpurple-dev,
+               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/precise/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/precise/rules

@@ -20,8 +20,6 @@ include /usr/share/dpkg/buildflags.mk
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
 
-# choose freeradius
-
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
 

pkg/kamailio/deb/sid/control

@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libradcli-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/sid/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/sid/rules

@@ -19,9 +19,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
-export FREERADIUS=1
+export RADCLI=1
 
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=

pkg/kamailio/deb/squeeze/control

@@ -15,7 +15,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libjson0-dev,
                libldap2-dev,
@@ -26,6 +25,7 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
+               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsnmp-dev,

pkg/kamailio/deb/squeeze/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/squeeze/rules

@@ -18,8 +18,6 @@ DPKG_EXPORT_BUILDFLAGS = 1
 #export DH_VERBOSE=1
 
 
-# choose freeradius
-
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
 

pkg/kamailio/deb/stretch/control

@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libradcli-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/stretch/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/stretch/rules

@@ -19,9 +19,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
-export FREERADIUS=1
+export RADCLI=1
 
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=

pkg/kamailio/deb/trusty/control

@@ -17,7 +17,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -33,6 +32,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libfreeradius-client-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/trusty/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/trusty/rules

@@ -19,8 +19,6 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
 export FREERADIUS=1
 
 # modules not in the "main" kamailio package

pkg/kamailio/deb/wheezy/control

@@ -17,7 +17,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -31,6 +30,7 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
+               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,

pkg/kamailio/deb/wheezy/kamailio.examples

@@ -1,2 +1 @@
 examples/*
-

pkg/kamailio/deb/wheezy/rules

@@ -20,8 +20,6 @@ include /usr/share/dpkg/buildflags.mk
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
 
-# choose freeradius
-
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=