SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-cnxtconfig.diff	Mon Jun 15 09:08:48 2009 +0200
     1.3 @@ -0,0 +1,205 @@
     1.4 +--- hsfmodem-7.80.02.03full/scripts/cnxtconfig.in	Fri Feb 20 22:30:17 2009
     1.5 ++++ hsfmodem-7.80.02.03full-slitaz/scripts/cnxtconfig.in	Fri Jun 12 16:20:59 2009
     1.6 +@@ -74,7 +74,7 @@
     1.7 + 				answer="${region}"
     1.8 + 				;;
     1.9 + 			*)
    1.10 +-				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
    1.11 ++				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
    1.12 + 				;;
    1.13 + 			esac
    1.14 + 		fi
    1.15 +@@ -109,15 +109,25 @@
    1.16 + {
    1.17 + 	# Try to guess what region we're in, using the timezone settings
    1.18 + 
    1.19 +-	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    1.20 ++#	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    1.21 ++#
    1.22 ++#	if ! [ ${localtime_size} -gt 0 ]; then
    1.23 ++#		return 1
    1.24 ++#	fi
    1.25 + 
    1.26 +-	if ! [ ${localtime_size} -gt 0 ]; then
    1.27 ++#	zoneinfo_dir=/usr/share/zoneinfo
    1.28 ++#
    1.29 ++#	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
    1.30 ++#		return 1
    1.31 ++#
    1.32 ++#	fi
    1.33 ++	if [ ! -e /etc/TZ ]; then
    1.34 + 		return 1
    1.35 + 	fi
    1.36 + 
    1.37 +-	zoneinfo_dir=/usr/share/zoneinfo
    1.38 ++	zoneinfo_dir=/usr/share/softmodem
    1.39 + 
    1.40 +-	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
    1.41 ++	if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then
    1.42 + 		return 1
    1.43 + 	fi
    1.44 + 
    1.45 +@@ -206,18 +216,25 @@
    1.46 + 	iso_VN=00BC # VIETNAM
    1.47 + 
    1.48 + 	(
    1.49 +-		cd ${zoneinfo_dir} 2>/dev/null || return 1
    1.50 +-		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
    1.51 +-			while read file; do
    1.52 +-				cmp -s /etc/localtime $file || continue
    1.53 ++#		cd ${zoneinfo_dir} 2>/dev/null || return 1
    1.54 ++#		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
    1.55 ++#			while read file; do
    1.56 ++#				cmp -s /etc/localtime $file || continue
    1.57 + # in the egrep and sed regular expressions below, it is very important to
    1.58 + # have tabs, not spaces
    1.59 +-				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
    1.60 +-			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
    1.61 +-				while read code; do
    1.62 +-					eval "echo \${iso_${code}}"
    1.63 +-				done | sort | uniq
    1.64 +-		return 0
    1.65 ++#				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
    1.66 ++#			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
    1.67 ++#				while read code; do
    1.68 ++#					eval "echo \${iso_${code}}"
    1.69 ++#				done | sort | uniq
    1.70 ++#		return 0
    1.71 ++	zone=`cat /etc/TZ`
    1.72 ++	egrep $zone ${zoneinfo_dir}/zone.tab | sed -n '/^[^#]/s/    .*//p' | sort | uniq | \ 
    1.73 ++		while read code; do
    1.74 ++			eval "echo \${iso_${code}}"
    1.75 ++		done | sort | uniq 
    1.76 ++	return 0
    1.77 ++		
    1.78 + 	)
    1.79 + }
    1.80 + 
    1.81 +@@ -1636,7 +1653,7 @@
    1.82 + 		update-modules
    1.83 + 	else
    1.84 + 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
    1.85 +-			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
    1.86 ++			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
    1.87 + 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
    1.88 + 					rm -f ${modulesconf}.$$ ${f}
    1.89 + 					exit 1
    1.90 +@@ -1662,7 +1679,7 @@
    1.91 + 	fi
    1.92 + 
    1.93 + 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
    1.94 +-		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
    1.95 ++		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
    1.96 + 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
    1.97 + 				rm -f ${modprobeconf}.$$ ${f}
    1.98 + 				exit 1
    1.99 +@@ -1710,7 +1727,7 @@
   1.100 + 	fi
   1.101 + 
   1.102 + 	if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then
   1.103 +-		rm -f /dev/modem
   1.104 ++		echo
   1.105 + 	fi
   1.106 + 
   1.107 + 	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
   1.108 +@@ -1734,7 +1751,7 @@
   1.109 + 	fi
   1.110 + 
   1.111 + 	echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   1.112 +-	echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
   1.113 ++	echo "alias /dev/modem none"
   1.114 + 	echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
   1.115 + 	if [ "$1" = modulesconf ]; then
   1.116 + 		echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   1.117 +@@ -1908,7 +1925,7 @@
   1.118 + REGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
   1.119 + UNREGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
   1.120 + 			> /etc/devfs/conf.d/@CNXTTARGET@.conf
   1.121 +-		rm -f /dev/modem
   1.122 ++		echo
   1.123 + 		which update-devfsd >/dev/null 2>&1 && update-devfsd
   1.124 + 		killall -HUP devfsd 2>/dev/null
   1.125 + 	else
   1.126 +@@ -1922,7 +1939,7 @@
   1.127 + 				cp /etc/devfsd.conf.$$ /etc/devfsd.conf
   1.128 + 			fi
   1.129 + 			rm -f /etc/devfsd.conf.$$
   1.130 +-			rm -f /dev/modem
   1.131 ++			echo
   1.132 + 			killall -HUP devfsd 2>/dev/null
   1.133 + 		fi
   1.134 + 	fi
   1.135 +@@ -1971,13 +1988,13 @@
   1.136 + 		done
   1.137 + 
   1.138 + 		if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then
   1.139 +-			rm -f /dev/modem
   1.140 ++			echo
   1.141 + 		fi
   1.142 + 
   1.143 + 		if [ -e /dev/modem ]; then
   1.144 + 			if ! fuser /dev/modem >/dev/null 2>&1; then
   1.145 +-				rm -f /dev/modem.old
   1.146 +-				mv /dev/modem /dev/modem.old
   1.147 ++				echo
   1.148 ++				echo
   1.149 + 
   1.150 + 				echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
   1.151 + 				echo ""
   1.152 +@@ -1986,7 +2003,7 @@
   1.153 + 		fi
   1.154 + 
   1.155 + 		if [ ! -e /dev/modem ]; then
   1.156 +-			ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
   1.157 ++			echo
   1.158 + 		fi
   1.159 + 	fi
   1.160 +   fi
   1.161 +@@ -2195,6 +2212,10 @@
   1.162 + 	elif [ -d /var/lib/LST ]; then
   1.163 + 		OSDISTNAME=Caldera
   1.164 + 		OSDISTIDNT=caldera
   1.165 ++	elif [ -f /etc/slitaz-release ]; then
   1.166 ++		OSDISTNAME=SliTaz
   1.167 ++		OSDISTIDNT=slitaz
   1.168 ++		OSDISTVERS="`cat /etc/slitaz-release`"
   1.169 + 	fi
   1.170 + 
   1.171 + 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
   1.172 +@@ -2249,7 +2270,7 @@
   1.173 + 
   1.174 + dump_file()
   1.175 + {
   1.176 +-	dump_cmd cat -v $@
   1.177 ++	dump_cmd cat $@
   1.178 + }
   1.179 + 
   1.180 + dump_diagnostics()
   1.181 +@@ -2568,7 +2589,7 @@
   1.182 + 	fi
   1.183 + 	units="${specificunit}"
   1.184 + 	if [ -z "${units}" ]; then
   1.185 +-		units=`ls --ignore=flush_nvm ${procdrvdir}`
   1.186 ++		units=`ls ${procdrvdir} | grep -v flush_nvm`
   1.187 + 
   1.188 + 		if [ -z "${units}" ]; then
   1.189 + 			echo ""
   1.190 +@@ -2865,7 +2886,7 @@
   1.191 + 			explicitopt=true
   1.192 + 			do_cfgregion=true
   1.193 + 			if [ -n "$2" ]; then
   1.194 +-				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
   1.195 ++				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   1.196 + 			fi
   1.197 + 			shift 2
   1.198 + 			;;
   1.199 +@@ -2935,7 +2956,7 @@
   1.200 + 
   1.201 + # Accept --region <name> as equivalent to --region=<name>
   1.202 + if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
   1.203 +-	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
   1.204 ++	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
   1.205 + 	shift
   1.206 + fi
   1.207 +
   1.208 +