Merge remote-tracking branch 'origin/libradsec' into moonshot

Conflicts:
	lib/Makefile.am
	lib/configure.ac
	lib/libradsec.spec.in
	lib/radius/Makefile.am
	lib/radsec.c
	lib/radsecproxy/tlscommon.c
	lib/tcp.c
	lib/tls.c

diff --combined lib/radius/Makefile.am
index f0d498f,c827465..9aafed7
--- 1/lib/radius/Makefile.am
--- 2/lib/radius/Makefile.am
+++ b/lib/radius/Makefile.am
@@@ -1,8 -1,6 +1,8 @@@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
 +BUILT_SOURCES = dictionaries.c
 +
  INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
  AM_CFLAGS = -Wall -g
  
@@@ -13,7 -11,6 +13,7 @@@ libradsec_radius_la_SOURCES = 
        crypto.c \
        custom.c \
        dict.c \
 +      client.h \
        id.c \
        parse.c \
        print.c \
@@@ -21,6 -18,8 +21,8 @@@
        static.c \
        valuepair.c
  
+ libradsec_radius_la_SOURCES += client.h
+ 
  libradsec_radius_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H
  
  DICTIONARIES = \
@@@ -30,7 -29,7 +32,7 @@@
        share/dictionary.ukerna \
        share/dictionary.abfab.ietf
  
- EXTRA_DIST = $(DICTIONARIES) convert.pl common.pl header.pl
+ EXTRA_DIST = dictionaries.c $(DICTIONARIES) common.pl convert.pl
  
  $(top_srcdir)/include/radsec/radius.h dictionaries.c: ${DICTIONARIES} convert.pl common.pl
        $(srcdir)/convert.pl ${DICTIONARIES}
@@@ -41,4 -40,3 +43,3 @@@ clean-local
        rm -f dictionaries.c
  
  $(libradsec_radius_la_SOURCES): $(top_srcdir)/include/radsec/radius.h
-