wok annotate bristuff/stuff/bristuff.u @ rev 2774

Up: cups (1.3.10) [security update]
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Apr 27 09:27:59 2009 +0200 (2009-04-27)
parents d659eda8a095
children
rev   line source
pascal@1187 1 --- apply-patches.sh
pascal@1187 2 +++ apply-patches.sh
pascal@1187 3 @@ -12,6 +12,2 @@
pascal@1187 4 patch_file="$patches_dir/$patch_name"
pascal@1187 5 - if ! patch -p1 < "$patch_file" --quiet --dry-run; then
pascal@1187 6 - echo "Failed applying $patch_file (directory: $2). Aborting."
pascal@1187 7 - exit 1
pascal@1187 8 - fi
pascal@1187 9 patch -p1 < "$patch_file"
pascal@1187 10
pascal@1187 11 --- download.sh
pascal@1187 12 +++ download.sh
pascal@1187 13 @@ -44,3 +44,3 @@
pascal@1187 14 url="$1"
pascal@1187 15 - file=`echo $url | rev | cut -d/ -f1 | rev`
pascal@1187 16 + file=${url##*/}
pascal@1187 17 wget -c $url.sha1
pascal@1187 18 @@ -51,3 +51,3 @@
pascal@1187 19 # we have a file. Let's check if it is valid
pascal@1187 20 - if sha1sum -c --status $file.sha1; then return; fi
pascal@1187 21 + if sha1sum -c -s $file.sha1; then return; fi
pascal@1187 22
pascal@1187 23 --- download.sh Tue Apr 29 09:43:48 2008
pascal@1187 24 +++ download.sh Tue Apr 29 09:48:51 2008
pascal@1187 25 @@ -36,6 +36,18 @@
pascal@1187 26 fi
pascal@1187 27 }
pascal@1187 28
pascal@1187 29 +. /etc/tazwok.conf
pascal@1187 30 +slitaz_wget()
pascal@1187 31 +{
pascal@1187 32 + if [ ! -f $SOURCES_REPOSITORY/$(basename $2) ]; then
pascal@1187 33 + local here=$(pwd)
pascal@1187 34 + cd $SOURCES_REPOSITORY
pascal@1187 35 + wget $1 $2
pascal@1187 36 + cd $here
pascal@1187 37 + fi
pascal@1187 38 + cp $SOURCES_REPOSITORY/$(basename $2) .
pascal@1187 39 +}
pascal@1187 40 +
pascal@1187 41 # A simple 'wget -c' won't work with Digium, as they keep providing a
pascal@1187 42 # newer timestamp on files.
pascal@1187 43 #
pascal@1187 44 @@ -43,26 +54,26 @@
pascal@1187 45 digium_download() {
pascal@1187 46 url="$1"
pascal@1187 47 file=${url##*/}
pascal@1187 48 - wget -c $url.sha1
pascal@1187 49 + slitaz_wget -c $url.sha1
pascal@1187 50 if [ ! -f "$file" ]; then
pascal@1187 51 - wget -c "$url"
pascal@1187 52 + slitaz_wget -c "$url"
pascal@1187 53 fi
pascal@1187 54
pascal@1187 55 # we have a file. Let's check if it is valid
pascal@1187 56 if sha1sum -c -s $file.sha1; then return; fi
pascal@1187 57
pascal@1187 58 # If we're still here: bad download
pascal@1187 59 - wget -c "$url"
pascal@1187 60 + slitaz_wget -c "$url"
pascal@1187 61 }
pascal@1187 62
pascal@1187 63 -#wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz
pascal@1187 64 -#wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz
pascal@1187 65 +#slitaz_wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz
pascal@1187 66 +#slitaz_wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz
pascal@1187 67 digium_download http://downloads.digium.com/pub/zaptel/releases/zaptel-${ZAP_VER}.tar.gz
pascal@1187 68 -#wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz
pascal@1187 69 +#slitaz_wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz
pascal@1187 70 digium_download http://downloads.digium.com/pub/libpri/releases/libpri-${PRI_VER}.tar.gz
pascal@1187 71 -#wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz
pascal@1187 72 +#slitaz_wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz
pascal@1187 73 digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-${AST_VER}.tar.gz
pascal@1187 74 -wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz
pascal@1187 75 +slitaz_wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz
pascal@1187 76 #digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-${ADD_VER}.tar.gz
pascal@1187 77
pascal@1187 78 move_dir zaptel-${ZAP_VER}
pascal@1187 79 --- patches/zaptel/series
pascal@1187 80 +++ patches/zaptel/series
pascal@1187 81 @@ -3,3 +3,4 @@
pascal@1187 82 zt_alarm_notify_no_master_change
pascal@1187 83 ztcfg-start_stop
pascal@1187 84 ztpty
pascal@1187 85 +slitaz
pascal@1187 86 --- patches/zaptel/slitaz
pascal@1187 87 +++ patches/zaptel/slitaz
pascal@1567 88 @@ -0,0 +1,88 @@
pascal@1187 89 +--- zaptel-1.4.8/zaptel-base.c 2008-04-29 11:04:40.000000000 +0200
pascal@1187 90 ++++ zaptel-1.4.8/zaptel-base.c 2008-04-29 11:05:16.000000000 +0200
pascal@1187 91 +@@ -4432,3 +4432,3 @@
pascal@1187 92 + void *rxgain=NULL;
pascal@1187 93 +- struct echo_can_state *ec;
pascal@1187 94 ++ struct echo_can_state *ec, *tec;
pascal@1187 95 + struct zt_echocanparams ecp;
pascal@1187 96 +--- zaptel-1.4.8/Makefile.org 2008-04-29 13:07:17.000000000 +0200
pascal@1187 97 ++++ zaptel-1.4.8/Makefile 2008-04-29 13:08:20.000000000 +0200
pascal@1187 98 +@@ -205,14 +205,14 @@
pascal@1187 99 + INITRD_DIR := $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d))
pascal@1187 100 + ifneq (,$(INITRD_DIR))
pascal@1187 101 + INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/zaptel
pascal@1187 102 +- COPY_INITD := install -D zaptel.init $(INIT_TARGET)
pascal@1187 103 ++ COPY_INITD := cp zaptel.init $(INIT_TARGET)
pascal@1187 104 + endif
pascal@1187 105 + RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default))
pascal@1187 106 +
pascal@1187 107 + NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts ))
pascal@1187 108 + ifneq (,$(NETSCR_DIR))
pascal@1187 109 + NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc
pascal@1187 110 +- COPY_NETSCR := install -D ifup-hdlc $(NETSCR_TARGET)
pascal@1187 111 ++ COPY_NETSCR := cp ifup-hdlc $(NETSCR_TARGET)
pascal@1187 112 + endif
pascal@1187 113 +
pascal@1187 114 + ifneq ($(wildcard .version),)
pascal@1187 115 +@@ -466,7 +466,7 @@
pascal@1187 116 + install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
pascal@1187 117 + endif
pascal@1187 118 + ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
pascal@1187 119 +- $(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
pascal@1187 120 ++ cp zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
pascal@1187 121 + endif
pascal@1187 122 +
pascal@1187 123 + # Pushing those two to a separate target that is not used by default:
pascal@1187 124 +@@ -482,8 +482,8 @@
pascal@1187 125 + endif
pascal@1187 126 +
pascal@1187 127 + install-libs: libs
pascal@1187 128 +- $(INSTALL) -D -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A)
pascal@1187 129 +- $(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
pascal@1187 130 ++ cp $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A)
pascal@1187 131 ++ cp $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
pascal@1187 132 + ifeq (,$(DESTDIR))
pascal@1187 133 + if [ `id -u` = 0 ]; then \
pascal@1187 134 + /sbin/ldconfig || : ;\
pascal@1187 135 +@@ -499,7 +499,7 @@
pascal@1187 136 + /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
pascal@1187 137 + endif
pascal@1187 138 + endif
pascal@1187 139 +- $(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
pascal@1187 140 ++ cp tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
pascal@1187 141 +
pascal@1187 142 + install-utils-subdirs:
pascal@1187 143 + @for dir in $(SUBDIRS_UTILS); do \
pascal@1187 144 +@@ -507,7 +507,7 @@
pascal@1187 145 + done
pascal@1187 146 +
pascal@1187 147 + install-include:
pascal@1187 148 +- $(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
pascal@1187 149 ++ cp zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
pascal@1187 150 +
pascal@1187 151 + devices:
pascal@1187 152 + ifndef DYNFS
pascal@1187 153 +@@ -578,7 +578,7 @@
pascal@1187 154 + endif
pascal@1187 155 + ifneq (,$(RCCONF_DIR))
pascal@1187 156 + ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/zaptel))
pascal@1187 157 +- $(INSTALL) -D -m 644 zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel
pascal@1187 158 ++ cp zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel
pascal@1187 159 + endif
pascal@1187 160 + endif
pascal@1187 161 + ifneq (,$(COPY_NETSCR))
pascal@1567 162 +
pascal@1567 163 +--- zaptel-1.4.8/zconfig.h.org 2008-10-13 21:49:25.000000000 +0200
pascal@1567 164 ++++ zaptel-1.4.8/zconfig.h 2008-10-13 21:49:43.000000000 +0200
pascal@1567 165 +@@ -88,9 +88,11 @@
pascal@1567 166 + /* #define NO_ECHOCAN_DISABLE */
pascal@1567 167 +
pascal@1567 168 + /* udev support */
pascal@1567 169 ++#ifdef LINUX_VERSION_CODE
pascal@1567 170 + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
pascal@1567 171 + #define CONFIG_ZAP_UDEV
pascal@1567 172 + #endif
pascal@1567 173 ++#endif
pascal@1567 174 +
pascal@1567 175 + /* We now use the linux kernel config to detect which options to use */
pascal@1567 176 + /* You can still override them below */
pascal@1567 177
pascal@1187 178 --- patches/zaphfc/series
pascal@1187 179 +++ patches/zaphfc/series
pascal@1187 180 @@ -1,3 +1,4 @@
pascal@1187 181 local_zap
pascal@1187 182 newzaptel
pascal@1187 183 florz.diff
pascal@1187 184 +slitaz
pascal@1187 185 --- /dev/null
pascal@1187 186 +++ patches/zaphfc/slitaz
pascal@1187 187 @@ -0,0 +1,13 @@
pascal@1187 188 +--- zaphfc/Makefile.org 2008-04-29 13:07:25.000000000 +0200
pascal@1187 189 ++++ zaphfc/Makefile 2008-04-29 13:08:38.000000000 +0200
pascal@1187 190 +@@ -111,8 +111,8 @@
pascal@1187 191 + install: install$(BUILDVER)
pascal@1187 192 +
pascal@1187 193 + installlinux26:
pascal@1187 194 +- install -D -m 644 zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.ko
pascal@1187 195 ++ cp zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/
pascal@1187 196 +
pascal@1187 197 + installlinux24:
pascal@1187 198 +- install -D -m 644 zaphfc.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.o
pascal@1187 199 ++ cp zaphfc.o $(INSTALL_PREFIX)/lib/modules/*/misc/
pascal@1187 200 +
pascal@1187 201
pascal@1187 202 --- patches/cwain/series
pascal@1187 203 +++ patches/cwain/series
pascal@1187 204 @@ -1,3 +1,2 @@
pascal@1187 205 -# Does not seem to apply cleanly. Testing needed:
pascal@1187 206 -#beronet.diff
pascal@1187 207 +beronet.diff
pascal@1187 208 local_zap