Which git branch?

[Brian Candler]

The documentation at http://git.freeradius.org/ says that the "master"
branch is for "the next major release".  However if I try to build it under
Ubuntu 10.10 x86_64, it aborts with an error (see below).  In any case the
last commit on this branch is May 29.

I have some small patches to contribute. Should I be working from "stable"
or "v2.1.x"?  Both have commits from Nov 11.

Thanks,

Brian.

$ ./configure && make
...
libtool: link: ranlib .libs/libfreeradius-radius.a
libtool: link: ( cd ".libs" && rm -f "libfreeradius-radius.la" && ln -s "../libfreeradius-radius.la" "libfreeradius-radius.la" )
make[4]: Leaving directory `/v/git/freeradius-server/src/lib'
Making all in modules...
/usr/bin/make -w -C modules all
make[4]: Entering directory `/v/git/freeradius-server/src/modules'
make[5]: Entering directory `/v/git/freeradius-server/src/modules'
Making all in rlm_acctlog...
/usr/bin/make -w -C rlm_acctlog all
make[6]: Entering directory `/v/git/freeradius-server/src/modules/rlm_acctlog'
/bin/sh /u/home/brian/git/freeradius-server/libtool --mode=compile gcc  -g -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -D_GNU_SOURCE -g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef -I/u/home/brian/git/freeradius-server/src   -c rlm_acctlog.c
libtool: compile:  gcc -g -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -D_GNU_SOURCE -g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef -I/u/home/brian/git/freeradius-server/src -c rlm_acctlog.c  -fPIC -DPIC -o .libs/rlm_acctlog.o
In file included from /u/home/brian/git/freeradius-server/src/freeradius-devel/radiusd.h:107,
                 from rlm_acctlog.c:28:
/u/home/brian/git/freeradius-server/src/freeradius-devel/smodule.h:144: error: expected specifier-qualifier-list before 'RADCLIENT'
make[6]: *** [rlm_acctlog.lo] Error 1
make[6]: Leaving directory `/v/git/freeradius-server/src/modules/rlm_acctlog'
make[5]: *** [rlm_acctlog] Error 2
...

I did a google search for this, and found a patch from last February:
https://lists.freeradius.org/pipermail/freeradius-devel/2010-February/013618.html
which isn't in this branch.

If I apply it, then it fails here instead:

...
make[6]: Entering directory `/v/git/freeradius-server/src/modules/rlm_acctlog'
/bin/sh /u/home/brian/git/freeradius-server/libtool --mode=compile gcc  -g -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -D_GNU_SOURCE -g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef -I/u/home/brian/git/freeradius-server/src   -c rlm_acctlog.c
libtool: compile:  gcc -g -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -D_GNU_SOURCE -g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef -I/u/home/brian/git/freeradius-server/src -c rlm_acctlog.c  -fPIC -DPIC -o .libs/rlm_acctlog.o
In file included from /u/home/brian/git/freeradius-server/src/freeradius-devel/radiusd.h:153,
                 from rlm_acctlog.c:28:
/u/home/brian/git/freeradius-server/src/freeradius-devel/smodule.h:146: error: expected specifier-qualifier-list before 'fr_tcp_radius_t'
make[6]: *** [rlm_acctlog.lo] Error 1
make[6]: Leaving directory `/v/git/freeradius-server/src/modules/rlm_acctlog'
make[5]: *** [rlm_acctlog] Error 2
...