SliTaz Repositories

     1.1 --- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff	Mon Jun 15 15:05:01 2009 +0200
     1.2 +++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff	Mon Jun 15 21:45:58 2009 +0200
     1.3 @@ -1,15 +1,6 @@
     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 @@ -40,10 +31,9 @@
    1.20   ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    1.21   $(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.22   endif
    1.23 -
    1.24  diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in
    1.25  --- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in	2009-04-23 17:32:18.000000000 +0200
    1.26 -+++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in	2009-06-15 14:08:02.000000000 +0200
    1.27 ++++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in	2009-06-15 21:29:49.000000000 +0200
    1.28  @@ -74,7 +74,7 @@
    1.29   				answer="${region}"
    1.30   				;;
    1.31 @@ -95,6 +85,15 @@
    1.32   	)
    1.33   }
    1.34   
    1.35 +@@ -271,7 +262,7 @@
    1.36 + # The md5sum is used for input verification.
    1.37 + disptokey()
    1.38 + {
    1.39 +-	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
    1.40 ++	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
    1.41 + 	case $k in
    1.42 + 	00000000)
    1.43 + 		echo "$k"
    1.44  @@ -1655,7 +1646,7 @@
    1.45   		update-modules
    1.46   	else
    1.47 @@ -113,68 +112,6 @@
    1.48   			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
    1.49   				rm -f ${modprobeconf}.$$ ${f}
    1.50   				exit 1
    1.51 -@@ -1729,7 +1720,7 @@
    1.52 - 	fi
    1.53 - 
    1.54 - 	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.55 --		rm -f /dev/modem
    1.56 -+		echo
    1.57 - 	fi
    1.58 - 
    1.59 - 	rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
    1.60 -@@ -1753,7 +1744,7 @@
    1.61 - 	fi
    1.62 - 
    1.63 - 	echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
    1.64 --	echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
    1.65 -+	echo "alias /dev/modem none"
    1.66 - 	echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
    1.67 - 	if [ "$1" = modulesconf ]; then
    1.68 - 		echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
    1.69 -@@ -1927,7 +1918,7 @@
    1.70 - REGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
    1.71 - UNREGISTER	^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
    1.72 - 			> /etc/devfs/conf.d/@CNXTTARGET@.conf
    1.73 --		rm -f /dev/modem
    1.74 -+		echo
    1.75 - 		which update-devfsd >/dev/null 2>&1 && update-devfsd
    1.76 - 		killall -HUP devfsd 2>/dev/null
    1.77 - 	else
    1.78 -@@ -1941,7 +1932,7 @@
    1.79 - 				cp /etc/devfsd.conf.$$ /etc/devfsd.conf
    1.80 - 			fi
    1.81 - 			rm -f /etc/devfsd.conf.$$
    1.82 --			rm -f /dev/modem
    1.83 -+			echo
    1.84 - 			killall -HUP devfsd 2>/dev/null
    1.85 - 		fi
    1.86 - 	fi
    1.87 -@@ -1990,13 +1981,13 @@
    1.88 - 		done
    1.89 - 
    1.90 - 		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.91 --			rm -f /dev/modem
    1.92 -+			echo
    1.93 - 		fi
    1.94 - 
    1.95 - 		if [ -e /dev/modem ]; then
    1.96 - 			if ! fuser /dev/modem >/dev/null 2>&1; then
    1.97 --				rm -f /dev/modem.old
    1.98 --				mv /dev/modem /dev/modem.old
    1.99 -+				echo
   1.100 -+				echo
   1.101 - 
   1.102 - 				echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
   1.103 - 				echo ""
   1.104 -@@ -2005,7 +1996,7 @@
   1.105 - 		fi
   1.106 - 
   1.107 - 		if [ ! -e /dev/modem ]; then
   1.108 --			ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
   1.109 -+			echo
   1.110 - 		fi
   1.111 - 	fi
   1.112 -   fi
   1.113  @@ -2214,6 +2205,10 @@
   1.114   	elif [ -d /var/lib/LST ]; then
   1.115   		OSDISTNAME=Caldera
   1.116 @@ -213,7 +150,7 @@
   1.117   			fi
   1.118   			shift 2
   1.119   			;;
   1.120 -@@ -2954,7 +2949,7 @@
   1.121 +@@ -2954,6 +2949,6 @@
   1.122   
   1.123   # Accept --region <name> as equivalent to --region=<name>
   1.124   if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then