* merged r21436 from kernel-cleanup2:

* updated zaptel (1.2.11 -> 1.4.3)


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21660 10447126-35f2-4685-b0cf-6dd780d3921f

network/zaptel/hotfix_noredef_bool.diff

@@ -1,26 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: package/.../zaptel/hotfix_noredef_bool.diff
-# Copyright (C) 2006 The OpenSDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- ./xpp/xdefs.h.orig	2006-10-09 09:33:11.000000000 -0400
-+++ ./xpp/xdefs.h	2006-10-09 09:52:31.000000000 -0400
-@@ -90,7 +90,6 @@
- 
- typedef char			*charp;
- typedef unsigned char		byte;
--typedef int			bool;
- typedef struct xbus		xbus_t;
- typedef	struct xpd		xpd_t;
- typedef	struct xpacket_raw	xpacket_raw_t;

network/zaptel/no-depmod.patch

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../zaptel/no-depmod.patch
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # 
 # More information can be found in the files COPYING and README.
 # 
@@ -14,13 +14,13 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- ./Makefile.orig	2006-09-01 00:23:07.000000000 +0200
-+++ ./Makefile	2006-09-01 00:24:58.000000000 +0200
-@@ -365,7 +365,6 @@
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
- 	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
+--- ./Makefile.orig	2007-06-08 15:37:44.000000000 +0000
++++ ./Makefile	2007-06-22 18:47:48.000000000 +0000
+@@ -405,7 +405,6 @@
+ 	fi
+ 	$(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
+ 	$(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
 -	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+ 	[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+ 	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
  	@if [ -d /etc/modutils ]; then \

network/zaptel/pkg_linux26_pre.conf

@@ -1,16 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../zaptel/pkg_linux26_pre.conf
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-var_append lx_3rd_party_modules " " "zaptel"

network/zaptel/pkg_linux26mm_pre.conf

@@ -1,16 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../zaptel/pkg_linux26mm_pre.conf
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-var_append lx_3rd_party_modules " " "zaptel"

network/zaptel/postlinux.conf

@@ -1,27 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: package/.../zaptel/postlinux.conf
-# Copyright (C) 2006 The OpenSDE Project
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-
-var_append makeopt " " "CC=$KCC"
-
-var_append makeopt " " "KVERS=$lx_kernelrelease"
-var_append makeopt " " "KSRC=$kerneldir"
-var_append makeopt " " "INSTALL_PREFIX=$root"
-
-makeinstopt="$makeopt install-modules"
-
-if [ "$super" == "linux26mm" ]; then
-	var_append patchfiles ' ' $confdir/hotfix_noredef_bool.diff
-fi

network/zaptel/split_make_install.patch

@@ -1,61 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: package/.../zaptel/split_make_install.patch
-# Copyright (C) 2006 The OpenSDE Project
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Just build and install userspace stuff of zaptel 
-
---- ./Makefile.orig	2006-09-11 06:49:22.000000000 -0400
-+++ ./Makefile	2006-09-11 10:39:02.000000000 -0400
-@@ -137,6 +137,8 @@
- 
- all: $(BUILDVER) $(LIBTONEZONE_SO)
- 
-+bins: $(BINS)
-+
- linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o $(BINS)
- 
- linux26: prereq $(BINS)
-@@ -315,14 +317,7 @@
- 	tar -zxf mISDNuser.tar.gz
- 	$(MAKE) -C mISDNuser install
- 
--install: all devices firmware
--	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
--	if [ -f sethdlc-new ]; then \
--		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
--	elif [ -f sethdlc ]; then \
--		install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
--	fi
--	if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
-+install-modules:
- ifeq ($(BUILDVER),linux26)
- 	for x in $(MODULESKO); do \
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
-@@ -337,6 +332,14 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
- 	fi; \
- 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
-+install: 
-+	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
-+	if [ -f sethdlc-new ]; then \
-+		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-+	elif [ -f sethdlc ]; then \
-+		install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
-+	fi
-+	if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi	
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
- 	[ `id -u` = 0 ] && /sbin/ldconfig || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)

network/zaptel/zaptel.conf

@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../zaptel/zaptel.conf
+# Filename: package/.../zaptel/zaptel.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -10,10 +11,18 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
+if pkginstalled udev; then
+	var_append makeinstopt ' ' "install-udev"
+fi
 
-var_append makeopt ' ' "bins"
-var_append makeopt ' ' "libtonezone.so"
-
-pkginstalled udev && var_append makeinstopt ' ' "install-udev"
+zaptel_firmware() {
+	local file= name=
+	for file in $( match_source_file -p firmware ); do
+		name=${file##*/}; 
+		name=${name%.bz2}.gz
+		bunzip2 -c $file | gzip -c - > firmware/$name
+	done
+}
+hook_add preconf 5 'zaptel_firmware'

network/zaptel/zaptel.desc

@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
 [COPY] Filename: package/.../zaptel/zaptel.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2006 The T2 SDE Project
 [COPY] 
 [COPY] More information can be found in the files COPYING and README.
@@ -28,8 +28,10 @@
 
 [L] GPL
 [S] Stable
-[V] 1.2.11
+[V] 1.4.3
 [P] X -----5---9 201.200 
 
-[D] 1330967377 zaptel-1.2.11.tar.gz http://ftp.digium.com/pub/zaptel/
-
+[D] 3609870612 zaptel-1.4.3.tar.gz http://ftp.digium.com/pub/zaptel/
+[D] 3813212664 zaptel-fw-oct6114-064-1.05.01.tar.gz http://ftp.digium.com/pub/telephony/firmware/releases/
+[D] 3689583728 zaptel-fw-oct6114-128-1.05.01.tar.gz http://ftp.digium.com/pub/telephony/firmware/releases/
+[D] 3236715012 zaptel-fw-tc400m-MR5.6.tar.gz http://ftp.digium.com/pub/telephony/firmware/releases/