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

36 files changed, 255 insertions, 427 deletions

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index d234b8a57..ecb33b52d 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26.3
+PKG_VERSION:=		1.4.27.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		04017dfdc8caeb8f4663b5dc4a9e1019
+PKG_MD5SUM:=		e09ca163a6e90018c92c65a50b9ec398
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
@@ -121,8 +121,8 @@ pre-configure:
 
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.15.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.15.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz
 	@echo
 	@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
 	@echo
diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c
new file mode 100644
index 000000000..f39c2bf5b
--- /dev/null
+++ b/package/asterisk/patches/patch-channels_chan_iax2_c
@@ -0,0 +1,20 @@
+--- asterisk-1.4.27.1.orig/channels/chan_iax2.c	2009-11-10 18:15:57.000000000 +0100
++++ asterisk-1.4.27.1/channels/chan_iax2.c	2009-12-03 20:57:05.000000000 +0100
+@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2
+ 	
+ 	memset(&ied, 0, sizeof(ied));
+ 	if (ies->apparent_addr)
+-		bcopy(ies->apparent_addr, &new, sizeof(new));
++		memcpy(&new, ies->apparent_addr, sizeof(new));
+ 	if (ies->callno)
+ 		newcall = ies->callno;
+ 	if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
+@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_
+ 
+ 	memset(&us, 0, sizeof(us));
+ 	if (ies->apparent_addr)
+-		bcopy(ies->apparent_addr, &us, sizeof(us));
++		memcpy(&us, ies->apparent_addr, sizeof(us));
+ 	if (ies->username)
+ 		ast_copy_string(peer, ies->username, sizeof(peer));
+ 	if (ies->refresh)
diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c
new file mode 100644
index 000000000..33e9aaad7
--- /dev/null
+++ b/package/asterisk/patches/patch-channels_chan_oss_c
@@ -0,0 +1,37 @@
+--- asterisk-1.4.27.1.orig/channels/chan_oss.c	2009-08-10 21:15:57.000000000 +0200
++++ asterisk-1.4.27.1/channels/chan_oss.c	2009-12-03 20:58:13.000000000 +0100
+@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
+ 				l = FRAME_SIZE - ofs;
+ 			if (l > s->datalen - start)	/* don't overflow the source */
+ 				l = s->datalen - start;
+-			bcopy(s->data + start, myframe + ofs, l * 2);
++			memcpy(myframe + ofs, s->data + start, l * 2);
+ 			if (0)
+ 				ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
+ 			l_sampsent += l;
+@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
+ 			if (l > 0) {
+ 				if (l > FRAME_SIZE - ofs)
+ 					l = FRAME_SIZE - ofs;
+-				bcopy(silence, myframe + ofs, l * 2);
++				memcpy(myframe + ofs, silence, l * 2);
+ 				l_sampsent += l;
+ 			} else {			/* silence is over, restart sound if loop */
+ 				if (s->repeat == 0) {	/* last block */
+ 					o->cursound = -1;
+ 					o->nosound = 0;	/* allow audio data */
+ 					if (ofs < FRAME_SIZE)	/* pad with silence */
+-						bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
++						memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
+ 				}
+ 				l_sampsent = 0;
+ 			}
+@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
+ 
+ 	/* XXX can be simplified returning &ast_null_frame */
+ 	/* prepare a NULL frame in case we don't have enough data to return */
+-	bzero(f, sizeof(struct ast_frame));
++	memset(f, 0, sizeof(struct ast_frame));
+ 	f->frametype = AST_FRAME_NULL;
+ 	f->src = oss_tech.type;
+ 
diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c
new file mode 100644
index 000000000..d8aaf114b
--- /dev/null
+++ b/package/asterisk/patches/patch-main_astobj2_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/main/astobj2.c	2009-10-06 03:16:36.000000000 +0200
++++ asterisk-1.4.27.1/main/astobj2.c	2009-12-03 20:54:12.000000000 +0100
+@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d
+ 		/* for safety, zero-out the astobj2 header and also the
+ 		 * first word of the user-data, which we make sure is always
+ 		 * allocated. */
+-		bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
++		memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) );
+ 		free(obj);
+ 	}
+ 
diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c
new file mode 100644
index 000000000..36d7c3058
--- /dev/null
+++ b/package/asterisk/patches/patch-main_translate_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/main/translate.c	2009-10-21 18:44:49.000000000 +0200
++++ asterisk-1.4.27.1/main/translate.c	2009-12-03 20:53:36.000000000 +0100
+@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples)
+ 	if (option_debug)
+ 		ast_log(LOG_DEBUG, "Resetting translation matrix\n");
+ 
+-	bzero(tr_matrix, sizeof(tr_matrix));
++	memset(tr_matrix, 0, sizeof(tr_matrix));
+ 
+ 	/* first, compute all direct costs */
+ 	AST_LIST_TRAVERSE(&translators, t, list) {
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
new file mode 100644
index 000000000..6bac1894d
--- /dev/null
+++ b/package/asterisk/patches/patch-menuselect-tree
@@ -0,0 +1,12 @@
+--- asterisk-1.4.27.1.orig/menuselect-tree	2009-11-30 19:30:41.000000000 +0100
++++ asterisk-1.4.27.1/menuselect-tree	2009-12-03 20:55:04.000000000 +0100
+@@ -59,9 +59,6 @@
+ <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
+ 	<depend>dahdi</depend>
+ </member>
+-<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
+-        <depend>chan_local</depend>
+-</member>
+ <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
+ </member>
+ <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c
new file mode 100644
index 000000000..a237fbf97
--- /dev/null
+++ b/package/asterisk/patches/patch-res_res_features_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/res/res_features.c	2009-10-20 19:46:37.000000000 +0200
++++ asterisk-1.4.27.1/res/res_features.c	2009-12-03 20:53:57.000000000 +0100
+@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void
+ 	ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
+ 	ast_hangup(tobj->chan);
+ 	ast_hangup(tobj->peer);
+-	bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */
++	memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */
+ 	free(tobj);
+ 	return NULL;
+ }
diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index db8c3a676..e11446366 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -8,7 +8,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 	mount none /tmp -t tmpfs -o size=${size}k
 	mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
 }
-mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev
+mount -o nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 mkdir /dev/pts /dev/shm
 mount -o nosuid,noexec -t devpts devpts /dev/pts
 exec 0<>/dev/console >&0 2>&0
diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update
index 10d6e58c2..0cd4ee713 100755
--- a/package/base-files/extra/sbin/update
+++ b/package/base-files/extra/sbin/update
@@ -6,9 +6,6 @@ if [ $who -ne 0 ]; then
   exit 1
 fi
 
-cd /
-umount -f /etc
-mount -o remount,rw /
 
 check_exit() {
 	if [ $? -ne 0 ];then
@@ -17,17 +14,26 @@ check_exit() {
 	fi
 }
 
+prepare() {
+	cd /
+	umount -f /etc
+	mount -o remount,rw /
+}
+
 extract_from_file() {
+	prepare
         cat $1 | gunzip -c | tar -xf -
 	check_exit
 }
 
 extract_from_ssh() {
+	prepare
         ssh $1 "cat $2" | gunzip -c | tar -xf -
 	check_exit
 }
 
 extract_from_http() {
+	prepare
         wget -O - $1 | gunzip -c | tar -xf -
 	check_exit
 }
diff --git a/package/curl/Makefile b/package/curl/Makefile
index a0e27d77c..69768dc63 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.19.6
+PKG_VERSION:=		7.19.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6625de9d42d1b8d3af372d3241a576fd
+PKG_MD5SUM:=		ecb2e37e45c9933e2a963cabe03670ab
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
 PKG_URL:=		http://curl.haxx.se
@@ -28,7 +28,7 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ARGS+=	--disable-thread \
 			--enable-cookies \
@@ -50,14 +50,14 @@ CONFIGURE_ARGS+=	--disable-thread \
 			--without-ca-bundle \
 			--without-gnutls \
 			--without-libidn
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
-	${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
 	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure
index 3cb59e18e..21c0b095d 100644
--- a/package/curl/patches/patch-configure
+++ b/package/curl/patches/patch-configure
@@ -1,6 +1,6 @@
---- curl-7.19.6.orig/configure	2009-07-22 22:11:25.000000000 +0200
-+++ curl-7.19.6/configure	2009-10-01 14:05:37.578930054 +0200
-@@ -25479,16 +25479,6 @@ fi
+--- curl-7.19.7.orig/configure	2009-11-04 13:26:02.000000000 +0100
++++ curl-7.19.7/configure	2009-12-03 21:07:01.000000000 +0100
+@@ -19233,15 +19233,6 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
  
@@ -9,11 +9,10 @@
 -
 -       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
 -       export LD_LIBRARY_PATH
--       { $as_echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
 -    fi
 -  fi
--
- fi
  
+ fi
  
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index f341614d1..5c8cf0fd5 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openntpd
 PKG_VERSION:=		3.9p1
-PKG_RELEASE:=		17
+PKG_RELEASE:=		18
 PKG_MD5SUM:=		afc34175f38d08867c1403d9008600b3
 PKG_DESCR:=		NTP server daemon
 PKG_SECTION:=		net
diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init
index 42e068860..fd655e9cc 100644
--- a/package/openntpd/files/ntpd.init
+++ b/package/openntpd/files/ntpd.init
@@ -7,7 +7,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $ntpd_flags = NO ]] && exit 0
+	test x"${ntpd:-NO}" = x"NO" && exit 0
         exec sh $0 start
         ;;
 start)
@@ -15,7 +15,7 @@ start)
 	/usr/sbin/ntpd $ntpd_flags
 	;;
 stop)
-	kill $(pidof ntpd|cut -d ' ' -f 3)
+	pkill ntpd
 	;;
 restart)
 	sh $0 stop
diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst
index 53bc8c387..c6d0bd33d 100644
--- a/package/openntpd/files/openntpd.postinst
+++ b/package/openntpd/files/openntpd.postinst
@@ -4,4 +4,5 @@ gid=$(get_next_gid)
 add_group ntp $gid
 add_user ntp $(get_next_uid) $gid /tmp/.ntp
 add_service ntp 123/udp
-add_rcconf 'e.g. "-s"' ntpd_flags
+add_rcconf ntpd_flags ntpd_flags "-s"
+add_rcconf ntpd ntpd NO
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index e2d7ab460..6c3662b71 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		radvd
-PKG_VERSION:=		1.2
+PKG_VERSION:=		1.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		614876420d76cd2bb5bcb49760c8b9e3
+PKG_MD5SUM:=		78598b60ed9d64920739189c3dc0934d
 PKG_DESCR:=		Routing Advertisement Daemon for IPv6
 PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-ipv6
diff --git a/package/rpm/Makefile b/package/rpm/Makefile
index c7cf91c97..8526288be 100644
--- a/package/rpm/Makefile
+++ b/package/rpm/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		rpm
-PKG_VERSION:=		4.7.0
+PKG_VERSION:=		4.7.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		74791d638c571ec79f06227d453a6a03
-PKG_DESCR:=		GNU rpm
+PKG_MD5SUM:=		224715646325df4cd3904e3ac9e16186
+PKG_DESCR:=		Package Manager
 PKG_SECTION:=		base
 PKG_URL:=		http://www.rpm.org
 PKG_SITES:=		http://rpm.org/releases/rpm-4.7.x/
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 0eda1d6c9..44f56502a 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.5.18
+PKG_VERSION:=		4.5.19
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e9449fcee97e6a8ed73934c883c870e0
+PKG_MD5SUM:=		2415e435d61e40315a298c80aced0cda
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		misc
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
diff --git a/package/strace/patches/patch-config_h_in b/package/strace/patches/patch-config_h_in
deleted file mode 100644
index ea06ade61..000000000
--- a/package/strace/patches/patch-config_h_in
+++ /dev/null
@@ -1,15 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/config.h.in	2008-08-28 23:36:28.000000000 +0200
-+++ strace-4.5.18/config.h.in	2009-01-02 21:24:05.414089778 +0100
-@@ -409,6 +409,11 @@
- /* Define for the AMD x86-64 architecture. */
- #undef X86_64
- 
-+/* Define for the CRISv10 architecture. */
-+#undef CRISV10
-+
-+/* Define for the CRISv32 architecture. */
-+#undef CRISV32
- /* Enable GNU extensions on systems that have them.  */
- #ifndef _GNU_SOURCE
- # undef _GNU_SOURCE
diff --git a/package/strace/patches/patch-configure b/package/strace/patches/patch-configure
deleted file mode 100644
index eadd57304..000000000
--- a/package/strace/patches/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/configure	2008-08-28 23:36:06.000000000 +0200
-+++ strace-4.5.18/configure	2009-01-02 21:26:59.664979346 +0100
-@@ -2531,6 +2531,22 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
- 
- 	;;
-+cris|crisv10)
-+	arch=crisv10
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define CRISV10 1
-+_ACEOF
-+
-+	;;
-+crisv32)
-+	arch=crisv32
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define CRISV32 1
-+_ACEOF
-+
-+	;;
- *)
- 	{ echo "$as_me:$LINENO: result: NO!" >&5
- echo "${ECHO_T}NO!" >&6; }
diff --git a/package/strace/patches/patch-configure_ac b/package/strace/patches/patch-configure_ac
deleted file mode 100644
index 28abf1d1a..000000000
--- a/package/strace/patches/patch-configure_ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/configure.ac	2008-08-28 23:15:56.000000000 +0200
-+++ strace-4.5.18/configure.ac	2009-01-02 21:24:05.482095139 +0100
-@@ -103,6 +103,14 @@ x86?64*)
- 	arch=x86_64
- 	AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
- 	;;
-+cris|crisv10)
-+	arch=crisv10
-+	AC_DEFINE([CRISV10], 1, [Define for the CRISv10 architecture.])
-+	;;
-+crisv32)
-+	arch=crisv32
-+	AC_DEFINE([CRISV32], 1, [Define for the CRISv32 architecture.])
-+	;;
- *)
- 	AC_MSG_RESULT([NO!])
- 	AC_MSG_ERROR([architecture $host_cpu is not supported by strace])
diff --git a/package/strace/patches/patch-linux_arm_syscallent_h b/package/strace/patches/patch-linux_arm_syscallent_h
deleted file mode 100644
index 387490267..000000000
--- a/package/strace/patches/patch-linux_arm_syscallent_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- strace-4.5.18.orig/linux/arm/syscallent.h	2008-07-18 03:23:49.000000000 +0200
-+++ strace-4.5.18/linux/arm/syscallent.h	2009-11-22 21:27:48.660576873 +0100
-@@ -431,6 +431,7 @@
- 	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
- 	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
- 
-+#ifndef __ARM_EABI__
- #if SYS_socket_subcall != 400
-  #error fix me
- #endif
-@@ -481,3 +482,4 @@
- 	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
- 	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
- 	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
-+#endif
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
new file mode 100644
index 000000000..a0dc31029
--- /dev/null
+++ b/package/strace/patches/patch-net_c
@@ -0,0 +1,10 @@
+--- strace-4.5.19.orig/net.c	2009-09-01 21:53:29.000000000 +0200
++++ strace-4.5.19/net.c	2009-12-03 23:35:36.000000000 +0100
+@@ -53,6 +53,7 @@
+ #include <net/if.h>
+ #if defined(LINUX)
+ #include <asm/types.h>
++#include <linux/netlink.h>
+ #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
+ #  include <netipx/ipx.h>
+ #else
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
deleted file mode 100644
index 7309200d0..000000000
--- a/package/strace/patches/patch-process_c
+++ /dev/null
@@ -1,109 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/process.c	2008-07-18 04:16:47.000000000 +0200
-+++ strace-4.5.18/process.c	2009-01-02 21:24:05.490094969 +0100
-@@ -584,7 +584,7 @@ extern void print_ldt_entry();
- #  define ARG_PTID	(known_scno(tcp) == SYS_clone2 ? 3 : 2)
- #  define ARG_CTID	(known_scno(tcp) == SYS_clone2 ? 4 : 3)
- #  define ARG_TLS	(known_scno(tcp) == SYS_clone2 ? 5 : 4)
--# elif defined S390 || defined S390X
-+# elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32
- #  define ARG_STACK	0
- #  define ARG_FLAGS	1
- #  define ARG_PTID	2
-@@ -740,6 +740,10 @@ int new;
-                                    0x100000 | new) < 0)
-                        return -1;
-        return 0;
-+#elif defined(CRISV10) || defined(CRISV32)
-+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_R9), new) < 0)
-+		return -1;
-+	return 0;
- #elif defined(ARM)
-        /* Some kernels support this, some (pre-2.6.16 or so) don't.  */
- # ifndef PTRACE_SET_SYSCALL
-@@ -3003,7 +3007,77 @@ const struct xlat struct_user_offsets[] 
- 	{ 69,			"fpcsr"					},
- 	{ 70,			"fpeir"					},
- #endif
-+#ifdef CRISV10
-+	{ 4*PT_FRAMETYPE, "4*PT_FRAMETYPE" },
-+	{ 4*PT_ORIG_R10, "4*PT_ORIG_R10" },
-+	{ 4*PT_R13, "4*PT_R13" },
-+	{ 4*PT_R12, "4*PT_R12" },
-+	{ 4*PT_R11, "4*PT_R11" },
-+	{ 4*PT_R10, "4*PT_R10" },
-+	{ 4*PT_R9, "4*PT_R9" },
-+	{ 4*PT_R8, "4*PT_R8" },
-+	{ 4*PT_R7, "4*PT_R7" },
-+	{ 4*PT_R6, "4*PT_R6" },
-+	{ 4*PT_R5, "4*PT_R5" },
-+	{ 4*PT_R4, "4*PT_R4" },
-+	{ 4*PT_R3, "4*PT_R3" },
-+	{ 4*PT_R2, "4*PT_R2" },
-+	{ 4*PT_R1, "4*PT_R1" },
-+	{ 4*PT_R0, "4*PT_R0" },
-+	{ 4*PT_MOF, "4*PT_MOF" },
-+	{ 4*PT_DCCR, "4*PT_DCCR" },
-+	{ 4*PT_SRP, "4*PT_SRP" },
-+	{ 4*PT_IRP, "4*PT_IRP" },
-+	{ 4*PT_CSRINSTR, "4*PT_CSRINSTR" },
-+	{ 4*PT_CSRADDR, "4*PT_CSRADDR" },
-+	{ 4*PT_CSRDATA, "4*PT_CSRDATA" },
-+	{ 4*PT_USP, "4*PT_USP" },
-+#endif
-+#ifdef CRISV32
-+	{ 4*PT_ORIG_R10, "4*PT_ORIG_R10" },
-+	{ 4*PT_R0, "4*PT_R0" },
-+	{ 4*PT_R1, "4*PT_R1" },
-+	{ 4*PT_R2, "4*PT_R2" },
-+	{ 4*PT_R3, "4*PT_R3" },
-+	{ 4*PT_R4, "4*PT_R4" },
-+	{ 4*PT_R5, "4*PT_R5" },
-+	{ 4*PT_R6, "4*PT_R6" },
-+	{ 4*PT_R7, "4*PT_R7" },
-+	{ 4*PT_R8, "4*PT_R8" },
-+	{ 4*PT_R9, "4*PT_R9" },
-+	{ 4*PT_R10, "4*PT_R10" },
-+	{ 4*PT_R11, "4*PT_R11" },
-+	{ 4*PT_R12, "4*PT_R12" },
-+	{ 4*PT_R13, "4*PT_R13" },
-+	{ 4*PT_ACR, "4*PT_ACR" },
-+	{ 4*PT_SRS, "4*PT_SRS" },
-+	{ 4*PT_MOF, "4*PT_MOF" },
-+	{ 4*PT_SPC, "4*PT_SPC" },        
-+	{ 4*PT_CCS, "4*PT_CCS" },
-+	{ 4*PT_SRP, "4*PT_SRP" },
-+	{ 4*PT_ERP, "4*PT_ERP" },
-+	{ 4*PT_EXS, "4*PT_EXS" },
-+	{ 4*PT_EDA, "4*PT_EDA" },
-+	{ 4*PT_USP, "4*PT_USP" },
-+	{ 4*PT_PPC, "4*PT_PPC" },
-+	{ 4*PT_BP_CTRL, "4*PT_BP_CTRL" },
-+	{ 4*PT_BP+4, "4*PT_BP+4" },
-+	{ 4*PT_BP+8, "4*PT_BP+8" },
-+	{ 4*PT_BP+12, "4*PT_BP+12" },
-+	{ 4*PT_BP+16, "4*PT_BP+16" },
-+	{ 4*PT_BP+20, "4*PT_BP+20" },
-+	{ 4*PT_BP+24, "4*PT_BP+24" },
-+	{ 4*PT_BP+28, "4*PT_BP+28" },
-+	{ 4*PT_BP+32, "4*PT_BP+32" },
-+	{ 4*PT_BP+36, "4*PT_BP+36" },
-+	{ 4*PT_BP+40, "4*PT_BP+40" },
-+	{ 4*PT_BP+44, "4*PT_BP+44" },
-+	{ 4*PT_BP+48, "4*PT_BP+48" },
-+	{ 4*PT_BP+52, "4*PT_BP+52" },
-+	{ 4*PT_BP+56, "4*PT_BP+56" },
-+#endif
- 
-+#if !defined(CRISV10) && !defined(CRISV32)
- #if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64)
- 	{ uoff(u_fpvalid),	"offsetof(struct user, u_fpvalid)"	},
- #endif
-@@ -3041,6 +3115,7 @@ const struct xlat struct_user_offsets[] 
- #if defined(I386) || defined(X86_64)
- 	{ uoff(u_debugreg),	"offsetof(struct user, u_debugreg)"	},
- #endif /* I386 */
-+#endif /* !CRISV10/!CRISV32 */
- #endif /* !IA64 */
- #endif /* !ALPHA */
- #endif /* !POWERPC/!SPARC */
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c
deleted file mode 100644
index 76795fbf6..000000000
--- a/package/strace/patches/patch-signal_c
+++ /dev/null
@@ -1,42 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/signal.c	2008-08-20 03:59:40.000000000 +0200
-+++ strace-4.5.18/signal.c	2009-01-02 21:24:05.502094888 +0100
-@@ -1485,9 +1485,38 @@ struct tcb *tcp;
- 	}
- 	return 0;
- #else
-+#if defined(CRISV10) || defined(CRISV32)
-+	struct sigcontext sc;
-+	
-+	if (entering(tcp)) {
-+	   long regs[PT_MAX+1];
-+
-+	   tcp->u_arg[0] = 0;
-+
-+	   if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) {
-+			perror("sigreturn: PTRACE_GETREGS");
-+			return 0;
-+	   }
-+	   if (umove(tcp, regs[PT_USP], &sc) < 0)
-+			return 0;
-+	   tcp->u_arg[0] = 1;
-+	   tcp->u_arg[1] = sc.oldmask;
-+   } else {
-+	   sigset_t sigm;
-+
-+	   long_to_sigset(tcp->u_arg[1], &sigm);
-+	   tcp->u_rval = tcp->u_error = 0;
-+	   if (tcp->u_arg[0] == 0)
-+			return 0;
-+	   tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
-+	   return RVAL_NONE | RVAL_STR;
-+   }
-+   return 0;
-+#else
- #warning No sys_sigreturn() for this architecture
- #warning         (no problem, just a reminder :-)
- 	return 0;
-+#endif /* !CRISV10/!CRISV32 */
- #endif /* MIPS */
- #endif /* LINUX_MIPSN32 || LINUX_MIPSN64 */
- #endif /* SPARC || SPARC64 */
diff --git a/package/strace/patches/patch-syscall_c b/package/strace/patches/patch-syscall_c
deleted file mode 100644
index 700d9be09..000000000
--- a/package/strace/patches/patch-syscall_c
+++ /dev/null
@@ -1,81 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/syscall.c	2008-08-25 05:16:26.000000000 +0200
-+++ strace-4.5.18/syscall.c	2009-01-02 21:24:05.514097112 +0100
-@@ -772,6 +772,8 @@ internal_syscall(struct tcb *tcp)
-        static long r9;
- #elif defined(X86_64)
-        static long rax;
-+#elif defined(CRISV10) || defined(CRISV32)
-+	static long r10;
- #endif
- #endif /* LINUX */
- #ifdef FREEBSD
-@@ -1273,7 +1275,10 @@ struct tcb *tcp;
- 			return 0;
- 		}
- 	}
--#endif /* SH64 */
-+#elif defined(CRISV10) || defined(CRISV32)
-+	if (upeek(pid, 4*PT_R9, &scno) < 0)
-+		       return -1;
-+#endif /* CRISV10/CRISV32 */
- #endif /* LINUX */
- #ifdef SUNOS4
- 	if (upeek(pid, uoff(u_arg[7]), &scno) < 0)
-@@ -1468,6 +1473,14 @@ struct tcb *tcp;
- 			fprintf(stderr, "stray syscall exit: r8 = %ld\n", r8);
- 		return 0;
- 	}
-+#elif defined(CRISV10) || defined(CRISV32)
-+	if (upeek(pid, 4*PT_R10, &r10) < 0)
-+		return -1;
-+	if (r10 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
-+		if (debug)
-+			fprintf(stderr, "stray syscall exit: r10 = %ld\n", r10);
-+		return 0;
-+	}
- #endif
- #endif /* LINUX */
- 	return 1;
-@@ -1649,6 +1662,17 @@ struct tcb *tcp;
-                         tcp->u_rval = r9;
- 	                u_error = 0;
-                 }
-+#else
-+#if defined(CRISV10) || defined(CRISV32)
-+		if (r10 && (unsigned) -r10 < nerrnos) {
-+			tcp->u_rval = -1;
-+			u_error = -r10;
-+		}
-+		else {
-+			tcp->u_rval = r10;
-+			u_error = 0;
-+		}
-+#endif /* CRISV10/CRISV32 */
- #endif /* SH64 */
- #endif /* SH */
- #endif /* HPPA */
-@@ -2169,6 +2193,23 @@ struct tcb *tcp;
- 				return -1;
- 		}
- 	}
-+#elif defined(CRISV10) || defined(CRISV32)
-+	{
-+		int i;
-+		static const int crisregs[] = {
-+			4*PT_ORIG_R10, 4*PT_R11, 4*PT_R12,
-+			4*PT_R13, 4*PT_MOF, 4*PT_SRP
-+		};
-+		
-+		if (tcp->scno >= 0 && tcp->scno < nsyscalls)
-+			tcp->u_nargs = sysent[tcp->scno].nargs;
-+		else
-+			tcp->u_nargs = 0;
-+		for (i = 0; i < tcp->u_nargs; i++) {
-+			if (upeek(pid, crisregs[i], &tcp->u_arg[i]) < 0)
-+				return -1;
-+		}
-+	}
- #else /* Other architecture (like i386) (32bits specific) */
- 	{
- 		int i;
diff --git a/package/strace/patches/patch-system_c b/package/strace/patches/patch-system_c
deleted file mode 100644
index 85ad4a434..000000000
--- a/package/strace/patches/patch-system_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- strace-4.5.18.orig/system.c	2007-01-17 00:22:36.000000000 +0100
-+++ strace-4.5.18/system.c	2009-11-22 21:29:57.404591477 +0100
-@@ -70,7 +70,7 @@
- #include <linux/capability.h>
- #endif
- 
--#ifdef SYS_cacheflush
-+#if defined SYS_cacheflush && !defined ARM 
- #include <asm/cachectl.h>
- #endif
- 
diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c
deleted file mode 100644
index 17112f30e..000000000
--- a/package/strace/patches/patch-util_c
+++ /dev/null
@@ -1,53 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- strace-4.5.18.orig/util.c	2008-08-19 06:47:51.000000000 +0200
-+++ strace-4.5.18/util.c	2009-01-02 21:24:05.530098238 +0100
-@@ -1097,6 +1097,12 @@ struct tcb *tcp;
- #elif defined(SH64)
-        if (upeek(tcp->pid, REG_PC ,&pc) < 0)
-                return -1;
-+#elif defined(CRISV10)
-+	if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0)
-+		return -1;
-+#elif defined(CRISV32)
-+	if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0)
-+		return -1;
- #endif
- 	return pc;
- #endif /* LINUX */
-@@ -1245,6 +1251,22 @@ struct tcb *tcp;
- 		return;
- 	}
- 	tprintf("[%08lx] ", pc);
-+#elif defined(CRISV10)
-+	long pc;
-+	
-+	if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0) {
-+		PRINTBADPC;
-+		return;
-+	}
-+	tprintf("[%08lx] ", (unsigned long)pc);
-+#elif defined(CRISV32)
-+	long pc;
-+	
-+	if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0) {
-+		PRINTBADPC;
-+		return;
-+	}
-+	tprintf("[%08lx] ", (unsigned long)pc);
- #endif /* !architecture */
- #endif /* LINUX */
- 
-@@ -1444,6 +1466,13 @@ typedef struct regs arg_setup_state;
- #  define arg0_offset   (REG_OFFSET+16)
- #  define arg1_offset   (REG_OFFSET+24)
- #  define restore_arg0(tcp, state, val) 0
-+# elif defined CRISV10 || defined CRISV32
-+#  define arg0_offset   (4*PT_R11)
-+#  define arg1_offset   (4*PT_ORIG_R10)
-+#  define restore_arg0(tcp, state, val) 0
-+#  define restore_arg1(tcp, state, val) 0
-+#  define arg0_index   1
-+#  define arg1_index   0
- # else
- #  define arg0_offset	0
- #  define arg1_offset	4
diff --git a/package/tor/Makefile b/package/tor/Makefile
index cf952da0d..4eebf0243 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tor
-PKG_VERSION:=		0.1.1.26
-PKG_RELEASE:=		9
-PKG_MD5SUM:=		0667df7a1f670bee5163b607aea172ba
+PKG_VERSION:=		0.2.1.20
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0d62ee2332fdd95de43debac7435df19
 PKG_DESCR:=		An anonymous Internet communication system
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libevent libopenssl libpthread zlib
diff --git a/package/tor/patches/patch-configure b/package/tor/patches/patch-configure
deleted file mode 100644
index b87f3dde8..000000000
--- a/package/tor/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- tor-0.1.1.26.orig/configure	2006-12-15 01:12:11.000000000 +0100
-+++ tor-0.1.1.26/configure	2007-02-17 21:46:29.000000000 +0100
-@@ -15193,7 +15193,7 @@ _ACEOF
- # Set CFLAGS _after_ all the above checks, since our warnings are stricter
- # than autoconf's macros like.
- if test $ac_cv_c_compiler_gnu = yes; then
--  CFLAGS="$CFLAGS -Wall -g -O2"
-+  CFLAGS="$CFLAGS -Wall"
- else
-   CFLAGS="$CFLAGS -g -O"
- fi
diff --git a/package/tor/patches/patch-contrib_suse_tor_sh b/package/tor/patches/patch-contrib_suse_tor_sh
new file mode 100644
index 000000000..2bc55db33
--- /dev/null
+++ b/package/tor/patches/patch-contrib_suse_tor_sh
@@ -0,0 +1,11 @@
+--- tor-0.2.1.20.orig/contrib/suse/tor.sh	2009-10-15 18:16:23.000000000 +0200
++++ tor-0.2.1.20/contrib/suse/tor.sh	2009-12-03 23:45:45.000000000 +0100
+@@ -43,7 +43,7 @@ rc_reset
+ # Increase open file descriptors a reasonable amount
+ ulimit -n 8192
+ 
+-TORCTL=/usr/local/bin/torctl
++TORCTL=/usr/bin/torctl
+ 
+ # torctl will use these environment variables
+ TORUSER=_tor
diff --git a/package/tor/patches/patch-contrib_tor_sh b/package/tor/patches/patch-contrib_tor_sh
new file mode 100644
index 000000000..4f953b0fd
--- /dev/null
+++ b/package/tor/patches/patch-contrib_tor_sh
@@ -0,0 +1,11 @@
+--- tor-0.2.1.20.orig/contrib/tor.sh	2009-10-15 18:16:22.000000000 +0200
++++ tor-0.2.1.20/contrib/tor.sh	2009-12-03 23:45:44.000000000 +0100
+@@ -26,7 +26,7 @@ fi
+ # Increase open file descriptors a reasonable amount
+ ulimit -n 8192
+ 
+-TORCTL=/usr/local/bin/torctl
++TORCTL=/usr/bin/torctl
+ 
+ # torctl will use these environment variables
+ TORUSER=_tor
diff --git a/package/tor/patches/patch-contrib_torctl b/package/tor/patches/patch-contrib_torctl
new file mode 100644
index 000000000..b531711db
--- /dev/null
+++ b/package/tor/patches/patch-contrib_torctl
@@ -0,0 +1,27 @@
+--- tor-0.2.1.20.orig/contrib/torctl	2009-10-15 18:16:22.000000000 +0200
++++ tor-0.2.1.20/contrib/torctl	2009-12-03 23:45:44.000000000 +0100
+@@ -24,19 +24,19 @@
+ EXEC=tor
+ #
+ # the path to your binary, including options if necessary
+-TORBIN="/usr/local/bin/$EXEC"
++TORBIN="/usr/bin/$EXEC"
+ #
+ # the path to the configuration file
+-TORCONF="/usr/local/etc/tor/torrc"
++TORCONF="/etc/tor/torrc"
+ #
+ # the path to your PID file
+-PIDFILE="/usr/local/var/run/tor/tor.pid"
++PIDFILE="/var/run/tor/tor.pid"
+ #
+ # The path to the log file
+-LOGFILE="/usr/local/var/log/tor/tor.log"
++LOGFILE="/var/log/tor/tor.log"
+ #
+ # The path to the datadirectory
+-TORDATA="/usr/local/var/lib/tor"
++TORDATA="/var/lib/tor"
+ #
+ TORARGS="--pidfile $PIDFILE --log \"notice file $LOGFILE\" --runasdaemon 1"
+ TORARGS="$TORARGS --datadirectory $TORDATA"
diff --git a/package/tor/patches/patch-src_common_util_h b/package/tor/patches/patch-src_common_util_h
index 4052d16f1..f6607ffc1 100644
--- a/package/tor/patches/patch-src_common_util_h
+++ b/package/tor/patches/patch-src_common_util_h
@@ -1,12 +1,23 @@
-$Id$
---- tor-0.1.1.26.orig/src/common/util.h	2006-09-24 19:47:57.000000000 +0200
-+++ tor-0.1.1.26/src/common/util.h	2007-02-17 23:09:46.000000000 +0100
-@@ -36,7 +36,7 @@
-  * And I'm not just saying that because some of our asserts check
-  * security-critical properties.
-  */
+--- tor-0.2.1.20.orig/src/common/util.h	2009-06-19 08:13:53.000000000 +0200
++++ tor-0.2.1.20/src/common/util.h	2009-12-03 23:47:21.000000000 +0100
+@@ -24,20 +24,6 @@
+ #define O_TEXT 0
+ #endif
+ 
+-/* Replace assert() with a variant that sends failures to the log before
+- * calling assert() normally.
+- */
+-#ifdef NDEBUG
+-/* Nobody should ever want to build with NDEBUG set.  99% of our asserts will
+- * be outside the critical path anyway, so it's silly to disable bug-checking
+- * throughout the entire program just because a few asserts are slowing you
+- * down.  Profile, optimize the critical path, and keep debugging on.
+- *
+- * And I'm not just saying that because some of our asserts check
+- * security-critical properties.
+- */
 -#error "Sorry; we don't support building with NDEBUG."
-+#define tor_assert(expr) ((void)(0))
- #else
- #define tor_assert(expr) do {                                           \
-     if (!(expr)) {                                                      \
+-#endif
+ 
+ /** Like assert(3), but send assertion failures to the log as well as to
+  * stderr. */
diff --git a/package/tor/patches/patch-src_or_eventdns_c b/package/tor/patches/patch-src_or_eventdns_c
new file mode 100644
index 000000000..138469f09
--- /dev/null
+++ b/package/tor/patches/patch-src_or_eventdns_c
@@ -0,0 +1,18 @@
+--- tor-0.2.1.20.orig/src/or/eventdns.c	2009-09-17 08:02:18.000000000 +0200
++++ tor-0.2.1.20/src/or/eventdns.c	2009-12-03 23:49:27.000000000 +0100
+@@ -375,7 +375,6 @@ error_is_eagain(int err)
+ #define TOLOWER(c) TOR_TOLOWER(c)
+ #define TOUPPER(c) TOR_TOUPPER(c)
+ 
+-#ifndef NDEBUG
+ static const char *
+ debug_ntoa(u32 address)
+ {
+@@ -404,7 +403,6 @@ debug_ntop(const struct sockaddr *sa)
+ 	}
+ 	return "<unknown>";
+ }
+-#endif
+ 
+ static evdns_debug_log_fn_type evdns_log_fn = NULL;
+ 
diff --git a/package/tor/patches/patch-tor_spec b/package/tor/patches/patch-tor_spec
new file mode 100644
index 000000000..a4bc4adaa
--- /dev/null
+++ b/package/tor/patches/patch-tor_spec
@@ -0,0 +1,11 @@
+--- tor-0.2.1.20.orig/tor.spec	2009-10-15 18:16:22.000000000 +0200
++++ tor-0.2.1.20/tor.spec	2009-12-03 23:45:44.000000000 +0100
+@@ -101,7 +101,7 @@
+ %endif
+ 
+ %if %{!?_localstatedir:1}%{?_localstatedir:0}
+-%define _localstatedir /usr/local/var
++%define _localstatedir /var
+ %endif
+ 
+ ## Package information
diff --git a/package/udev/Makefile b/package/udev/Makefile
index dd7a8c2fe..90ffefe66 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -19,6 +19,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,UDEV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--disable-extras \
+			--disable-logging \
+			--disable-introspection
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto