[packages/wanpipe] - up to 7.0.0 - updated opt patch - removed obsolete include-limits,refcnt patches

qboosh qboosh at pld-linux.org
Mon Mar 11 20:00:49 CET 2013 

commit d22608569072a1a5e5a5a882f6307d46fb823a79
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 11 20:00:47 2013 +0100

    - up to 7.0.0
    - updated opt patch
    - removed obsolete include-limits,refcnt patches

 wanpipe-include-limits.patch |  13 ----
 wanpipe-opt.patch            | 135 +++++++++++++++++------------------------
 wanpipe-refcnt.patch         |  14 -----
 wanpipe.spec                 | 139 ++++++++++++++++++++++++++++++++++++-------
 4 files changed, 171 insertions(+), 130 deletions(-)
---
diff --git a/wanpipe.spec b/wanpipe.spec
index d7125eb..9b28143 100644
--- a/wanpipe.spec
+++ b/wanpipe.spec
@@ -3,7 +3,7 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 #
-%if !%{with kernel}
+%if %{without kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -12,21 +12,19 @@
 Summary:	WAN routing package for Sangoma cards
 Summary(pl.UTF-8):	Pakiet do rutingu WAN dla kart Sangoma
 Name:		wanpipe
-Version:	3.5.20
+Version:	7.0.0
 Release:	%{rel}
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.sangoma.com/linux/current_wanpipe/%{name}-%{version}.tgz
-# Source0-md5:	a52bfc800baebc4b0aa4e7a97c841afe
+# Source0-md5:	0602bf8a632312019e092f7de23caa9a
 Source1:	wanrouter.init
 Source2:	wanrouter.sysconfig
 Source3:	%{name}1.conf
 Patch0:		%{name}-cfgtools.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-setup.patch
-Patch3:		%{name}-include-limits.patch
-Patch4:		%{name}-kbuild.patch
-Patch5:		%{name}-refcnt.patch
+Patch3:		%{name}-kbuild.patch
 URL:		http://www.sangoma.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -40,6 +38,7 @@ BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,6 +62,41 @@ Menu-driven configuration tools for WANPIPE.
 %description cfgtools -l pl.UTF-8
 Narzędzia konfiguracyjne do WANPIPE w postaci menu.
 
+%package libs
+Summary:	Sangoma WANPIPE libraries
+Summary(pl.UTF-8):	Biblioteki Sangoma WANPIPE
+Group:		Libraries
+
+%description libs
+Sangoma WANPIPE libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki Sangoma WANPIPE.
+
+%package devel
+Summary:	Header files for Sangoma WANPIPE libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Sangoma WANPIPE
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for Sangoma WANPIPE libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek Sangoma WANPIPE.
+
+%package static
+Summary:	Static Sangoma WANPIPE libraries
+Summary(pl.UTF-8):	Biblioteki statyczne Sangoma WANPIPE
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static Sangoma WANPIPE libraries.
+
+%description static -l pl.UTF-8
+Biblioteki statyczne Sangoma WANPIPE.
+
 %package -n kernel%{_alt_kernel}-%{name}
 Summary:	Linux driver for WANPIPE
 Summary(pl.UTF-8):	Sterownik WANPIPE dla Linuksa
@@ -83,17 +117,13 @@ Ten pakiet zawiera moduł WANPIPE dla Linuksa.
 %prep
 %setup -q
 #%patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch3 -p1
 
 sed -i 's#EXTRA_UTIL_FLAGS = #EXTRA_UTIL_FLAGS = -I/usr/include/ncurses #' Makefile
 sed -i 's#<ncurses.h>#<ncurses/ncurses.h>#' util/lxdialog/Makefile
 sed -i 's#MODULE_EXT=".ko"#MODULE_EXT=".ko.gz"#' util/lxdialog/Makefile
-sed -i 's/libstelephony\.cpp//; s#libstelephony_la_SOURCES *=#libstelephony_la_SOURCES = libstelephony.cpp#' api/libstelephony/Makefile.am
-sed -i '/lib_LIBRARIES/d; /libstelephony_a_CXXFLAGS/d' -i api/libstelephony/Makefile.am
 
 sed "1a\include $(pwd)/Makefile.kbuild" -i patches/kdrivers/src/net/Makefile
 
@@ -102,23 +132,28 @@ cd api/libstelephony
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 cd ../..
 
 %{__make} all_kmod_dahdi all_util all_lib \
-	DAHDI_DIR=/usr \
-	INSTALLPREFIX=%{buildroot}
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}" \
+	DAHDI_DIR=/usr
+#	INSTALLPREFIX=$RPM_BUILD_ROOT
 
 %if %{with kernel}
 %build_kernel_modules -C patches/kdrivers/src/net -m {af_wanpipe,sdladrv,wanrouter,wanpipe,wanpipe_syncppp,wanec,wan_aften}
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig},/var/log} \
 	$RPM_BUILD_ROOT%{_datadir}/wanrouter/{firmware,wancfg}
 
+%{__make} install_lib \
+	INSTALLPREFIX=$RPM_BUILD_ROOT
+
 %{__make} -C util install \
 	WAN_VIRTUAL=$RPM_BUILD_ROOT
 
@@ -135,6 +170,8 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
 
 touch $RPM_BUILD_ROOT/var/log/wanrouter
 
+%{__mv} $RPM_BUILD_ROOT/usr/local/sbin/setup-sangoma $RPM_BUILD_ROOT/usr/sbin/setup-sangoma
+
 %if %{with kernel}
 %install_kernel_modules -m patches/kdrivers/src/net/{wanec,af_wanpipe,wanrouter} -d kernel/net/wanrouter
 %install_kernel_modules -m patches/kdrivers/src/net/{sdladrv,wanpipe_syncppp,wanpipe,wan_aften} -d kernel/drivers/net/wan
@@ -156,16 +193,42 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del wanrouter
 fi
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc README doc samples
-%attr(755,root,root) %{_sbindir}/sdladump
+%attr(755,root,root) %{_sbindir}/setup-sangoma
 %attr(755,root,root) %{_sbindir}/wanconfig
 %attr(755,root,root) %{_sbindir}/wanpipemon
+%attr(755,root,root) %{_sbindir}/wanrouter
 %attr(755,root,root) %{_sbindir}/wpbwm
 %attr(755,root,root) %{_sbindir}/wp_pppconfig
 %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wanpipe1.conf
+%dir %{_sysconfdir}/lib
+%{_sysconfdir}/lib/*_lib.sh
+%{_sysconfdir}/lib/lib.sh
+%{_sysconfdir}/lib/help.sh
+%dir %{_sysconfdir}/util
+%dir %{_sysconfdir}/util/wan_aftup
+%{_sysconfdir}/util/wan_aftup/*.BIN
+%attr(754,root,root) %{_sysconfdir}/util/wan_aftup/update_aft_firm.sh
+# XXX: ELF binary
+%attr(754,root,root) %{_sysconfdir}/util/wan_aftup/wan_aftup
+%dir %{_sysconfdir}/util/wan_aftup/scripts
+%attr(754,root,root) %{_sysconfdir}/util/wan_aftup/scripts/load.sh
+%attr(754,root,root) %{_sysconfdir}/util/wan_aftup/scripts/unload.sh
+%dir %{_sysconfdir}/wancfg_zaptel
+%{_sysconfdir}/wancfg_zaptel/Makefile
+%{_sysconfdir}/wancfg_zaptel/*.pm
+%attr(754,root,root) %{_sysconfdir}/wancfg_zaptel/clean.sh
+%attr(754,root,root) %{_sysconfdir}/wancfg_zaptel/install.sh
+%attr(754,root,root) %{_sysconfdir}/wancfg_zaptel/uninstall.sh
+%attr(754,root,root) %{_sysconfdir}/wancfg_zaptel/setup-sangoma
+%attr(754,root,root) %{_sysconfdir}/wancfg_zaptel/wancfg_*
+%{_sysconfdir}/wancfg_zaptel/templates
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/wanrouter
 %attr(754,root,root) /etc/rc.d/init.d/wanrouter
 %dir %{_datadir}/wanrouter
@@ -174,13 +237,47 @@ fi
 
 %files cfgtools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/cfgft1
-%attr(755,root,root) %{_sbindir}/wan*
+%attr(755,root,root) %{_sbindir}/wan_aftup
+%attr(755,root,root) %{_sbindir}/wan_ec_client
+%attr(755,root,root) %{_sbindir}/wan_plxup
+%attr(755,root,root) %{_sbindir}/wancfg_*
+%attr(755,root,root) %{_sbindir}/wanconfig
+%attr(755,root,root) %{_sbindir}/wanpipe_lxdialog
+%attr(755,root,root) %{_sbindir}/wanpipemon
+%attr(755,root,root) %{_sbindir}/wanpipemon_legacy
 %{_datadir}/wanrouter/wancfg
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsangoma.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsangoma.so.3
+%attr(755,root,root) %{_libdir}/libstelephony.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libstelephony.so.1
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsangoma.so
+%attr(755,root,root) %{_libdir}/libstelephony.so
+%{_libdir}/libsangoma.la
+%{_libdir}/libstelephony.la
+%{_includedir}/libhpsangoma.h
+%{_includedir}/libsangoma.h
+%{_includedir}/libstelephony.h
+%{_includedir}/wanec_api.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libsangoma.a
+%{_libdir}/libstelephony.a
+
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-%{name}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/net/wanrouter/*.ko*
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan/*.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan/sdladrv.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan/wan_aften.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan/wanpipe.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan/wanpipe_syncppp.ko*
+/lib/modules/%{_kernel_ver}/kernel/net/wanrouter/af_wanpipe.ko*
+/lib/modules/%{_kernel_ver}/kernel/net/wanrouter/wanec.ko*
+/lib/modules/%{_kernel_ver}/kernel/net/wanrouter/wanrouter.ko*
 %endif
diff --git a/wanpipe-include-limits.patch b/wanpipe-include-limits.patch
deleted file mode 100644
index c5eb55e..0000000
--- a/wanpipe-include-limits.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- wanpipe-3.2.5/util/wanpipemon/aftpipemon.c.org	2008-05-17 15:06:44.189393500 +0000
-+++ wanpipe-3.2.5/util/wanpipemon/aftpipemon.c	2008-05-17 15:06:50.545790750 +0000
-@@ -23,9 +23,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <time.h>
--#if defined(__FreeBSD__)
--# include <limits.h>
--#endif
-+#include <limits.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
diff --git a/wanpipe-opt.patch b/wanpipe-opt.patch
index 7ff45f7..bcead58 100644
--- a/wanpipe-opt.patch
+++ b/wanpipe-opt.patch
@@ -1,82 +1,70 @@
---- wanpipe/util/misc/Makefile.orig	2003-07-18 22:18:36.000000000 +0200
-+++ wanpipe/util/misc/Makefile	2004-04-09 18:39:26.032529856 +0200
-@@ -15,7 +15,8 @@
- WAN_VIRTUAL=
+--- wanpipe-7.0.0/util/misc/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.0/util/misc/Makefile	2013-03-10 19:56:46.015102862 +0100
+@@ -20,7 +20,8 @@
+ endif
  
  # Tools options.
--CFLAGS  = -Wall -O2 -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -I$(SYSINC) $(HOSTCFLAGS)
-+OPTFLAGS=-O2
-+CFLAGS  = -Wall $(OPTFLAGS) -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -I$(SYSINC) $(HOSTCFLAGS)
- 
+-CFLAGS  = -Wall -O2 -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -I$(SYSINC) -I$(WANINCDIR) $(HOSTCFLAGS)
++OPTFLAGS = -O2
++CFLAGS  = -Wall $(OPTFLAGS) -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -I$(SYSINC) -I$(WANINCDIR) $(HOSTCFLAGS)
  
  ####### RULES ################################################################
---- wanpipe/util/wanconfig/Makefile.orig	2003-07-18 22:18:35.000000000 +0200
-+++ wanpipe/util/wanconfig/Makefile	2004-04-09 18:40:07.506224896 +0200
-@@ -17,7 +17,8 @@
- WAN_VIRTUAL=
+ 
+--- wanpipe-7.0.0/util/wanconfig/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.0/util/wanconfig/Makefile	2013-03-10 19:55:12.731773439 +0100
+@@ -23,7 +23,8 @@
  
  # Tools options.
--CFLAGS  = -Wall -O2 -D$(OS_TYPE) -I$(SYSINC) -I../../patches/kdrivers/include -D_DEBUG_=$(DEBUG)
+ SRCS=wanconfig.c wanconfig_hwec.c  
+-CFLAGS = -Wall -O2 -D$(OS_TYPE) -I$(SYSINC) -D_DEBUG_=$(DEBUG)
 +OPTFLAGS=-O2
-+CFLAGS  = -Wall $(OPTFLAGS) -D$(OS_TYPE) -I/usr/include/ncurses -I../../patches/kdrivers/include -D_DEBUG_=$(DEBUG)
++CFLAGS = -Wall $(OPTFLAGS) -D$(OS_TYPE) -I$(SYSINC) -D_DEBUG_=$(DEBUG)
+ CFLAGS += -DCONFIG_PRODUCT_WANPIPE_AFT_BRI -DCONFIG_PRODUCT_WANPIPE_USB -I../libsangoma/wanec
+ CFLAGS += -I../../patches/kdrivers/include -I$(SYSINC)
+ CFLAGS += -I$(WANECDIR)/oct6100_api/include
+--- wanpipe-7.0.0/util/wanpipemon/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.0/util/wanpipemon/Makefile	2013-03-10 19:57:27.298434463 +0100
+@@ -34,11 +34,12 @@
  
- CFLAGS += -DWAN_HWEC
- 
---- 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
-@@ -12,7 +12,7 @@
- 
- PROD=wanpipemon
- 
--SYSINC=/lib/modules/$(shell uname -r)/build/include
-+HOSTCFLAGS=-I../../patches/kdrivers/include -I/usr/include/ncurses
- 
- WAN_VIRTUAL=
- LXDIR=../lxdialog
-@@ -27,7 +27,8 @@
+ CC = gcc 
  CPP = gcc -E
++OPTFLAGS = -O2
  CFLAGS = -Wall -Wstrict-prototypes 
- CFLAGS += $(EXTRA_FLAGS)
--CFLAGS += -I$(SYSINC) -D$(OS_TYPE) -I../ft1 -O2 -fomit-frame-pointer -DLOCALE -D_DEBUG_=$(DEBUG)
-+OPTFLAGS=-O2                                                                                                                     
-+CFLAGS = $(OPTFLAGS) -fomit-frame-pointer -DLOCALE -D$(OS_TYPE) -I../ft1 -D_DEBUG_=$(DEBUG) $(HOSTCFLAGS)  
+ CFLAGS += $(EXTRA_FLAGS) $(PROTOCOL_DEFS)
+ CFLAGS += $(GLOBAL_CFLAGS)
+ CFLAGS +=  -D$(OS_TYPE) -I../libsangoma -I../libsangoma/wanec -I$(WLINC) -I$(WEC) -I$(WECOCT) -I$(WINC)
+-CFLAGS += -I$(SYSINC) -I$(SYSINC)/oct6100_api -I$(SYSINC)/oct6100_api/oct6100api -I../ft1 -O2 -fomit-frame-pointer -DLOCALE -D_DEBUG_=$(DEBUG)
++CFLAGS += -I$(SYSINC) -I$(SYSINC)/oct6100_api -I$(SYSINC)/oct6100_api/oct6100api -I../ft1 -fomit-frame-pointer $(OPTFLAGS) -DLOCALE -D_DEBUG_=$(DEBUG)
  WAN_VIRTUAL=
  
  
-
---- 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 @@
- SYSINC	= /usr/src/linux/include
+--- wanpipe-7.0.0/util/sdladump/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.0/util/sdladump/Makefile	2013-03-10 19:57:59.671766435 +0100
+@@ -15,7 +15,8 @@
+ endif
  
  # Tools options.
--CFLAGS  = -D__LINUX__ -I$(SYSINC) -Wall -O2  -D_DEBUG_=$(DEBUG) 
-+OPTFLAGS=-O2
-+CFLAGS  = -D__LINUX__ -I/usr/include/ncurses -I../../patches/kdrivers/include -Wall $(OPTFLAGS)  -D_DEBUG_=$(DEBUG) 
+-CFLAGS  = -D__LINUX__ -I$(SYSINC) -Wall -O2  -D_DEBUG_=$(DEBUG) $(EXTRA_FLAGS) 
++OPTFLAGS = -O2
++CFLAGS  = -D__LINUX__ -I$(SYSINC) -Wall $(OPTFLAGS)  -D_DEBUG_=$(DEBUG) $(EXTRA_FLAGS) 
  
  
  ####### 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
-@@ -11,10 +11,12 @@
- DEBUG	= 2
- 
- # Project file paths.
--SYSINC=/lib/modules/$(shell uname -r)/build/include
-+HOSTCFLAGS=-I../../patches/kdrivers/include -I/usr/include/ncurses
+--- wanpipe-7.0.0/util/ft1/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.0/util/ft1/Makefile	2013-03-10 19:58:40.768431374 +0100
+@@ -22,7 +22,8 @@
+ EXTRA_FLAGS=
  
  # Tools options.
--CFLAGS  = -D__LINUX__ -Wall -O2 -D_GNUC_ -I$(SYSINC) -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -I../../patches/kdrivers/include 
-+OPTFLAGS=-O2
-+CFLAGS  = -D__LINUX__ -Wall $(OPTFLAGS) -D_GNUC_ -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) $(HOSTCFLAGS)
-+
+-CFLAGS  = -D__LINUX__ -Wall -O2 -D_GNUC_ -I$(WANINCDIR) -I$(SYSINC) -D$(OS_TYPE) -D_DEBUG_=$(DEBUG)  
++OPTFLAGS = -O2
++CFLAGS  = -D__LINUX__ -Wall $(OPTFLAGS) -D_GNUC_ -I$(WANINCDIR) -I$(SYSINC) -D$(OS_TYPE) -D_DEBUG_=$(DEBUG)  
  LIBS = -lncurses
  
- ####### RULES ################################################################
---- 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 @@
-+CC=gcc
+ CFLAGS += $(EXTRA_FLAGS)
+--- wanpipe-7.0.0/util/bwm/Makefile.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.0/util/bwm/Makefile	2013-03-10 19:59:10.858430099 +0100
+@@ -1,5 +1,7 @@
 +OPTFLAGS=-O2
 +
  all: bwm.c
@@ -84,33 +72,16 @@
 +	$(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
-@@ -1,15 +1,14 @@
- CC = gcc 
- CPP = gcc -E
+ 	rm -f wpbwm
+--- wanpipe-7.0.0/util/lxdialog/Makefile.orig	2013-03-10 19:10:00.295220605 +0100
++++ wanpipe-7.0.0/util/lxdialog/Makefile	2013-03-10 20:00:40.318426412 +0100
+@@ -3,7 +3,8 @@
  #Will be overwritten by ./Setup
--SYSINC=/lib/modules/$(shell uname -r)/build/include
+ SYSINC=/lib/modules/$(shell uname -r)/build/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
+-CFLAGS = -D__LINUX__ -Wall -Wstrict-prototypes -I$(SYSINC) -O2 -fomit-frame-pointer -DLOCALE 
++OPTFLAGS = -O2
++CFLAGS = -D__LINUX__ -Wall -Wstrict-prototypes -I$(SYSINC) -fomit-frame-pointer $(OPTFLAGS) -DLOCALE 
  LDFLAGS = -s -L .
  LDLIBS = -lncurses
  WAN_VIRTUAL=
- 
- 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>"
- #else
---- wanpipe/util/Makefile.orig	2007-03-22 00:27:29.000000000 +0000
-+++ wanpipe/util/Makefile	2007-10-10 22:03:32.603992707 +0000
-@@ -1,5 +1,5 @@
- PWD=$(shell pwd)
--SYSINC=$(PWD)/../patches/kdrivers/include
-+SYSINC="../../patches/kdrivers/include -I/usr/include/ncurses"
- WAN_VIRTUAL=$(PREFIX)
- WANINCDIR=/usr/include/wanpipe
- ARCH=$(shell uname -m)
diff --git a/wanpipe-refcnt.patch b/wanpipe-refcnt.patch
deleted file mode 100644
index 5648c66..0000000
--- a/wanpipe-refcnt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- wanpipe-3.5.20/patches/kdrivers/src/wanrouter/wanmain.c~	2011-04-17 15:15:10.162513484 +0200
-+++ wanpipe-3.5.20/patches/kdrivers/src/wanrouter/wanmain.c	2011-04-17 15:15:24.459179809 +0200
-@@ -2136,10 +2136,7 @@
- void wan_skb_destructor (struct sk_buff *skb)
- {
- 	if (skb->dev){
--		struct net_device *dev=skb->dev;
--		atomic_dec(&(dev)->refcnt);
--		//printk(KERN_INFO "%s: Skb destructor: put dev: refcnt=%i\n",
--		//		dev->name,atomic_read(&dev->refcnt));
-+		dev_put( skb->dev );
- 	}	
- }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wanpipe.git/commitdiff/d22608569072a1a5e5a5a882f6307d46fb823a79

More information about the pld-cvs-commit mailing list