Merge branch 'master' of git://www.openadk.org/git/openadk

63 files changed, 440 insertions, 587 deletions

diff --git a/package/Pacemaker-Python-GUI/patches/patch-configure b/package/Pacemaker-Python-GUI/patches/patch-configure
deleted file mode 100644
index bfbf2ae69..000000000
--- a/package/Pacemaker-Python-GUI/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- Pacemaker-Python-GUI-2.1.0.orig/configure	2011-10-07 11:55:11.000000000 +0200
-+++ Pacemaker-Python-GUI-2.1.0/configure	2011-10-12 18:13:25.563559000 +0200
-@@ -5555,7 +5555,7 @@ case $libdir in
-     prefix|NONE|*exec_prefix*)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
- $as_echo_n "checking which lib directory to use... " >&6; }
--    for aDir in lib64 lib
-+    for aDir in lib
-     do
-       trydir="${exec_prefix}/${aDir}"
-       if
diff --git a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c
deleted file mode 100644
index 1882093d5..000000000
--- a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c
+++ /dev/null
@@ -1,32 +0,0 @@
---- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c	2011-08-03 13:54:23.000000000 +0200
-+++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c	2011-10-07 16:15:59.000000000 +0200
-@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc)
- 				argv[1], cib_error2string(rc));
- 	} else {
- 		buffer = crm_concat("fail-count", argv[2], '-');
--		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL,
-+		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL,
- 				NULL, buffer, NULL, FALSE);
- 		crm_free(dest_node);
- 		crm_free(buffer);
-@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc)
- 	sleep(2); /* wait for the refresh */
- 	now_s = crm_itoa(now);
- 	update_attr(cib_conn, cib_sync_call,
--		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
-+		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
- 	crm_free(now_s);
- 
- 	crmd_channel->ops->destroy(crmd_channel);
-@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc
- 				strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1);
- 			}
- 
-+			/*
- 			if(is_set(rsc->flags, pe_rsc_failure_ignored)) {
- 				strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1);
- 			}
-+			*/
- 
- 			ret = mgmt_msg_append(ret, buf);
- 			break;
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index d3a55ad1f..d9caa7c4f 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.8.3
+PKG_VERSION:=		1.8.20.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		79964868c124a921e71fd568fbc9290f
+PKG_MD5SUM:=		99204257de80a42c4e287fc93dfe714a
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		phone
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
@@ -19,7 +19,7 @@ PKG_NEED_CXX:=		1
 
 PKG_ARCH_DEPENDS:=	!cris
 
-PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP
+PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
 PKG_SUBPKGS+=		ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM
 PKG_SUBPKGS+=		ASTERISK_PBX_DUNDI ASTERISK_RES_AGI
 PKGSB_ASTERISK_CODEC_SPEEX:=	speex
@@ -37,7 +37,7 @@ $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION}))
+#$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION}))
@@ -117,8 +117,8 @@ pre-build:
 
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.20.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.20.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.22.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.22.tar.gz
 
 do-install:
 	$(CP) $(WRKINST)/* $(IDIR_ASTERISK)
diff --git a/package/asterisk/patches/patch-main_dns_c b/package/asterisk/patches/patch-main_dns_c
new file mode 100644
index 000000000..0c3684d52
--- /dev/null
+++ b/package/asterisk/patches/patch-main_dns_c
@@ -0,0 +1,11 @@
+--- asterisk-1.8.20.1.orig/main/dns.c	2012-06-15 17:56:08.000000000 +0200
++++ asterisk-1.8.20.1/main/dns.c	2013-03-05 14:49:01.000000000 +0100
+@@ -45,6 +45,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ #include "asterisk/dns.h"
+ #include "asterisk/endian.h"
+ 
++#undef HAVE_RES_NINIT
++
+ #define MAX_SIZE 4096
+ 
+ #ifdef __PDP_ENDIAN
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 8ca4899ad..58781ae99 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -4,16 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		atk
-PKG_VERSION:=		2.7.5
+PKG_VERSION:=		1.33.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		85f4f5ad1c1a89a857c73ebd6adb9dc7
+PKG_MD5SUM:=		4338e0c94f767714f4786878112750dd
 PKG_DESCR:=		atk library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
-PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/2.7/}
+PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/1.33/}
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_SUBPKGS:=		LIBATK LIBATK_DEV
 PKGSC_LIBATK_DEV:=	devel
diff --git a/package/b43-firmware/Makefile b/package/b43-firmware/Makefile
index 3d170b68c..311644bd8 100644
--- a/package/b43-firmware/Makefile
+++ b/package/b43-firmware/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		b43-firmware
-PKG_VERSION:=		1.1
+PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b53e1234c596c49f9ee0c11d04d989ed
+PKG_MD5SUM:=		37c8d2c029a7e5b82f4433a6fa1e2ee5
 PKG_DESCR:=		firmware for b43 wireless cards
 PKG_SECTION:=		wifi
 PKG_SITES:=		http://openadk.org/distfiles/
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 5e1e71e50..258d070ba 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -18,6 +18,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=        -L$(STAGING_DIR)/usr/lib64
 CONFIGURE_ARGS+=	--without-cplusplus \
 			--without-python \
 			--without-java
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 5cf30d57d..93453d917 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -4,17 +4,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.12.12
+PKG_VERSION:=		1.10.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9f7315e54885c735dcfdabe77f322d30
+PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
 PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11 libXrender glib
+PKG_BUILDDEP+=		libXext
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+#DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_SUBPKGS:=		CAIRO CAIRO_DEV
 PKGSC_CAIRO_DEV:=	devel
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index bb2d63fec..b7b9a6d81 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -24,7 +24,7 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	${MAKE} -C "${WRKBUILD}"/tests check
+	#${MAKE} -C "${WRKBUILD}"/tests check
 	${MAKE} -C "${WRKBUILD}" version.h
 	GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \
 			 M="${WRKBUILD}" modules
diff --git a/package/db/Makefile b/package/db/Makefile
index 2fd961258..82d69ef64 100644
--- a/package/db/Makefile
+++ b/package/db/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		db
-PKG_VERSION:=		5.3.15
+PKG_VERSION:=		5.3.21
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d40e3e4b9a76a23d1db225465aa8bae0
+PKG_MD5SUM:=		3fda0b004acdaa6fa350bfc41a3b95ca
 PKG_DESCR:=		disk file format database which stores key/data-pairs in single files
 PKG_SECTION:=		db
 PKG_URL:=		http://www.oracle.com/technology/software/products/berkeley-db
diff --git a/package/epdfview/Makefile b/package/epdfview/Makefile
index af7493ff3..f8349b328 100644
--- a/package/epdfview/Makefile
+++ b/package/epdfview/Makefile
@@ -12,7 +12,9 @@ PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		poppler libgtk
 PKG_BUILDDEP:=		poppler gtk+
 PKG_URL:=		http://trac.emma-soft.com/epdfview/wiki
-PKG_SITES:=		http://trac.emma-soft.com/epdfview/chrome/site/releases/
+PKG_SITES:=		http://openadk.org/distfiles
+
+PKG_CFLINE_EPDFVIEW:=  depends on ADK_BROKEN
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index 19df5b0b1..ac8a41c64 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -25,6 +25,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FORKED_DAAPD,forked-daapd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-levent
+
 forked-daapd-install:
 	$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/etc
 	$(CP) ./files/forked-daapd.conf \
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 7f55e9f0f..ba9efa759 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.35.7
-PKG_EXTRAVER:=		2.35
+PKG_VERSION:=		2.28.1
+PKG_EXTRAVER:=		2.28
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d9f36f01a24fcfd568c7e45ceabcec90
+PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libintl libiconv libpthread
@@ -16,7 +16,7 @@ PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 PKG_NOPARALLEL:=	1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+#DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_SUBPKGS:=		GLIB GLIB_DEV
 PKGSC_GLIB_DEV:=	devel
diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in
deleted file mode 100644
index 0bc0dbdc5..000000000
--- a/package/glib/patches/patch-gio_Makefile_in
+++ /dev/null
@@ -1,34 +0,0 @@
---- glib-2.35.7.orig/gio/Makefile.in	2013-02-05 21:44:27.000000000 +0100
-+++ glib-2.35.7/gio/Makefile.in	2013-02-12 12:07:43.000000000 +0100
-@@ -1291,6 +1291,7 @@ DISTCLEANFILES = \
- glib_compile_resources_LDADD = \
- 	$(top_builddir)/glib/libglib-2.0.la \
- 	$(top_builddir)/gobject/libgobject-2.0.la	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	libgio-2.0.la
- 
- glib_compile_resources_SOURCES = \
-@@ -1318,6 +1319,7 @@ glib_compile_schemas_SOURCES = \
- gsettings_LDADD = \
- 	$(top_builddir)/glib/libglib-2.0.la		\
- 	$(top_builddir)/gobject/libgobject-2.0.la	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	libgio-2.0.la
- 
- gsettings_SOURCES = gsettings-tool.c
-@@ -1326,6 +1328,7 @@ dist_schema_DATA = gschema.dtd
- gdbus_SOURCES = gdbus-tool.c
- gdbus_LDADD = libgio-2.0.la \
- 	$(top_builddir)/glib/libglib-2.0.la 		\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	$(top_builddir)/gobject/libgobject-2.0.la
- 
- completiondir = $(datadir)/bash-completion/completions
-@@ -1338,6 +1341,7 @@ gresource_SOURCES = gresource-tool.c
- gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
- gresource_LDADD = libgio-2.0.la \
- 	$(top_builddir)/glib/libglib-2.0.la 		\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	$(top_builddir)/gobject/libgobject-2.0.la \
- 	$(LIBELF_LIBS)
- 
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index 6ea2fe069..37d7c2d24 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:=		0.1
 PKG_RELEASE:=		1
 PKG_DESCR:=		huawei modem control
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		libusb
-PKG_BUILDDEP:=		libusb
+PKG_DEPENDS:=		libusb libusb-compat
+PKG_BUILDDEP:=		libusb libusb-compat
 
 PKG_ARCH_DEPENDS:=	!avr32
 
diff --git a/package/intltool/Makefile b/package/intltool/Makefile
index 64b54f566..611a04dcb 100644
--- a/package/intltool/Makefile
+++ b/package/intltool/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		intltool
-PKG_VERSION:=		0.41.1
+PKG_VERSION:=		0.50.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d6c91bf06681919ccfdf3624035b75dc
+PKG_MD5SUM:=		23fbd879118253cb99aeac067da5f591
 PKG_DESCR:=		Internationalization Tool Collection
 PKG_SECTION:=		misc
-PKG_SITES:=		http://edge.launchpad.net/intltool/trunk/0.41.1/+download/
+PKG_SITES:=		https://launchpad.net/intltool/trunk/0.50.2/+download/
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 54f155f89..ec8728410 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b79aae3055a51f8de5c0f1b8ca6cf619
 PKG_DESCR:=		IPsec management tools
 PKG_SECTION:=		net/security
-PKG_BUILDDEP:=		openssl
+PKG_BUILDDEP:=		openssl flex
 PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://ipsec-tools.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 9c167c60b..0d6bc1cef 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iptraf
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		377371c28ee3c21a76f7024920649ea8
+PKG_MD5SUM:=		004c2c005a1b78739e22bc49d33e244d
 PKG_DESCR:=		A console-based network monitoring program.
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses
diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile
index c73f68411..15af62737 100644
--- a/package/iptraf/patches/patch-src_Makefile
+++ b/package/iptraf/patches/patch-src_Makefile
@@ -1,6 +1,6 @@
 $Id$
---- iptraf-3.0.0.orig/src/Makefile	2005-09-13 11:11:17.000000000 +0200
-+++ iptraf-3.0.0/src/Makefile	2011-01-21 13:46:03.628658655 +0100
+--- iptraf-3.0.1.orig/src/Makefile	2005-09-13 11:11:17.000000000 +0200
++++ iptraf-3.0.1/src/Makefile	2013-03-04 11:42:11.000000000 +0100
 @@ -18,7 +18,8 @@ VERSION 	= -DVERSION=\"$(VERNUMBER)\"
  BINDIR		= ../../iptraf-$(VERNUMBER).bin.$(ARCH)
  
@@ -32,6 +32,15 @@ $Id$
  
  # You can uncomment this one to disable the backspace key in input fields.
  # This means you must use the Del key or Ctrl+H combination to erase the
+@@ -98,7 +101,7 @@ LOCKDIR		= /var/run/iptraf
+ # Object file names
+ 
+ OBJS = iptraf.o itrafmon.o packet.o tcptable.o othptab.o ifstats.o deskman.o \
+-ipcsum.o hostmon.o fltedit.o tr.o cidr.o \
++ipcsum.o hostmon.o fltedit.o cidr.o \
+ fltselect.o ipfilter.o fltmgr.o ipfrag.o serv.o servname.o instances.o \
+ timer.o revname.o pktsize.o landesc.o isdntab.o options.o promisc.o ifaces.o \
+ error.o log.o mode.o getpath.o bar.o parseproto.o
 @@ -106,33 +109,31 @@ error.o log.o mode.o getpath.o bar.o par
  BINS = iptraf rvnamed rawtime
  
diff --git a/package/iptraf/patches/patch-src_hostmon_c b/package/iptraf/patches/patch-src_hostmon_c
index 0c77aad22..da8d6ff69 100644
--- a/package/iptraf/patches/patch-src_hostmon_c
+++ b/package/iptraf/patches/patch-src_hostmon_c
@@ -1,15 +1,14 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- iptraf-3.0.0.orig/src/hostmon.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/hostmon.c	2008-10-09 17:34:11.000000000 +0200
-@@ -30,7 +30,6 @@ details.
- #include <netinet/in.h>
- #include <linux/if_packet.h>
+--- iptraf-3.0.1.orig/src/hostmon.c	2007-09-25 11:18:56.000000000 +0200
++++ iptraf-3.0.1/src/hostmon.c	2013-03-04 11:41:08.000000000 +0100
+@@ -32,7 +32,6 @@ details.
  #include <linux/if_ether.h>
--#include <linux/if_fddi.h>
- #include <linux/if_tr.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_fddi.h>
+-#include <linux/if_tr.h>
  #include <net/if_arp.h>
  #include <stdlib.h>
-@@ -293,8 +292,6 @@ void printethent(struct ethtab *table, s
+ #include <time.h>
+@@ -294,8 +293,6 @@ void printethent(struct ethtab *table, s
              wprintw(table->tabwin, "Ethernet");
          else if (entry->un.desc.linktype == LINK_PLIP)
              wprintw(table->tabwin, "PLIP");
@@ -18,16 +17,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
          wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr);
  
-@@ -722,7 +719,7 @@ void hostmon(const struct OPTIONS *optio
+@@ -723,7 +720,6 @@ void hostmon(const struct OPTIONS *optio
      unsigned long long updtime_usec = 0;
  
      struct desclist elist;      /* Ethernet description list */
 -    struct desclist flist;      /* FDDI description list */
-+    struct desclist flist;	/* Other links description list */
      struct desclist *list = NULL;
  
      FILE *logfile = NULL;
-@@ -786,7 +783,6 @@ void hostmon(const struct OPTIONS *optio
+@@ -787,7 +783,6 @@ void hostmon(const struct OPTIONS *optio
  
      initethtab(&table, options->actmode);
      loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS);
@@ -35,18 +33,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
      if (logging) {
          if (strcmp(current_logfile, "") == 0) {
-@@ -900,9 +896,7 @@ void hostmon(const struct OPTIONS *optio
+@@ -901,8 +896,7 @@ void hostmon(const struct OPTIONS *optio
              if (pkt_result != PACKET_OK)
                  continue;
  
 -            if ((linktype == LINK_ETHERNET)