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

Conflicts:
	BUGS
	package/autoconf/Makefile

4 files changed, 44 insertions, 19 deletions

diff --git a/package/trafshow/Config.in b/package/trafshow/Config.in
deleted file mode 100644
index dc0cee659..000000000
--- a/package/trafshow/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_TRAFSHOW
-	prompt "trafshow.......................... network traffic monitor"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index d0d0dde3a..6f0411225 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -4,25 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		trafshow
-PKG_VERSION:=		4.0
+PKG_VERSION:=		5.2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0b2f0bb23b7832138b7d841437b9e182
+PKG_SECTION:=		net
+PKG_SITES:=		http://www.sfr-fresh.com/linux/misc/
+PKG_NOPARALLEL:=	1
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-PKG_SITES:=		ftp://ftp.nsk.su/pub/RinetSoftware/
-WRKDIST=		${WRKDIR}/trafshow-5.2.3
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -I$(STAGING_DIR)/usr/include
+TCFLAGS+=		-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
 TLDFLAGS+=		-pthread
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-ALL_TARGET=		
 
-do-install:
-	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/trafshow ${IDIR_TRAFSHOW}/usr/sbin/
+post-install:
+	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/trafshow ${IDIR_TRAFSHOW}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/trafshow/patches/patch-Makefile_in b/package/trafshow/patches/patch-Makefile_in
new file mode 100644
index 000000000..d5562d64c
--- /dev/null
+++ b/package/trafshow/patches/patch-Makefile_in
@@ -0,0 +1,24 @@
+--- trafshow-5.2.3.orig/Makefile.in	2004-06-15 10:29:14.000000000 +0200
++++ trafshow-5.2.3/Makefile.in	2010-02-05 23:07:13.164334256 +0100
+@@ -59,6 +59,8 @@ OBJ	= $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC
+ 
+ CLEANFILES = $(PROG) $(OBJ) $(GENSRC) y.tab.h
+ 
++all:	$(PROG)
++
+ $(PROG): $(OBJ)
+ 	@rm -f $@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+@@ -73,9 +75,9 @@ version.c: VERSION Makefile
+ 	@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
+ 
+ install:
+-	./install-sh -c -s -m 555 -o bin -g bin $(PROG) $(BINDEST)/$(PROG)
+-	./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(MANDEST)/man1/$(PROG).1
+-	[ -f /etc/$(PROG) ] || ./install-sh -c -m 444 .trafshow /etc/$(PROG)
++	./install-sh -c -m 755 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
++	./install-sh -c -m 644 $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
++	./install-sh -c -m 644 .trafshow $(DESTDIR)/etc/$(PROG)
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/package/trafshow/patches/patch-session_c b/package/trafshow/patches/patch-session_c
new file mode 100644
index 000000000..cee3cb266
--- /dev/null
+++ b/package/trafshow/patches/patch-session_c
@@ -0,0 +1,11 @@
+--- trafshow-5.2.3.orig/session.c	2006-01-08 06:58:08.000000000 +0100
++++ trafshow-5.2.3/session.c	2010-02-05 22:59:54.974334342 +0100
+@@ -40,7 +40,7 @@
+ #define	ASYNC_MODE	FNDELAY
+ #elif	O_ASYNC
+ #define	ASYNC_MODE	O_ASYNC
+-#elif
++#else
+ #error the fcntl argument to turn ON/OFF non-blocking I/O is unknown
+ #endif
+