Merge branch 'master' of git+ssh://openadk.org/git/openadk

23 files changed, 111 insertions, 120 deletions

diff --git a/package/Config.in b/package/Config.in
index 68c81aad1..1a5a05ea2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -260,6 +260,7 @@ source "package/libpcap/Config.in"
 source "package/libpcap/Config.in.lib"
 source "package/libpri/Config.in"
 source "package/libpri/Config.in.lib"
+source "package/lvm/Config.in.lib"
 source "package/pango/Config.in"
 source "package/pcre/Config.in"
 source "package/pcre/Config.in.lib"
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index bebd71ef9..595bae027 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.6.2.1
+PKG_VERSION:=		1.6.2.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8fbc60f9d80e686c749ae95292e225d8
+PKG_MD5SUM:=		9d1f7bcf6833605ced4b2740d14bd576
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
diff --git a/package/bash/Makefile b/package/bash/Makefile
index 82b6c2334..b06ee4991 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bash
-PKG_VERSION:=		4.0
+PKG_VERSION:=		4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a90a1b5a6db4838483f05438e05e8eb9
+PKG_MD5SUM:=		9800d8724815fd84994d9be65ab5e7b8
 PKG_DESCR:=		Bourne-Again SHell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.gnu.org/software/bash/
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 70ff2f923..eb6eb46da 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bind
-PKG_VERSION:=		9.6.1-P3
+PKG_VERSION:=		9.7.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a0952d589b3051538033387be4c983f9
+PKG_MD5SUM:=		c245b5d1aa0a4f53d9538faa1efe2c3f
 PKG_DESCR:=		popular DNS server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libbind libxml2
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index c9298e15d..b82e67e51 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -6,13 +6,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cryptinit
 PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		cryptsetup
+PKG_BUILDDEP+=		cryptsetup lvm
 PKG_DESCR:=		init for encrypted rootfilesystem
 PKG_SECTION:=		base
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
+CFLINE_CRYPTINIT:=	depends on ADK_TARGET_ROOTFS_ENCRYPTED
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/git/Makefile b/package/git/Makefile
index 4fb5abf26..fb9f114a3 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.6
+PKG_VERSION:=		1.7.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		08af805fd59f68d9ad00a2f878cf820e
+PKG_MD5SUM:=		05485caf5c503ce378a87759bc3a0509
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 8d1430ea7..4db94344a 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.22.2
+PKG_VERSION:=		2.22.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		00eb873975e2ef9361b8177131c7c943
+PKG_MD5SUM:=		e699a93d62c01e0ee07caef3e11eddd8
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		gettext libiconv libpthread
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index c6a911370..511663c2b 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -4,16 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxml2
-PKG_VERSION:=		2.7.3
+PKG_VERSION:=		2.7.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8f4fda3969237c2a33bdb1583b5d06b2
+PKG_MD5SUM:=		7740a8ec23878a2f50120e1faa2730f2
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.xmlsoft.org/
-PKG_SITES:=		http://xmlsoft.org/sources/ \
-			ftp://fr.rpmfind.net/pub/libxml/
+PKG_SITES:=		http://xmlsoft.org/sources/
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index d67bbc43e..5013b1645 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,16 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lvm
-PKG_VERSION:=		2.02.51
+PKG_VERSION:=		2.02.61
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		725d07794007e021bfc592b1636100c7
+PKG_MD5SUM:=		0fdac768c78d96525d47b5a3df4c67de
 PKG_DESCR:=		logical volume management
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		device-mapper libncurses
+PKG_DEPENDS:=		libdevmapper libncurses
 PKG_URL:=		http://sourceware.org/lvm2/
 PKG_SITES:=		ftp://sources.redhat.com/pub/lvm2/
 
-PKG_DESCR_DM:=		device-mapper library and utility
+PKG_DESCR_DM:=		device-mapper utility
+PKG_DESCR_LIBDM:=	device-mapper library
 DISTFILES:=		LVM2.${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/LVM2.${PKG_VERSION}
 
@@ -21,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
@@ -30,12 +32,14 @@ post-install:
 	# lvm
 	${INSTALL_DIR} ${IDIR_LVM}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm
-	# device-mapper
-	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
+	# libdevmapper
+	${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
-		${IDIR_DEVICE_MAPPER}/usr/lib
+		${IDIR_LIBDEVMAPPER}/usr/lib
+	chmod u+w ${IDIR_LIBDEVMAPPER}/usr/lib/*.so*
+	# device-mapper
+	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
 		${IDIR_DEVICE_MAPPER}/usr/sbin
-	chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so*
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index d0e22571f..fd15b0060 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,15 +1,15 @@
---- LVM2.2.02.51.orig/Makefile.in	2009-07-31 13:49:53.000000000 +0200
-+++ LVM2.2.02.51/Makefile.in	2009-08-22 15:24:06.000000000 +0200
-@@ -16,7 +16,7 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+--- LVM2.2.02.61.orig/Makefile.in	2009-10-02 21:10:31.000000000 +0200
++++ LVM2.2.02.61/Makefile.in	2010-03-03 19:43:58.976123551 +0100
+@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
  VPATH = @srcdir@
  
 -SUBDIRS = doc include man scripts
-+SUBDIRS = doc include
++SUBDIRS = include
  
  ifeq ("@UDEV_RULES@", "yes")
    SUBDIRS += udev
-@@ -60,7 +60,7 @@ po: tools daemons
+@@ -64,7 +64,7 @@ po: tools daemons
  libdm.device-mapper: include.device-mapper
  daemons.device-mapper: libdm.device-mapper
  tools.device-mapper: libdm.device-mapper
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
deleted file mode 100644
index 381e0ceea..000000000
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-bsd compatibility
---- LVM2.2.02.51.orig/doc/Makefile.in	2009-05-11 12:28:46.000000000 +0200
-+++ LVM2.2.02.51/doc/Makefile.in	2009-08-22 15:24:06.000000000 +0200
-@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl
- install_lvm2:
- 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
- 		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
--		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
-+		@INSTALL@ -d $(confdir); \
-+		@INSTALL@ $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
- 			$(confdir)/$(CONFDEST); \
- 	fi
- 
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 0a7799b33..259f0f9d3 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,41 +1,21 @@
-always install static library
---- LVM2.2.02.51.orig/libdm/Makefile.in	Wed Apr  8 16:04:35 2009
-+++ LVM2.2.02.51/libdm/Makefile.in	Mon Feb 15 23:25:01 2010
-@@ -34,9 +34,9 @@ SOURCES =\
- 
- INCLUDES = -I$(interface) -I.
- 
--ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
--endif
-+#endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
-   LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -59,9 +59,9 @@ device-mapper: all
- 
- INSTALL_TYPE = install_dynamic
- 
--ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
-   INSTALL_TYPE += install_static
--endif
-+#endif
- 
- ifeq ("@PKGCONFIG@", "yes")
-   INSTALL_TYPE += install_pkgconfig
-@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include
+--- LVM2.2.02.61.orig/libdm/Makefile.in	2009-10-02 21:10:36.000000000 +0200
++++ LVM2.2.02.61/libdm/Makefile.in	2010-03-03 19:48:02.316248648 +0100
+@@ -73,26 +73,32 @@ install: $(INSTALL_TYPE) install_include
  install_device-mapper: install
  
  install_include:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
 +	$(INSTALL) -d $(includedir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
  		$(includedir)/libdevmapper.h
  
  install_dynamic: install_@interface@
-@@ -83,15 +84,17 @@ install_static: install_@interface@_static
++	$(INSTALL) -d $(libdir)
+ 	$(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
+ 		$(libdir)/libdevmapper.$(LIB_SUFFIX)
+ 
+ install_static: install_@interface@_static
++	$(INSTALL) -d $(libdir)
  	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
  
  install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
@@ -52,6 +32,7 @@ always install static library
  
  install_ioctl_static: ioctl/libdevmapper.a
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -d $(libdir)
 +	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
  
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 8d6e49a3f..ae6fcbf8f 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,33 +1,28 @@
---- LVM2.2.02.51.orig/tools/Makefile.in	Thu May 21 13:11:29 2009
-+++ LVM2.2.02.51/tools/Makefile.in	Mon Feb 15 23:30:04 2010
-@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
- 
- .commands: commands.h cmdnames.h Makefile
- 	$(CC) -E -P cmdnames.h 2> /dev/null | \
--		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
-+		egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands
- 
- .PHONY: install_cmdlib_dynamic install_cmdlib_static \
- 	install_tools_dynamic install_tools_static
-@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
+--- LVM2.2.02.61.orig/tools/Makefile.in	2010-01-19 02:10:47.000000000 +0100
++++ LVM2.2.02.61/tools/Makefile.in	2010-03-03 19:46:06.396138753 +0100
+@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
  endif
  
  install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 +	$(INSTALL) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
  	$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
- 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++	$(INSTALL) -d $(includedir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
  		$(includedir)/lvm2cmd.h
  
  install_cmdlib_static: liblvm2cmd-static.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 +	$(INSTALL) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
  	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++	$(INSTALL) -d $(includedir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
  		$(includedir)/lvm2cmd.h
  
  install_tools_dynamic: lvm .commands
@@ -37,13 +32,13 @@
  		$(sbindir)/lvm
  	@echo Creating symbolic links for individual commands in $(sbindir)
  	@( \
-@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
+@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
  	)
  
  install_tools_static: lvm.static
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 +	$(INSTALL) -d $(sbindir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(staticdir)/lvm.static
  
  install_dmsetup_dynamic: dmsetup
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 3aa1a16f7..77cd7cf7c 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		moc
-PKG_VERSION:=		2.4.4
+PKG_VERSION:=		2.5.0-alpha4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		647c770a5542a4ae5437386807a89796
+PKG_MD5SUM:=		2dd0cb6481d77fda09c58ec3154a21c0
 PKG_DESCR:=		console music player
 PKG_SECTION:=		sound
 PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg libiconv
@@ -14,7 +14,7 @@ PKG_DEPENDS+=		libncurses libid3tag
 PKG_BUILDDEP+=		ncurses libvorbis curl libmad flac ffmpeg libiconv
 PKG_BUILDDEP+=		libid3tag
 PKG_URL:=		http://moc.daper.net
-PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/stable/
+PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/unstable/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure
index 0968574d6..2330e0f4c 100644
--- a/package/moc/patches/patch-configure
+++ b/package/moc/patches/patch-configure
@@ -1,6 +1,6 @@
---- moc-2.4.4.orig/configure	2009-01-04 09:28:51.000000000 +0100
-+++ moc-2.4.4/configure	2010-02-06 01:22:38.464334671 +0100
-@@ -13910,7 +13910,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
+--- moc-2.5.0-alpha4.orig/configure	2009-09-25 10:54:41.000000000 +0200
++++ moc-2.5.0-alpha4/configure	2010-03-06 11:37:45.867276809 +0100
+@@ -17669,7 +17669,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
  PLUGIN_LDFLAGS='-module -avoid-version'
  
  
@@ -9,12 +9,12 @@
  
  case "$OS" in
  	Linux)
-@@ -13929,7 +13929,7 @@ _ACEOF
+@@ -17688,7 +17688,7 @@ _ACEOF
  		;;
  esac
  
 -LDFLAGS="$LDFLAGS -export-dynamic"
 +LDFLAGS="$LDFLAGS"
  
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c
new file mode 100644
index 000000000..b5e9ca676
--- /dev/null
+++ b/package/moc/patches/patch-options_c
@@ -0,0 +1,11 @@
+--- moc-2.5.0-alpha4.orig/options.c	2009-09-16 12:04:53.000000000 +0200
++++ moc-2.5.0-alpha4/options.c	2010-03-06 11:38:50.596035001 +0100
+@@ -327,7 +327,7 @@ static void option_add_symb (const char 
+ 		char *val = va_arg (va, char *);
+ 		if (strlen (val) == 0 ||
+ 		    strlen (val) != strspn (val, valid) ||
+-		    index (first, val[0]) != NULL)
++		    strchr (first, val[0]) != NULL)
+ 			fatal ("Invalid symbol in '%s' constraint list.", name);
+ 		((char **) options[pos].constraints)[ix] = xstrdup (val);
+ 		if (!strcasecmp (val, value))
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 644a87271..542f72d9a 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		readline
-PKG_VERSION:=		5.2
+PKG_VERSION:=		6.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e39331f32ad14009b9ff49cc10c5e751
+PKG_MD5SUM:=		fc2f7e714fe792db1ce6ddc4c9fb4ef3
 PKG_DESCR:=		Command line editing library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses
@@ -21,8 +21,8 @@ CONFIGURE_ARGS+= 	--with-curses
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libhistory.so.* ${IDIR_LIBREADLINE}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libreadline.so.* ${IDIR_LIBREADLINE}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib/
 	chmod u+w ${IDIR_LIBREADLINE}/usr/lib/*
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index b106d11a0..e95c9e6b5 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -17,6 +17,8 @@ $(eval $(call PKG_template,SETSERIAL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
 
 INSTALL_STYLE:=         manual
 
+TCFLAGS+=		-DFIOQSIZE=1
+
 do-install:
 	${INSTALL_DIR} ${IDIR_SETSERIAL}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/setserial ${IDIR_SETSERIAL}/usr/sbin/
diff --git a/package/setserial/patches/patch-setserial_c b/package/setserial/patches/patch-setserial_c
new file mode 100644
index 000000000..ec2cb3c84
--- /dev/null
+++ b/package/setserial/patches/patch-setserial_c
@@ -0,0 +1,10 @@
+--- setserial-2.17.orig/setserial.c	2000-01-27 16:40:52.000000000 +0100
++++ setserial-2.17/setserial.c	2010-03-05 17:42:26.316553683 +0100
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <termios.h>
+ #include <string.h>
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index bfa99f834..5e311d358 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		shorewall-common
 PKG_VERSION:=		4.0.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2df43356b1fdbc91920d48c5595aa101
 PKG_DESCR:=		high-level netfilter configuration tool
 PKG_SECTION:=		net
@@ -17,7 +17,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SHOREWALL,shorewall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -41,7 +41,7 @@ endif
 do-install:
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
-	${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
+	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
 		${IDIR_SHOREWALL}/etc/shorewall/
 	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
@@ -66,6 +66,6 @@ do-install:
 		${IDIR_SHOREWALL}/usr/share/shorewall/
 	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup \
 		${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
+	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index b1f772faa..bdda82b64 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		srelay
-PKG_VERSION:=		0.4.7b2
+PKG_VERSION:=		0.4.7p3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		73904ecbb5d305135b3e8907ce7d0513
+PKG_MD5SUM:=		214ca8bc476c5e0eab54adb01972be6a
 PKG_DESCR:=		A socks 4/5 proxy server
 PKG_SECTION:=		net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=socks-relay/}
@@ -17,7 +17,6 @@ $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 
 INSTALL_STYLE:=		manual
 
-CONFIGURE_ENV+=		ac_cv_lib_nsl_getaddrinfo=no
 CONFIGURE_ARGS+=	--disable-thread \
 			--with-libwrap=no
 
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index fcae1474c..3af2bc6da 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		subversion
-PKG_VERSION:=		1.6.6
+PKG_VERSION:=		1.6.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0ab0f26f6eb056add1b9d3059a3f4247
+PKG_MD5SUM:=		facaa0ee78c8f24b9af12c74662bbd24
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat libsqlite
@@ -50,7 +50,7 @@ INSTALL_TARGET:=	external-install local-install
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib}
-	${CP} ${WRKINST}/usr/bin/* ${IDIR_SUBVERSION}/usr/bin
-	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_SUBVERSION}/usr/lib
+	${INSTALL_BIN} ${WRKINST}/usr/bin/svn ${IDIR_SUBVERSION}/usr/bin
+	${CP} ${WRKINST}/usr/lib/libsvn*.so* ${IDIR_SUBVERSION}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tor/Makefile b/package/tor/Makefile
index 414d50a30..b6e1fc093 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tor
-PKG_VERSION:=		0.2.1.20
+PKG_VERSION:=		0.2.1.24
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0d62ee2332fdd95de43debac7435df19
+PKG_MD5SUM:=		cb5629b2709ada82d34c22fef3ed77a9
 PKG_DESCR:=		An anonymous Internet communication system
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libevent libopenssl zlib libpthread