[Pkg-voip-commits] [kamailio] 03/04: use radcli lib for radius (Closes: #822338)

[Victor Seva]

This is an automated email from the git hooks/post-receive script.

vseva pushed a commit to branch master
in repository kamailio.

commit 774f7d4b86fb8e188de2c311ee6ebde2bae8ab14
Author: Victor Seva <vseva at debian.org>
Date:   Wed May 11 14:19:18 2016 +0200

    use radcli lib for radius (Closes: #822338)
---
 debian/backports/jessie  | 4 ++++
 debian/backports/squeeze | 4 ++--
 debian/backports/wheezy  | 4 ++--
 debian/control           | 2 +-
 debian/kamailio.examples | 1 -
 debian/rules             | 6 ++----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/backports/jessie b/debian/backports/jessie
index 6e4a467..fc28061 100755
--- a/debian/backports/jessie
+++ b/debian/backports/jessie
@@ -10,4 +10,8 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' debian/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' debian/rules
 
+# use old libfreeradius
+sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control
+sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules
+
 exit 0
diff --git a/debian/backports/squeeze b/debian/backports/squeeze
index 29b358f..da08a17 100755
--- a/debian/backports/squeeze
+++ b/debian/backports/squeeze
@@ -63,8 +63,8 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mono/' debian/rules
 sed -i -e 's/db-util/db4.8-util/' debian/control
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' debian/control
-sed -i -e '/FREERADIUS/d' debian/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/' debian/control
diff --git a/debian/backports/wheezy b/debian/backports/wheezy
index 74e0211..3c481cd 100755
--- a/debian/backports/wheezy
+++ b/debian/backports/wheezy
@@ -23,8 +23,8 @@ sed -i -e 's/ dnssec[ ,$]*/ /' debian/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' debian/rules
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' debian/control
-sed -i -e '/FREERADIUS/d' debian/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/' debian/control
diff --git a/debian/control b/debian/control
index e9ab09c..28ca794 100644
--- a/debian/control
+++ b/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 [linux-any],
diff --git a/debian/kamailio.examples b/debian/kamailio.examples
index c48447a..e39721e 100644
--- a/debian/kamailio.examples
+++ b/debian/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/debian/rules b/debian/rules
index 1fcbab4..e47f60b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,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=
@@ -51,7 +49,7 @@ ifneq ("$(wildcard /usr/share/mono/mono-archs.make)","")
 override PACKAGE_GROUPS+= mono
 else
 override EXCLUDED_MODULES += mono
-endif	
+endif
 
 # FTBFS on powerpcspe because of AltiVec assumption #729635
 ifeq ($(DEB_HOST_ARCH),powerpcspe)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git