SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/get-softmodem-driver/description.txt	Mon Jun 15 15:05:01 2009 +0200
     1.3 @@ -0,0 +1,3 @@
     1.4 +Support for software modems: Conexant
     1.5 +
     1.6 +Warning: This package HAS huge dependencies including a full install of dev tools and a complete kernel compilation. This will use a significant amount of disk space and take a while depending on your processing power.

     2.1 --- a/get-softmodem-driver/receipt	Mon Jun 15 09:08:48 2009 +0200
     2.2 +++ b/get-softmodem-driver/receipt	Mon Jun 15 15:05:01 2009 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="get-softmodem-driver"
     2.7 -VERSION="0.2"
     2.8 +VERSION="0.3"
     2.9  CATEGORY="non-free"
    2.10  SHORT_DESC="Get misc softmodem drivers."
    2.11  MAINTAINER="domcox@slitaz.org"
    2.12 @@ -18,5 +18,6 @@
    2.13  	done
    2.14  	mkdir -p $fs/usr/share/softmodem
    2.15  	cp stuff/*diff $fs/usr/share/softmodem
    2.16 +	cp stuff/*receipt $fs/usr/share/softmodem
    2.17  	cp stuff/zone.tab $fs/usr/share/softmodem
    2.18  }

     3.1 --- a/get-softmodem-driver/stuff/get-softmodem-driver	Mon Jun 15 09:08:48 2009 +0200
     3.2 +++ b/get-softmodem-driver/stuff/get-softmodem-driver	Mon Jun 15 15:05:01 2009 +0200
     3.3 @@ -7,12 +7,7 @@
     3.4  
     3.5  case "$PACKAGE" in
     3.6  hsfmodem)
     3.7 -	VERSION="7.80.02.03full"
     3.8 -	TARBALL="$PACKAGE-$VERSION.tar.gz"
     3.9 -	SHORT_DESC="Modem driver for Conexant HSF chipsets"
    3.10 -	WEB_SITE="http://www.linuxant.com/drivers"
    3.11 -	WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$PACKAGE-$VERSION/$TARBALL"
    3.12 -	DEPENDS="module-init-tools linux-source"
    3.13 +	. /usr/share/softmodem/hsfmodem.receipt
    3.14  	;;
    3.15  *)	echo "Unknown modem driver. Please run one of the following commands:"
    3.16  	for i in $(cd $(dirname $0); ls get-*-driver); do
    3.17 @@ -80,13 +75,8 @@
    3.18  hsfmodem)
    3.19  	# Rules to configure and make the package.
    3.20  	cd $src
    3.21 -	while read file; do
    3.22 -		echo "Apply $file..."
    3.23 -		patch -p1 < /usr/share/softmodem/$PACKAGE-$VERSION-$file || return 1
    3.24 -	done <<EOT
    3.25 -makefile.diff
    3.26 -cnxtconfig.diff
    3.27 -EOT
    3.28 +	echo "Apply $file..."
    3.29 +	patch -p1 < /usr/share/softmodem/$PACKAGE-$VERSION.diff || return 1
    3.30  	# Build
    3.31  	make DESTDIR=$_pkg install
    3.32  	cd $_pkg/usr/lib/hsfmodem/modules
    3.33 @@ -98,19 +88,17 @@
    3.34  	MODS_DIR=$fs/lib/modules/`uname -r`/extra
    3.35  	mkdir -p $MODS_DIR
    3.36  	cp -a $_pkg/usr/lib/hsfmodem/modules/*.ko $MODS_DIR
    3.37 +	cd $src
    3.38 +	make clean
    3.39 +	cd $taz
    3.40 +	mkdir -p $fs/usr/src
    3.41 +	mv $src $fs/usr/src
    3.42  	;;
    3.43  esac
    3.44  
    3.45  # Create receipt
    3.46  cd $taz
    3.47 -cat > $PACKAGE-$VERSION/receipt <<EOT
    3.48 -PACKAGE="$PACKAGE"
    3.49 -VERSION="$VERSION"
    3.50 -CATEGORY="non-free"
    3.51 -SHORT_DESC="$SHORT_DESC."
    3.52 -WEB_SITE="$WEB_SITE"
    3.53 -DEPENDS="$DEPENDS"
    3.54 -EOT
    3.55 +cat /usr/share/softmodem/hsfmodem.receipt> $PACKAGE-$VERSION/receipt
    3.56  
    3.57  # Pack
    3.58  tazpkg pack $PACKAGE-$VERSION
    3.59 @@ -120,5 +108,3 @@
    3.60  
    3.61  # Clean
    3.62  rm -rf $taz
    3.63 -cd $src
    3.64 -make clean

     4.1 --- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-cnxtconfig.diff	Mon Jun 15 09:08:48 2009 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,205 +0,0 @@
     4.4 ---- hsfmodem-7.80.02.03full/scripts/cnxtconfig.in	Fri Feb 20 22:30:17 2009
     4.5 -+++ hsfmodem-7.80.02.03full-slitaz/scripts/cnxtconfig.in	Fri Jun 12 16:20:59 2009
     4.6 -@@ -74,7 +74,7 @@
     4.7 - 				answer="${region}"
     4.8 - 				;;
     4.9 - 			*)
    4.10 --				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
    4.11 -+				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
    4.12 - 				;;
    4.13 - 			esac
    4.14 - 		fi
    4.15 -@@ -109,15 +109,25 @@
    4.16 - {
    4.17 - 	# Try to guess what region we're in, using the timezone settings
    4.18 - 
    4.19 --	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    4.20 -+#	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    4.21 -+#
    4.22 -+#	if ! [ ${localtime_size} -gt 0 ]; then
    4.23 -+#		return 1
    4.24 -+#	fi
    4.25 - 
    4.26 --	if ! [ ${localtime_size} -gt 0 ]; then
    4.27 -+#	zoneinfo_dir=/usr/share/zoneinfo
    4.28 -+#
    4.29 -+#	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
    4.30 -+#		return 1
    4.31 -+#
    4.32 -+#	fi
    4.33 -+	if [ ! -e /etc/TZ ]; then
    4.34 - 		return 1
    4.35 - 	fi
    4.36 - 
    4.37 --	zoneinfo_dir=/usr/share/zoneinfo
    4.38 -+	zoneinfo_dir=/usr/share/softmodem
    4.39 - 
    4.40 --	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
    4.41 -+	if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then
    4.42 - 		return 1
    4.43 - 	fi
    4.44 - 
    4.45 -@@ -206,18 +216,25 @@
    4.46 - 	iso_VN=00BC # VIETNAM
    4.47 - 
    4.48 - 	(
    4.49 --		cd ${zoneinfo_dir} 2>/dev/null || return 1
    4.50 --		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
    4.51 --			while read file; do
    4.52 --				cmp -s /etc/localtime $file || continue
    4.53 -+#		cd ${zoneinfo_dir} 2>/dev/null || return 1
    4.54 -+#		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
    4.55 -+#			while read file; do
    4.56 -+#				cmp -s /etc/localtime $file || continue
    4.57 - # in the egrep and sed regular expressions below, it is very important to
    4.58 - # have tabs, not spaces
    4.59 --				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
    4.60 --			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
    4.61 --				while read code; do
    4.62 --					eval "echo \${iso_${code}}"
    4.63 --				done | sort | uniq
    4.64 --		return 0
    4.65 -+#				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
    4.66 -+#			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
    4.67 -+#				while read code; do
    4.68 -+#					eval "echo \${iso_${code}}"
    4.69 -+#				done | sort | uniq
    4.70 -+#		return 0
    4.71 -+	zone=`cat /etc/TZ`
    4.72 -+	egrep $zone ${zoneinfo_dir}/zone.tab | sed -n '/^[^#]/s/    .*//p' | sort | uniq | \ 
    4.73 -+		while read code; do
    4.74 -+			eval "echo \${iso_${code}}"
    4.75 -+		done | sort | uniq 
    4.76 -+	return 0
    4.77 -+		
    4.78 - 	)
    4.79 - }
    4.80 - 
    4.81 -@@ -1636,7 +1653,7 @@
    4.82 - 		update-modules
    4.83 - 	else
    4.84 - 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
    4.85 --			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
    4.86 -+			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
    4.87 - 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
    4.88 - 					rm -f ${modulesconf}.$$ ${f}
    4.89 - 					exit 1
    4.90 -@@ -1662,7 +1679,7 @@
    4.91 - 	fi
    4.92 - 
    4.93 - 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
    4.94 --		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
    4.95 -+		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
    4.96 - 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
    4.97 - 				rm -f ${modprobeconf}.$$ ${f}
    4.98 - 				exit 1
    4.99 -@@ -1710,7 +1727,7 @@
   4.100 - 	fi
   4.101 - 
   4.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
   4.103 --		rm -f /dev/modem
   4.104 -+		echo
   4.105 - 	fi
   4.106 - 
   4.107 - 	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
   4.108 -@@ -1734,7 +1751,7 @@
   4.109 - 	fi
   4.110 - 
   4.111 - 	echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   4.112 --	echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
   4.113 -+	echo "alias /dev/modem none"
   4.114 - 	echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
   4.115 - 	if [ "$1" = modulesconf ]; then
   4.116 - 		echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   4.117 -@@ -1908,7 +1925,7 @@
   4.118 - REGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
   4.119 - UNREGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
   4.120 - 			> /etc/devfs/conf.d/@CNXTTARGET@.conf
   4.121 --		rm -f /dev/modem
   4.122 -+		echo
   4.123 - 		which update-devfsd >/dev/null 2>&1 && update-devfsd
   4.124 - 		killall -HUP devfsd 2>/dev/null
   4.125 - 	else
   4.126 -@@ -1922,7 +1939,7 @@
   4.127 - 				cp /etc/devfsd.conf.$$ /etc/devfsd.conf
   4.128 - 			fi
   4.129 - 			rm -f /etc/devfsd.conf.$$
   4.130 --			rm -f /dev/modem
   4.131 -+			echo
   4.132 - 			killall -HUP devfsd 2>/dev/null
   4.133 - 		fi
   4.134 - 	fi
   4.135 -@@ -1971,13 +1988,13 @@
   4.136 - 		done
   4.137 - 
   4.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
   4.139 --			rm -f /dev/modem
   4.140 -+			echo
   4.141 - 		fi
   4.142 - 
   4.143 - 		if [ -e /dev/modem ]; then
   4.144 - 			if ! fuser /dev/modem >/dev/null 2>&1; then
   4.145 --				rm -f /dev/modem.old
   4.146 --				mv /dev/modem /dev/modem.old
   4.147 -+				echo
   4.148 -+				echo
   4.149 - 
   4.150 - 				echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
   4.151 - 				echo ""
   4.152 -@@ -1986,7 +2003,7 @@
   4.153 - 		fi
   4.154 - 
   4.155 - 		if [ ! -e /dev/modem ]; then
   4.156 --			ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
   4.157 -+			echo
   4.158 - 		fi
   4.159 - 	fi
   4.160 -   fi
   4.161 -@@ -2195,6 +2212,10 @@
   4.162 - 	elif [ -d /var/lib/LST ]; then
   4.163 - 		OSDISTNAME=Caldera
   4.164 - 		OSDISTIDNT=caldera
   4.165 -+	elif [ -f /etc/slitaz-release ]; then
   4.166 -+		OSDISTNAME=SliTaz
   4.167 -+		OSDISTIDNT=slitaz
   4.168 -+		OSDISTVERS="`cat /etc/slitaz-release`"
   4.169 - 	fi
   4.170 - 
   4.171 - 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
   4.172 -@@ -2249,7 +2270,7 @@
   4.173 - 
   4.174 - dump_file()
   4.175 - {
   4.176 --	dump_cmd cat -v $@
   4.177 -+	dump_cmd cat $@
   4.178 - }
   4.179 - 
   4.180 - dump_diagnostics()
   4.181 -@@ -2568,7 +2589,7 @@
   4.182 - 	fi
   4.183 - 	units="${specificunit}"
   4.184 - 	if [ -z "${units}" ]; then
   4.185 --		units=`ls --ignore=flush_nvm ${procdrvdir}`
   4.186 -+		units=`ls ${procdrvdir} | grep -v flush_nvm`
   4.187 - 
   4.188 - 		if [ -z "${units}" ]; then
   4.189 - 			echo ""
   4.190 -@@ -2865,7 +2886,7 @@
   4.191 - 			explicitopt=true
   4.192 - 			do_cfgregion=true
   4.193 - 			if [ -n "$2" ]; then
   4.194 --				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
   4.195 -+				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   4.196 - 			fi
   4.197 - 			shift 2
   4.198 - 			;;
   4.199 -@@ -2935,7 +2956,7 @@
   4.200 - 
   4.201 - # Accept --region <name> as equivalent to --region=<name>
   4.202 - if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
   4.203 --	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
   4.204 -+	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
   4.205 - 	shift
   4.206 - fi
   4.207 -
   4.208 - 

     5.1 --- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-makefile.diff	Mon Jun 15 09:08:48 2009 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,39 +0,0 @@
     5.4 ---- hsfmodem-7.80.02.03full/config.mak	Fri Feb 20 22:30:12 2009
     5.5 -+++ hsfmodem-7.80.02.03full-slitaz/config.mak	Sat May  9 22:38:51 2009
     5.6 -@@ -55,7 +55,7 @@
     5.7 - # maximum number of modem units
     5.8 - CNXTMAXMDM=8
     5.9 - 
    5.10 --ROOT=
    5.11 -+ROOT=$(DESTDIR)
    5.12 - PREFIX=$(ROOT)/usr
    5.13 - 
    5.14 - ETCDIR=$(ROOT)/etc
    5.15 -@@ -131,4 +131,4 @@
    5.16 - 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
    5.17 - 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
    5.18 - 		< $< > $@
    5.19 --	chmod --reference=$< $@
    5.20 -+	chmod 755 $@
    5.21 ---- hsfmodem-7.80.02.03full/makefile	Mon Feb 23 22:51:37 2009
    5.22 -+++ hsfmodem-7.80.02.03full-slitaz/makefile	Sat May  9 22:38:51 2009
    5.23 -@@ -149,7 +149,7 @@
    5.24 - ifeq ($(RPMOPTEVAL),yes)
    5.25 - RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
    5.26 - else
    5.27 --RPMTARGETCPU=$(shell uname -i)
    5.28 -+RPMTARGETCPU=$(shell uname -m)
    5.29 - endif
    5.30 - 
    5.31 - ifneq ($(RPMOPTDEFINE),yes)
    5.32 ---- hsfmodem-7.80.02.03full/modules/Makefile	Fri Feb 20 22:30:12 2009
    5.33 -+++ hsfmodem-7.80.02.03full-slitaz/modules/Makefile	Sat May  9 22:38:51 2009
    5.34 -@@ -20,7 +20,7 @@
    5.35 - include $(TOP)/config.mak
    5.36 - 
    5.37 - IMPORTED = $(TOP)/modules/imported
    5.38 --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)
    5.39 -+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)
    5.40 - ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    5.41 - $(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... ***)
    5.42 - endif

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff	Mon Jun 15 15:05:01 2009 +0200
     6.3 @@ -0,0 +1,224 @@
     6.4 +diff -ru hsfmodem-7.80.02.04full/config.mak hsfmodem-7.80.02.04full-slitaz/config.mak
     6.5 +--- hsfmodem-7.80.02.04full/config.mak	2009-02-20 22:30:12.000000000 +0100
     6.6 ++++ hsfmodem-7.80.02.04full-slitaz/config.mak	2009-06-15 11:49:13.000000000 +0200
     6.7 +@@ -55,7 +55,7 @@
     6.8 + # maximum number of modem units
     6.9 + CNXTMAXMDM=8
    6.10 + 
    6.11 +-ROOT=
    6.12 ++ROOT=$(DESTDIR)
    6.13 + PREFIX=$(ROOT)/usr
    6.14 + 
    6.15 + ETCDIR=$(ROOT)/etc
    6.16 +@@ -131,4 +131,4 @@
    6.17 + 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
    6.18 + 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
    6.19 + 		< $< > $@
    6.20 +-	chmod --reference=$< $@
    6.21 ++	chmod 755 $@
    6.22 +diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile
    6.23 +--- hsfmodem-7.80.02.04full/makefile	2009-02-23 22:51:37.000000000 +0100
    6.24 ++++ hsfmodem-7.80.02.04full-slitaz/makefile	2009-06-15 11:49:13.000000000 +0200
    6.25 +@@ -149,7 +149,7 @@
    6.26 + ifeq ($(RPMOPTEVAL),yes)
    6.27 + RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
    6.28 + else
    6.29 +-RPMTARGETCPU=$(shell uname -i)
    6.30 ++RPMTARGETCPU=$(shell uname -m)
    6.31 + endif
    6.32 + 
    6.33 + ifneq ($(RPMOPTDEFINE),yes)
    6.34 +diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile
    6.35 +--- hsfmodem-7.80.02.04full/modules/Makefile	2009-04-24 03:03:57.000000000 +0200
    6.36 ++++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile	2009-06-15 11:49:13.000000000 +0200
    6.37 +@@ -20,7 +20,7 @@
    6.38 + include $(TOP)/config.mak
    6.39 + 
    6.40 + IMPORTED = $(TOP)/modules/imported
    6.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)
    6.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)
    6.43 + ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    6.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... ***)
    6.45 + endif
    6.46 +
    6.47 +diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in
    6.48 +--- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in	2009-04-23 17:32:18.000000000 +0200
    6.49 ++++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in	2009-06-15 14:08:02.000000000 +0200
    6.50 +@@ -74,7 +74,7 @@
    6.51 + 				answer="${region}"
    6.52 + 				;;
    6.53 + 			*)
    6.54 +-				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
    6.55 ++				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
    6.56 + 				;;
    6.57 + 			esac
    6.58 + 		fi
    6.59 +@@ -109,15 +109,13 @@
    6.60 + {
    6.61 + 	# Try to guess what region we're in, using the timezone settings
    6.62 + 
    6.63 +-	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    6.64 +-
    6.65 +-	if ! [ ${localtime_size} -gt 0 ]; then
    6.66 ++	if [ ! -e /etc/TZ ]; then
    6.67 + 		return 1
    6.68 + 	fi
    6.69 + 
    6.70 +-	zoneinfo_dir=/usr/share/zoneinfo
    6.71 ++	zoneinfo_dir=/usr/share/softmodem
    6.72 + 
    6.73 +-	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
    6.74 ++	if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then
    6.75 + 		return 1
    6.76 + 	fi
    6.77 + 
    6.78 +@@ -206,18 +204,11 @@
    6.79 + 	iso_VN=00BC # VIETNAM
    6.80 + 
    6.81 + 	(
    6.82 +-		cd ${zoneinfo_dir} 2>/dev/null || return 1
    6.83 +-		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
    6.84 +-			while read file; do
    6.85 +-				cmp -s /etc/localtime $file || continue
    6.86 +-# in the egrep and sed regular expressions below, it is very important to
    6.87 +-# have tabs, not spaces
    6.88 +-				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
    6.89 +-			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
    6.90 +-				while read code; do
    6.91 +-					eval "echo \${iso_${code}}"
    6.92 +-				done | sort | uniq
    6.93 ++		zone=`cat /etc/TZ`
    6.94 ++		code=`grep $zone ${zoneinfo_dir}/hsfzone.tab | awk '{print $1}' | sort | uniq`
    6.95 ++		eval "echo \${iso_${code}}"
    6.96 + 		return 0
    6.97 ++		
    6.98 + 	)
    6.99 + }
   6.100 + 
   6.101 +@@ -1655,7 +1646,7 @@
   6.102 + 		update-modules
   6.103 + 	else
   6.104 + 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
   6.105 +-			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
   6.106 ++			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
   6.107 + 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
   6.108 + 					rm -f ${modulesconf}.$$ ${f}
   6.109 + 					exit 1
   6.110 +@@ -1681,7 +1672,7 @@
   6.111 + 	fi
   6.112 + 
   6.113 + 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
   6.114 +-		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
   6.115 ++		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
   6.116 + 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
   6.117 + 				rm -f ${modprobeconf}.$$ ${f}
   6.118 + 				exit 1
   6.119 +@@ -1729,7 +1720,7 @@
   6.120 + 	fi
   6.121 + 
   6.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
   6.123 +-		rm -f /dev/modem
   6.124 ++		echo
   6.125 + 	fi
   6.126 + 
   6.127 + 	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
   6.128 +@@ -1753,7 +1744,7 @@
   6.129 + 	fi
   6.130 + 
   6.131 + 	echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   6.132 +-	echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
   6.133 ++	echo "alias /dev/modem none"
   6.134 + 	echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
   6.135 + 	if [ "$1" = modulesconf ]; then
   6.136 + 		echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
   6.137 +@@ -1927,7 +1918,7 @@
   6.138 + REGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
   6.139 + UNREGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
   6.140 + 			> /etc/devfs/conf.d/@CNXTTARGET@.conf
   6.141 +-		rm -f /dev/modem
   6.142 ++		echo
   6.143 + 		which update-devfsd >/dev/null 2>&1 && update-devfsd
   6.144 + 		killall -HUP devfsd 2>/dev/null
   6.145 + 	else
   6.146 +@@ -1941,7 +1932,7 @@
   6.147 + 				cp /etc/devfsd.conf.$$ /etc/devfsd.conf
   6.148 + 			fi
   6.149 + 			rm -f /etc/devfsd.conf.$$
   6.150 +-			rm -f /dev/modem
   6.151 ++			echo
   6.152 + 			killall -HUP devfsd 2>/dev/null
   6.153 + 		fi
   6.154 + 	fi
   6.155 +@@ -1990,13 +1981,13 @@
   6.156 + 		done
   6.157 + 
   6.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
   6.159 +-			rm -f /dev/modem
   6.160 ++			echo
   6.161 + 		fi
   6.162 + 
   6.163 + 		if [ -e /dev/modem ]; then
   6.164 + 			if ! fuser /dev/modem >/dev/null 2>&1; then
   6.165 +-				rm -f /dev/modem.old
   6.166 +-				mv /dev/modem /dev/modem.old
   6.167 ++				echo
   6.168 ++				echo
   6.169 + 
   6.170 + 				echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
   6.171 + 				echo ""
   6.172 +@@ -2005,7 +1996,7 @@
   6.173 + 		fi
   6.174 + 
   6.175 + 		if [ ! -e /dev/modem ]; then
   6.176 +-			ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
   6.177 ++			echo
   6.178 + 		fi
   6.179 + 	fi
   6.180 +   fi
   6.181 +@@ -2214,6 +2205,10 @@
   6.182 + 	elif [ -d /var/lib/LST ]; then
   6.183 + 		OSDISTNAME=Caldera
   6.184 + 		OSDISTIDNT=caldera
   6.185 ++	elif [ -f /etc/slitaz-release ]; then
   6.186 ++		OSDISTNAME=SliTaz
   6.187 ++		OSDISTIDNT=slitaz
   6.188 ++		OSDISTVERS="`cat /etc/slitaz-release`"
   6.189 + 	fi
   6.190 + 
   6.191 + 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
   6.192 +@@ -2268,7 +2263,7 @@
   6.193 + 
   6.194 + dump_file()
   6.195 + {
   6.196 +-	dump_cmd cat -v $@
   6.197 ++	dump_cmd cat $@
   6.198 + }
   6.199 + 
   6.200 + dump_diagnostics()
   6.201 +@@ -2587,7 +2582,7 @@
   6.202 + 	fi
   6.203 + 	units="${specificunit}"
   6.204 + 	if [ -z "${units}" ]; then
   6.205 +-		units=`ls --ignore=flush_nvm ${procdrvdir}`
   6.206 ++		units=`ls ${procdrvdir} | grep -v flush_nvm`
   6.207 + 
   6.208 + 		if [ -z "${units}" ]; then
   6.209 + 			echo ""
   6.210 +@@ -2884,7 +2879,7 @@
   6.211 + 			explicitopt=true
   6.212 + 			do_cfgregion=true
   6.213 + 			if [ -n "$2" ]; then
   6.214 +-				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
   6.215 ++				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   6.216 + 			fi
   6.217 + 			shift 2
   6.218 + 			;;
   6.219 +@@ -2954,7 +2949,7 @@
   6.220 + 
   6.221 + # Accept --region <name> as equivalent to --region=<name>
   6.222 + if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
   6.223 +-	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
   6.224 ++	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
   6.225 + 	shift
   6.226 + fi
   6.227 +

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/get-softmodem-driver/stuff/hsfmodem.receipt	Mon Jun 15 15:05:01 2009 +0200
     7.3 @@ -0,0 +1,18 @@
     7.4 +# SliTaz package receipt.
     7.5 +
     7.6 +PACKAGE="hsfmodem"
     7.7 +VERSION="7.80.02.04full"
     7.8 +CATEGORY="non-free"
     7.9 +SHORT_DESC="Modem driver for Conexant HSF chipsets."
    7.10 +MAINTAINER="domcox@slitaz.org"
    7.11 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    7.12 +DEPENDS="module-init-tools linux-source"
    7.13 +WEB_SITE="http://www.linuxant.com/drivers"
    7.14 +WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$PACKAGE-$VERSION/$TARBALL"
    7.15 +
    7.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    7.17 +
    7.18 +post_install()
    7.19 +{
    7.20 +	/usr/sbin/hsfconfig --auto
    7.21 +}