SOURCES: wanpipe-opt.patch, wanpipe-cfgtools.patch - 2.3.3

areq areq at pld-linux.org
Sun Jun 11 01:31:26 CEST 2006


Author: areq                         Date: Sat Jun 10 23:31:26 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.3.3

---- Files affected:
SOURCES:
   wanpipe-opt.patch (1.2 -> 1.3) , wanpipe-cfgtools.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/wanpipe-opt.patch
diff -u SOURCES/wanpipe-opt.patch:1.2 SOURCES/wanpipe-opt.patch:1.3
--- SOURCES/wanpipe-opt.patch:1.2	Fri Apr  9 19:58:32 2004
+++ SOURCES/wanpipe-opt.patch	Sun Jun 11 01:31:21 2006
@@ -18,38 +18,41 @@
  # Tools options.
 -CFLAGS  = -Wall -O2 -D$(OS_TYPE) -I$(SYSINC) -D_DEBUG_=$(DEBUG)
 +OPTFLAGS=-O2
-+CFLAGS  = -Wall $(OPTFLAGS) -D$(OS_TYPE) -I../../patches/kdrivers/include -D_DEBUG_=$(DEBUG)
++CFLAGS  = -Wall $(OPTFLAGS) -D$(OS_TYPE) -I/usr/include/ncurses -I../../patches/kdrivers/include -D_DEBUG_=$(DEBUG)
  
  ####### RULES ################################################################
  
 --- wanpipe/util/wanpipemon/Makefile.orig	2004-01-15 17:10:28.000000000 +0100
 +++ wanpipe/util/wanpipemon/Makefile	2004-04-09 18:41:11.266531856 +0200
-@@ -11,14 +11,13 @@
- DEBUG	= 2
+@@ -12,9 +12,6 @@
  
- # Project file paths.
--SYSINC	= /usr/src/linux/include
+ PROD=wanpipemon
+ 
+-SYSINC=$(shell if [ -d /lib/modules/$(uname -r)/build/include ]; then echo "/lib/modules/$(uname -r)/build/include" else echo "/usr/src/linux/include"; fi)
+-SYSINC=$(shell echo "/lib/modules/$(uname -r)/build/include")
+-
  WAN_VIRTUAL=
  LXDIR=../lxdialog
  ENABLE_GUI=YES
- PROTOCOL_DEFS=
+@@ -23,14 +20,15 @@
+ ASTBROOT=/usr
  #-DCONFIG_PRODUCT_WANPIPE_ADSL
  
--HOSTCFLAGS=-I$(SYSINC)
-+HOSTCFLAGS=-I../../patches/kdrivers/include
- ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
-         HOSTCFLAGS += -I/usr/include/ncurses
- else
-@@ -29,7 +28,8 @@
- endif
- 
- # Tools options.
--CFLAGS  = -Wall -O2 -D$(OS_TYPE) -I$(SYSINC) -I../ft1 -D_DEBUG_=$(DEBUG) $(HOSTCFLAGS)
++HOSTCFLAGS=-I../../patches/kdrivers/include -I/usr/include/ncurses
++
+ CC = gcc 
+ CPP = gcc -E
+-CFLAGS = -Wall -Wstrict-prototypes -I$(SYSINC) -D$(OS_TYPE) -I../ft1 -O2 -fomit-frame-pointer -DLOCALE -D_DEBUG_=$(DEBUG) $(HOSTCFLAGS)
 +OPTFLAGS=-O2
-+CFLAGS  = -Wall $(OPTFLAGS) -D$(OS_TYPE) -I../ft1 -D_DEBUG_=$(DEBUG) $(HOSTCFLAGS)
++CFLAGS = -Wall $(OPTFLAGS) -fomit-frame-pointer -DLOCALE -D$(OS_TYPE) -I../ft1 -D_DEBUG_=$(DEBUG) $(HOSTCFLAGS)
+ LDFLAGS = -s -L .
+ WAN_VIRTUAL=
  
- ifeq "${ENABLE_GUI}" "NO"
- LX_OBJ =
+-
+-HOSTCFLAGS=-I$(SYSINC)
+ #ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
+ #        HOSTCFLAGS += -I/usr/include/ncurses
+ #else
 --- wanpipe/util/sdladump/Makefile.orig	2003-07-18 22:18:35.000000000 +0200
 +++ wanpipe/util/sdladump/Makefile	2004-04-09 18:39:45.744533176 +0200
 @@ -13,7 +13,8 @@
@@ -58,25 +61,24 @@
  # Tools options.
 -CFLAGS  = -D__LINUX__ -I$(SYSINC) -Wall -O2  -D_DEBUG_=$(DEBUG) 
 +OPTFLAGS=-O2
-+CFLAGS  = -D__LINUX__ -I../../patches/kdrivers/include -Wall $(OPTFLAGS)  -D_DEBUG_=$(DEBUG) 
++CFLAGS  = -D__LINUX__ -I/usr/include/ncurses -I../../patches/kdrivers/include -Wall $(OPTFLAGS)  -D_DEBUG_=$(DEBUG) 
  
  
  ####### RULES ################################################################
 --- wanpipe/util/ft1/Makefile.orig	2003-07-18 22:18:36.000000000 +0200
 +++ wanpipe/util/ft1/Makefile	2004-04-09 18:38:37.559898816 +0200
-@@ -10,10 +10,7 @@
- OS_TYPE	= _LINUX_
+@@ -11,9 +11,7 @@
  DEBUG	= 2
  
--# Project file paths.
--SYSINC = /usr/src/linux/include
+ # Project file paths.
+-SYSINC = /usr/include
 -
--HOSTCFLAGS=-I/usr/src/linux/include 
-+HOSTCFLAGS=-I../../patches/kdrivers/include
+-HOSTCFLAGS=-I/usr/include
++HOSTCFLAGS=-I../../patches/kdrivers/include -I/usr/include/ncurses
  ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
          HOSTCFLAGS += -I/usr/include/ncurses
  else
-@@ -24,7 +21,8 @@
+@@ -24,7 +22,8 @@
  endif
  
  # Tools options.
@@ -86,18 +88,6 @@
  LIBS = -lncurses
  
  ####### RULES ################################################################
---- wanpipe/util/lxdialog/Makefile.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/lxdialog/Makefile	2004-04-09 18:39:10.810843904 +0200
-@@ -3,7 +3,8 @@
- 
- SYSINC=/usr/src/linux/include
- 
--CFLAGS = -Wall -Wstrict-prototypes -I$(SYSINC) -O2 -fomit-frame-pointer -DLOCALE 
-+OPTFLAGS=-O2 -fomit-frame-pointer
-+CFLAGS = -Wall -Wstrict-prototypes $(OPTFLAGS) -DLOCALE 
- LDFLAGS = -s -L .
- LDLIBS = -lncurses
- WAN_VIRTUAL=
 --- wanpipe/util/bwm/Makefile.orig	2003-10-08 17:38:05.000000000 +0200
 +++ wanpipe/util/bwm/Makefile	2004-04-09 18:38:09.166215312 +0200
 @@ -1,5 +1,8 @@
@@ -105,8 +95,44 @@
 +OPTFLAGS=-O2
 +
  all: bwm.c
--	cc $(CFLAGS) -O2 -Wall bwm.c -o wpbwm
+-	$(CC) $(CFLAGS) -O2 -Wall bwm.c -o wpbwm
 +	$(CC) $(CFLAGS) $(OPTFLAGS) -Wall bwm.c -o wpbwm
  
  clean:
  	rm wpbwm
+--- wanpipe/util/lxdialog/Makefile.orig	2003-07-18 22:18:36.000000000 +0200
++++ wanpipe/util/lxdialog/Makefile	2004-04-09 18:39:10.810843904 +0200
+@@ -3,13 +3,14 @@
+ #Will be overwritten by ./Setup
+ SYSINC=/usr/src/linux/include
+ 
+-CFLAGS = -Wall -Wstrict-prototypes -I$(SYSINC) -O2 -fomit-frame-pointer -DLOCALE 
++OPTFLAGS=-O2 -fomit-frame-pointer
++CFLAGS = -Wall -Wstrict-prototypes $(OPTFLAGS) -DLOCALE -I/usr/include/ncurses
+ LDFLAGS = -s -L .
+ LDLIBS = -lncurses
+ WAN_VIRTUAL=
+ ASTBROOT=/usr
+
+-CFLAGS += -I$(ASTBROOT)/include -DCURSES_LOC="<ncurses.h>"
++CFLAGS += -I$(ASTBROOT)/include -DCURSES_LOC="<ncurses.h>"
+
+ #ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
+ #        CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+--- wanpipe/util/Makefile.org	2006-06-10 22:56:52.165416750 +0000
++++ wanpipe/util/Makefile	2006-06-10 22:56:59.481874000 +0000
+@@ -1,4 +1,4 @@
+-SYSINC=/usr/src/linux/include
++SYSINC="../../patches/kdrivers/include -I/usr/include/ncurses"
+ 
+ all:
+ 	make -C ft1 all #SYSINC=$(SYSINC) 
+@@ -7,7 +7,7 @@
+ 	make -C wanconfig all SYSINC=$(SYSINC)
+ 	make -C wanpipemon all SYSINC=$(SYSINC) PROTOCOL_DEFS=$(PROTOCOL_DEFS) ENABLE_WANPIPEMON_ZAP=$(ENABLE_WANPIPEMON_ZAP)  
+ 	make -C wanpipemon_legacy all SYSINC=$(SYSINC) PROTOCOL_DEFS=$(PROTOCOL_DEFS) 
+-#	make -C wancfg all SYSINC=$(SYSINC) 
++	make -C wancfg all SYSINC=$(SYSINC) 
+ 	make -C bwm all SYSINC=$(SYSINC) PROTOCOL_DEFS=$(PROTOCOL_DEFS)
+ 
+ install:

================================================================
Index: SOURCES/wanpipe-cfgtools.patch
diff -u SOURCES/wanpipe-cfgtools.patch:1.3 SOURCES/wanpipe-cfgtools.patch:1.4
--- SOURCES/wanpipe-cfgtools.patch:1.3	Fri Apr  9 19:58:32 2004
+++ SOURCES/wanpipe-cfgtools.patch	Sun Jun 11 01:31:21 2006
@@ -9,104 +9,6 @@
  WAN_LOAD=NO
  
  source $META_CONF
---- wanpipe/util/wancfg/lib/chdlc_lib.sh.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/wancfg/lib/chdlc_lib.sh	2004-04-09 18:23:20.363333888 +0200
-@@ -1,4 +1,4 @@
--#!/bins/sh
-+#!/bin/bash
- 
- function chdlc_interface_init () {
- 	
---- wanpipe/util/wancfg/lib/fr_lib.sh.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/wancfg/lib/fr_lib.sh	2004-04-09 18:23:36.286913136 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- function fr_interface_setup () {
- 
---- wanpipe/util/wancfg/lib/help.sh.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/wancfg/lib/help.sh	2004-04-09 18:24:12.509406480 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
  #============================================================
  # start_menu_help
---- wanpipe/util/wancfg/lib/lib.sh.orig	2004-02-02 23:43:18.000000000 +0100
-+++ wanpipe/util/wancfg/lib/lib.sh	2004-04-09 18:26:41.126813200 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- function setup_name_prefix()
- {
-@@ -4152,7 +4152,7 @@
- 			NMSK_IP[$num]=$value
- 			#echo "NMSK_IP=${NMSK_IP[$num]}"
- 			  ;;
--		*POINTOPOINT*)
-+		*POINTOPOINT*|REMIP)
- 			R_IP[$num]=$value
- 			#echo "R_IP=${R_IP[$num]}"
- 			  ;;
-@@ -4896,7 +4896,7 @@
- DEVICE=${IF_NAME[$if_num]}
- IPADDR=${L_IP[$if_num]}
- NETMASK=${NMSK_IP[$if_num]}
--POINTOPOINT=${R_IP[$if_num]}
-+REMIP=${R_IP[$if_num]}
- ONBOOT=yes
- EOM
- 		
---- wanpipe/util/wancfg/lib/ppp_lib.sh.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/wancfg/lib/ppp_lib.sh	2004-04-09 18:26:49.412553576 +0200
-@@ -1,4 +1,4 @@
--#!/bins/sh
-+#!/bin/bash
- 
- function ppp_interface_setup () {
- 
---- wanpipe/util/wancfg/lib/x25_lib.sh.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/wancfg/lib/x25_lib.sh	2004-04-09 18:26:59.112079024 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- function x25_interface_setup () {
- 
---- wanpipe/util/wancfg/wancfg.orig	2004-03-24 22:28:37.000000000 +0100
-+++ wanpipe/util/wancfg/wancfg	2004-04-09 18:28:25.656922208 +0200
-@@ -1234,7 +1234,7 @@
- # check_setup  
- #
- #  	Check that all libraries exit as well as 
--#       /etc/wanrouter.rc.  
-+#       /etc/sysconfig/wanrouter
- #       Wanpipe Package must be installed before
- #       proceeding.
- #============================================================
-@@ -1277,12 +1277,12 @@
- 		exit 1
- 	fi
- 
--	if [ ! -f "$PROD_HOME/wanrouter.rc" ]; then
-+	if [ ! -f "/etc/sysconfig/wanrouter" ]; then
- 		cat << EOM
- 
- 	BAD CONFIGURATION - FILE MISSING
- 
--	$PROD_HOME/wanrouter.rc file could not 
-+	/etc/sysconfig/wanrouter file could not 
- be found. Please make sure that the wanpipe
- pacakge has been correctly installed before
- proceeding to configure a Sangoma device.
-@@ -1405,7 +1405,7 @@
- check_setup 1
- 
- #Load the library files
--source $PROD_HOME/wanrouter.rc
-+source /etc/sysconfig/wanrouter
- 
- check_setup 2
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/wanpipe-opt.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/wanpipe-cfgtools.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list