Module: sip-router Branch: 4.1 Commit: a7dc504075d3b5c74c6af6a3216338a0d604d1d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7dc504… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Feb 18 16:44:40 2014 +0100 pkg/kamailio/deb: use freeradius-client lib on sid and jessie (cherry picked from commit ba68be91bc206d27284cdaf9fb3ccc189fe33d4a) --- pkg/kamailio/deb/debian/backports/jessie | 2 +- pkg/kamailio/deb/debian/backports/precise | 4 ++++ pkg/kamailio/deb/debian/backports/squeeze | 4 ++++ pkg/kamailio/deb/debian/backports/wheezy | 4 ++++ pkg/kamailio/deb/debian/control | 2 +- pkg/kamailio/deb/debian/rules | 3 +++ pkg/kamailio/deb/jessie/control | 2 +- pkg/kamailio/deb/jessie/rules | 3 +++ pkg/kamailio/deb/precise/rules | 2 ++ pkg/kamailio/deb/squeeze/rules | 2 ++ pkg/kamailio/deb/wheezy/rules | 2 ++ 11 files changed, 27 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/deb/debian/backports/jessie b/pkg/kamailio/deb/debian/backports/jessie index d143b0b..80cd6a6 100755 --- a/pkg/kamailio/deb/debian/backports/jessie +++ b/pkg/kamailio/deb/debian/backports/jessie @@ -2,7 +2,7 @@ # # Hook for automatic backports at buildserver.net # -# Target dist: Debian Wheezy +# Target dist: Debian Jessie DIST=jessie rm -rf ${DIST} diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index ec5448c..c2ece7e 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -20,6 +20,10 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ 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 + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze index 0ec1e79..d589dda 100755 --- a/pkg/kamailio/deb/debian/backports/squeeze +++ b/pkg/kamailio/deb/debian/backports/squeeze @@ -65,6 +65,10 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mono/' ${DIST}/rules # db-util version 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 + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 40a4bfe..df43929 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -26,6 +26,10 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ 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 + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index d78f622..26c4750 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -28,7 +28,7 @@ Build-Depends: bison, libperl-dev, libpq-dev, libpurple-dev, - libradiusclient-ng-dev, + libfreeradius-client-dev, libreadline-dev, libsasl2-dev, libsctp-dev, diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 433f82b..1790eee 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -21,6 +21,9 @@ include /usr/share/dpkg/buildflags.mk # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 +# choose freeradius +export FREERADIUS=1 + # modules not in the "main" kamailio package EXCLUDED_MODULES= diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index d793a14..71e7f35 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -28,7 +28,7 @@ Build-Depends: bison, libperl-dev, libpq-dev, libpurple-dev, - libradiusclient-ng-dev, + libfreeradius-client-dev, libreadline-dev, libsasl2-dev, libsctp-dev, diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index b2bf418..f1381b7 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -21,6 +21,9 @@ include /usr/share/dpkg/buildflags.mk # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 +# choose freeradius +export FREERADIUS=1 + # modules not in the "main" kamailio package EXCLUDED_MODULES= diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index f8f749c..2b72cff 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -21,6 +21,8 @@ include /usr/share/dpkg/buildflags.mk # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 +# choose freeradius + # modules not in the "main" kamailio package EXCLUDED_MODULES= diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 3ce3030..ba45388 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -20,6 +20,8 @@ DPKG_EXPORT_BUILDFLAGS = 1 # stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 +# choose freeradius + # modules not in the "main" kamailio package EXCLUDED_MODULES= diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 3369aff..495a453 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -21,6 +21,8 @@ include /usr/share/dpkg/buildflags.mk # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 +# choose freeradius + # modules not in the "main" kamailio package EXCLUDED_MODULES=