Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=8feabb7cda5062b0528d3b5c5a0508ff212d303e
commit 8feabb7cda5062b0528d3b5c5a0508ff212d303e Author: crazy <[email protected]> Date: Sat Dec 19 23:16:54 2015 +0100 iptraf-3.0.0-4-x86_64 * rebuild with ncurses6 * added patch to fix the build diff --git a/source/network/iptraf/FrugalBuild b/source/network/iptraf/FrugalBuild index fd40c3d..cbc792e 100644 --- a/source/network/iptraf/FrugalBuild +++ b/source/network/iptraf/FrugalBuild @@ -3,15 +3,16 @@ pkgname=iptraf pkgver=3.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Interactive Colorful IP LAN Monitor" url="http://iptraf.seul.org/"; -depends=('glibc') +depends=('glibc' 'ncurses>=6.0-3') groups=('network') archs=('i686' 'x86_64') up2date="lynx -dump http://iptraf.seul.org/download.html|grep 'iptraf-.*.tar.gz$'|sed -n 's/.*traf-\(.*\)\.t.*/\1/; 2 p'" -source=(ftp://iptraf.seul.org/pub/iptraf/$pkgname-$pkgver.tar.gz iptraf-fix-compile.patch) -sha1sums=('e5032b564593a8ec336751d41c090e5cdb7663a1' '58cc56a1dd6e9fc34836a2b0d846ca7cd4b95af0') +source=(ftp://iptraf.seul.org/pub/iptraf/$pkgname-$pkgver.tar.gz iptraf-3.0.0-headerfix.patch) +sha1sums=('e5032b564593a8ec336751d41c090e5cdb7663a1' \ + '0d0230b41a290efd6c6dbe9981b454aeec62f13a') build() { Fpatchall || return 1 @@ -42,7 +43,7 @@ EOF Fexerel /usr/sbin/iptraf Fexerel /usr/sbin/rvnamed - DOC="/$pkgname-$pkgver/Documentation" + local DOC="/$pkgname-$pkgver/Documentation" Ffile $DOC/*.html /usr/share/doc/$pkgname-$pkgver/html Ffile $DOC/stylesheet-images/*.gif /usr/share/doc/$pkgname-$pkgver/html/stylesheet-images/ Ffile $DOC/iptraf.8 /usr/man/man8/ diff --git a/source/network/iptraf/iptraf-3.0.0-headerfix.patch b/source/network/iptraf/iptraf-3.0.0-headerfix.patch new file mode 100644 index 0000000..03a9f01 --- /dev/null +++ b/source/network/iptraf/iptraf-3.0.0-headerfix.patch @@ -0,0 +1,60 @@ +diff -ru iptraf-3.0.0-orig/src/hostmon.c iptraf-3.0.0/src/hostmon.c +--- iptraf-3.0.0-orig/src/hostmon.c 2013-05-10 14:39:56.326338734 +1000 ++++ iptraf-3.0.0/src/hostmon.c 2013-05-10 14:40:00.546137298 +1000 +@@ -31,7 +31,7 @@ + #include <linux/if_packet.h> + #include <linux/if_ether.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> ++#include <netinet/if_tr.h> + #include <net/if_arp.h> + #include <stdlib.h> + #include <time.h> +diff -ru iptraf-3.0.0-orig/src/othptab.c iptraf-3.0.0/src/othptab.c +--- iptraf-3.0.0-orig/src/othptab.c 2013-05-10 14:39:56.326338734 +1000 ++++ iptraf-3.0.0/src/othptab.c 2013-05-10 14:40:00.566136343 +1000 +@@ -18,7 +18,7 @@ + + #include <asm/types.h> + #include <linux/if_ether.h> +-#include <linux/if_tr.h> ++#include <netinet/if_tr.h> + #include <linux/if_fddi.h> + #include <winops.h> + #include "arphdr.h" +diff -ru iptraf-3.0.0-orig/src/packet.c iptraf-3.0.0/src/packet.c +--- iptraf-3.0.0-orig/src/packet.c 2013-05-10 14:39:56.326338734 +1000 ++++ iptraf-3.0.0/src/packet.c 2013-05-10 14:40:00.566136343 +1000 +@@ -36,7 +36,7 @@ + #include <linux/if_packet.h> + #include <linux/if_ether.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> ++#include <netinet/if_tr.h> + #include <linux/isdn.h> + #include <linux/sockios.h> + #include <msgboxes.h> +diff -ru iptraf-3.0.0-orig/src/tcptable.h iptraf-3.0.0/src/tcptable.h +--- iptraf-3.0.0-orig/src/tcptable.h 2013-05-10 14:39:56.326338734 +1000 ++++ iptraf-3.0.0/src/tcptable.h 2013-05-10 14:40:00.576135867 +1000 +@@ -23,7 +23,7 @@ + #include <linux/if_packet.h> + #include <linux/if_ether.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> ++#include <netinet/if_tr.h> + #include <net/if.h> + #include <netinet/ip.h> + #include <netinet/udp.h> +diff -ru iptraf-3.0.0-orig/src/tr.c iptraf-3.0.0/src/tr.c +--- iptraf-3.0.0-orig/src/tr.c 2013-05-10 14:39:56.326338734 +1000 ++++ iptraf-3.0.0/src/tr.c 2013-05-10 14:40:00.576135867 +1000 +@@ -7,7 +7,7 @@ + */ + + #include <asm/types.h> +-#include <linux/if_tr.h> ++#include <netinet/if_tr.h> + #include <netinet/in.h> + + unsigned int get_tr_ip_offset(unsigned char *pkt) diff --git a/source/network/iptraf/iptraf-fix-compile.patch b/source/network/iptraf/iptraf-fix-compile.patch deleted file mode 100644 index 4c43837..0000000 --- a/source/network/iptraf/iptraf-fix-compile.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur iptraf-2.7.0.orig/src/othptab.c iptraf-2.7.0/src/othptab.c ---- iptraf-2.7.0.orig/src/othptab.c 2005-06-09 16:48:17.000000000 +0000 -+++ iptraf-2.7.0/src/othptab.c 2005-06-09 16:49:12.000000000 +0000 -@@ -16,6 +16,7 @@ - - ***/ - -+#include <net/if.h> - #include <asm/types.h> - #include <linux/if_ether.h> - #include <linux/if_tr.h> -diff -Naur iptraf-2.7.0.orig/src/tcptable.h iptraf-2.7.0/src/tcptable.h ---- iptraf-2.7.0.orig/src/tcptable.h 2005-06-09 16:48:17.000000000 +0000 -+++ iptraf-2.7.0/src/tcptable.h 2005-06-09 16:48:45.000000000 +0000 -@@ -19,12 +19,12 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <net/if_arp.h> -+#include <net/if.h> - #include <asm/types.h> - #include <linux/if_packet.h> - #include <linux/if_ether.h> - #include <linux/if_fddi.h> - #include <linux/if_tr.h> --#include <net/if.h> - #include <netinet/ip.h> - #include <netinet/udp.h> - #include "servname.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
