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.04full.diff	Mon Jun 15 15:05:01 2009 +0200
     1.3 @@ -0,0 +1,224 @@
     1.4 +diff -ru hsfmodem-7.80.02.04full/config.mak hsfmodem-7.80.02.04full-slitaz/config.mak
     1.5 +--- hsfmodem-7.80.02.04full/config.mak	2009-02-20 22:30:12.000000000 +0100
     1.6 ++++ hsfmodem-7.80.02.04full-slitaz/config.mak	2009-06-15 11:49:13.000000000 +0200
     1.7 +@@ -55,7 +55,7 @@
     1.8 + # maximum number of modem units
     1.9 + CNXTMAXMDM=8
    1.10 + 
    1.11 +-ROOT=
    1.12 ++ROOT=$(DESTDIR)
    1.13 + PREFIX=$(ROOT)/usr
    1.14 + 
    1.15 + ETCDIR=$(ROOT)/etc
    1.16 +@@ -131,4 +131,4 @@
    1.17 + 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
    1.18 + 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
    1.19 + 		< $< > $@
    1.20 +-	chmod --reference=$< $@
    1.21 ++	chmod 755 $@
    1.22 +diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile
    1.23 +--- hsfmodem-7.80.02.04full/makefile	2009-02-23 22:51:37.000000000 +0100
    1.24 ++++ hsfmodem-7.80.02.04full-slitaz/makefile	2009-06-15 11:49:13.000000000 +0200
    1.25 +@@ -149,7 +149,7 @@
    1.26 + ifeq ($(RPMOPTEVAL),yes)
    1.27 + RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
    1.28 + else
    1.29 +-RPMTARGETCPU=$(shell uname -i)
    1.30 ++RPMTARGETCPU=$(shell uname -m)
    1.31 + endif
    1.32 + 
    1.33 + ifneq ($(RPMOPTDEFINE),yes)
    1.34 +diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile
    1.35 +--- hsfmodem-7.80.02.04full/modules/Makefile	2009-04-24 03:03:57.000000000 +0200
    1.36 ++++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile	2009-06-15 11:49:13.000000000 +0200
    1.37 +@@ -20,7 +20,7 @@
    1.38 + include $(TOP)/config.mak
    1.39 + 
    1.40 + IMPORTED = $(TOP)/modules/imported
    1.41 +-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.42 ++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.43 + ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    1.44 + $(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.45 + endif
    1.46 +
    1.47 +diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in
    1.48 +--- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in	2009-04-23 17:32:18.000000000 +0200
    1.49 ++++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in	2009-06-15 14:08:02.000000000 +0200
    1.50 +@@ -74,7 +74,7 @@
    1.51 + 				answer="${region}"
    1.52 + 				;;
    1.53 + 			*)
    1.54 +-				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
    1.55 ++				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
    1.56 + 				;;
    1.57 + 			esac
    1.58 + 		fi
    1.59 +@@ -109,15 +109,13 @@
    1.60 + {
    1.61 + 	# Try to guess what region we're in, using the timezone settings
    1.62 + 
    1.63 +-	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    1.64 +-
    1.65 +-	if ! [ ${localtime_size} -gt 0 ]; then
    1.66 ++	if [ ! -e /etc/TZ ]; then
    1.67 + 		return 1
    1.68 + 	fi
    1.69 + 
    1.70 +-	zoneinfo_dir=/usr/share/zoneinfo
    1.71 ++	zoneinfo_dir=/usr/share/softmodem
    1.72 + 
    1.73 +-	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
    1.74 ++	if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then
    1.75 + 		return 1
    1.76 + 	fi
    1.77 + 
    1.78 +@@ -206,18 +204,11 @@
    1.79 + 	iso_VN=00BC # VIETNAM
    1.80 + 
    1.81 + 	(
    1.82 +-		cd ${zoneinfo_dir} 2>/dev/null || return 1
    1.83 +-		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
    1.84 +-			while read file; do
    1.85 +-				cmp -s /etc/localtime $file || continue
    1.86 +-# in the egrep and sed regular expressions below, it is very important to
    1.87 +-# have tabs, not spaces
    1.88 +-				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
    1.89 +-			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
    1.90 +-				while read code; do
    1.91 +-					eval "echo \${iso_${code}}"
    1.92 +-				done | sort | uniq
    1.93 ++		zone=`cat /etc/TZ`
    1.94 ++		code=`grep $zone ${zoneinfo_dir}/hsfzone.tab | awk '{print $1}' | sort | uniq`
    1.95 ++		eval "echo \${iso_${code}}"
    1.96 + 		return 0
    1.97 ++		
    1.98 + 	)
    1.99 + }
   1.100 + 
   1.101 +@@ -1655,7 +1646,7 @@
   1.102 + 		update-modules
   1.103 + 	else
   1.104 + 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
   1.105 +-			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
   1.106 ++			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
   1.107 + 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
   1.108 + 					rm -f ${modulesconf}.$$ ${f}
   1.109 + 					exit 1
   1.110 +@@ -1681,7 +1672,7 @@
   1.111 + 	fi
   1.112 + 
   1.113 + 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
   1.114 +-		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
   1.115 ++		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
   1.116 + 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
   1.117 + 				rm -f ${modprobeconf}.$$ ${f}
   1.118 + 				exit 1
   1.119 +@@ -1729,7 +1720,7 @@
   1.120 + 	fi
   1.121 + 
   1.122 + 	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.123 +-		rm -f /dev/modem
   1.124 ++		echo
   1.125 + 	fi
   1.126 + 
   1.127 + 	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
   1.128 +@@ -1753,7 +1744,7 @@
   1.129 + 	fi
   1.130 + 
   1.131 + 	echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   1.132 +-	echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
   1.133 ++	echo "alias /dev/modem none"
   1.134 + 	echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
   1.135 + 	if [ "$1" = modulesconf ]; then
   1.136 + 		echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   1.137 +@@ -1927,7 +1918,7 @@
   1.138 + REGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
   1.139 + UNREGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
   1.140 + 			> /etc/devfs/conf.d/@CNXTTARGET@.conf
   1.141 +-		rm -f /dev/modem
   1.142 ++		echo
   1.143 + 		which update-devfsd >/dev/null 2>&1 && update-devfsd
   1.144 + 		killall -HUP devfsd 2>/dev/null
   1.145 + 	else
   1.146 +@@ -1941,7 +1932,7 @@
   1.147 + 				cp /etc/devfsd.conf.$$ /etc/devfsd.conf
   1.148 + 			fi
   1.149 + 			rm -f /etc/devfsd.conf.$$
   1.150 +-			rm -f /dev/modem
   1.151 ++			echo
   1.152 + 			killall -HUP devfsd 2>/dev/null
   1.153 + 		fi
   1.154 + 	fi
   1.155 +@@ -1990,13 +1981,13 @@
   1.156 + 		done
   1.157 + 
   1.158 + 		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.159 +-			rm -f /dev/modem
   1.160 ++			echo
   1.161 + 		fi
   1.162 + 
   1.163 + 		if [ -e /dev/modem ]; then
   1.164 + 			if ! fuser /dev/modem >/dev/null 2>&1; then
   1.165 +-				rm -f /dev/modem.old
   1.166 +-				mv /dev/modem /dev/modem.old
   1.167 ++				echo
   1.168 ++				echo
   1.169 + 
   1.170 + 				echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
   1.171 + 				echo ""
   1.172 +@@ -2005,7 +1996,7 @@
   1.173 + 		fi
   1.174 + 
   1.175 + 		if [ ! -e /dev/modem ]; then
   1.176 +-			ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
   1.177 ++			echo
   1.178 + 		fi
   1.179 + 	fi
   1.180 +   fi
   1.181 +@@ -2214,6 +2205,10 @@
   1.182 + 	elif [ -d /var/lib/LST ]; then
   1.183 + 		OSDISTNAME=Caldera
   1.184 + 		OSDISTIDNT=caldera
   1.185 ++	elif [ -f /etc/slitaz-release ]; then
   1.186 ++		OSDISTNAME=SliTaz
   1.187 ++		OSDISTIDNT=slitaz
   1.188 ++		OSDISTVERS="`cat /etc/slitaz-release`"
   1.189 + 	fi
   1.190 + 
   1.191 + 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
   1.192 +@@ -2268,7 +2263,7 @@
   1.193 + 
   1.194 + dump_file()
   1.195 + {
   1.196 +-	dump_cmd cat -v $@
   1.197 ++	dump_cmd cat $@
   1.198 + }
   1.199 + 
   1.200 + dump_diagnostics()
   1.201 +@@ -2587,7 +2582,7 @@
   1.202 + 	fi
   1.203 + 	units="${specificunit}"
   1.204 + 	if [ -z "${units}" ]; then
   1.205 +-		units=`ls --ignore=flush_nvm ${procdrvdir}`
   1.206 ++		units=`ls ${procdrvdir} | grep -v flush_nvm`
   1.207 + 
   1.208 + 		if [ -z "${units}" ]; then
   1.209 + 			echo ""
   1.210 +@@ -2884,7 +2879,7 @@
   1.211 + 			explicitopt=true
   1.212 + 			do_cfgregion=true
   1.213 + 			if [ -n "$2" ]; then
   1.214 +-				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
   1.215 ++				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   1.216 + 			fi
   1.217 + 			shift 2
   1.218 + 			;;
   1.219 +@@ -2954,7 +2949,7 @@
   1.220 + 
   1.221 + # Accept --region <name> as equivalent to --region=<name>
   1.222 + if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
   1.223 +-	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
   1.224 ++	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
   1.225 + 	shift
   1.226 + fi
   1.227 +