SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linmodem-hsfmodem/stuff/hsfmodem-7.80.02.05full.diff	Tue Mar 01 02:32:24 2011 +0000
     1.3 @@ -0,0 +1,207 @@
     1.4 +--- hsfmodem-7.80.02.05full/config.mak	Fri Feb 20 22:30:12 2009
     1.5 ++++ hsfmodem-7.80.02.05full+patch2/config.mak	Sun Apr 11 19:29:08 2010
     1.6 +@@ -131,4 +131,4 @@
     1.7 + 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
     1.8 + 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
     1.9 + 		< $< > $@
    1.10 +-	chmod --reference=$< $@
    1.11 ++	chmod 755 $@
    1.12 +--- hsfmodem-7.80.02.05full/makefile	Mon Feb 23 22:51:37 2009
    1.13 ++++ hsfmodem-7.80.02.05full+patch2/makefile	Sun Apr 11 19:29:08 2010
    1.14 +@@ -149,7 +149,7 @@
    1.15 + ifeq ($(RPMOPTEVAL),yes)
    1.16 + RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
    1.17 + else
    1.18 +-RPMTARGETCPU=$(shell uname -i)
    1.19 ++RPMTARGETCPU=$(shell uname -m)
    1.20 + endif
    1.21 + 
    1.22 + ifneq ($(RPMOPTDEFINE),yes)
    1.23 +--- hsfmodem-7.80.02.05full/modules/Makefile	Thu Oct 22 00:35:59 2009
    1.24 ++++ hsfmodem-7.80.02.05full+patch2/modules/Makefile	Sun Apr 11 19:49:54 2010
    1.25 +@@ -20,7 +20,7 @@
    1.26 + include $(TOP)/config.mak
    1.27 + 
    1.28 + IMPORTED = $(TOP)/modules/imported
    1.29 +-MACHINE_ARCH := $(shell if uname --hardware-platform >/dev/null 2>&1 && ! uname --hardware-platform | grep -q "unknown"; then uname --hardware-platform; else uname --machine | sed 's/^i.86$$/i386/'; fi)
    1.30 ++MACHINE_ARCH := $(shell if uname -p >/dev/null 2>&1 && ! uname -p | grep -q "unknown"; then uname -p; else uname -m | sed 's/^i.86$$/i386/'; fi)
    1.31 + ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    1.32 + $(warning *** WARNING: Trying to compile kernel modules on a $(MACHINE_ARCH) system while the installed $(CNXTTARGET) driver package is for $(IMPORTED_ARCH), this is likely to fail... ***)
    1.33 + endif
    1.34 +@@ -56,6 +56,7 @@
    1.35 + CNXT_KERNELSRC := /usr/src/kernel-headers-$(shell uname -r)
    1.36 + else
    1.37 + CNXT_KERNELSRC := /usr/src/linux
    1.38 ++CNXT_KERNELSRC := ../../../linux/linux-$(shell uname -r | sed s/-slitaz//)
    1.39 + endif
    1.40 + KERNELSRC_EXISTS := $(shell test -r ${CNXT_KERNELSRC}/include/linux/version.h && echo yes || echo no)
    1.41 + endif
    1.42 +
    1.43 +--- hsfmodem-7.80.02.05full/nvm/linksame	Fri Jan 13 20:23:51 2006
    1.44 ++++ hsfmodem-7.80.02.05full+patch2/nvm/linksame	Sun Apr 11 19:29:08 2010
    1.45 +@@ -17,7 +17,7 @@
    1.46 + 
    1.47 + if $dryrun; then
    1.48 + 	echo "dry run.."
    1.49 +-	find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do
    1.50 ++	find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do
    1.51 + 		if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then
    1.52 + 			echo ln "$prevfile" "$file"
    1.53 + 		else
    1.54 +@@ -28,7 +28,7 @@
    1.55 + 	exit $?
    1.56 + fi
    1.57 + 
    1.58 +-find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do
    1.59 ++find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do
    1.60 + 	if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then
    1.61 + 		rm -f "$file"
    1.62 + 		echo ln "$prevfile" "$file"
    1.63 +--- hsfmodem-7.80.02.05full/nvm/makefile	Wed Oct  1 17:23:26 2008
    1.64 ++++ hsfmodem-7.80.02.05full+patch2/nvm/makefile	Sun Apr 11 19:29:08 2010
    1.65 +@@ -52,7 +52,7 @@
    1.66 + all: $(ALL)
    1.67 + 
    1.68 + $(NVMCVTDIR)/.linksame: $(NVMDIRS_CVT)
    1.69 +-	cd $(NVMCVTDIR) && find . -type f ! -empty -exec md5sum {} ';' | sort | \
    1.70 ++	cd $(NVMCVTDIR) && find . -type f ! -size 0 -exec md5sum {} ';' | sort | \
    1.71 + 	while read sum file ; do \
    1.72 + 		if [ "$$sum" = "$$prevsum" ] && cmp -s "$$file" "$$prevfile"; then \
    1.73 + 			rm -f "$$file"; \
    1.74 +--- hsfmodem-7.80.02.05full/scripts/cnxtconfig.in	Thu Oct 22 00:35:59 2009
    1.75 ++++ hsfmodem-7.80.02.05full+patch2/scripts/cnxtconfig.in	Sun Apr 11 19:29:08 2010
    1.76 +@@ -74,7 +74,7 @@
    1.77 + 				answer="${region}"
    1.78 + 				;;
    1.79 + 			*)
    1.80 +-				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
    1.81 ++				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
    1.82 + 				;;
    1.83 + 			esac
    1.84 + 		fi
    1.85 +@@ -109,15 +109,13 @@
    1.86 + {
    1.87 + 	# Try to guess what region we're in, using the timezone settings
    1.88 + 
    1.89 +-	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    1.90 +-
    1.91 +-	if ! [ ${localtime_size} -gt 0 ]; then
    1.92 ++	if [ ! -e /etc/TZ ]; then
    1.93 + 		return 1
    1.94 + 	fi
    1.95 + 
    1.96 +-	zoneinfo_dir=/usr/share/zoneinfo
    1.97 ++	zoneinfo_dir=/etc/hsfmodem
    1.98 + 
    1.99 +-	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
   1.100 ++	if [ ! -f ${zoneinfo_dir}/zone.tab ]; then
   1.101 + 		return 1
   1.102 + 	fi
   1.103 + 
   1.104 +@@ -206,18 +204,11 @@
   1.105 + 	iso_VN=00BC # VIETNAM
   1.106 + 
   1.107 + 	(
   1.108 +-		cd ${zoneinfo_dir} 2>/dev/null || return 1
   1.109 +-		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
   1.110 +-			while read file; do
   1.111 +-				cmp -s /etc/localtime $file || continue
   1.112 +-# in the egrep and sed regular expressions below, it is very important to
   1.113 +-# have tabs, not spaces
   1.114 +-				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
   1.115 +-			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
   1.116 +-				while read code; do
   1.117 +-					eval "echo \${iso_${code}}"
   1.118 +-				done | sort | uniq
   1.119 ++		zone=`cat /etc/TZ`
   1.120 ++		code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`
   1.121 ++		eval "echo \${iso_${code}}"
   1.122 + 		return 0
   1.123 ++		
   1.124 + 	)
   1.125 + }
   1.126 + 
   1.127 +@@ -271,7 +262,7 @@
   1.128 + # The md5sum is used for input verification.
   1.129 + disptokey()
   1.130 + {
   1.131 +-	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
   1.132 ++	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
   1.133 + 	case $k in
   1.134 + 	00000000)
   1.135 + 		echo "$k"
   1.136 +@@ -1655,7 +1646,7 @@
   1.137 + 		update-modules
   1.138 + 	else
   1.139 + 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
   1.140 +-			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
   1.141 ++			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
   1.142 + 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
   1.143 + 					rm -f ${modulesconf}.$$ ${f}
   1.144 + 					exit 1
   1.145 +@@ -1681,7 +1672,7 @@
   1.146 + 	fi
   1.147 + 
   1.148 + 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
   1.149 +-		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
   1.150 ++		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
   1.151 + 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
   1.152 + 				rm -f ${modprobeconf}.$$ ${f}
   1.153 + 				exit 1
   1.154 +@@ -2214,6 +2205,10 @@
   1.155 + 	elif [ -d /var/lib/LST ]; then
   1.156 + 		OSDISTNAME=Caldera
   1.157 + 		OSDISTIDNT=caldera
   1.158 ++	elif [ -f /etc/slitaz-release ]; then
   1.159 ++		OSDISTNAME=SliTaz
   1.160 ++		OSDISTIDNT=slitaz
   1.161 ++		OSDISTVERS="`cat /etc/slitaz-release`"
   1.162 + 	fi
   1.163 + 
   1.164 + 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
   1.165 +@@ -2268,7 +2263,7 @@
   1.166 + 
   1.167 + dump_file()
   1.168 + {
   1.169 +-	dump_cmd cat -v $@
   1.170 ++	dump_cmd cat $@
   1.171 + }
   1.172 + 
   1.173 + dump_diagnostics()
   1.174 +@@ -2587,7 +2582,7 @@
   1.175 + 	fi
   1.176 + 	units="${specificunit}"
   1.177 + 	if [ -z "${units}" ]; then
   1.178 +-		units=`ls --ignore=flush_nvm ${procdrvdir}`
   1.179 ++		units=`ls ${procdrvdir} | grep -v flush_nvm`
   1.180 + 
   1.181 + 		if [ -z "${units}" ]; then
   1.182 + 			echo ""
   1.183 +@@ -2884,7 +2879,7 @@
   1.184 + 			explicitopt=true
   1.185 + 			do_cfgregion=true
   1.186 + 			if [ -n "$2" ]; then
   1.187 +-				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
   1.188 ++				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   1.189 + 			fi
   1.190 + 			shift 2
   1.191 + 			;;
   1.192 +@@ -2954,7 +2949,7 @@
   1.193 + 
   1.194 + # Accept --region <name> as equivalent to --region=<name>
   1.195 + if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
   1.196 +-	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
   1.197 ++	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   1.198 + 	shift
   1.199 + fi
   1.200 + 
   1.201 +@@ -3033,7 +3028,7 @@
   1.202 + 
   1.203 + if ${do_cfgnewinstance}; then
   1.204 + 	if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
   1.205 +-		mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
   1.206 ++		mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
   1.207 + 		# The purpose of --info here is to ensure module reload:
   1.208 + 		(sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
   1.209 + 	fi
   1.210 +