[Pkg-voip-commits] [asterisk] 03/03: build against libfreeradius-client

[Jeremy Lainé]

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

sharky pushed a commit to branch master
in repository asterisk.

commit 202bfebb202ec9b28ee9db5964e271892bd11061
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Dec 11 12:36:44 2013 +0100

    build against libfreeradius-client
---
 debian/changelog                 |  1 +
 debian/control                   |  2 +-
 debian/patches/freeradius-client | 49 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 57acae3..b6e9b6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ asterisk (1:11.6.0~dfsg-2) UNRELEASED; urgency=medium
   [ Jeremy Lainé ]
   * Update Standards-Version to 3.9.5 (no changes).
   * Add Suggests on asterisk-vpb.
+  * Build against libfreeradius-client (Closes: #721622).
 
   [ Tzafrir Cohen ]
   * Restore SE Linux settings on directories created in init script
diff --git a/debian/control b/debian/control
index fac6aaa..fc1ac36 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 8),
  libxml2-dev,
  libpopt-dev,
  libiksemel-dev,
- libradiusclient-ng-dev,
+ libfreeradius-client-dev,
  freetds-dev,
  libvorbis-dev,
  libsnmp-dev,
diff --git a/debian/patches/freeradius-client b/debian/patches/freeradius-client
new file mode 100644
index 0000000..e5c3ed1
--- /dev/null
+++ b/debian/patches/freeradius-client
@@ -0,0 +1,49 @@
+Description: allows either libfreeradius-client or libradiusclient-ng
+Author: Daniel Pocock <daniel at pocock.com.au>
+Author: Jeremy Lainé <jeremy.laine at m4x.org>
+--- a/cdr/cdr_radius.c	2013-12-11 10:08:13.537159711 +0100
++++ b/cdr/cdr_radius.c	2013-12-11 10:08:13.529159762 +0100
+@@ -36,7 +36,11 @@
+ 
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 328259 $")
+ 
++#ifdef FREERADIUS_CLIENT
++#include <freeradius-client.h>
++#else
+ #include <radiusclient-ng.h>
++#endif
+ 
+ #include "asterisk/channel.h"
+ #include "asterisk/cdr.h"
+--- a/cel/cel_radius.c	2013-12-11 10:08:13.537159711 +0100
++++ b/cel/cel_radius.c	2013-12-11 10:08:13.529159762 +0100
+@@ -35,7 +35,11 @@
+ 
+ ASTERISK_FILE_VERSION(__FILE__, "$Rev: 328259 $")
+ 
++#ifdef FREERADIUS_CLIENT
++#include <freeradius-client.h>
++#else
+ #include <radiusclient-ng.h>
++#endif
+ 
+ #include "asterisk/channel.h"
+ #include "asterisk/cel.h"
+--- a/configure.ac	2013-12-11 10:08:13.537159711 +0100
++++ b/configure.ac	2013-12-11 10:11:02.420053317 +0100
+@@ -2103,7 +2103,14 @@
+ # Some distributions (like SuSE) remove the 5.1 suffix.
+ AST_EXT_LIB_CHECK([LUA], [lua], [luaL_register], [lua.h], [-lm])
+ 
+-AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
++# Accept either RADIUS client library, their APIs are fully compatible,
++# just different header filenames and different SONAMEs
++AST_EXT_LIB_CHECK([RADIUS], [freeradius-client], [rc_read_config], [freeradius-client.h])
++if test "x${PBX_RADIUS}" = "x1"; then
++	AC_DEFINE(FREERADIUS_CLIENT, [], [Use the FreeRADIUS-client library])
++else
++	AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
++fi
+ 
+ AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcfg])
+ AST_EXT_LIB_CHECK([COROSYNC_CFG_STATE_TRACK], [cfg], [corosync_cfg_state_track], [corosync/cfg.h], [-lcfg])
diff --git a/debian/patches/series b/debian/patches/series
index d180777..f4203ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ dahdi_create_channels
 astdb_mans
 hyphen
 reenable
+freeradius-client

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