wok-next diff bristuff/stuff/bristuff.u @ rev 1304
Fix: DEPENDS to claws-mail.
author | Eric Joseph-Alexandre <erjo@slitaz.org> |
---|---|
date | Mon Aug 25 09:24:39 2008 +0200 (2008-08-25) |
parents | |
children | 6fd8242e9be0 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/bristuff/stuff/bristuff.u Mon Aug 25 09:24:39 2008 +0200 1.3 @@ -0,0 +1,192 @@ 1.4 +--- apply-patches.sh 1.5 ++++ apply-patches.sh 1.6 +@@ -12,6 +12,2 @@ 1.7 + patch_file="$patches_dir/$patch_name" 1.8 +- if ! patch -p1 < "$patch_file" --quiet --dry-run; then 1.9 +- echo "Failed applying $patch_file (directory: $2). Aborting." 1.10 +- exit 1 1.11 +- fi 1.12 + patch -p1 < "$patch_file" 1.13 + 1.14 +--- download.sh 1.15 ++++ download.sh 1.16 +@@ -44,3 +44,3 @@ 1.17 + url="$1" 1.18 +- file=`echo $url | rev | cut -d/ -f1 | rev` 1.19 ++ file=${url##*/} 1.20 + wget -c $url.sha1 1.21 +@@ -51,3 +51,3 @@ 1.22 + # we have a file. Let's check if it is valid 1.23 +- if sha1sum -c --status $file.sha1; then return; fi 1.24 ++ if sha1sum -c -s $file.sha1; then return; fi 1.25 + 1.26 +--- download.sh Tue Apr 29 09:43:48 2008 1.27 ++++ download.sh Tue Apr 29 09:48:51 2008 1.28 +@@ -36,6 +36,18 @@ 1.29 + fi 1.30 + } 1.31 + 1.32 ++. /etc/tazwok.conf 1.33 ++slitaz_wget() 1.34 ++{ 1.35 ++ if [ ! -f $SOURCES_REPOSITORY/$(basename $2) ]; then 1.36 ++ local here=$(pwd) 1.37 ++ cd $SOURCES_REPOSITORY 1.38 ++ wget $1 $2 1.39 ++ cd $here 1.40 ++ fi 1.41 ++ cp $SOURCES_REPOSITORY/$(basename $2) . 1.42 ++} 1.43 ++ 1.44 + # A simple 'wget -c' won't work with Digium, as they keep providing a 1.45 + # newer timestamp on files. 1.46 + # 1.47 +@@ -43,26 +54,26 @@ 1.48 + digium_download() { 1.49 + url="$1" 1.50 + file=${url##*/} 1.51 +- wget -c $url.sha1 1.52 ++ slitaz_wget -c $url.sha1 1.53 + if [ ! -f "$file" ]; then 1.54 +- wget -c "$url" 1.55 ++ slitaz_wget -c "$url" 1.56 + fi 1.57 + 1.58 + # we have a file. Let's check if it is valid 1.59 + if sha1sum -c -s $file.sha1; then return; fi 1.60 + 1.61 + # If we're still here: bad download 1.62 +- wget -c "$url" 1.63 ++ slitaz_wget -c "$url" 1.64 + } 1.65 + 1.66 +-#wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz 1.67 +-#wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz 1.68 ++#slitaz_wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz 1.69 ++#slitaz_wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz 1.70 + digium_download http://downloads.digium.com/pub/zaptel/releases/zaptel-${ZAP_VER}.tar.gz 1.71 +-#wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz 1.72 ++#slitaz_wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz 1.73 + digium_download http://downloads.digium.com/pub/libpri/releases/libpri-${PRI_VER}.tar.gz 1.74 +-#wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz 1.75 ++#slitaz_wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz 1.76 + digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-${AST_VER}.tar.gz 1.77 +-wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz 1.78 ++slitaz_wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz 1.79 + #digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-${ADD_VER}.tar.gz 1.80 + 1.81 + move_dir zaptel-${ZAP_VER} 1.82 +--- patches/zaptel/series 1.83 ++++ patches/zaptel/series 1.84 +@@ -3,3 +3,4 @@ 1.85 + zt_alarm_notify_no_master_change 1.86 + ztcfg-start_stop 1.87 + ztpty 1.88 ++slitaz 1.89 +--- patches/zaptel/slitaz 1.90 ++++ patches/zaptel/slitaz 1.91 +@@ -0,0 +1,73 @@ 1.92 ++--- zaptel-1.4.8/zaptel-base.c 2008-04-29 11:04:40.000000000 +0200 1.93 +++++ zaptel-1.4.8/zaptel-base.c 2008-04-29 11:05:16.000000000 +0200 1.94 ++@@ -4432,3 +4432,3 @@ 1.95 ++ void *rxgain=NULL; 1.96 ++- struct echo_can_state *ec; 1.97 +++ struct echo_can_state *ec, *tec; 1.98 ++ struct zt_echocanparams ecp; 1.99 ++--- zaptel-1.4.8/Makefile.org 2008-04-29 13:07:17.000000000 +0200 1.100 +++++ zaptel-1.4.8/Makefile 2008-04-29 13:08:20.000000000 +0200 1.101 ++@@ -205,14 +205,14 @@ 1.102 ++ INITRD_DIR := $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d)) 1.103 ++ ifneq (,$(INITRD_DIR)) 1.104 ++ INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/zaptel 1.105 ++- COPY_INITD := install -D zaptel.init $(INIT_TARGET) 1.106 +++ COPY_INITD := cp zaptel.init $(INIT_TARGET) 1.107 ++ endif 1.108 ++ RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default)) 1.109 ++ 1.110 ++ NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts )) 1.111 ++ ifneq (,$(NETSCR_DIR)) 1.112 ++ NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc 1.113 ++- COPY_NETSCR := install -D ifup-hdlc $(NETSCR_TARGET) 1.114 +++ COPY_NETSCR := cp ifup-hdlc $(NETSCR_TARGET) 1.115 ++ endif 1.116 ++ 1.117 ++ ifneq ($(wildcard .version),) 1.118 ++@@ -466,7 +466,7 @@ 1.119 ++ install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/ 1.120 ++ endif 1.121 ++ ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE))) 1.122 ++- $(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE) 1.123 +++ cp zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE) 1.124 ++ endif 1.125 ++ 1.126 ++ # Pushing those two to a separate target that is not used by default: 1.127 ++@@ -482,8 +482,8 @@ 1.128 ++ endif 1.129 ++ 1.130 ++ install-libs: libs 1.131 ++- $(INSTALL) -D -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A) 1.132 ++- $(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) 1.133 +++ cp $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A) 1.134 +++ cp $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) 1.135 ++ ifeq (,$(DESTDIR)) 1.136 ++ if [ `id -u` = 0 ]; then \ 1.137 ++ /sbin/ldconfig || : ;\ 1.138 ++@@ -499,7 +499,7 @@ 1.139 ++ /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO) 1.140 ++ endif 1.141 ++ endif 1.142 ++- $(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h 1.143 +++ cp tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h 1.144 ++ 1.145 ++ install-utils-subdirs: 1.146 ++ @for dir in $(SUBDIRS_UTILS); do \ 1.147 ++@@ -507,7 +507,7 @@ 1.148 ++ done 1.149 ++ 1.150 ++ install-include: 1.151 ++- $(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h 1.152 +++ cp zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h 1.153 ++ 1.154 ++ devices: 1.155 ++ ifndef DYNFS 1.156 ++@@ -578,7 +578,7 @@ 1.157 ++ endif 1.158 ++ ifneq (,$(RCCONF_DIR)) 1.159 ++ ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/zaptel)) 1.160 ++- $(INSTALL) -D -m 644 zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel 1.161 +++ cp zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel 1.162 ++ endif 1.163 ++ endif 1.164 ++ ifneq (,$(COPY_NETSCR)) 1.165 +--- patches/zaphfc/series 1.166 ++++ patches/zaphfc/series 1.167 +@@ -1,3 +1,4 @@ 1.168 + local_zap 1.169 + newzaptel 1.170 + florz.diff 1.171 ++slitaz 1.172 +--- /dev/null 1.173 ++++ patches/zaphfc/slitaz 1.174 +@@ -0,0 +1,13 @@ 1.175 ++--- zaphfc/Makefile.org 2008-04-29 13:07:25.000000000 +0200 1.176 +++++ zaphfc/Makefile 2008-04-29 13:08:38.000000000 +0200 1.177 ++@@ -111,8 +111,8 @@ 1.178 ++ install: install$(BUILDVER) 1.179 ++ 1.180 ++ installlinux26: 1.181 ++- install -D -m 644 zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.ko 1.182 +++ cp zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/ 1.183 ++ 1.184 ++ installlinux24: 1.185 ++- install -D -m 644 zaphfc.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.o 1.186 +++ cp zaphfc.o $(INSTALL_PREFIX)/lib/modules/*/misc/ 1.187 ++ 1.188 + 1.189 +--- patches/cwain/series 1.190 ++++ patches/cwain/series 1.191 +@@ -1,3 +1,2 @@ 1.192 +-# Does not seem to apply cleanly. Testing needed: 1.193 +-#beronet.diff 1.194 ++beronet.diff 1.195 + local_zap