1 --- freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in~ 2009-09-14 16:43:29.000000000 +0200
2 +++ freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in 2010-03-01 13:53:59.571124248 +0100
4 # RB_LIB_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('libdir')"`
5 # RB_EXTRA_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBS')"`
6 RB_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBRUBYARG_SHARED')"`
7 - RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('includedir')"`
8 + RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('rubyhdrdir')"`
9 RB_CFLAGS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('CFLAGS')"`
10 RB_ARCH_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('archdir')"`
11 + RB_ARCH_INC_DIR=`${RUBYBIN} -r rbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'`
14 - CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_DIR} -I${RB_INC_DIR}"
15 + CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_INC_DIR} -I${RB_INC_DIR}"
16 # smart_try_dir=$RB_INC_DIR
17 FR_SMART_CHECK_INCLUDE(ruby.h)
18 if test "x$ac_cv_header_ruby_h" != "xyes"; then
19 --- freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c~ 2009-09-14 16:43:29.000000000 +0200
20 +++ freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c 2010-03-01 15:21:45.111123747 +0100
24 /* Get the array size. */
25 - outertuplesize = RARRAY(rb_value)->len;
26 + outertuplesize = RARRAY_LEN(rb_value);
28 for (i = 0; i < outertuplesize; i++) {
29 VALUE pTupleElement = rb_ary_entry(rb_value, i);
31 /* Check if it's a pair */
34 - if ((tuplesize = RARRAY(pTupleElement)->len) != 2) {
35 + if ((tuplesize = RARRAY_LEN(pTupleElement)) != 2) {
36 radlog(L_ERR, "%s: tuple element %d is a tuple "
37 " of size %d. must be 2\n", function_name,