package updates and compile fixes

- update ctorrent, cups, gnutls and freeradius-server
- compile kerberos (heimdal,krb5) with com_err library from
  e2fsprogs to allow both to be build without installing local
  copys of libcom_err
- cleanup lynx package add zlib dependency

37 files changed, 638 insertions, 303 deletions

diff --git a/.gitignore b/.gitignore
index c66451c54..7e9e1ef50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ toolchain_build_*/
 .tmpconfig.h
 .prereq_done
 .config*
+.defconfig
+all.config
 .cfg/
 .cfg.*/
 cross_*/
diff --git a/mk/build.mk b/mk/build.mk
index 3bfd3bce9..994611a15 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -160,7 +160,8 @@ cleankernel:
 cleandir:
 	@$(TRACE) cleandir
 	$(MAKE) -C $(CONFIG) clean
-	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) ${TOPDIR}/.cfg
+	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
+		${TOPDIR}/.cfg*
 	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
 	rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk
 
@@ -174,9 +175,11 @@ cleantarget:
 distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean
-	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) ${TOPDIR}/.cfg*
+	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+		${TOPDIR}/.cfg*
 	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
-	rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk
+	rm -f .config* .defconfig .tmpconfig.h all.config \
+		${TOPDIR}/package/*/info.mk
 
 else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
@@ -244,8 +247,10 @@ _mconfig2: ${CONFIG}/conf modconfig
 
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
-	@rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) ${TOPDIR}/.cfg*
+	@rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \
+		${TOPDIR}/.cfg*
 	@rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR)
-	@rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk
+	@rm -f .config* .defconfig all.config .tmpconfig.h \
+		${TOPDIR}/package/*/info.mk
 
 endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
diff --git a/package/Depends.mk b/package/Depends.mk
index ee9f74030..170cbf65a 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -65,7 +65,7 @@ endif
 ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
 heimdal-compile: openldap-compile
 endif
-heimdal-compile: openssl-compile ncurses-compile
+heimdal-compile: openssl-compile ncurses-compile e2fsprogs-compile
 httping-compile: openssl-compile
 icecast-compile: curl-compile libvorbis-compile libxml2-compile libxslt-compile
 ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y)
@@ -91,7 +91,7 @@ kismet-compile: uclibc++-compile
 endif
 kismet-compile: libpcap-compile ncurses-compile
 knock-compile: libpcap-compile
-krb5-compile: ncurses-compile
+krb5-compile: ncurses-compile e2fsprogs-compile
 l2tpns-compile: libcli-compile
 less-compile: ncurses-compile
 libgcrypt-compile: libgpg-error-compile
@@ -129,7 +129,7 @@ endif
 lighttpd-compile: pcre-compile libxml2-compile sqlite-compile
 links-compile: openssl-compile libpng-compile jpeg-compile gpm-compile
 logrotate-compile: popt-compile
-lynx-compile: ncurses-compile openssl-compile
+lynx-compile: ncurses-compile openssl-compile zlib-compile
 madplay-compile: libid3tag-compile libmad-compile
 maradns-compile: libpthread-compile
 mc-compile: glib-compile ncurses-compile
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 23ba6ac71..ff4b662cb 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -4,15 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ctorrent
-PKG_VERSION:=		1.3.4-dnh2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		6635e2d0d0ee21faeb85d95cd93c137b
+PKG_VERSION:=		dnh3.3.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		net
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
-PKG_SITES:=		http://www.rahul.net/dholmes/ctorrent/
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-dnh2
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=dtorrent/}
 
 ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
 PKG_DEPENDS:=            uclibc++
@@ -29,12 +27,12 @@ TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
 TLDFLAGS+=		-lgcc_s -luClibc++ -lc -lm -nodefaultlibs
 endif
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CTORRENT}
-	${CP} ${WRKINST}/* ${IDIR_CTORRENT}/
+	${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin
+	${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ctorrent/patches/patch-bencode_cpp b/package/ctorrent/patches/patch-bencode_cpp
deleted file mode 100644
index 9f2a4381e..000000000
--- a/package/ctorrent/patches/patch-bencode_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ctorrent-dnh2.orig/bencode.cpp	2006-01-02 03:38:01.000000000 +0100
-+++ ctorrent-dnh2/bencode.cpp	2009-06-01 19:10:05.000000000 +0200
-@@ -213,10 +213,10 @@ size_t bencode_end_dict_list(FILE *fp)
-   return (EOF == fputc('e',fp)) ? 0 : 1;
- }
- 
--size_t bencode_path2list(const char *pathname, FILE *fp)
-+size_t bencode_path2list(char *pathname, FILE *fp)
- {
-   char *pn;
--  const char *p = pathname;
-+  char *p = pathname;
-   
-   if( bencode_begin_list(fp) != 1 ) return 0;
-   
diff --git a/package/ctorrent/patches/patch-bencode_h b/package/ctorrent/patches/patch-bencode_h
deleted file mode 100644
index 594fa668a..000000000
--- a/package/ctorrent/patches/patch-bencode_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ctorrent-dnh2.orig/bencode.h	2005-08-27 05:43:00.000000000 +0200
-+++ ctorrent-dnh2/bencode.h	2009-06-01 19:11:29.000000000 +0200
-@@ -31,6 +31,6 @@ size_t bencode_int(const int integer, FI
- size_t bencode_begin_dict(FILE *fp);
- size_t bencode_begin_list(FILE *fp);
- size_t bencode_end_dict_list(FILE *fp);
--size_t bencode_path2list(const char *pathname, FILE *fp);
-+size_t bencode_path2list(char *pathname, FILE *fp);
- 
- #endif
diff --git a/package/ctorrent/patches/patch-btcontent_cpp b/package/ctorrent/patches/patch-btcontent_cpp
deleted file mode 100644
index e402465f8..000000000
--- a/package/ctorrent/patches/patch-btcontent_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id$
---- ctorrent-dnh2.orig/btcontent.cpp	2006-01-02 03:40:49.000000000 +0100
-+++ ctorrent-dnh2/btcontent.cpp	2007-01-22 23:43:50.000000000 +0100
-@@ -9,12 +9,8 @@
- #else
- #include <unistd.h>
- #include <sys/param.h>
--#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO)
--#include <sha.h>
--#elif defined(HAVE_LIBSSL)
- #include <openssl/sha.h>
- #endif
--#endif
- 
- #include <time.h>
- #include <sys/stat.h>
diff --git a/package/ctorrent/patches/patch-btfiles_cpp b/package/ctorrent/patches/patch-btfiles_cpp
deleted file mode 100644
index e390083bb..000000000
--- a/package/ctorrent/patches/patch-btfiles_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id$
---- ctorrent-dnh2.orig/btfiles.cpp	2006-01-02 03:41:21.000000000 +0100
-+++ ctorrent-dnh2/btfiles.cpp	2007-01-22 23:46:13.000000000 +0100
-@@ -8,12 +8,8 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <sys/param.h>
--#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO)
--#include <sha.h>
--#elif defined(HAVE_LIBSSL)
- #include <openssl/sha.h>
- #endif
--#endif
- 
- #include <time.h>
- #include <sys/stat.h>
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 778c8fe47..608b043b7 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
-PKG_VERSION:=		1.3.10
+PKG_VERSION:=		1.4.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		84fffe96b8537c81a463faccead80026
+PKG_MD5SUM:=		d95e2d588e3d36e563027a963b117b1b
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib libpthread
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
 CONFIGURE_ARGS+=	--with-cups-user=0 \
@@ -40,19 +40,19 @@ CONFIGURE_ARGS+=	--with-cups-user=0 \
 			--disable-cdsassl \
 			--disable-dbus \
 			--disable-ssl
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
 XAKE_FLAGS+=		OPTIM='-fPIC'
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
 	${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners
+	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates
 	${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/
 	rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default
diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile
index 663b989b9..70febbf51 100644
--- a/package/cups/patches/patch-Makefile
+++ b/package/cups/patches/patch-Makefile
@@ -1,12 +1,16 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/Makefile	2009-03-12 22:34:21.000000000 +0100
-+++ cups-1.3.10/Makefile	2009-05-09 22:41:42.000000000 +0200
-@@ -19,7 +19,7 @@ include Makedefs
+--- cups-1.4.2.orig/Makefile	2009-07-01 06:01:31.000000000 +0200
++++ cups-1.4.2/Makefile	2009-11-19 22:04:36.000000000 +0100
+@@ -27,10 +27,10 @@ include Makedefs
  # Directories to make...
  #
  
--DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
-+DIRS	=	cups backend berkeley cgi-bin filter locale monitor \
- 		notifier scheduler systemv test \
+-DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
+-		notifier ppdc scheduler systemv test \
++DIRS	=	cups filter backend berkeley cgi-bin driver locale monitor \
++		notifier ppdc scheduler systemv \
  		$(PHPDIR) \
- 		conf data doc $(FONTS) ppd templates
+-		conf data doc examples $(FONTS) templates
++		conf data examples doc $(FONTS) templates
+ 
+ 
+ #
diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile
new file mode 100644
index 000000000..f3ae5c8dd
--- /dev/null
+++ b/package/cups/patches/patch-conf_Makefile
@@ -0,0 +1,18 @@
+--- cups-1.4.2.orig/conf/Makefile	2009-09-22 23:53:31.000000000 +0200
++++ cups-1.4.2/conf/Makefile	2009-11-19 22:02:20.000000000 +0100
+@@ -72,12 +72,12 @@ install:	all install-data install-header
+ install-data:
+ 	for file in $(KEEP); do \
+ 		if test -r $(SERVERROOT)/$$file ; then \
+-			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
++			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+-			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
+ 		fi ; \
+ 	done
+-	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
++	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+ 		if test -r $(DATADIR)/mime/$$file ; then \
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
deleted file mode 100644
index 82550e632..000000000
--- a/package/cups/patches/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/configure	2009-04-16 22:02:06.000000000 +0200
-+++ cups-1.3.10/configure	2009-05-31 19:41:18.000000000 +0200
-@@ -7460,9 +7460,6 @@ done
- 
- 
- case $uname in
--        Darwin* | *BSD*)
--                ARFLAGS="-rcv"
--                ;;
-         *)
-                 ARFLAGS="crvs"
-                 ;;
-@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib
- 			;;
- 		Linux*)
- 			if test -d /usr/lib64; then
--				libdir="$exec_prefix/lib64"
-+				libdir="$exec_prefix/lib"
- 			fi
- 			;;
- 		HP-UX*)
-@@ -9587,11 +9584,6 @@ _ACEOF
- 
- # Server executables...
- case "$uname" in
--	*BSD* | Darwin*)
--		# *BSD and Darwin (MacOS X)
--		INSTALL_SYSV=""
--		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
--		;;
- 	*)
- 		# All others
- 		INSTALL_SYSV="install-sysv"
diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile
new file mode 100644
index 000000000..5cfa1ac9b
--- /dev/null
+++ b/package/cups/patches/patch-ppdc_Makefile
@@ -0,0 +1,11 @@
+--- cups-1.4.2.orig/ppdc/Makefile	2009-05-27 01:27:06.000000000 +0200
++++ cups-1.4.2/ppdc/Makefile	2009-11-19 21:58:49.000000000 +0100
+@@ -244,7 +244,7 @@ genstrings:		genstrings.o libcupsppdc.a 
+ 		libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+ 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+ 	echo Generating localization strings...
+-	./genstrings >sample.c
++	#./genstrings >sample.c
+ 
+ 
+ #
diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c
deleted file mode 100644
index c1f3a3e94..000000000
--- a/package/cups/patches/patch-scheduler_auth_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/scheduler/auth.c	2009-02-07 06:06:11.000000000 +0100
-+++ cups-1.3.10/scheduler/auth.c	2009-06-01 19:17:20.000000000 +0200
-@@ -54,6 +54,7 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H
diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in
new file mode 100644
index 000000000..d0936ae5d
--- /dev/null
+++ b/package/cxxtools/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- cxxtools-1.4.8.orig/Makefile.in	2008-05-26 19:51:34.000000000 +0200
++++ cxxtools-1.4.8/Makefile.in	2009-11-19 22:10:18.000000000 +0100
+@@ -200,7 +200,7 @@ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = src include demo
++SUBDIRS = src include
+ bin_SCRIPTS = cxxtools-config
+ EXTRA_dist = \
+ 	m4/acx_pthread.m4 \
diff --git a/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp b/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp
new file mode 100644
index 000000000..6afb0e2a5
--- /dev/null
+++ b/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp
@@ -0,0 +1,10 @@
+--- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp	2008-11-18 12:27:04.000000000 +0100
++++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp	2009-11-19 22:17:54.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include "../HTMLTemplate.hpp"
+ #include "../ConnectionHandler.hpp"
+ 
++#include <stdio.h>
+ #include <syslog.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 011b3b257..4f80a07dc 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -4,6 +4,7 @@ config ADK_PACKAGE_E2FSPROGS
 	default n
 	select ADK_PACKAGE_LIBUUID
 	select ADK_PACKAGE_LIBCOM_ERR
+	select ADK_PACKAGE_LIBSS
 	select ADK_PACKAGE_LIBBLKID
 	help
 	  This package contains essential ext2 filesystem utilities which consists of
@@ -32,3 +33,10 @@ config ADK_PACKAGE_LIBCOM_ERR
 	tristate
 	default n
 	help
+
+config ADK_PACKAGE_LIBSS
+	prompt "libss........................... Subsystem command parsing library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index c6d924b84..3230b61df 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -18,12 +18,15 @@ PKG_DESCR_2:=		Common error library
 PKG_SECTION_2:=		libs
 PKG_DESCR_3:=		Libblkid
 PKG_SECTION_3:=		libs
+PKG_DESCR_SS:=		Subsystem command parsing library
+PKG_SECTION_SS:=	libs
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1}))
 $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS}))
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION_3}))
 
 CONFIGURE_STYLE=	gnu
@@ -55,15 +58,20 @@ post-install:
 		${IDIR_LIBBLKID}/usr/lib/
 	# subpackage libcom_err
 	${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcom_err.so.* \
+	${CP} ${WRKINST}/usr/lib/libcom_err.so* \
 		${IDIR_LIBCOM_ERR}/usr/lib/
+	# subpackage libss
+	${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libss.so* \
+		${IDIR_LIBSS}/usr/lib/
 	# subpackage libuuid
 	${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libuuid.so.* \
 		${IDIR_LIBUUID}/usr/lib/
-	# install some headers explicitely
+	# install some headers/apps explicitely
 	${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid
 	${CP} ${WRKBUILD}/lib/uuid/uuid.h \
 		${STAGING_DIR}/usr/include/uuid
+	${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_TOOLS}/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 895ae527b..1e5304103 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-server
-PKG_VERSION:=		2.1.6
+PKG_VERSION:=		2.1.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		078f7d29b4d2d34f7c992abf772c28a0
+PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libltdl libopenssl libpthread
diff --git a/package/freeradius-server/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary
index 6027a7810..075c19c71 100644
--- a/package/freeradius-server/patches/patch-share_dictionary
+++ b/package/freeradius-server/patches/patch-share_dictionary
@@ -1,18 +1,140 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- freeradius-server-2.1.6.orig/share/dictionary	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/share/dictionary	2009-06-01 16:15:56.702126337 +0200
-@@ -54,7 +54,7 @@
- #	this directive to the end of this file if you want to see the
- #	old names in the logfiles, INSTEAD OF the new names.
- #
+--- freeradius-server-2.1.7.orig/share/dictionary	2009-09-14 16:43:29.000000000 +0200
++++ freeradius-server-2.1.7/share/dictionary	2009-11-19 22:39:16.000000000 +0100
+@@ -1,224 +1,224 @@
+-# -*- text -*-
+-#
+-# Version $Id$
+-#
+-#	DO NOT EDIT THE FILES IN THIS DIRECTORY
+-#
+-#	The files in this directory are maintained and updated by
+-#	the FreeRADIUS project.  Newer releases of software may update
+-#	or change these files.
+-#
+-#	Use the main dictionary file (usually /etc/raddb/dictionary)
+-#	for local system attributes and $INCLUDEs.
+-#
+-#
+-#
+-#	This file contains dictionary translations for parsing
+-#	requests and generating responses.  All transactions are
+-#	composed of Attribute/Value Pairs.  The value of each attribute
+-#	is specified as one of 4 data types.  Valid data types are:
+-#
+-#	text       - printable, generally UTF-8 encoded (subset of 'string')
+-#	string     - 0-253 octets
+-#	ipaddr     - 4 octets in network byte order
+-#	integer    - 32 bit value in big endian order (high byte first)
+-#	date       - 32 bit value in big endian order - seconds since
+-#		     00:00:00 GMT,  Jan.  1,  1970
+-#	ifid       - 8 octets in network byte order
+-#	ipv6addr   - 16 octets in network byte order
+-#	ipv6prefix - 18 octets in network byte order
+-#	ether      - 6 octets of hh:hh:hh:hh:hh:hh
+-#		     where 'h' is hex digits, upper or lowercase.
+-#
+-#	FreeRADIUS includes extended data types which are not defined
+-#	in the RFC's.  These data types are:
+-#
+-#	abinary - Ascend's binary filter format.
+-#	octets  - raw octets, printed and input as hex strings.
+-#		  e.g.: 0x123456789abcdef
+-#
+-#
+-#	Enumerated values are stored in the user file with dictionary
+-#	VALUE translations for easy administration.
+-#
+-#	Example:
+-#
+-#	ATTRIBUTE	  VALUE
+-#	---------------   -----
+-#	Framed-Protocol = PPP
+-#	7		= 1	(integer encoding)
+-#
+-
+-#
+-#	Include compatibility dictionary for older users file. Move
+-#	this directive to the end of this file if you want to see the
+-#	old names in the logfiles, INSTEAD OF the new names.
+-#
 -$INCLUDE dictionary.compat
-+#$INCLUDE dictionary.compat
- 
- #
- #	Include the RFC dictionaries next.
-@@ -82,110 +82,12 @@ $INCLUDE dictionary.rfc5176
- #
- #	Include vendor dictionaries after the standard ones.
+-
+-#
+-#	Include the RFC dictionaries next.
+-#
+-#	For a complete list of the standard attributes and values,
+-#	see:
+-#		http://www.iana.org/assignments/radius-types
+-#
+-$INCLUDE dictionary.rfc2865
+-$INCLUDE dictionary.rfc2866
+-$INCLUDE dictionary.rfc2867
+-$INCLUDE dictionary.rfc2868
+-$INCLUDE dictionary.rfc2869
+-$INCLUDE dictionary.rfc3162
+-$INCLUDE dictionary.rfc3576
+-$INCLUDE dictionary.rfc3580
+-$INCLUDE dictionary.rfc4072
+-$INCLUDE dictionary.rfc4372
+-$INCLUDE dictionary.rfc4675
+-$INCLUDE dictionary.rfc4679
+-$INCLUDE dictionary.rfc4818
+-$INCLUDE dictionary.rfc4849
+-$INCLUDE dictionary.rfc5176
+-$INCLUDE dictionary.rfc5580
+-
+-#
+-#	Include vendor dictionaries after the standard ones.
++## -*- text -*-
++##
++## Version $Id$
++##
++##	DO NOT EDIT THE FILES IN THIS DIRECTORY
++##
++##	The files in this directory are maintained and updated by
++##	the FreeRADIUS project.  Newer releases of software may update
++##	or change these files.
++##
++##	Use the main dictionary file (usually /etc/raddb/dictionary)
++##	for local system attributes and $INCLUDEs.
++##
++##
++##
++##	This file contains dictionary translations for parsing
++##	requests and generating responses.  All transactions are
++##	composed of Attribute/Value Pairs.  The value of each attribute
++##	is specified as one of 4 data types.  Valid data types are:
++##
++##	text       - printable, generally UTF-8 encoded (subset of 'string')
++##	string     - 0-253 octets
++##	ipaddr     - 4 octets in network byte order
++##	integer    - 32 bit value in big endian order (high byte first)
++##	date       - 32 bit value in big endian order - seconds since
++##		     00:00:00 GMT,  Jan.  1,  1970
++##	ifid       - 8 octets in network byte order
++##	ipv6addr   - 16 octets in network byte order
++##	ipv6prefix - 18 octets in network byte order
++##	ether      - 6 octets of hh:hh:hh:hh:hh:hh
++##		     where 'h' is hex digits, upper or lowercase.
++##
++##	FreeRADIUS includes extended data types which are not defined
++##	in the RFC's.  These data types are:
++##
++##	abinary - Ascend's binary filter format.
++##	octets  - raw octets, printed and input as hex strings.
++##		  e.g.: 0x123456789abcdef
++##
++##
++##	Enumerated values are stored in the user file with dictionary
++##	VALUE translations for easy administration.
++##
++##	Example:
++##
++##	ATTRIBUTE	  VALUE
++##	---------------   -----
++##	Framed-Protocol = PPP
++##	7		= 1	(integer encoding)
++##
  #
 -$INCLUDE dictionary.3com
 -$INCLUDE dictionary.3gpp
@@ -30,10 +152,40 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -$INCLUDE dictionary.bintec
 -$INCLUDE dictionary.cablelabs
 -$INCLUDE dictionary.cabletron
+-$INCLUDE dictionary.chillispot
 -$INCLUDE dictionary.cisco
++##
++##	Include compatibility dictionary for older users file. Move
++##	this directive to the end of this file if you want to see the
++##	old names in the logfiles, INSTEAD OF the new names.
++##
++##$INCLUDE dictionary.compat
  #
- #	 The Cisco VPN300 dictionary is the same as the altiga one.
- #	 You shouldn't use both at the same time.
+-#	 The Cisco VPN300 dictionary is the same as the altiga one.
+-#	 You shouldn't use both at the same time.
++##
++##	Include the RFC dictionaries next.
++##
++##	For a complete list of the standard attributes and values,
++##	see:
++##		http://www.iana.org/assignments/radius-types
++##
++#$INCLUDE dictionary.rfc2865
++#$INCLUDE dictionary.rfc2866
++#$INCLUDE dictionary.rfc2867
++#$INCLUDE dictionary.rfc2868
++#$INCLUDE dictionary.rfc2869
++#$INCLUDE dictionary.rfc3162
++#$INCLUDE dictionary.rfc3576
++#$INCLUDE dictionary.rfc3580
++#$INCLUDE dictionary.rfc4072
++#$INCLUDE dictionary.rfc4372
++#$INCLUDE dictionary.rfc4675
++#$INCLUDE dictionary.rfc4679
++#$INCLUDE dictionary.rfc4818
++#$INCLUDE dictionary.rfc4849
++#$INCLUDE dictionary.rfc5176
++#$INCLUDE dictionary.rfc5580
  #
 -#$INCLUDE dictionary.cisco.vpn3000
 -$INCLUDE dictionary.cisco.vpn5000
@@ -47,6 +199,43 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -$INCLUDE dictionary.erx
 -$INCLUDE dictionary.ericsson
 -$INCLUDE dictionary.extreme
++##
++##	Include vendor dictionaries after the standard ones.
++##
++#$INCLUDE dictionary.3com
++#$INCLUDE dictionary.3gpp
++#$INCLUDE dictionary.3gpp2
++#$INCLUDE dictionary.acc
++#$INCLUDE dictionary.airespace
++#$INCLUDE dictionary.alcatel
++#$INCLUDE dictionary.alteon
++#$INCLUDE dictionary.alvarion
++#$INCLUDE dictionary.apc
++#$INCLUDE dictionary.aruba
++#$INCLUDE dictionary.azaire
++#$INCLUDE dictionary.ascend
++#$INCLUDE dictionary.bay
++#$INCLUDE dictionary.bintec