[Pkg-voip-commits] r5077 - in /yxa/trunk/debian: changelog patches/00list patches/autoconf.dpatch patches/autoconf_gen.dpatch patches/ssl_util.dpatch patches/to_lower.dpatch
mikma-guest at alioth.debian.org
mikma-guest at alioth.debian.org
Fri Dec 7 23:43:21 UTC 2007
Author: mikma-guest
Date: Fri Dec 7 23:43:21 2007
New Revision: 5077
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5077
Log:
* Auto-detect SSL-PKIX.hrl renamed to OTP-PKIX.hrl in OTP R12B-0.
* Replace all use of httpd:to_lower/1 (removed in OTP R12B-0) with
string:to_lower/1.
Added:
yxa/trunk/debian/patches/ssl_util.dpatch (with props)
yxa/trunk/debian/patches/to_lower.dpatch (with props)
Modified:
yxa/trunk/debian/changelog
yxa/trunk/debian/patches/00list
yxa/trunk/debian/patches/autoconf.dpatch
yxa/trunk/debian/patches/autoconf_gen.dpatch
Modified: yxa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/changelog?rev=5077&op=diff
==============================================================================
--- yxa/trunk/debian/changelog (original)
+++ yxa/trunk/debian/changelog Fri Dec 7 23:43:21 2007
@@ -1,5 +1,8 @@
yxa (1.0-1) UNRELEASED; urgency=low
* Initial release (Closes: #377617)
+ * Auto-detect SSL-PKIX.hrl renamed to OTP-PKIX.hrl in OTP R12B-0.
+ * Replace all use of httpd:to_lower/1 (removed in OTP R12B-0) with
+ string:to_lower/1.
-- Mikael Magnusson <mikma at users.sourceforge.net> Mon, 05 Nov 2007 15:43:45 +0100
Modified: yxa/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/00list?rev=5077&op=diff
==============================================================================
--- yxa/trunk/debian/patches/00list (original)
+++ yxa/trunk/debian/patches/00list Fri Dec 7 23:43:21 2007
@@ -6,3 +6,6 @@
yxa_yaws_makefile
yxa_yaws
erlang-auto-rel
+to_lower
+ssl_util
+eventserver_for_package
Modified: yxa/trunk/debian/patches/autoconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/autoconf.dpatch?rev=5077&op=diff
==============================================================================
--- yxa/trunk/debian/patches/autoconf.dpatch (original)
+++ yxa/trunk/debian/patches/autoconf.dpatch Fri Dec 7 23:43:21 2007
@@ -6,16 +6,17 @@
## DP: Make it possible to skip Erlang/OTP version check. Patch by Jakob Schlyter.
@DPATCH@
-diff -urNad yxa-1.0~rc1~/configure.ac yxa-1.0~rc1/configure.ac
---- yxa-1.0~rc1~/configure.ac 2007-04-12 12:20:20.000000000 +0200
-+++ yxa-1.0~rc1/configure.ac 2007-07-11 19:50:06.000000000 +0200
-@@ -9,6 +9,22 @@
+diff -urNad yxa-1.0~/configure.ac yxa-1.0/configure.ac
+--- yxa-1.0~/configure.ac 2007-12-08 00:09:40.000000000 +0100
++++ yxa-1.0/configure.ac 2007-12-08 00:10:48.000000000 +0100
+@@ -9,6 +9,23 @@
AC_PROG_CC
AC_PROG_INSTALL
+AC_ERLANG_NEED_ERLC
+AC_ERLANG_PATH_ERL
+AC_ERLANG_SUBST_INSTALL_LIB_DIR
++AC_ERLANG_CHECK_HEADERS([ssl/include/OTP-PKIX.hrl ssl/include/SSL-PKIX.hrl])
+AC_ERLANG_CHECK_LIB(asn1)
+AC_ERLANG_CHECK_LIB(kernel)
+AC_ERLANG_CHECK_LIB(mnesia)
@@ -32,7 +33,7 @@
AC_CONFIG_FILES(
Makefile \
src/Makefile \
-@@ -46,8 +62,13 @@
+@@ -46,8 +63,13 @@
fi
dnl check that the installed Erlang/OTP version is the right one for this version of YXA
@@ -48,7 +49,7 @@
-module(conftest).
-export([[start/0]]).
-@@ -66,19 +87,24 @@
+@@ -66,19 +88,24 @@
EOF
@@ -84,10 +85,10 @@
AC_ARG_WITH(mnesiadir,
-diff -urNad yxa-1.0~rc1~/m4/erlang.m4 yxa-1.0~rc1/m4/erlang.m4
---- yxa-1.0~rc1~/m4/erlang.m4 1970-01-01 01:00:00.000000000 +0100
-+++ yxa-1.0~rc1/m4/erlang.m4 2007-07-11 13:51:56.000000000 +0200
-@@ -0,0 +1,27 @@
+diff -urNad yxa-1.0~/m4/erlang.m4 yxa-1.0/m4/erlang.m4
+--- yxa-1.0~/m4/erlang.m4 1970-01-01 01:00:00.000000000 +0100
++++ yxa-1.0/m4/erlang.m4 2007-12-08 00:11:08.000000000 +0100
+@@ -0,0 +1,68 @@
+dnl erlang.m4
+dnl Copyright (C) 2007 Mikael Magnusson
+dnl
@@ -115,3 +116,44 @@
+ERLANG_LIB_VER_SUBST="$ERLANG_LIB_VER_SUBST -e 's,[@]ERLANG_LIB_VER_$1[@],\$(ERLANG_LIB_VER_$1),g'"
+AC_SUBST([ERLANG_LIB_VER_SUBST])
+]) # AC_ERLANG_LIB_VER
++
++#
++# AC_ERLANG_CHECK_HEADER(HEADER, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++# -----------------------------------------------------------------
++AC_DEFUN([AC_ERLANG_CHECK_HEADER],
++[AC_REQUIRE([AC_ERLANG_NEED_ERLC])dnl
++ac_header_name="$1"
++AS_VAR_PUSHDEF([ac_hrl], [ac_cv_erl_hrl_${ac_header_name}])dnl
++AC_CACHE_CHECK([for ${ac_header_name}], ac_hrl,
++[AC_LANG_PUSH(Erlang)dnl
++AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([dnl
++ -include_lib("${ac_header_name}").],[
++ ok
++ ])],
++ [AS_VAR_SET(ac_hrl, yes)],
++ [AS_VAR_SET(ac_hrl, no)])
++AC_LANG_POP(Erlang)dnl
++])
++AS_IF([test AS_VAR_GET(ac_hrl) = yes], [$2], [$3])dnl
++AS_VAR_POPDEF([ac_hrl])dnl
++])# AC_ERLANG_CHECK_HEADER
++
++# AC_ERLANG_CHECK_HEADERS(HEADER..., [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++# ---------------------------------------------------------------------
++AC_DEFUN([AC_ERLANG_CHECK_HEADERS],
++[AC_FOREACH([AC_Hrl], [$1],
++ [m4_pushdef([AC_Hrl_Name],m4_bpatsubst(m4_bpatsubst(AC_Hrl, ["], []),
++ [(.*)],
++ []))dnl
++ AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Hrl_Name),
++ [Define to 1 if you have the `]AC_Hrl_Name[' header file.])dnl
++ m4_popdef([AC_Hrl_Name])])dnl
++for ac_hrl in $1
++do
++ac_hrl_name=`echo $ac_hrl|sed -e 's/^\(.*\)(.*)$/\1/'`
++AC_ERLANG_CHECK_HEADER($ac_hrl,
++ [AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$ac_hrl_name])]) $2],
++ [$3], [$4])dnl
++done
++])# AC_ERLANG_CHECK_HEADERS
Modified: yxa/trunk/debian/patches/autoconf_gen.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/autoconf_gen.dpatch?rev=5077&op=diff
==============================================================================
--- yxa/trunk/debian/patches/autoconf_gen.dpatch (original)
+++ yxa/trunk/debian/patches/autoconf_gen.dpatch Fri Dec 7 23:43:21 2007
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad yxa-1.0~/aclocal.m4 yxa-1.0/aclocal.m4
--- yxa-1.0~/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
-+++ yxa-1.0/aclocal.m4 2007-11-05 15:52:06.000000000 +0100
++++ yxa-1.0/aclocal.m4 2007-12-08 00:12:24.000000000 +0100
@@ -0,0 +1,14 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
@@ -24,8 +24,8 @@
+
+m4_include([m4/erlang.m4])
diff -urNad yxa-1.0~/configure yxa-1.0/configure
---- yxa-1.0~/configure 2007-11-05 08:55:59.000000000 +0100
-+++ yxa-1.0/configure 2007-11-05 15:52:07.000000000 +0100
+--- yxa-1.0~/configure 2007-12-08 00:09:40.000000000 +0100
++++ yxa-1.0/configure 2007-12-08 00:12:32.000000000 +0100
@@ -1,28 +1,57 @@
#! /bin/sh
# From configure.ac Revision: 1643 .
@@ -2758,7 +2758,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -2803,7 +2803,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
@@ -2871,7 +2871,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2305,26 +2725,974 @@
+@@ -2305,26 +2725,1046 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -3116,6 +3116,78 @@
+fi
+
+
++
++
++ for ac_hrl in ssl/include/OTP-PKIX.hrl ssl/include/SSL-PKIX.hrl
++do
++ac_hrl_name=`echo $ac_hrl|sed -e 's/^\(.*\)(.*)$/\1/'`
++ac_header_name="$ac_hrl"
++as_ac_hrl=`echo "ac_cv_erl_hrl_${ac_header_name}" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for ${ac_header_name}" >&5
++echo $ECHO_N "checking for ${ac_header_name}... $ECHO_C" >&6; }
++if { as_var=$as_ac_hrl; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_ext=erl
++ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
++cat >conftest.$ac_ext <<_ACEOF
++-module(conftest).
++-export([start/0]).
++ -include_lib("${ac_header_name}").
++start() ->
++
++ ok
++
++.
++
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_erl_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_hrl=yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_hrl=no"
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++ac_res=`eval echo '${'$as_ac_hrl'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_hrl'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_hrl_name" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
+{ echo "$as_me:$LINENO: checking for Erlang/OTP 'asn1' library subdirectory" >&5
+echo $ECHO_N "checking for Erlang/OTP 'asn1' library subdirectory... $ECHO_C" >&6; }
+if test "${erlang_cv_lib_dir_asn1+set}" = set; then
@@ -3123,7 +3195,7 @@
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
-+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
@@ -3225,7 +3297,7 @@
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
-+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
@@ -3327,7 +3399,7 @@
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
-+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
@@ -3429,7 +3501,7 @@
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
-+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
@@ -3531,7 +3603,7 @@
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
-+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
@@ -3633,7 +3705,7 @@
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
-+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
++ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5&& echo "#!/bin/sh" > conftest$ac_exeext&& echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext&& chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
@@ -3853,7 +3925,7 @@
if test "${ac_cv_path_ERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2339,34 +3707,35 @@
+@@ -2339,34 +3779,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3897,7 +3969,7 @@
if test "${ac_cv_path_ac_pt_ERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2381,28 +3750,42 @@
+@@ -2381,28 +3822,42 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3947,7 +4019,7 @@
else
ERL="$ac_cv_path_ERL"
fi
-@@ -2410,8 +3793,8 @@
+@@ -2410,8 +3865,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}erlc", so it can be a program name with args.
set dummy ${ac_tool_prefix}erlc; ac_word=$2
@@ -3958,7 +4030,7 @@
if test "${ac_cv_path_ERLC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2426,34 +3809,35 @@
+@@ -2426,34 +3881,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4002,7 +4074,7 @@
if test "${ac_cv_path_ac_pt_ERLC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2468,28 +3852,42 @@
+@@ -2468,28 +3924,42 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4052,7 +4124,7 @@
else
ERLC="$ac_cv_path_ERLC"
fi
-@@ -2501,9 +3899,16 @@
+@@ -2501,9 +3971,16 @@
{ (exit 1); exit 1; }; }
fi
@@ -4072,7 +4144,7 @@
-module(conftest).
-export([start/0]).
-@@ -2522,70 +3927,76 @@
+@@ -2522,70 +3999,76 @@
EOF
@@ -4174,7 +4246,7 @@
-@@ -2612,39 +4023,58 @@
+@@ -2612,39 +4095,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -4249,7 +4321,7 @@
fi
fi
rm -f confcache
-@@ -2653,63 +4083,48 @@
+@@ -2653,63 +4155,48 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -4340,7 +4412,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -2740,17 +4155,45 @@
+@@ -2740,17 +4227,45 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -4390,7 +4462,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -2760,8 +4203,43 @@
+@@ -2760,8 +4275,43 @@
fi
@@ -4435,7 +4507,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -2775,18 +4253,19 @@
+@@ -2775,18 +4325,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -4458,7 +4530,7 @@
as_basename=basename
else
as_basename=false
-@@ -2794,159 +4273,120 @@
+@@ -2794,159 +4345,120 @@
# Name of the executable.
@@ -4689,7 +4761,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -2955,7 +4395,28 @@
+@@ -2955,7 +4467,28 @@
as_mkdir_p=false
fi
@@ -4719,7 +4791,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -2964,31 +4425,14 @@
+@@ -2964,31 +4497,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -4755,7 +4827,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -2996,30 +4440,18 @@
+@@ -2996,30 +4512,18 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -4792,7 +4864,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -3027,7 +4459,7 @@
+@@ -3027,7 +4531,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -4801,7 +4873,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -3038,19 +4470,21 @@
+@@ -3038,19 +4542,21 @@
$config_files
Report bugs to <bug-autoconf at gnu.org>."
@@ -4829,7 +4901,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -3061,60 +4495,42 @@
+@@ -3061,60 +4567,42 @@
do
case $1 in
--*=*)
@@ -4902,7 +4974,7 @@
esac
shift
-@@ -3130,42 +4546,56 @@
+@@ -3130,42 +4618,56 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -4981,7 +5053,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -3175,304 +4605,384 @@
+@@ -3175,334 +4677,425 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -5224,7 +5296,7 @@
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
++_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -5239,7 +5311,7 @@
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
-+_ACEOF
+ _ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -5587,8 +5659,8 @@
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
@@ -5597,15 +5669,15 @@
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
- _ACEOF
++_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -3480,29 +4990,40 @@
+ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
Added: yxa/trunk/debian/patches/ssl_util.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/ssl_util.dpatch?rev=5077&op=file
==============================================================================
--- yxa/trunk/debian/patches/ssl_util.dpatch (added)
+++ yxa/trunk/debian/patches/ssl_util.dpatch Fri Dec 7 23:43:21 2007
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ssl_util.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: SSL-PKIX.hrl was renamed to OTP-PKIX.hrl in R12B-0.
+
+ at DPATCH@
+diff -urNad yxa-1.0~/src/transportlayer/Makefile.in yxa-1.0/src/transportlayer/Makefile.in
+--- yxa-1.0~/src/transportlayer/Makefile.in 2006-12-19 16:42:17.000000000 +0100
++++ yxa-1.0/src/transportlayer/Makefile.in 2007-12-07 23:58:44.000000000 +0100
+@@ -21,6 +21,8 @@
+ ERLC = @ERLC@
+ ERL = @ERL@
+
++DEFS = @DEFS@
++
+ INSTALL = @INSTALL@
+ install_DATA = @INSTALL_DATA@
+ install_PROGRAM = @INSTALL_PROGRAM@
+@@ -97,4 +99,4 @@
+ .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
+
+ .erl.beam:
+- $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
++ $(ERLC) $(DEFS) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+diff -urNad yxa-1.0~/src/transportlayer/ssl_util.erl yxa-1.0/src/transportlayer/ssl_util.erl
+--- yxa-1.0~/src/transportlayer/ssl_util.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/transportlayer/ssl_util.erl 2007-12-08 00:03:03.000000000 +0100
+@@ -24,7 +24,14 @@
+ %%--------------------------------------------------------------------
+ %% Include files
+ %%--------------------------------------------------------------------
++% OTP R12B-0 or later
++-ifdef(HAVE_SSL_INCLUDE_OTP_PKIX_HRL).
++-include_lib("ssl/include/OTP-PKIX.hrl").
++-endif.
++% Before OTP R12B-0
++-ifdef(HAVE_SSL_INCLUDE_SSL_PKIX_HRL).
+ -include_lib("ssl/include/SSL-PKIX.hrl").
++-endif.
+ -include("sipsocket.hrl").
+
+
Propchange: yxa/trunk/debian/patches/ssl_util.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: yxa/trunk/debian/patches/to_lower.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/to_lower.dpatch?rev=5077&op=file
==============================================================================
--- yxa/trunk/debian/patches/to_lower.dpatch (added)
+++ yxa/trunk/debian/patches/to_lower.dpatch Fri Dec 7 23:43:21 2007
@@ -1,0 +1,382 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## to_lower.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: httpd_util:to_lower/1 is replaced with string:to_lower/1 in R12B-0
+
+ at DPATCH@
+diff -urNad yxa-1.0~/src/contact.erl yxa-1.0/src/contact.erl
+--- yxa-1.0~/src/contact.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/contact.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -403,7 +403,7 @@
+ end,
+ NameStripped = sipparse_util:strip(Name, both, [?SP,?HTAB]),
+
+- ParamName = httpd_util:to_lower(NameStripped),
++ ParamName = string:to_lower(NameStripped),
+
+ case ParamName of
+ "expires" ->
+diff -urNad yxa-1.0~/src/contact_param.erl yxa-1.0/src/contact_param.erl
+--- yxa-1.0~/src/contact_param.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/contact_param.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -79,9 +79,9 @@
+ [$\" | _] ->
+ ValIn; %% quoted value, don't lowercase
+ _ when is_list(ValIn) ->
+- httpd_util:to_lower(ValIn)
++ string:to_lower(ValIn)
+ end,
+- { httpd_util:to_lower(Name), Val}
++ { string:to_lower(Name), Val}
+ end,
+ %% make case insensitive
+ L = [F(E) || E <- Params],
+@@ -134,8 +134,8 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ add(ContactParam, Key, Value) when is_record(ContactParam, contact_param), is_list(Key), is_list(Value) ->
+- NKey = httpd_util:to_lower(Key),
+- NValue = httpd_util:to_lower(Value),
++ NKey = string:to_lower(Key),
++ NValue = string:to_lower(Value),
+ add2(ContactParam, {NKey, NValue}).
+
+ add2(ContactParam, {Key, Value}) ->
+@@ -154,7 +154,7 @@
+ %%--------------------------------------------------------------------
+ find(ContactParam, Key) when is_record(ContactParam, contact_param), is_list(Key) ->
+ Data = ContactParam#contact_param.pairs,
+- CKey = httpd_util:to_lower(Key),
++ CKey = string:to_lower(Key),
+ key_val_db:find(Data, CKey).
+
+ %%--------------------------------------------------------------------
+@@ -168,7 +168,7 @@
+ %%--------------------------------------------------------------------
+ remove(ContactParam, Key) ->
+ Data = ContactParam#contact_param.pairs,
+- CKey = httpd_util:to_lower(Key),
++ CKey = string:to_lower(Key),
+ Res = key_val_db:rm(Data, CKey),
+ ContactParam#contact_param{pairs = Res}.
+
+diff -urNad yxa-1.0~/src/cpl/interpret_backend.erl yxa-1.0/src/cpl/interpret_backend.erl
+--- yxa-1.0~/src/cpl/interpret_backend.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/cpl/interpret_backend.erl 2007-12-07 17:48:20.000000000 +0100
+@@ -173,7 +173,7 @@
+
+ %% values are case insensitive
+ compare_address_or_address_part({'address-type', ReqVal}, Val) ->
+- ReqVal == httpd_util:to_lower(Val);
++ ReqVal == string:to_lower(Val);
+
+ %% values are case sensitive
+ compare_address_or_address_part({user, ReqVal}, Val) ->
+@@ -188,7 +188,7 @@
+ %% is a v4-in-v6 embedding." - RFC 3880 chapter 4 p9
+ compare_address_or_address_part({host, ReqVal}, Val) ->
+ %% host name values are case insensitive
+- ReqVal == httpd_util:to_lower(Val)
++ ReqVal == string:to_lower(Val)
+ %% XXX this will probably fail for IPv4 and IPv6
+ ;
+
+@@ -208,7 +208,7 @@
+ compare_address_or_address_part({display, ReqVal}, Val) ->
+ %% XXX erlang only supports Latin-1 (8 bit), so unicode will only
+ %% work correctly when it's in the ASCII range
+- httpd_util:to_lower(ReqVal) == httpd_util:to_lower(Val);
++ string:to_lower(ReqVal) == string:to_lower(Val);
+
+ %% values are case sensitive
+ compare_address_or_address_part({password, ReqVal}, Val) ->
+@@ -227,7 +227,7 @@
+ %% XXX see compare_address_or_address_part({display, ReqVal}, Val) about lacking unicode support !
+ address_or_address_part_contains({display, ReqVal}, Val) ->
+ %% non-zero index is returned if Val is a part of ReqVal
+- case string:str(httpd_util:to_lower(ReqVal), httpd_util:to_lower(Val)) of
++ case string:str(string:to_lower(ReqVal), string:to_lower(Val)) of
+ 0 -> false;
+ _ -> true
+ end.
+@@ -329,17 +329,17 @@
+ subject ->
+ case keylist:fetch("subject", Header) of
+ [] -> '#no_value';
+- [SubjectStr] -> httpd_util:to_lower(SubjectStr)
++ [SubjectStr] -> string:to_lower(SubjectStr)
+ end;
+ organization ->
+ case keylist:fetch("organization", Header) of
+ [] -> '#no_value';
+- [OrganizationStr] -> httpd_util:to_lower(OrganizationStr)
++ [OrganizationStr] -> string:to_lower(OrganizationStr)
+ end;
+ 'user-agent' ->
+ case keylist:fetch("user-agent", Header) of
+ [] -> '#no_value';
+- [UserAgentStr] -> httpd_util:to_lower(UserAgentStr)
++ [UserAgentStr] -> string:to_lower(UserAgentStr)
+ end;
+ display ->
+ throw({error, string_switch_tag_field_attribute_value_display_unsupported_by_sip})
+@@ -360,7 +360,7 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ string_is(ReqVal, Val) ->
+- httpd_util:to_lower(ReqVal) == httpd_util:to_lower(Val).
++ string:to_lower(ReqVal) == string:to_lower(Val).
+
+ %%--------------------------------------------------------------------
+ %% @spec (ReqVal, Val) -> true | false
+@@ -377,7 +377,7 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ string_contains(ReqVal, Val) ->
+- case string:str(httpd_util:to_lower(ReqVal), httpd_util:to_lower(Val)) of
++ case string:str(string:to_lower(ReqVal), string:to_lower(Val)) of
+ 0 -> false;
+ _ -> true
+ end.
+@@ -448,7 +448,7 @@
+
+
+ prefix_match(SubString, String) ->
+- prefix_match2(httpd_util:to_lower(SubString), httpd_util:to_lower(String)).
++ prefix_match2(string:to_lower(SubString), string:to_lower(String)).
+
+ %% SubString = String
+ prefix_match2([], []) ->
+@@ -584,7 +584,7 @@
+ urgent -> 3;
+ normal -> 2;
+ 'non-urgent' -> 1;
+- {unknown, PrioStr} -> httpd_util:to_lower(PrioStr)
++ {unknown, PrioStr} -> string:to_lower(PrioStr)
+ end.
+
+ %%--------------------------------------------------------------------
+diff -urNad yxa-1.0~/src/cpl/xml_parse.erl yxa-1.0/src/cpl/xml_parse.erl
+--- yxa-1.0~/src/cpl/xml_parse.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/cpl/xml_parse.erl 2007-12-07 17:48:20.000000000 +0100
+@@ -1605,7 +1605,7 @@
+ case get_attribute(Cond, wkst) of
+ '#no_value' -> mo;
+ Wkst ->
+- case httpd_util:to_lower(Wkst) of
++ case string:to_lower(Wkst) of
+ "mo" -> mo;
+ "tu" -> tu;
+ "we" -> we;
+@@ -1620,7 +1620,7 @@
+
+ %% convert freq value to a atom
+ freq_str_to_atom(Str) ->
+- freq_str_to_atom2(httpd_util:to_lower(Str)).
++ freq_str_to_atom2(string:to_lower(Str)).
+
+ freq_str_to_atom2("secondly") -> secondly;
+ freq_str_to_atom2("minutely") -> minutely;
+diff -urNad yxa-1.0~/src/cpl/xml_parse_util.erl yxa-1.0/src/cpl/xml_parse_util.erl
+--- yxa-1.0~/src/cpl/xml_parse_util.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/cpl/xml_parse_util.erl 2007-12-07 17:48:21.000000000 +0100
+@@ -206,7 +206,7 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ parse_byday(Str) ->
+- Days = string:tokens(httpd_util:to_lower(Str), ","),
++ Days = string:tokens(string:to_lower(Str), ","),
+ F = fun
+ ("mo") -> {all, mo};
+ ("tu") -> {all, tu};
+@@ -298,7 +298,7 @@
+ %%--------------------------------------------------------------------
+
+ duration(Str) ->
+- case duration2(httpd_util:to_lower(Str), #duration{}) of
++ case duration2(string:to_lower(Str), #duration{}) of
+ #duration{weeks = 0, days = 0, hours = 0, minutes = 0, seconds = 0} ->
+ throw({error, duration_value_may_not_be_zero_length});
+ Duration ->
+@@ -488,7 +488,7 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ normalize_prio(PrioStr) ->
+- case httpd_util:to_lower(PrioStr) of
++ case string:to_lower(PrioStr) of
+ "emergency" -> emergency;
+ "urgent" -> urgent;
+ "normal" -> normal;
+diff -urNad yxa-1.0~/src/keylist.erl yxa-1.0/src/keylist.erl
+--- yxa-1.0~/src/keylist.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/keylist.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -359,7 +359,7 @@
+ %% RFC3515 #7
+ normalize("r") -> "refer-to";
+ normalize(Name) when is_list(Name) ->
+- LC = httpd_util:to_lower(Name),
++ LC = string:to_lower(Name),
+ normalize2(LC);
+ normalize(Key) when is_atom(Key) ->
+ %% XXX perhaps check that it is one of the atoms we actually use?
+diff -urNad yxa-1.0~/src/sipdst.erl yxa-1.0/src/sipdst.erl
+--- yxa-1.0~/src/sipdst.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/sipdst.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -409,7 +409,7 @@
+ get_transport_param(URL) when is_record(URL, sipurl) ->
+ case url_param:find(URL#sipurl.param_pairs, "transport") of
+ [Transport] ->
+- case httpd_util:to_lower(Transport) of
++ case string:to_lower(Transport) of
+ "tcp" -> tcp;
+ "udp" -> udp;
+ "tls" -> tls;
+diff -urNad yxa-1.0~/src/sipheader.erl yxa-1.0/src/sipheader.erl
+--- yxa-1.0~/src/sipheader.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/sipheader.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -500,7 +500,7 @@
+ Index ->
+ FirstWord = string:substr(In, 1, Index - 1),
+ Rest = string:substr(In, Index + 1),
+- LCfw = httpd_util:to_lower(FirstWord),
++ LCfw = string:to_lower(FirstWord),
+ auth2(LCfw, Rest)
+ end.
+
+@@ -550,9 +550,9 @@
+ Index = string:chr(H, $=),
+ case Index of
+ 0 ->
+- {httpd_util:to_lower(H), ""};
++ {string:to_lower(H), ""};
+ _ ->
+- Name = httpd_util:to_lower(string:substr(H, 1, Index - 1)),
++ Name = string:to_lower(string:substr(H, 1, Index - 1)),
+ Value = string:substr(H, Index + 1),
+ {Name, unescape(Value)}
+ end
+diff -urNad yxa-1.0~/src/siphost.erl yxa-1.0/src/siphost.erl
+--- yxa-1.0~/src/siphost.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/siphost.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -80,7 +80,7 @@
+ integer_to_list(A4);
+ makeip({A1, A2, A3, A4, A5, A6, A7, A8}) ->
+ A = inet_parse:ntoa({A1, A2, A3, A4, A5, A6, A7, A8}),
+- "[" ++ httpd_util:to_lower(A) ++ "]".
++ "[" ++ string:to_lower(A) ++ "]".
+
+
+ %%====================================================================
+diff -urNad yxa-1.0~/src/sipurl.erl yxa-1.0/src/sipurl.erl
+--- yxa-1.0~/src/sipurl.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/sipurl.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -219,7 +219,7 @@
+ case string:chr(URLStr, $:) of
+ N when is_integer(N), N > 0 ->
+ In = string:substr(URLStr, 1, N - 1),
+- case httpd_util:to_lower(In) of
++ case string:to_lower(In) of
+ LC when LC == "sip"; LC == "sips" ->
+ RURL = string:substr(URLStr, N + 1),
+ case parse2(LC, RURL) of
+@@ -733,7 +733,7 @@
+ set([{proto, Val} | T], URL) when is_record(URL, sipurl), Val == "sip"; Val == "sips" ->
+ set(T, URL#sipurl{proto=Val});
+ set([{proto, Val} | T], URL) when is_record(URL, sipurl), is_list(Val) ->
+- case httpd_util:to_lower(Val) of
++ case string:to_lower(Val) of
+ L when L == "sip"; L == "sips" ->
+ set(T, URL#sipurl{proto=L});
+ _ ->
+@@ -753,7 +753,7 @@
+ %% HOST
+ set([{host, Val} | T], URL) when is_record(URL, sipurl), is_list(Val) ->
+ %% Lowercase and remove trailing dots
+- LC = httpd_util:to_lower(Val),
++ LC = string:to_lower(Val),
+ Hostname = string:strip(LC, right, $.),
+ set(T, URL#sipurl{host=Hostname});
+
+diff -urNad yxa-1.0~/src/unused/gssapi.erl yxa-1.0/src/unused/gssapi.erl
+--- yxa-1.0~/src/unused/gssapi.erl 2005-08-24 14:59:51.000000000 +0200
++++ yxa-1.0/src/unused/gssapi.erl 2007-12-07 17:48:21.000000000 +0100
+@@ -14,7 +14,7 @@
+ end,
+ case {Data1, Data2} of
+ {Response, "User:" ++ Username} ->
+- {Response, httpd_util:to_lower(Username)};
++ {Response, string:to_lower(Username)};
+ {_, _} ->
+ {"", false}
+ end.
+diff -urNad yxa-1.0~/src/url_param.erl yxa-1.0/src/url_param.erl
+--- yxa-1.0~/src/url_param.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/url_param.erl 2007-12-07 17:48:17.000000000 +0100
+@@ -77,11 +77,11 @@
+ F = fun(E) ->
+ case string:tokens(E, "=") of
+ [Name, Val] ->
+- { sipurl:unescape_str(httpd_util:to_lower(Name)),
+- sipurl:unescape_str(httpd_util:to_lower(Val))
++ { sipurl:unescape_str(string:to_lower(Name)),
++ sipurl:unescape_str(string:to_lower(Val))
+ };
+ [Name] ->
+- { sipurl:unescape_str(httpd_util:to_lower(Name)), none}
++ { sipurl:unescape_str(string:to_lower(Name)), none}
+ end
+ end,
+ L = [F(E) || E <- Params],
+@@ -156,7 +156,7 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ add(UrlParam, Key) ->
+- NKey = httpd_util:to_lower(Key),
++ NKey = string:to_lower(Key),
+ add2(UrlParam, {NKey, none}).
+
+ %%--------------------------------------------------------------------
+@@ -171,8 +171,8 @@
+ %% @end
+ %%--------------------------------------------------------------------
+ add(UrlParam, Key, Value) when is_record(UrlParam, url_param), is_list(Key) ->
+- NKey = httpd_util:to_lower(Key),
+- NValue = httpd_util:to_lower(Value),
++ NKey = string:to_lower(Key),
++ NValue = string:to_lower(Value),
+ add2(UrlParam, {NKey, NValue}).
+
+
+@@ -192,7 +192,7 @@
+ %%--------------------------------------------------------------------
+ find(Param, Key) when is_record(Param, url_param), is_list(Key) ->
+ Data = Param#url_param.pairs,
+- CKey = httpd_util:to_lower(Key),
++ CKey = string:to_lower(Key),
+ key_val_db:find(Data, CKey).
+
+ %%--------------------------------------------------------------------
+@@ -206,7 +206,7 @@
+ %%--------------------------------------------------------------------
+ remove(Param, Key) when is_record(Param, url_param), is_list(Key) ->
+ Data = Param#url_param.pairs,
+- CKey = httpd_util:to_lower(Key),
++ CKey = string:to_lower(Key),
+ Res = key_val_db:rm(Data, CKey),
+ Param#url_param{pairs = Res}.
+
+diff -urNad yxa-1.0~/src/util.erl yxa-1.0/src/util.erl
+--- yxa-1.0~/src/util.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/util.erl 2007-12-07 17:48:18.000000000 +0100
+@@ -144,8 +144,8 @@
+ casecompare(_String, none) ->
+ false;
+ casecompare(String1, String2) ->
+- S1 = httpd_util:to_lower(String1),
+- case httpd_util:to_lower(String2) of
++ S1 = string:to_lower(String1),
++ case string:to_lower(String2) of
+ S1 ->
+ true;
+ _ ->
Propchange: yxa/trunk/debian/patches/to_lower.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-voip-commits
mailing list