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

5 files changed, 86 insertions, 12 deletions

diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index f8ea5e1b7..4ee013601 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libgcrypt
-PKG_VERSION:=		1.4.1
+PKG_VERSION:=		1.4.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		555488ddfc81a6e0df1fb5112e7eee13
+PKG_MD5SUM:=		9e6dcf7fef1ae96b57207a1de91fdaa4
 PKG_DESCR:=		GNU crypto library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgpg-error
diff --git a/package/libgcrypt/patches/patch-mpi_longlong_h b/package/libgcrypt/patches/patch-mpi_longlong_h
new file mode 100644
index 000000000..0afce135e
--- /dev/null
+++ b/package/libgcrypt/patches/patch-mpi_longlong_h
@@ -0,0 +1,67 @@
+--- libgcrypt-1.4.4.orig/mpi/longlong.h	2008-08-19 17:20:03.000000000 +0200
++++ libgcrypt-1.4.4/mpi/longlong.h	2009-06-14 19:45:28.000000000 +0200
+@@ -710,18 +710,35 @@ extern USItype __udiv_qrnnd ();
+ #endif /* __m88110__ */
+ #endif /* __m88000__ */
+ 
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min)  0
++#endif
++
+ /***************************************
+  **************  MIPS  *****************
+  ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                 \
++    UDItype __ll = (UDItype)(u) * (v);                                 \
++    w1 = __ll >> 32;                                                   \
++    w0 = __ll;                                                         \
++  } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3"                                                \
+ 	   : "=l" ((USItype)(w0)),                                      \
+ 	     "=h" ((USItype)(w1))                                       \
+ 	   : "d" ((USItype)(u)),                                        \
+ 	     "d" ((USItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3 \n" \
+ 	   "mflo %0 \n"     \
+@@ -739,14 +756,24 @@ extern USItype __udiv_qrnnd ();
+  **************  MIPS/64  **************
+  ***************************************/
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {                                                                 \
++    typedef unsigned int __ll_UTItype __attribute__((mode(TI)));       \
++    __ll_UTItype __ll = (__ll_UTItype)(u) * (v);                       \
++    w1 = __ll >> 64;                                                   \
++    w0 = __ll;                                                         \
++  } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3"                                               \
+ 	   : "=l" ((UDItype)(w0)),                                      \
+ 	     "=h" ((UDItype)(w1))                                       \
+ 	   : "d" ((UDItype)(u)),                                        \
+ 	     "d" ((UDItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3 \n"    \
+ 	   "mflo %0 \n"         \
diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init
index d71797a0d..97b883a11 100644
--- a/package/mpd/files/mpd.init
+++ b/package/mpd/files/mpd.init
@@ -11,6 +11,12 @@ autostart)
 	exec sh $0 start
 	;;
 start)
+	# check group membership
+	id mpd | grep audio >/dev/null 2>&1
+	if [ $? -ne 0 ];then
+		echo "mpd user must be in group audio."
+		exit 1
+	fi
 	mpd
 	;;
 stop)
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index 58e0fa6bf..19df602aa 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -2,9 +2,6 @@ config ADK_PACKAGE_RTORRENT
 	prompt "rtorrent........................... console bittorrent client"
 	tristate
 	depends on ADK_CXX
-	# libtorrent / rtorrent does not work with uclibc++
-	# with gcc 4.4 libstdc++ needs TLS in uClibc
-	depends on ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBTORRENT
 	select ADK_PACKAGE_LIBCURL
@@ -16,17 +13,10 @@ choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_RTORRENT
 default ADK_COMPILE_RTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
-default ADK_COMPILE_RTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_RTORRENT_WITH_STDCXX
 	bool "Standard C++ library"
 	select ADK_PACKAGE_LIBSTDCXX
 	help
 
-config ADK_COMPILE_RTORRENT_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends ADK_BROKEN
-	help
-
 endchoice
diff --git a/package/squid/patch-src_HttpHeaderTools_cc b/package/squid/patch-src_HttpHeaderTools_cc
new file mode 100644
index 000000000..3b456ebf5
--- /dev/null
+++ b/package/squid/patch-src_HttpHeaderTools_cc
@@ -0,0 +1,11 @@
+--- squid-3.0.STABLE15.orig/src/HttpHeaderTools.cc	2009-05-06 13:11:40.000000000 +0200
++++ squid-3.0.STABLE15/src/HttpHeaderTools.cc	2009-06-15 18:29:41.000000000 +0200
+@@ -356,7 +356,7 @@ httpHeaderParseQuotedString (const char 
+     pos = start + 1;
+ 
+     while (1) {
+-        if (!(end = index (pos,'"'))) {
++        if (!(end = strchr (pos,'"'))) {
+             debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+             return 0;
+         }