# HG changeset patch # User Pascal Bellard # Date 1253394597 -7200 # Node ID 7b1634394048caeea4a8559d2b0d8910a4f0e6a9 # Parent 6e3a46ecfae64aee563ee00138fc43bd255120d3 Remove bristuff diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/receipt --- a/bristuff/receipt Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -#!/bin/sh -# SliTaz package receipt. - -PACKAGE="bristuff" -VERSION="0.4.0-test6-xr1" -CATEGORY="meta" -SHORT_DESC="ISDN patches for Asterisk/Zaptel." -MAINTAINER="pascal.bellard@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.junghanns.net/" -WGET_URL="http://updates.xorcom.com/astribank/bristuff/1.4/$TARBALL" -BUILD_DEPENDS="openssl-dev ncurses-dev zlib-dev patch libogg-dev libvorbis-dev \ -curl-dev newt-dev libusb-dev sqlite-dev alsa-lib-dev fxload speex-dev \ -iksemel-dev mysql-dev glibc-dev spandsp-dev tiff-dev radiusclient-ng-dev \ -mysql libmysqlclient cmake postgresql postgresql-dev libpostgresqlclient \ -libtool unixODBC-dev libunixODBC nbs nbs-dev mISDNuser-dev mISDNuser \ -gnutls-dev" -DEPENDS="asterisk asterisk-sound zaptel nbs mISDNuser" -TAGS="isdn" - -#TODO: net-snmp(-dev) vpb-driver(-dev) -#Asterisk: libopenh323-dev (Not so nice addon), libsnmp-dev (Asterisk 1.4) -#Asterisk+=app_ivrdemo? app_osplookup app_rpt? app_skel? -#Asterisk+=cdr_sqlite(sqlite) res_snmp(netsnmp) -#Asterisk+=chan_features? chan_h323(openh323) chan_vpb(vpbapi) -#Asterisk+=pbx_gtkconsole(gtk) pbx_kdeconsole(qt) -#Asterisk+=IMAP_STORAGE(imap_tk,ssl) CORE-SOUNDS-ES-GSM CORE-SOUNDS-FR-GSM -#Asterisk+=MOH-FREEPLAY-GSM EXTRA-SOUNDS-EN-GSM - -# Download a source tarball -. /etc/tazwok.conf -slitaz_wget() -{ - if [ ! -f $SOURCES_REPOSITORY/$(basename $2) ]; then - local here=$(pwd) - cd $SOURCES_REPOSITORY - wget $1 $2 - cd $here - fi - cp $SOURCES_REPOSITORY/$(basename $2) . -} - -# Rules to configure and make the package. -compile_rules() -{ - if [ -L $(which patch) ]; then - echo "Please reinstall patch !" - return 1 - fi - if [ ! -d ../linux/taz ]; then - tazwok cook linux - fi - KVERS=$(grep "kernel version" ../linux/$(ls ../linux/taz)/.config) - KVERS=${KVERS##* } - KSRC=$(cd ../linux/$(ls ../linux/taz) ; pwd) - export KVERS - export KSRC - cd $src - eval $(grep ^ADD_VER= download.sh) - slitaz_wget -c $SF_MIRROR/agx-ast-addons/agx-ast-addons-$ADD_VER.tar.bz2 - #bluetooth: - #slitaz_wget -c http://svn.digium.com/view/asterisk-addons/trunk/channels/chan_mobile.c?view=co - #slitaz_wget -c http://www.chan-mobile.org/downloads/chan_mobile-1.4.x.patch - # cd asterisk-addons - # patch -p0 < chan_mobile-1.4.x.patch - tar xjf agx-ast-addons-$ADD_VER.tar.bz2 - for i in CMakeLists.u bristuff.u; do - [ -f done.$i ] && continue - echo "Apply $i..." - patch -p0 < ../stuff/$i || return 1 - touch done.$i - done - chmod +x apply-patches.sh - sh ./download.sh - echo "Apply sounds.u..." - patch -p0 < ../stuff/sounds.u || return 1 - ln -s . zaptel/zaptel - ln -s . zaptel/linux - mkdir -p _pkg/etc/init.d _pkg/usr/include/zaptel - [ -f done.uname ] || - grep -rsl "uname -r" . | xargs sed -i -e "s/uname -r/echo $KVERS/g" - touch done.uname - export BRISTUFF_ZAP_PARAMS="KBUILD_NOPEDANTIC=1" - sed -i 's/^NO_H323=.*/NO_H323="--with-gsm=internal --without-pwlib --without-h323"/' ./compile.sh - sh ./compile.sh -d $(cd _pkg; pwd) -i - cp asterisk/configs/* _pkg/etc/asterisk/ - cp asterisk-addons/configs/* _pkg/etc/asterisk/ - cd agx-ast-addons - cmake "." -DCMAKE_INSTALL_PREFIX=../_pkg/usr - make install - cd .. - ln -s libgsmat.so.1.0 _pkg/usr/lib/libgsmat.so.1 - cp ../stuff/*.files-list . -} - - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - # Just to have a dir. - mkdir -p $fs/var/lib/asterisk - # Cook all packages based on bristuff - for i in $(cd $WOK; grep -l '^WANTED="bristuff"$' */receipt) - do - tazwok cook ${i%/receipt} - done -} - diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/CMakeLists.u --- a/bristuff/stuff/CMakeLists.u Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- agx-ast-addons/CMakeLists.txt.org Wed Apr 30 13:41:43 2008 -+++ agx-ast-addons/CMakeLists.txt Wed Apr 30 13:47:46 2008 -@@ -14,7 +14,7 @@ - # Asterisk is required - #-------------------------------------------------- - --FIND_PATH(ASTERISK_INCLUDE_DIR asterisk.h /usr/include /usr/local/include) -+FIND_PATH(ASTERISK_INCLUDE_DIR asterisk.h ../asterisk/include) - IF(NOT ASTERISK_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "MISSING HEADER: asterisk.h") - ENDIF(NOT ASTERISK_INCLUDE_DIR) diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/asterisk-dev.files-list --- a/bristuff/stuff/asterisk-dev.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -/usr/include/asterisk* diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/asterisk-sound-fr.files-list --- a/bristuff/stuff/asterisk-sound-fr.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -/var/lib/asterisk/sounds/fr -/var/lib/asterisk/sounds/.asterisk-core-sounds-fr-* diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/asterisk-sound.files-list --- a/bristuff/stuff/asterisk-sound.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -/var/lib/asterisk/sounds/* -/var/lib/asterisk/sounds/.asterisk-core-sounds-en-* diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/asterisk.files-list --- a/bristuff/stuff/asterisk.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -/usr/lib/asterisk -/etc/asterisk -/usr/sbin/asterisk -/usr/sbin/rasterisk -/usr/sbin/astgenkey -/usr/sbin/autosupport -/usr/sbin/safe_asterisk -/usr/sbin/astman -/usr/sbin/stereorize -/usr/sbin/streamplayer -/usr/sbin/aelparse -/usr/sbin/muted -/usr/sbin/smsq -/var/lib/asterisk/static-http -/var/lib/asterisk/images -/var/lib/asterisk/agi-bin -/var/lib/asterisk/moh -/var/lib/asterisk/keys -/var/lib/asterisk/firmware -/var/run -/var/spool -/var/log diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/bristuff.u --- a/bristuff/stuff/bristuff.u Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,208 +0,0 @@ ---- apply-patches.sh -+++ apply-patches.sh -@@ -12,6 +12,2 @@ - patch_file="$patches_dir/$patch_name" -- if ! patch -p1 < "$patch_file" --quiet --dry-run; then -- echo "Failed applying $patch_file (directory: $2). Aborting." -- exit 1 -- fi - patch -p1 < "$patch_file" - ---- download.sh -+++ download.sh -@@ -44,3 +44,3 @@ - url="$1" -- file=`echo $url | rev | cut -d/ -f1 | rev` -+ file=${url##*/} - wget -c $url.sha1 -@@ -51,3 +51,3 @@ - # we have a file. Let's check if it is valid -- if sha1sum -c --status $file.sha1; then return; fi -+ if sha1sum -c -s $file.sha1; then return; fi - ---- download.sh Tue Apr 29 09:43:48 2008 -+++ download.sh Tue Apr 29 09:48:51 2008 -@@ -36,6 +36,18 @@ - fi - } - -+. /etc/tazwok.conf -+slitaz_wget() -+{ -+ if [ ! -f $SOURCES_REPOSITORY/$(basename $2) ]; then -+ local here=$(pwd) -+ cd $SOURCES_REPOSITORY -+ wget $1 $2 -+ cd $here -+ fi -+ cp $SOURCES_REPOSITORY/$(basename $2) . -+} -+ - # A simple 'wget -c' won't work with Digium, as they keep providing a - # newer timestamp on files. - # -@@ -43,26 +54,26 @@ - digium_download() { - url="$1" - file=${url##*/} -- wget -c $url.sha1 -+ slitaz_wget -c $url.sha1 - if [ ! -f "$file" ]; then -- wget -c "$url" -+ slitaz_wget -c "$url" - fi - - # we have a file. Let's check if it is valid - if sha1sum -c -s $file.sha1; then return; fi - - # If we're still here: bad download -- wget -c "$url" -+ slitaz_wget -c "$url" - } - --#wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz --#wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz -+#slitaz_wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz -+#slitaz_wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz - digium_download http://downloads.digium.com/pub/zaptel/releases/zaptel-${ZAP_VER}.tar.gz --#wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz -+#slitaz_wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz - digium_download http://downloads.digium.com/pub/libpri/releases/libpri-${PRI_VER}.tar.gz --#wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz -+#slitaz_wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz - digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-${AST_VER}.tar.gz --wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz -+slitaz_wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz - #digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-${ADD_VER}.tar.gz - - move_dir zaptel-${ZAP_VER} ---- patches/zaptel/series -+++ patches/zaptel/series -@@ -3,3 +3,4 @@ - zt_alarm_notify_no_master_change - ztcfg-start_stop - ztpty -+slitaz ---- patches/zaptel/slitaz -+++ patches/zaptel/slitaz -@@ -0,0 +1,88 @@ -+--- zaptel-1.4.8/zaptel-base.c 2008-04-29 11:04:40.000000000 +0200 -++++ zaptel-1.4.8/zaptel-base.c 2008-04-29 11:05:16.000000000 +0200 -+@@ -4432,3 +4432,3 @@ -+ void *rxgain=NULL; -+- struct echo_can_state *ec; -++ struct echo_can_state *ec, *tec; -+ struct zt_echocanparams ecp; -+--- zaptel-1.4.8/Makefile.org 2008-04-29 13:07:17.000000000 +0200 -++++ zaptel-1.4.8/Makefile 2008-04-29 13:08:20.000000000 +0200 -+@@ -205,14 +205,14 @@ -+ INITRD_DIR := $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d)) -+ ifneq (,$(INITRD_DIR)) -+ INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/zaptel -+- COPY_INITD := install -D zaptel.init $(INIT_TARGET) -++ COPY_INITD := cp zaptel.init $(INIT_TARGET) -+ endif -+ RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default)) -+ -+ NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts )) -+ ifneq (,$(NETSCR_DIR)) -+ NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc -+- COPY_NETSCR := install -D ifup-hdlc $(NETSCR_TARGET) -++ COPY_NETSCR := cp ifup-hdlc $(NETSCR_TARGET) -+ endif -+ -+ ifneq ($(wildcard .version),) -+@@ -466,7 +466,7 @@ -+ install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/ -+ endif -+ ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE))) -+- $(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE) -++ cp zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE) -+ endif -+ -+ # Pushing those two to a separate target that is not used by default: -+@@ -482,8 +482,8 @@ -+ endif -+ -+ install-libs: libs -+- $(INSTALL) -D -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A) -+- $(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -++ cp $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A) -++ cp $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -+ ifeq (,$(DESTDIR)) -+ if [ `id -u` = 0 ]; then \ -+ /sbin/ldconfig || : ;\ -+@@ -499,7 +499,7 @@ -+ /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO) -+ endif -+ endif -+- $(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h -++ cp tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h -+ -+ install-utils-subdirs: -+ @for dir in $(SUBDIRS_UTILS); do \ -+@@ -507,7 +507,7 @@ -+ done -+ -+ install-include: -+- $(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h -++ cp zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h -+ -+ devices: -+ ifndef DYNFS -+@@ -578,7 +578,7 @@ -+ endif -+ ifneq (,$(RCCONF_DIR)) -+ ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/zaptel)) -+- $(INSTALL) -D -m 644 zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel -++ cp zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel -+ endif -+ endif -+ ifneq (,$(COPY_NETSCR)) -+ -+--- zaptel-1.4.8/zconfig.h.org 2008-10-13 21:49:25.000000000 +0200 -++++ zaptel-1.4.8/zconfig.h 2008-10-13 21:49:43.000000000 +0200 -+@@ -88,9 +88,11 @@ -+ /* #define NO_ECHOCAN_DISABLE */ -+ -+ /* udev support */ -++#ifdef LINUX_VERSION_CODE -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) -+ #define CONFIG_ZAP_UDEV -+ #endif -++#endif -+ -+ /* We now use the linux kernel config to detect which options to use */ -+ /* You can still override them below */ - ---- patches/zaphfc/series -+++ patches/zaphfc/series -@@ -1,3 +1,4 @@ - local_zap - newzaptel - florz.diff -+slitaz ---- /dev/null -+++ patches/zaphfc/slitaz -@@ -0,0 +1,13 @@ -+--- zaphfc/Makefile.org 2008-04-29 13:07:25.000000000 +0200 -++++ zaphfc/Makefile 2008-04-29 13:08:38.000000000 +0200 -+@@ -111,8 +111,8 @@ -+ install: install$(BUILDVER) -+ -+ installlinux26: -+- install -D -m 644 zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.ko -++ cp zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/ -+ -+ installlinux24: -+- install -D -m 644 zaphfc.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.o -++ cp zaphfc.o $(INSTALL_PREFIX)/lib/modules/*/misc/ -+ - ---- patches/cwain/series -+++ patches/cwain/series -@@ -1,3 +1,2 @@ --# Does not seem to apply cleanly. Testing needed: --#beronet.diff -+beronet.diff - local_zap diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/sounds.u --- a/bristuff/stuff/sounds.u Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ ---- asterisk/sounds/sounds.xml -+++ asterisk/sounds/sounds.xml -@@ -31,6 +31,7 @@ - - - -+ yes - - - -@@ -39,13 +40,13 @@ - - - -- yes - - - - - - -+ yes - - - diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/zaptel-dev.files-list --- a/bristuff/stuff/zaptel-dev.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -/usr/include/zaptel -/usr/include/libpri.h -/usr/include/libgsmat.h -/usr/lib/libtonezone.a -/usr/lib/libpri.a -/usr/lib/libgsmat.a diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/zaptel-perl.files-list --- a/bristuff/stuff/zaptel-perl.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -/usr/lib/perl5 diff -r 6e3a46ecfae6 -r 7b1634394048 bristuff/stuff/zaptel.files-list --- a/bristuff/stuff/zaptel.files-list Sat Sep 19 23:08:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -/etc/udev -/etc/zaptel.conf -/lib/modules -/sbin/zt* -/sbin/fxotune -/usr/sbin/genzaptelconf -/usr/sbin/fpga_load -/usr/sbin/zt_registration -/usr/sbin/xpp_sync -/usr/sbin/lszaptel -/usr/sbin/xpp_blink -/usr/sbin/zapconf -/usr/sbin/zaptel_hardware -/usr/share/zaptel -/usr/lib/libtonezone.so* -/usr/lib/libpri.so* -/usr/lib/libgsmat.so*