All pastes #612671 Raw Edit

forum2006

public text v1 · immutable
·published 2007-07-10 15:23 UTC
rendered paste body
Index: packages/net/wavemon/patches/001_includes.patch
===================================================================
--- packages/net/wavemon/patches/001_includes.patch	(Revision 0)
+++ packages/net/wavemon/patches/001_includes.patch	(Revision 0)
@@ -0,0 +1,13 @@
+Index: wavemon-0.4.0b/iw_if.h
+===================================================================
+--- wavemon-0.4.0b.orig/iw_if.h	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/iw_if.h	2007-07-10 16:33:07.000000000 +0200
+@@ -19,6 +19,8 @@
+  */
+ 
+ #include <netdb.h>
++#include <linux/types.h>
++#include <linux/if.h>
+ #include <linux/wireless.h>
+ 
+ #define IW_STACKSIZE 1024
Index: packages/net/wavemon/patches/002_gcc-fixes.patch
===================================================================
--- packages/net/wavemon/patches/002_gcc-fixes.patch	(Revision 0)
+++ packages/net/wavemon/patches/002_gcc-fixes.patch	(Revision 0)
@@ -0,0 +1,74 @@
+Index: wavemon-0.4.0b/conf.c
+===================================================================
+--- wavemon-0.4.0b.orig/conf.c	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/conf.c	2007-07-10 16:33:07.000000000 +0200
+@@ -409,8 +409,8 @@
+ 										fatal_error("parse error in %s, line %d: '%s' is not a valid argument here", cfname, lnum, rv);
+ 									}
+ 									break;
+-					case t_sep: 	/* gcc -Wall sucks */
+-					case t_func:
++					case t_sep: ; 	/* gcc -Wall sucks */
++					case t_func: ;
+ 				}
+ 			}
+ 		}
+@@ -481,7 +481,7 @@
+ 							break;
+ 				case t_listval: sprintf(rv, "%s", (char *)ci->v);
+ 				case t_sep: break;
+-				case t_func:
++				case t_func: ;
+ 			}
+ 			
+ 			add = 1;
+Index: wavemon-0.4.0b/conf_scr.c
+===================================================================
+--- wavemon-0.4.0b.orig/conf_scr.c	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/conf_scr.c	2007-07-10 16:33:07.000000000 +0200
+@@ -63,7 +63,7 @@
+ 			case t_listval:	strncpy(s, (char *)item->v, 32);
+ 							break;
+ 			case t_sep:		/* gcc -Wall sucks */
+-			case t_func:
++			case t_func: ;
+ 		}
+ 
+ 		if (!item->unit) {
+@@ -135,8 +135,8 @@
+ 						}
+ 						strncpy((char *)item->v, ll_get(item->list, tmp), 32);
+ 						break;
+-		case t_sep:		/* gcc -Wall sucks */
+-		case t_func:
++		case t_sep: ;		/* gcc -Wall sucks */
++		case t_func: ;
+ 	}
+ }	
+ 
+Index: wavemon-0.4.0b/llist.c
+===================================================================
+--- wavemon-0.4.0b.orig/llist.c	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/llist.c	2007-07-10 16:33:07.000000000 +0200
+@@ -352,7 +352,7 @@
+ 					*((int *)l->e) = va_arg(*ap, int);
+ 					break;
+ 		case 's':	l->e = (void *)malloc(sizeof(char *));
+-					(char *)l->e = strdup(va_arg(*ap, char *));
++					l->e = strdup(va_arg(*ap, char *));
+ 					break;
+ 		case 'f':	l->e = (void *)malloc(sizeof(double));
+ 					*((double *)l->e) = va_arg(*ap, double);
+Index: wavemon-0.4.0b/wavemon.c
+===================================================================
+--- wavemon-0.4.0b.orig/wavemon.c	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/wavemon.c	2007-07-10 16:33:07.000000000 +0200
+@@ -170,7 +170,7 @@
+ 
+ 	if (conf.dump == 1) {
+ 	  dump_parameters(&conf);
+-	  exit();
++	  exit(0);
+ 	}
+ 
+ 	/* initialize the ncurses interface */
Index: packages/net/wavemon/patches/003_cross-compile-fixes.patch
===================================================================
--- packages/net/wavemon/patches/003_cross-compile-fixes.patch	(Revision 0)
+++ packages/net/wavemon/patches/003_cross-compile-fixes.patch	(Revision 0)
@@ -0,0 +1,72 @@
+Index: wavemon-0.4.0b/Makefile.in
+===================================================================
+--- wavemon-0.4.0b.orig/Makefile.in	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/Makefile.in	2007-07-10 16:33:08.000000000 +0200
+@@ -8,13 +8,14 @@
+ LIBS = @LIBS@
+ 
+ CFLAGS = @CFLAGS@
++LDFLAGS= @LDFLAGS@
+ 
+ OBJECTS = conf.o llist.o ui.o error.o timer.o info_scr.o lhist_scr.o aplst_scr.o conf_scr.o help_scr.o about_scr.o iw_if.o net_if.o
+ 
+ all: wavemon
+ 
+ wavemon: wavemon.o $(OBJECTS)
+-	$(CC) $(CFLAGS) $(LIBS) -o wavemon wavemon.o $(OBJECTS)
++	$(CC) $(LDFLAGS) $(LIBS) -o wavemon wavemon.o $(OBJECTS)
+ 
+ wavemon.o: wavemon.c defs.h $(OBJECTS)
+ 
+Index: wavemon-0.4.0b/configure
+===================================================================
+--- wavemon-0.4.0b.orig/configure	2007-07-10 16:33:06.000000000 +0200
++++ wavemon-0.4.0b/configure	2007-07-10 16:33:08.000000000 +0200
+@@ -544,14 +544,14 @@
+ EOF
+ 
+ 
+-CFLAGS="-O2 -Wall"
++CFLAGS="$CFLAGS -O2 -Wall"
+ 
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
+   enableval="$enable_debug"
+   
+ 		if test x$enableval = xyes ; then
+-			CFLAGS="-O -Wall -g -DDEBUG"
++			CFLAGS="$CFLAGS -g -DDEBUG"
+ 		fi
+ 	
+ 
+Index: wavemon-0.4.0b/configure.in
+===================================================================
+--- wavemon-0.4.0b.orig/configure.in	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/configure.in	2007-07-10 16:33:08.000000000 +0200
+@@ -13,12 +13,12 @@
+ 
+ AC_DEFINE_UNQUOTED(WAVEMON_VERSION_STR, "version ${WAVEMON_VERSION} (${WAVEMON_RELEASE_DATE})")
+ 
+-CFLAGS="-O2 -Wall"
++CFLAGS="$CFLAGS -O2 -Wall"
+ 
+ AC_ARG_ENABLE(debug, [  --enable-debug             Enable debugging support],
+ 	[
+ 		if test x$enableval = xyes ; then
+-			CFLAGS="-O -Wall -g -DDEBUG"
++			CFLAGS="$CFLAGS -g -DDEBUG"
+ 		fi
+ 	]
+ )
+Index: wavemon-0.4.0b/error.c
+===================================================================
+--- wavemon-0.4.0b.orig/error.c	2007-07-10 16:33:07.000000000 +0200
++++ wavemon-0.4.0b/error.c	2007-07-10 16:33:08.000000000 +0200
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include <ncurses.h>
+ #include "conf.h"
Index: packages/net/wavemon/Makefile
===================================================================
--- packages/net/wavemon/Makefile	(Revision 0)
+++ packages/net/wavemon/Makefile	(Revision 0)
@@ -0,0 +1,44 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wavemon
+PKG_VERSION:=0.4.0b
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.janmorgenstern.de/
+PKG_MD5SUM:=2baab37eb967fc38dc53f8e4f609daac
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=libncurses
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wavemon
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libncurses
+  TITLE:=Wireless Device Monitoring Application
+  DESCRIPTION:=\
+	Wavemon allows you to watch signal and noise levels, packet statistics, \\\
+	device configuration and network parameters of your wireless network \\\
+	hardware. It has currently only been tested with the Lucent Orinoco series \\\
+	of cards, although it *should* work (though with varying features) with all \\\
+	devices supported by the wireless kernel extensions by Jean Tourrilhes.
+  URL:=http://www.janmorgenstern.de/projects-software.html
+endef
+
+define Package/wavemon/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,wavemon))