From 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 Mon Sep 17 00:00:00 2001 From: wbx Date: Sun, 17 May 2009 14:41:34 +0200 Subject: Initial import --- package/iptraf/Config.in | 13 ++++++ package/iptraf/Makefile | 35 +++++++++++++++ package/iptraf/ipkg/iptraf.control | 5 +++ package/iptraf/patches/patch-src_Makefile | 21 +++++++++ package/iptraf/patches/patch-src_dirs_h | 11 +++++ package/iptraf/patches/patch-src_fltmgr_c | 12 ++++++ package/iptraf/patches/patch-src_hostmon_c | 61 +++++++++++++++++++++++++++ package/iptraf/patches/patch-src_ifaces_c | 12 ++++++ package/iptraf/patches/patch-src_landesc_c | 21 +++++++++ package/iptraf/patches/patch-src_links_h | 11 +++++ package/iptraf/patches/patch-src_log_c | 12 ++++++ package/iptraf/patches/patch-src_options_c | 22 ++++++++++ package/iptraf/patches/patch-src_othptab_c | 33 +++++++++++++++ package/iptraf/patches/patch-src_packet_c | 50 ++++++++++++++++++++++ package/iptraf/patches/patch-src_promisc_c | 22 ++++++++++ package/iptraf/patches/patch-src_rvnamed_h | 16 +++++++ package/iptraf/patches/patch-src_tcptable_c | 12 ++++++ package/iptraf/patches/patch-src_tcptable_h | 11 +++++ package/iptraf/patches/patch-support_Makefile | 24 +++++++++++ 19 files changed, 404 insertions(+) create mode 100644 package/iptraf/Config.in create mode 100644 package/iptraf/Makefile create mode 100644 package/iptraf/ipkg/iptraf.control create mode 100644 package/iptraf/patches/patch-src_Makefile create mode 100644 package/iptraf/patches/patch-src_dirs_h create mode 100644 package/iptraf/patches/patch-src_fltmgr_c create mode 100644 package/iptraf/patches/patch-src_hostmon_c create mode 100644 package/iptraf/patches/patch-src_ifaces_c create mode 100644 package/iptraf/patches/patch-src_landesc_c create mode 100644 package/iptraf/patches/patch-src_links_h create mode 100644 package/iptraf/patches/patch-src_log_c create mode 100644 package/iptraf/patches/patch-src_options_c create mode 100644 package/iptraf/patches/patch-src_othptab_c create mode 100644 package/iptraf/patches/patch-src_packet_c create mode 100644 package/iptraf/patches/patch-src_promisc_c create mode 100644 package/iptraf/patches/patch-src_rvnamed_h create mode 100644 package/iptraf/patches/patch-src_tcptable_c create mode 100644 package/iptraf/patches/patch-src_tcptable_h create mode 100644 package/iptraf/patches/patch-support_Makefile (limited to 'package/iptraf') diff --git a/package/iptraf/Config.in b/package/iptraf/Config.in new file mode 100644 index 000000000..8964fa68b --- /dev/null +++ b/package/iptraf/Config.in @@ -0,0 +1,13 @@ +config ADK_PACKAGE_IPTRAF + prompt "iptraf............................ A console-based network monitoring program" + tristate + select ADK_PACKAGE_LIBNCURSES + default n + help + IPTraf is a console-based network statistics utility for Linux. It gathers + a variety of figures such as TCP connection packet and byte counts, + interface statistics and activity indicators, TCP/UDP traffic breakdowns, + and LAN station packet and byte counts. + + http://iptraf.seul.org/ + diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile new file mode 100644 index 000000000..3ee0796a8 --- /dev/null +++ b/package/iptraf/Makefile @@ -0,0 +1,35 @@ +# $Id$ +#- +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= iptraf +PKG_VERSION:= 3.0.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 377371c28ee3c21a76f7024920649ea8 +MASTER_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ + ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) + +do-build: + ${MAKE} -C ${WRKBUILD}/src \ + ${TARGET_CONFIGURE_OPTS} \ + CFLAGS="${TARGET_CFLAGS}" \ + DEBUG="" \ + INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include -I${STAGING_DIR}/include" \ + LDOPTS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib" \ + PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \ + TARGET="/usr/bin" \ + WORKDIR="/var/lib/iptraf" \ + all + +do-install: + ${INSTALL_DIR} ${IDIR_IPTRAF}/usr/bin + ${INSTALL_BIN} ${WRKBUILD}/src/iptraf ${IDIR_IPTRAF}/usr/bin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptraf/ipkg/iptraf.control b/package/iptraf/ipkg/iptraf.control new file mode 100644 index 000000000..840c9d1e0 --- /dev/null +++ b/package/iptraf/ipkg/iptraf.control @@ -0,0 +1,5 @@ +Package: iptraf +Priority: optional +Section: net +Depends: libncurses +Description: A console-based network monitoring program. diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile new file mode 100644 index 000000000..40b4f9d7d --- /dev/null +++ b/package/iptraf/patches/patch-src_Makefile @@ -0,0 +1,21 @@ +$Id$ +--- iptraf-3.0.0.orig/src/Makefile Tue Sep 13 11:11:17 2005 ++++ iptraf-3.0.0/src/Makefile Tue Jan 16 22:27:34 2007 +@@ -113,7 +113,7 @@ iptraf: $(OBJS) textlib + $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS) + + textlib: +- make -C ../support ++ $(MAKE) -C ../support + + %.o: %.c *.h version + $(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $< +@@ -132,7 +132,7 @@ rawtime: rawtime.c + + clean: + rm -f *.o *~ core $(BINS) +- make -C ../support clean ++ $(MAKE) -C ../support clean + + # I just included this rule to clear out the .o files, leaving the + # executables, stripped and ready for packing. diff --git a/package/iptraf/patches/patch-src_dirs_h b/package/iptraf/patches/patch-src_dirs_h new file mode 100644 index 000000000..430b4d27e --- /dev/null +++ b/package/iptraf/patches/patch-src_dirs_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/dirs.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/dirs.h 2008-10-09 17:34:11.000000000 +0200 +@@ -155,7 +155,6 @@ + */ + + #define ETHFILE get_path(T_WORKDIR, "ethernet.desc") +-#define FDDIFILE get_path(T_WORKDIR, "fddi.desc") + + /* + * The rvnamed program file diff --git a/package/iptraf/patches/patch-src_fltmgr_c b/package/iptraf/patches/patch-src_fltmgr_c new file mode 100644 index 000000000..6d0648422 --- /dev/null +++ b/package/iptraf/patches/patch-src_fltmgr_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/fltmgr.c 2005-09-13 09:27:51.000000000 +0200 ++++ iptraf-3.0.0/src/fltmgr.c 2008-10-09 17:35:25.000000000 +0200 +@@ -112,7 +112,7 @@ unsigned long int nametoaddr(char *ascna + + he = gethostbyname(ascname); + if (he != NULL) +- bcopy((he->h_addr_list)[0], &result, he->h_length); ++ memcpy(&result, (he->h_addr_list)[0], he->h_length); + else { + snprintf(imsg, 45, "Unable to resolve %s", ascname); + write_error(imsg, daemonized); diff --git a/package/iptraf/patches/patch-src_hostmon_c b/package/iptraf/patches/patch-src_hostmon_c new file mode 100644 index 000000000..0c77aad22 --- /dev/null +++ b/package/iptraf/patches/patch-src_hostmon_c @@ -0,0 +1,61 @@ +$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 + #include + #include +-#include + #include + #include + #include +@@ -293,8 +292,6 @@ void printethent(struct ethtab *table, s + wprintw(table->tabwin, "Ethernet"); + else if (entry->un.desc.linktype == LINK_PLIP) + wprintw(table->tabwin, "PLIP"); +- else if (entry->un.desc.linktype == LINK_FDDI) +- wprintw(table->tabwin, "FDDI"); + + wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr); + +@@ -722,7 +719,7 @@ 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 + + initethtab(&table, options->actmode); + loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS); +- loaddesclist(&flist, LINK_FDDI, WITHETCETHERS); + + if (logging) { + if (strcmp(current_logfile, "") == 0) { +@@ -900,9 +896,7 @@ void hostmon(const struct OPTIONS *optio + if (pkt_result != PACKET_OK) + continue; + +- if ((linktype == LINK_ETHERNET) || (linktype == LINK_FDDI) +- || (linktype == LINK_PLIP) || (linktype == LINK_TR) || +- (linktype == LINK_VLAN)) { ++ if ((linktype == LINK_ETHERNET) || (linktype == LINK_PLIP) || (linktype == LINK_TR) || (linktype == LINK_VLAN)) { + + if (fromaddr.sll_protocol == htons(ETH_P_IP)) + is_ip = 1; +@@ -920,12 +914,6 @@ void hostmon(const struct OPTIONS *optio + memcpy(scratch_daddr, ((struct ethhdr *) buf)->h_dest, + ETH_ALEN); + list = &elist; +- } else if (linktype == LINK_FDDI) { +- memcpy(scratch_saddr, ((struct fddihdr *) buf)->saddr, +- FDDI_K_ALEN); +- memcpy(scratch_daddr, ((struct fddihdr *) buf)->daddr, +- FDDI_K_ALEN); +- list = &flist; + } else if (linktype == LINK_TR) { + memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, + TR_ALEN); diff --git a/package/iptraf/patches/patch-src_ifaces_c b/package/iptraf/patches/patch-src_ifaces_c new file mode 100644 index 000000000..2da98aa53 --- /dev/null +++ b/package/iptraf/patches/patch-src_ifaces_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/ifaces.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/ifaces.c 2008-10-09 17:34:11.000000000 +0200 +@@ -37,7 +37,7 @@ extern int accept_unsupported_interfaces + extern int daemonized; + + char ifaces[][6] = +- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb", ++ { "lo", "eth", "sl", "ppp", "ippp", "plip", "isdn", "dvb", + "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3", + "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan" + }; diff --git a/package/iptraf/patches/patch-src_landesc_c b/package/iptraf/patches/patch-src_landesc_c new file mode 100644 index 000000000..8cbdd6be0 --- /dev/null +++ b/package/iptraf/patches/patch-src_landesc_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/landesc.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/landesc.c 2008-10-09 17:34:11.000000000 +0200 +@@ -83,8 +83,6 @@ void loaddesclist(struct desclist *list, + + if (linktype == LINK_ETHERNET) + fd = fopen(ETHFILE, "r"); +- else if (linktype == LINK_FDDI) +- fd = fopen(FDDIFILE, "r"); + + if (fd == NULL) { + return; +@@ -205,8 +203,6 @@ void savedesclist(struct desclist *list, + + if (linktype == LINK_ETHERNET) + fd = fopen(ETHFILE, "w"); +- else if (linktype == LINK_FDDI) +- fd = fopen(FDDIFILE, "w"); + + if (fd < 0) { + etherr(); diff --git a/package/iptraf/patches/patch-src_links_h b/package/iptraf/patches/patch-src_links_h new file mode 100644 index 000000000..35a7e3d24 --- /dev/null +++ b/package/iptraf/patches/patch-src_links_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/links.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/links.h 2008-10-09 17:34:11.000000000 +0200 +@@ -6,7 +6,6 @@ + #define LINK_ISDN_RAWIP 6 + #define LINK_ISDN_CISCOHDLC 7 + #define LINK_CISCOHDLC 7 +-#define LINK_FDDI 8 + #define LINK_FRAD 9 + #define LINK_DLCI 10 + #define LINK_TR 11 diff --git a/package/iptraf/patches/patch-src_log_c b/package/iptraf/patches/patch-src_log_c new file mode 100644 index 000000000..59786fcee --- /dev/null +++ b/package/iptraf/patches/patch-src_log_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/log.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/log.c 2008-10-09 17:34:11.000000000 +0200 +@@ -491,8 +491,6 @@ void writeethlog(struct ethtabent *list, + ptmp->un.desc.ascaddr); + else if (ptmp->un.desc.linktype == LINK_PLIP) + fprintf(fd, "\nPLIP address: %s", ptmp->un.desc.ascaddr); +- else if (ptmp->un.desc.linktype == LINK_FDDI) +- fprintf(fd, "\nFDDI address: %s", ptmp->un.desc.ascaddr); + + if (ptmp->un.desc.withdesc) + fprintf(fd, " (%s)", ptmp->un.desc.desc); diff --git a/package/iptraf/patches/patch-src_options_c b/package/iptraf/patches/patch-src_options_c new file mode 100644 index 000000000..b30bab481 --- /dev/null +++ b/package/iptraf/patches/patch-src_options_c @@ -0,0 +1,22 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/options.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/options.c 2008-10-09 17:34:11.000000000 +0200 +@@ -68,8 +68,6 @@ void makeoptionmenu(struct MENU *menu) + tx_additem(menu, NULL, NULL); + tx_additem(menu, " ^E^thernet/PLIP host descriptions...", + "Manages descriptions for Ethernet and PLIP addresses"); +- tx_additem(menu, " ^F^DDI/Token Ring host descriptions...", +- "Manages descriptions for FDDI and FDDI addresses"); + tx_additem(menu, NULL, NULL); + tx_additem(menu, " E^x^it configuration", "Returns to main menu"); + } +@@ -371,9 +369,6 @@ void setoptions(struct OPTIONS *options, + case 14: + ethdescmgr(LINK_ETHERNET); + break; +- case 15: +- ethdescmgr(LINK_FDDI); +- break; + } + + indicatesetting(row, options, statwin); diff --git a/package/iptraf/patches/patch-src_othptab_c b/package/iptraf/patches/patch-src_othptab_c new file mode 100644 index 000000000..5474c21c1 --- /dev/null +++ b/package/iptraf/patches/patch-src_othptab_c @@ -0,0 +1,33 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/othptab.c 2008-10-09 17:34:11.000000000 +0200 +@@ -19,7 +19,6 @@ details. + #include + #include + #include +-#include + #include + #include "arphdr.h" + #include "options.h" +@@ -139,11 +138,6 @@ struct othptabent *add_othp_entry(struct + new_entry->smacaddr); + convmacaddr(((struct ethhdr *) packet)->h_dest, + new_entry->dmacaddr); +- } else if (linkproto == LINK_FDDI) { +- convmacaddr(((struct fddihdr *) packet)->saddr, +- new_entry->smacaddr); +- convmacaddr(((struct fddihdr *) packet)->daddr, +- new_entry->dmacaddr); + } else if (linkproto == LINK_TR) { + convmacaddr(((struct trh_hdr *) packet)->saddr, + new_entry->smacaddr); +@@ -373,8 +367,7 @@ void printothpentry(struct othptable *ta + strcat(msgstring, scratchpad); + + if ((entry->linkproto == LINK_ETHERNET) || +- (entry->linkproto == LINK_PLIP) || +- (entry->linkproto == LINK_FDDI)) { ++ (entry->linkproto == LINK_PLIP)) { + sprintf(scratchpad, " from %s to %s on %s", + entry->smacaddr, entry->dmacaddr, entry->iface); + diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c new file mode 100644 index 000000000..c5669deca --- /dev/null +++ b/package/iptraf/patches/patch-src_packet_c @@ -0,0 +1,50 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/packet.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/packet.c 2008-10-09 17:34:11.000000000 +0200 +@@ -35,7 +35,6 @@ details. + #include + #include + #include +-#include + #include + #include + #include +@@ -81,8 +80,6 @@ unsigned short getlinktype(unsigned shor + result = LINK_ETHERNET; + else if (strncmp(ifname, "plip", 4) == 0) + result = LINK_PLIP; +- else if (strncmp(ifname, "fddi", 4) == 0) /* For some Ethernet- */ +- result = LINK_ETHERNET; /* emulated FDDI ifaces */ + else if (strncmp(ifname, "dvb", 3) == 0) + result = LINK_ETHERNET; + else if (strncmp(ifname, "sbni", 4) == 0) +@@ -136,9 +133,6 @@ unsigned short getlinktype(unsigned shor + case ARPHRD_PPP: + result = LINK_PPP; + break; +- case ARPHRD_FDDI: +- result = LINK_FDDI; +- break; + case ARPHRD_IEEE802: + case ARPHRD_IEEE802_TR: + result = LINK_TR; +@@ -194,19 +188,6 @@ void adjustpacket(char *tpacket, unsigne + *packet = tpacket + 4; + *readlen -= 4; + break; +- case LINK_FDDI: +- *packet = tpacket + sizeof(struct fddihdr); +- *readlen -= sizeof(struct fddihdr); +- +- /* +- * Move IP data into an aligned buffer. 96 bytes should be sufficient +- * for IP and TCP headers with reasonable numbers of options and some +- * data. +- */ +- +- memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen)); +- *packet = aligned_buf; +- break; + case LINK_TR: + /* + * Token Ring patch supplied by Tomas Dvorak diff --git a/package/iptraf/patches/patch-src_promisc_c b/package/iptraf/patches/patch-src_promisc_c new file mode 100644 index 000000000..a8b4c4f90 --- /dev/null +++ b/package/iptraf/patches/patch-src_promisc_c @@ -0,0 +1,22 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/promisc.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/promisc.c 2008-10-09 17:34:11.000000000 +0200 +@@ -81,8 +81,8 @@ void init_promisc_list(struct promisc_st + */ + + if ((strncmp(buf, "eth", 3) == 0) || +- (strncmp(buf, "fddi", 4) == 0) || + (strncmp(buf, "tr", 2) == 0) || ++ (strncmp(buf, "vlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "lec", 3) == 0) || + (accept_unsupported_interfaces)) { +@@ -195,7 +195,7 @@ void srpromisc(int mode, struct promisc_ + + while (ptmp != NULL) { + if (((strncmp(ptmp->params.ifname, "eth", 3) == 0) || +- (strncmp(ptmp->params.ifname, "fddi", 4) == 0) || ++ (strncmp(ptmp->params.ifname, "vlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "tr", 2) == 0) || + (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "lec", 3) == 0)) && diff --git a/package/iptraf/patches/patch-src_rvnamed_h b/package/iptraf/patches/patch-src_rvnamed_h new file mode 100644 index 000000000..f2637c597 --- /dev/null +++ b/package/iptraf/patches/patch-src_rvnamed_h @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/rvnamed.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/rvnamed.h 2008-10-09 17:34:11.000000000 +0200 +@@ -1,9 +1,9 @@ + #include + #include + +-#define CHILDSOCKNAME "/dev/rvndcldcomsk" +-#define PARENTSOCKNAME "/dev/rvndpntcomsk" +-#define IPTSOCKNAME "/dev/rvndiptcomsk" ++#define CHILDSOCKNAME "/tmp/rvndcldcomsk" ++#define PARENTSOCKNAME "/tmp/rvndpntcomsk" ++#define IPTSOCKNAME "/tmp/rvndiptcomsk" + + #define SOCKET_PREFIX "isock" + diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c new file mode 100644 index 000000000..83ba44ff3 --- /dev/null +++ b/package/iptraf/patches/patch-src_tcptable_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/tcptable.c 2008-10-09 17:34:11.000000000 +0200 +@@ -600,8 +600,6 @@ void updateentry(struct tcptable *table, + + if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) { + convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr); +- } else if (linkproto == LINK_FDDI) { +- convmacaddr(((struct fddihdr *) packet)->saddr, newmacaddr); + } else if (linkproto == LINK_TR) { + convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); + } diff --git a/package/iptraf/patches/patch-src_tcptable_h b/package/iptraf/patches/patch-src_tcptable_h new file mode 100644 index 000000000..fa3d66618 --- /dev/null +++ b/package/iptraf/patches/patch-src_tcptable_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/tcptable.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/tcptable.h 2008-10-09 17:34:11.000000000 +0200 +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/package/iptraf/patches/patch-support_Makefile b/package/iptraf/patches/patch-support_Makefile new file mode 100644 index 000000000..c72b89ef6 --- /dev/null +++ b/package/iptraf/patches/patch-support_Makefile @@ -0,0 +1,24 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/support/Makefile 2002-07-19 18:31:48.000000000 +0200 ++++ iptraf-3.0.0/support/Makefile 2008-10-09 17:34:11.000000000 +0200 +@@ -3,16 +3,14 @@ INCLUDEDIR = -I/usr/include/ncurses + OBJS = input.o menurt.o listbox.o winops.o labels.o \ + msgboxes.o txbox.o + +-all: libtextbox.a +- + libtextbox.a: $(OBJS) + rm -rf libtextbox.a +- ar cq libtextbox.a $(OBJS) +- ranlib libtextbox.a +-# gcc -shared -o libtextbox.so $(OBJS) ++ $(AR) cq libtextbox.a $(OBJS) ++ $(RANLIB) libtextbox.a ++# $(CC) -shared -o libtextbox.so $(OBJS) + + %.o: %.c *.h +- gcc -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $< ++ $(CC) -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $< + + clean: + rm -rf *.o *~ libtextbox.a libtextbox.so -- cgit v1.2.3