[Pkg-voip-commits] r8575 - in /yxa/trunk/debian: changelog patches/series patches/t/fix/naptr_replacement.diff rules

[mikma-guest at alioth.debian.org]

Author: mikma-guest
Date: Wed Jul 21 20:18:15 2010
New Revision: 8575

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8575
Log:
Fix enum lookup on Erlang/OTP R13.

Added:
    yxa/trunk/debian/patches/t/fix/naptr_replacement.diff
Modified:
    yxa/trunk/debian/changelog
    yxa/trunk/debian/patches/series
    yxa/trunk/debian/rules

Modified: yxa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/changelog?rev=8575&op=diff
==============================================================================
--- yxa/trunk/debian/changelog (original)
+++ yxa/trunk/debian/changelog Wed Jul 21 20:18:15 2010
@@ -1,4 +1,4 @@
-yxa (1.0+git5aeee79-1~1) UNRELEASED; urgency=low
+yxa (1.0+git5aeee79-1~3) UNRELEASED; urgency=low
   * Initial release (Closes: #377617)
   * Start applications using -s switch to erl instead of using custom boot
     file, except when running distribution over ssl.

Modified: yxa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/series?rev=8575&op=diff
==============================================================================
--- yxa/trunk/debian/patches/series (original)
+++ yxa/trunk/debian/patches/series Wed Jul 21 20:18:15 2010
@@ -1,3 +1,4 @@
 t/feature/yxa_yaws.diff -p1
 t/feature/yxa_yaws_makefile.diff -p1
 t/fix/net_util.diff -p1
+t/fix/naptr_replacement.diff -p1

Added: yxa/trunk/debian/patches/t/fix/naptr_replacement.diff
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/t/fix/naptr_replacement.diff?rev=8575&op=file
==============================================================================
--- yxa/trunk/debian/patches/t/fix/naptr_replacement.diff (added)
+++ yxa/trunk/debian/patches/t/fix/naptr_replacement.diff Wed Jul 21 20:18:15 2010
@@ -1,0 +1,52 @@
+From: Mikael Magnusson <mikma at users.sourceforge.net>
+Subject: [PATCH] t/fix/naptr_replacement
+
+Fix enum lookup on Erlang/OTP R13.
+All ENUM NAPTR records decoded by R13 were ignored since it adds a
+terminating "." which YXA doesn't expect.
+
+Signed-off-by: Mikael Magnusson <mikma at users.sourceforge.net>
+
+---
+ src/dnsutil.erl |   24 +++++++++++++++++++++++-
+ 1 files changed, 23 insertions(+), 1 deletions(-)
+
+diff --git a/src/dnsutil.erl b/src/dnsutil.erl
+index 0f88a2b..3c526c2 100644
+--- a/src/dnsutil.erl
++++ b/src/dnsutil.erl
+@@ -816,9 +816,31 @@ naptr_from_tuple({Order, Preference, Flags, Services, Regexp, Replacement}) ->
+ 		 flags=Flags,
+ 		 services=string:to_upper(Services),
+ 		 regexp=Regexp,
+-		 replacement=Replacement
++		 replacement=remove_last_period(Replacement)
+ 		}.
+ 
++
++%%--------------------------------------------------------------------
++%% @spec    (Replacement) ->
++%%            Replacement
++%%
++%%            Replacement = string()
++%%
++%% @doc     Removes the terminating period (".") of the replacement
++%%          string.
++%% @end
++%%--------------------------------------------------------------------
++remove_last_period(Replacement) ->
++    remove_last_period(Replacement, []).
++
++remove_last_period([], Acc) ->
++    Acc;
++remove_last_period([$.], Acc) ->
++    Acc;
++remove_last_period([E | Replacement], Acc) ->
++    remove_last_period(Replacement, [E | Acc]).
++    
++
+ %%--------------------------------------------------------------------
+ %% @spec    (Len, In, []) ->
+ %%            Replacement
+-- 
+tg: (5aeee79..) t/fix/naptr_replacement (depends on: upstream)

Modified: yxa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/rules?rev=8575&op=diff
==============================================================================
--- yxa/trunk/debian/rules (original)
+++ yxa/trunk/debian/rules Wed Jul 21 20:18:15 2010
@@ -3,7 +3,7 @@
 
 QUILT_PATCH_DIR ?= debian/patches
 
-TG_BRANCHES := t/feature/yxa_yaws,t/feature/yxa_yaws_makefile,t/fix/net_util
+TG_BRANCHES := t/feature/yxa_yaws,t/feature/yxa_yaws_makefile,t/fix/net_util,t/fix/naptr_replacement
 
 # Ensure aclocal.m4 exists before requesting cdbs to update it.
 common-configure-arch common-configure-indep:: aclocal.m4