# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1330802858 -3600
# Node ID af9070ffbe857b1f8110d51deb455af0e35993c7
# Parent  7f0fea8ad9f4fbb0c1ed57fef6df8a7b997d52cb
get-softmodem-driver: broken and superseded by linmodem-* packages, move to wok-undigest

diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/description.txt
--- a/get-softmodem-driver/description.txt	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Support for software modems: Conexant
-
-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.
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/receipt
--- a/get-softmodem-driver/receipt	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="get-softmodem-driver"
-VERSION="0.11"
-CATEGORY="non-free"
-SHORT_DESC="Get misc softmodem drivers."
-MAINTAINER="domcox@slitaz.org"
-DEPENDS="alsa-lib-dev cpio linux-source slitaz-toolchain"
-WEB_SITE="http://hg.slitaz.org/wok/file/$PACKAGE/stuff/$PACKAGE"
-TAGS="modem dialup"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/$PACKAGE $fs/usr/bin
-	for i in hsfmodem hcfpcimodem martian slmodem; do
-		ln -s $PACKAGE $fs/usr/bin/get-$i-driver
-	done
-	mkdir -p $fs/usr/share/softmodem
-	cp -a $stuff/*diff $fs/usr/share/softmodem
-	cp -a $stuff/*receipt $fs/usr/share/softmodem
-	cp -a $stuff/*init $fs/usr/share/softmodem
-	cp -a $stuff/*country $fs/usr/share/softmodem
-	cp -a $stuff/zone.tab $fs/usr/share/softmodem
-}
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/get-softmodem-driver
--- a/get-softmodem-driver/stuff/get-softmodem-driver	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-#!/bin/sh
-# install softmodems drivers if needed.
-
-PACKAGE=$(echo $0 | sed 's/.*get-\(.*\)-driver/\1/')
-ROOT="$1"
-DEPENDS=""
-
-untested()
-{
-echo "--------------------------------------------------------"
-echo "Due to a lack of compatible hardware for troubleshooting,"
-echo "this $PACKAGE package has not been tested. Please report"
-echo "any success, failure, bug to SliTaz Labs or SliTaz Forum."
-echo "--------------------------------------------------------"
-sleep 1
-}
-
-case "$PACKAGE" in
-hsfmodem)
-	. /usr/share/softmodem/hsfmodem.receipt ;;
-hcfpcimodem)
-	. /usr/share/softmodem/hcfpcimodem.receipt ;;
-martian)
-	. /usr/share/softmodem/martian.receipt ;;
-slmodem)
-	. /usr/share/softmodem/slmodem.receipt ;;
-*)
-	echo "Unknown modem driver. Please run one of the following commands:"
-	for i in $(cd $(dirname $0); ls get-*-driver); do
-		[ -L $i ] || continue
-		[ "$(readlink $i)" = "get-modem-driver" ] || continue
-		echo "  $i"
-	done
-	exit 1;;
-esac
-
-# Report
-echo "Installing $SHORT_DESC.."
-
-# Check if user is root to install.
-if test $(id -u) != 0 ; then
-	echo -e "\nYou must be root to run `basename $0`."
-	echo -e "Please use 'su' and root password to become super-user.\n"
-	exit 0
-fi
-
-# Avoid reinstall
-if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
-	echo -e "\n$PACKAGE-$VERSION package is already installed.\n"
-	exit 0
-fi
-
-# Check linux-source
-cp /proc/config.gz . && gunzip config.gz
-DIFF=$(diff /usr/src/linux/.config config | awk 'BEGIN{i=0}/^[-+]/{ i++} END{print i}')
-rm -f config config.gz
-if [ $DIFF -gt 2 ]; then
-	echo "Warning: Linux source .config file and currently installed kernel don't match."
-	echo "Please rebuild Linux source with the proper .config file."
-	echo "Otherwise you may not be able to load the generated drivers."
-	sleep 2
-fi
-
-# Get files
-cd /usr/src
-echo "Checking for source tarball... $WGET_URL"
-if [ ! -f "$TARBALL" ]; then 
-	wget $WGET_URL
-	# Exit if download failed to avoid errors.
-	if [ ! -f "$TARBALL" ]; then
-		echo -e "\nDownload failed, exiting. Please check WGET_URL variable.\n"
-		exit 1
-	fi
-fi
-
-case "$WGET_URL" in
-*rpm)	rpm2cpio < $(basename $WGET_URL) | cpio -id;;
-*deb)	dpkg-deb -x $(basename $WGET_URL) . ;;
-*bz2)	tar xjf $(basename $WGET_URL) ;;
-*tar.gz|*tgz)	tar xzf $(basename $WGET_URL) || exit 1 ;;
-*zip)	unzip $(basename $WGET_URL);;
-*o)	;;
-esac
-
-# Set dirs
-src=/usr/src/$PACKAGE-$VERSION
-taz=/tmp/sm$RANDOM$RANDOM$RANDOM.$$
-fs=$taz/$PACKAGE-$VERSION/fs
-mkdir -p $fs
-
-# Create pseudo package
-case "$PACKAGE" in 
-hsfmodem)
-	# Rules to configure and make the package.
-	cd $src
-	echo "Apply $file..."
-	patch -p1 < /usr/share/softmodem/$PACKAGE-$VERSION.diff || exit 1
-	# Build
-	make all
-	make ROOT=$fs install
-	make clean
-	# Data for automatic region setting
-	mkdir -p $fs/usr/share/hsfmodem
-	cp -a /usr/share/softmodem/zone.tab $fs/usr/share/hsfmodem
-	# src is needed
-	cd $taz
-	mkdir -p $fs/usr/src
-	mv $src $fs/usr/src
-	;;
-hcfpcimodem)
-	untested
-	# Rules to configure and make the package.
-	cd $src
-	echo "Apply $file..."
-	patch -p1 < /usr/share/softmodem/$PACKAGE-$VERSION.diff || exit 1
-	# Build
-	make all
-	make ROOT=$fs install
-	make clean
-	# Data for automatic region setting
-	mkdir -p $fs/usr/share/hcfpcimodem
-	cp -a /usr/share/softmodem/zone.tab $fs/usr/share/hcfpcimodem
-	# src is needed
-	cd $taz
-	mkdir -p $fs/usr/src
-	mv $src $fs/usr/src
-	;;
-martian)
-	untested
-	# Build
-	src=/usr/src/$PACKAGE
-	cd $src
-	sed -i 's/uname -i/uname -m/' modem/Makefile
-	sed -i 's/asm\/page.h/\/usr\/src\/linux\/include\/asm\/page.h/' modem/mport.c
-	sed -i 's/asm\/page.h/\/usr\/src\/linux\/include\/asm\/page.h/' modem/tweakrelocsdynamic.c
-	make all
-	# Install
-	mkdir -p $fs/usr/sbin
-	cp -a modem/martian_modem $fs/usr/sbin
-	mkdir -p $fs/lib/modules/`uname -r`/martian
-	cp -a kmodule/martian_dev.ko $fs/lib/modules/`uname -r`/martian
-	mkdir -p $fs/etc/init.d
-	cp -a /usr/share/softmodem/martian.init $fs/etc/init.d/martian
-	chmod +x $fs/etc/init.d/martian
-	# Data for automatic region setting
-	mkdir -p $fs/usr/share/martian
-	cp -a /usr/share/softmodem/zone.tab $fs/usr/share/martian
-	cp -a /usr/share/softmodem/martian.country $fs/usr/share/martian
-	rm -rf $src
-	;;
-slmodem)
-	untested
-	# build modules
-	cd $src
-	make clean
-	make drivers
-	# Build slmodemd with ALSA support
-	cd modem
-	make clean
-	make SUPPORT_ALSA=1
-	# install
-	cd $src
-	mkdir -p $fs/lib/modules/`uname -r`/slamr
-	cp -a drivers/*ko $fs/lib/modules/`uname -r`/slamr
-	mkdir -p $fs/usr/sbin
-	cp -a modem/slmodemd $fs/usr/sbin
-	mkdir -p $fs/etc/init.d
-	cp -a /usr/share/softmodem/slmodem.init $fs/etc/init.d/slmodem
-	chmod +x $fs/etc/init.d/slmodem
-	# Data for automatic region setting
-	mkdir -p $fs/usr/share/slmodem
-	cp -a /usr/share/softmodem/zone.tab $fs/usr/share/slmodem
-	cp -a /usr/share/softmodem/slmodem.country $fs/usr/share/slmodem
-	rm -rf $src
-	;;
-esac
-
-# Create receipt
-cd $taz
-cat /usr/share/softmodem/$PACKAGE.receipt> $PACKAGE-$VERSION/receipt
-
-# Pack
-tazpkg pack $PACKAGE-$VERSION
-
-# Install pseudo package
-tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
-
-# Clean
-if [ -e /etc/tazwok.conf ]; then
-	. /etc/tazwok.conf
-	mkdir -p $PACKAGES_REPOSITORY
-	cp -a $PACKAGE-$VERSION.tazpkg $PACKAGES_REPOSITORY
-fi
-rm -rf $taz
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/hcfpcimodem-1.19full.diff
--- a/get-softmodem-driver/stuff/hcfpcimodem-1.19full.diff	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-diff -ru hcfpcimodem-1.19full/config.mak hcfpcimodem-1.19full-slitaz/config.mak
---- hcfpcimodem-1.19full/config.mak	2009-04-29 22:04:22.000000000 +0200
-+++ hcfpcimodem-1.19full-slitaz/config.mak	2009-06-15 22:17:05.000000000 +0200
-@@ -131,4 +131,4 @@
- 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
- 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
- 		< $< > $@
--	chmod --reference=$< $@
-+	chmod 755 $@
-diff -ru hcfpcimodem-1.19full/makefile hcfpcimodem-1.19full-slitaz/makefile
---- hcfpcimodem-1.19full/makefile	2009-04-29 22:04:22.000000000 +0200
-+++ hcfpcimodem-1.19full-slitaz/makefile	2009-06-15 22:17:47.000000000 +0200
-@@ -149,7 +149,7 @@
- ifeq ($(RPMOPTEVAL),yes)
- RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
- else
--RPMTARGETCPU=$(shell uname -i)
-+RPMTARGETCPU=$(shell uname -m)
- endif
- 
- ifneq ($(RPMOPTDEFINE),yes)
-diff -ru hcfpcimodem-1.19full/modules/Makefile hcfpcimodem-1.19full-slitaz/modules/Makefile
---- hcfpcimodem-1.19full/modules/Makefile	2009-04-29 22:04:22.000000000 +0200
-+++ hcfpcimodem-1.19full-slitaz/modules/Makefile	2009-06-15 22:19:01.000000000 +0200
-@@ -20,7 +20,7 @@
- include $(TOP)/config.mak
- 
- IMPORTED = $(TOP)/modules/imported
--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)
-+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)
- ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
- $(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... ***)
- endif
-diff -ru hcfpcimodem-1.19full/scripts/cnxtconfig.in hcfpcimodem-1.19full-slitaz/scripts/cnxtconfig.in
---- hcfpcimodem-1.19full/scripts/cnxtconfig.in	2009-04-29 22:04:22.000000000 +0200
-+++ hcfpcimodem-1.19full-slitaz/scripts/cnxtconfig.in	2009-06-16 09:32:18.000000000 +0200
-@@ -74,7 +74,7 @@
- 				answer="${region}"
- 				;;
- 			*)
--				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
-+				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
- 				;;
- 			esac
- 		fi
-@@ -109,15 +109,13 @@
- {
- 	# Try to guess what region we're in, using the timezone settings
- 
--	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
--
--	if ! [ ${localtime_size} -gt 0 ]; then
-+	if [ ! -e /etc/TZ ]; then
- 		return 1
- 	fi
- 
--	zoneinfo_dir=/usr/share/zoneinfo
-+	zoneinfo_dir=/usr/share/hcfpcimodem
- 
--	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
-+	if [ -f ${zoneinfo_dir}/zone.tab ]; then
- 		return 1
- 	fi
- 
-@@ -206,17 +204,9 @@
- 	iso_VN=00BC # VIETNAM
- 
- 	(
--		cd ${zoneinfo_dir} 2>/dev/null || return 1
--		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
--			while read file; do
--				cmp -s /etc/localtime $file || continue
--# in the egrep and sed regular expressions below, it is very important to
--# have tabs, not spaces
--				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
--			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
--				while read code; do
--					eval "echo \${iso_${code}}"
--				done | sort | uniq
-+		zone=`cat /etc/TZ`
-+		code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`
-+		eval "echo \${iso_${code}}"
- 		return 0
- 	)
- }
-@@ -271,7 +261,7 @@
- # The md5sum is used for input verification.
- disptokey()
- {
--	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
-+	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
- 	case $k in
- 	00000000)
- 		echo "$k"
-@@ -1655,7 +1645,7 @@
- 		update-modules
- 	else
- 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
--			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
-+			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
- 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
- 					rm -f ${modulesconf}.$$ ${f}
- 					exit 1
-@@ -1681,7 +1671,7 @@
- 	fi
- 
- 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
--		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
-+		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
- 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
- 				rm -f ${modprobeconf}.$$ ${f}
- 				exit 1
-@@ -2214,6 +2204,10 @@
- 	elif [ -d /var/lib/LST ]; then
- 		OSDISTNAME=Caldera
- 		OSDISTIDNT=caldera
-+	elif [ -f /etc/slitaz-release ]; then
-+		OSDISTNAME=SliTaz
-+		OSDISTIDNT=slitaz
-+		OSDISTVERS="`cat /etc/slitaz-release`"
- 	fi
- 
- 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
-@@ -2268,7 +2262,7 @@
- 
- dump_file()
- {
--	dump_cmd cat -v $@
-+	dump_cmd cat $@
- }
- 
- dump_diagnostics()
-@@ -2587,7 +2581,7 @@
- 	fi
- 	units="${specificunit}"
- 	if [ -z "${units}" ]; then
--		units=`ls --ignore=flush_nvm ${procdrvdir}`
-+		units=`ls ${procdrvdir} | grep -v flush_nvm`
- 
- 		if [ -z "${units}" ]; then
- 			echo ""
-@@ -2884,7 +2878,7 @@
- 			explicitopt=true
- 			do_cfgregion=true
- 			if [ -n "$2" ]; then
--				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
-+				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
- 			fi
- 			shift 2
- 			;;
-@@ -2954,7 +2948,7 @@
- 
- # Accept --region <name> as equivalent to --region=<name>
- if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
--	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
-+	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
- 	shift
- fi
- 
-@@ -3033,7 +3027,7 @@
- 
- if ${do_cfgnewinstance}; then
- 	if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
--		mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
-+		mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
- 		# The purpose of --info here is to ensure module reload:
- 		(sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
- 	fi
-
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/hcfpcimodem.receipt
--- a/get-softmodem-driver/stuff/hcfpcimodem.receipt	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="hcfpcimodem"
-VERSION="1.19full"
-CATEGORY="non-free"
-SHORT_DESC="Driver for the Conexant HCF (controllerless) Softmodem family."
-MAINTAINER="domcox@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="module-init-tools linux-source"
-WEB_SITE="http://www.linuxant.com/drivers"
-WGET_URL="http://www.linuxant.com/drivers/hcf/full/archive/$PACKAGE-$VERSION/$TARBALL"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
-	/usr/sbin/hcfpciconfig --auto
-}
-
-post_remove()
-{
-    echo -n "Removing modules.."
-    rm -rf /lib/modules/`uname -r`/extra/hcfpci*
-    status
-	rm -rf /usr/share/hcfpicmodem
-	rm -rf /etc/hcfpcimodem
-}
\ No newline at end of file
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff
--- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-diff -ru hsfmodem-7.80.02.04full/config.mak hsfmodem-7.80.02.04full-slitaz/config.mak
---- hsfmodem-7.80.02.04full/config.mak	2009-02-20 22:30:12.000000000 +0100
-+++ hsfmodem-7.80.02.04full-slitaz/config.mak	2009-06-15 11:49:13.000000000 +0200
-@@ -131,4 +131,4 @@
- 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
- 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
- 		< $< > $@
--	chmod --reference=$< $@
-+	chmod 755 $@
-diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile
---- hsfmodem-7.80.02.04full/makefile	2009-02-23 22:51:37.000000000 +0100
-+++ hsfmodem-7.80.02.04full-slitaz/makefile	2009-06-15 11:49:13.000000000 +0200
-@@ -149,7 +149,7 @@
- ifeq ($(RPMOPTEVAL),yes)
- RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
- else
--RPMTARGETCPU=$(shell uname -i)
-+RPMTARGETCPU=$(shell uname -m)
- endif
- 
- ifneq ($(RPMOPTDEFINE),yes)
-diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile
---- hsfmodem-7.80.02.04full/modules/Makefile	2009-04-24 03:03:57.000000000 +0200
-+++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile	2009-06-15 11:49:13.000000000 +0200
-@@ -20,7 +20,7 @@
- include $(TOP)/config.mak
- 
- IMPORTED = $(TOP)/modules/imported
--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)
-+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)
- ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
- $(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... ***)
- endif
-diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in
---- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in	2009-04-23 17:32:18.000000000 +0200
-+++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in	2009-06-15 21:29:49.000000000 +0200
-@@ -74,7 +74,7 @@
- 				answer="${region}"
- 				;;
- 			*)
--				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
-+				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
- 				;;
- 			esac
- 		fi
-@@ -109,15 +109,13 @@
- {
- 	# Try to guess what region we're in, using the timezone settings
- 
--	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
--
--	if ! [ ${localtime_size} -gt 0 ]; then
-+	if [ ! -e /etc/TZ ]; then
- 		return 1
- 	fi
- 
--	zoneinfo_dir=/usr/share/zoneinfo
-+	zoneinfo_dir=/usr/share/hsfmodem
- 
--	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
-+	if [ ! -f ${zoneinfo_dir}/zone.tab ]; then
- 		return 1
- 	fi
- 
-@@ -206,18 +204,11 @@
- 	iso_VN=00BC # VIETNAM
- 
- 	(
--		cd ${zoneinfo_dir} 2>/dev/null || return 1
--		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
--			while read file; do
--				cmp -s /etc/localtime $file || continue
--# in the egrep and sed regular expressions below, it is very important to
--# have tabs, not spaces
--				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
--			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
--				while read code; do
--					eval "echo \${iso_${code}}"
--				done | sort | uniq
-+		zone=`cat /etc/TZ`
-+		code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`
-+		eval "echo \${iso_${code}}"
- 		return 0
-+		
- 	)
- }
- 
-@@ -271,7 +262,7 @@
- # The md5sum is used for input verification.
- disptokey()
- {
--	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
-+	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
- 	case $k in
- 	00000000)
- 		echo "$k"
-@@ -1655,7 +1646,7 @@
- 		update-modules
- 	else
- 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
--			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
-+			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
- 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
- 					rm -f ${modulesconf}.$$ ${f}
- 					exit 1
-@@ -1681,7 +1672,7 @@
- 	fi
- 
- 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
--		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
-+		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
- 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
- 				rm -f ${modprobeconf}.$$ ${f}
- 				exit 1
-@@ -2214,6 +2205,10 @@
- 	elif [ -d /var/lib/LST ]; then
- 		OSDISTNAME=Caldera
- 		OSDISTIDNT=caldera
-+	elif [ -f /etc/slitaz-release ]; then
-+		OSDISTNAME=SliTaz
-+		OSDISTIDNT=slitaz
-+		OSDISTVERS="`cat /etc/slitaz-release`"
- 	fi
- 
- 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
-@@ -2268,7 +2263,7 @@
- 
- dump_file()
- {
--	dump_cmd cat -v $@
-+	dump_cmd cat $@
- }
- 
- dump_diagnostics()
-@@ -2587,7 +2582,7 @@
- 	fi
- 	units="${specificunit}"
- 	if [ -z "${units}" ]; then
--		units=`ls --ignore=flush_nvm ${procdrvdir}`
-+		units=`ls ${procdrvdir} | grep -v flush_nvm`
- 
- 		if [ -z "${units}" ]; then
- 			echo ""
-@@ -2884,7 +2879,7 @@
- 			explicitopt=true
- 			do_cfgregion=true
- 			if [ -n "$2" ]; then
--				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
-+				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
- 			fi
- 			shift 2
- 			;;
-@@ -2954,6 +2949,6 @@
- 
- # Accept --region <name> as equivalent to --region=<name>
- if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
--	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
-+	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
- 	shift
- fi
-
-@@ -3033,0 +3027,0 @@
-
- if ${do_cfgnewinstance}; then
-  if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
--		mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
-+		mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
- 		# The purpose of --info here is to ensure module reload:
- 		(sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
- 	fi
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/hsfmodem.receipt
--- a/get-softmodem-driver/stuff/hsfmodem.receipt	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="hsfmodem"
-VERSION="7.80.02.04full"
-CATEGORY="non-free"
-SHORT_DESC="Driver for the Conexant (formerly Rockwell) HSF Softmodem family."
-MAINTAINER="domcox@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="module-init-tools linux-source"
-WEB_SITE="http://www.linuxant.com/drivers"
-WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$PACKAGE-$VERSION/$TARBALL"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
-	/usr/sbin/hsfconfig --auto
-}
-
-post_remove()
-{
-	echo -n "Removing modules.."
-	rm -rf /lib/modules/`uname -r`/extra/hsf*
-	status
-	rm -rf /usr/share/hsfmodem
-	rm -rf /etc/hsfmodem
-}
\ No newline at end of file
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/martian.country
--- a/get-softmodem-driver/stuff/martian.country	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-AE	ae	UNITED_ARAB_EMIRATES
-AR	ar	ARGENTINA
-AT	at	AUSTRIA
-AU	au	AUSTRALIA
-BB	bb	BARBADOS
-BD	bd	BANGLADESH
-BG	bg	BULGARIA
-BO	bo	BOLIVIA
-BR	br	BRAZIL
-BY	by	BELARUS
-CA	ca	CANADA
-CH	ch	SWITZERLAND
-CL	cl	CHILE
-CN	cn	CHINA
-CO	co	COLOMBIA
-CR	cr	COSTA_RICA
-CY	cy	CYPRUS
-CZ	cz	CZECH_REPUBLIC
-DE	de	GERMANY
-DK	dk	DENMARK
-EC	ec	ECUADOR
-EE	ee	ESTONIA
-EG	eg	EGYPT
-ES	es	SPAIN
-EU	eu	EUROPE
-FI	fi	FINLAND
-FR	fr	FRANCE
-GP	fr	GUADELOUPE
-GR	gr	GREECE
-GT	gt	GUATEMALA
-GU	gu	GUAM
-HK	hk	HONG_KONG
-HR	hr	CROATIA
-HU	hu	HUNGARY
-ID	id	INDONESIA
-IE	ie	IRELAND
-IL	il	ISRAEL
-IN	in	INDIA
-IS	is	ICELAND
-IT	it	ITALY
-JP	jp	JAPAN
-KR	kr	REPUBLIC_OF_KOREA
-KW	kw	KUWAIT
-LB	lb	LEBANON
-LI	li	LIECHTENSTEIN
-LK	lk	SRI_LANKA
-LT	lt	LITHUANIA
-LU	lu	LUXEMBOURG
-LV	lv	LATVIA
-MA	ma	MOROCCO
-MQ	fr	MARTINIQUE
-MT	mt	MALTA
-MX	mx	MEXICO
-MY	my	MALAYSIA
-NC	fr	NEW_CALEDONIA
-NI	ni	NICARAGUA
-NL	nl	NETHERLANDS
-NO	no	NORWAY
-NZ	nz	NEW_ZEALAND
-OM	om	OMAN
-PA	pa	PANAMA
-PE	pe	PERU
-PH	ph	PHILIPPINES
-PJ	fr	FRENCH_POLYNESIA
-PK	pk	PAKISTAN
-PL	pl	POLAND
-PR	pr	PUERTO_RICO
-PT	pt	PORTUGAL
-PY	py	PARAGUAY
-RO	ro	ROMANIA
-RU	ru	RUSSIA
-SA	sa	SAUDI_ARABIA
-SE	se	SWEDEN
-SG	sg	SINGAPORE
-SI	si	SLOVENIA
-SK	sk	SLOVAKIA
-TH	th	THAILAND
-TN	tn	TUNISIA
-TR	tr	TURKEY
-TW	tw	TAIWAN
-UA	ua	UKRAINE
-UK	uk	UNITED_KINGDOM
-US	us	UNITED_STATES
-UY	uy	URUGUAY
-VE	ve	VENEZUELA
-VI	vi	VIRGIN_ISLANDS_U.S.
-VN	vn	VIET_NAM
-ZA	za	SOUTH_AFRICA
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/martian.init
--- a/get-softmodem-driver/stuff/martian.init	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#!/bin/sh
-# /etc/init.d/martian: Start, stop and restart martian deamon on SliTaz, at boot
-# time or with the command line.
-#
-# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
-# variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
-#
-. /etc/init.d/rc.functions
-. /etc/daemons.conf
-
-NAME="Martian modem"
-DESC="Agere Systems PCI Modem deamon"
-DAEMON=/usr/sbin/martian_modem
-OPTIONS="--daemon $MARTIAN_OPTIONS"
-PIDFILE=/var/run/martian.pid
-MODULE="martian_dev"
-
-if [ `/sbin/lsmod | grep -c ${MODULE}` -lt "1" ]; then
-	echo "kernel module is not loaded!"
-	exit 1
-fi
-
-case "$1" in
-  start)
-    if active_pidfile $PIDFILE martian_modem ; then
-      echo "$NAME already running."
-      exit 1
-    fi
-    echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
-    status
-    ;;
-  stop)
-    if ! active_pidfile $PIDFILE martian_modem ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Stopping $DESC: $NAME... "
-    killall martian_modem
-	rm $PIDFILE
-    status
-    ;;
-  restart)
-    if ! active_pidfile $PIDFILE martian_modem ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Restarting $DESC: $NAME... "
-    killall martian_modem
-    sleep 2
-    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
-    status
-    ;;
-  *)
-    echo ""
-    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
-    echo ""
-    exit 1
-    ;;
-esac
-
-exit 0
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/martian.receipt
--- a/get-softmodem-driver/stuff/martian.receipt	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="martian"
-VERSION="full-20080617"
-CATEGORY="non-free"
-SHORT_DESC="Driver for the Agere Systems PCI Modem built on DSP 164x (Mars) series."
-MAINTAINER="domcox@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="module-init-tools linux-source"
-WEB_SITE="http://martian.barrelsoutofbond.org"
-WGET_URL="http://www.barrelsoutofbond.org/downloads/$PACKAGE/$TARBALL"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
-	# Country settings
-	if [ -e /etc/TZ ]; then
-		ZONE=`cat /etc/TZ`
-		CODE=`grep $ZONE /usr/share/martian/zone.tab | cut -f1'`
-		if [ -n $CODE ]; then
-			COUNTRY=`grep ^$CODE /usr/share/martian/martian.country | cut -f2`
-			COUNTRY_NAME=`grep ^$CODE /usr/share/martian/martian.country | cut -f3`
-		fi
-	fi
-	if [ -z $COUNTRY ]; then
-		COUNTRY="us"
-		COUNTRY_NAME="USA"
-	fi
-	echo "Automatic country setting: $COUNTRY_NAME"
-	# Save options
-	if [ `grep -c MARTIAN_OPTIONS /etc/daemons.conf` -gt 0 ]; then
-		sed -i 's/MARTIAN_OPTIONS=.*/MARTIAN_OPTIONS="--country='"$COUNTRY"' \/dev\/ttySM0"/' /etc/daemons.conf
-	else
-	echo "# slmodemd daemon options." >> $root/etc/daemons.conf
-		echo "MARTIAN_OPTIONS=\"--country=$COUNTRY /dev/ttySM0\"" >> $root/etc/daemons.conf
-		echo  >> $root/etc/daemons.conf
-	fi
-	# Load module
-	/sbin/depmod -a
-	/sbin/modprobe martian_dev && \
-	/etc/init.d/martian start
-}
-
-post_remove()
-{
-	/etc/init.d/martian stop
-	rm -rf /usr/share/martian
-}
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/slmodem.country
--- a/get-softmodem-driver/stuff/slmodem.country	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-AD	CTR21EUROPE
-AE	UAE
-AR	ARGENTINA
-AT	AUSTRIA
-AU	AUSTRALIA
-BE	BELGIUM
-BG	BULGARIA
-BH	BAHREIN
-BN	BRUNEI
-BR	BRAZIL
-CA	CANADA
-CH	SWITZERLAND
-CL	CHILE
-CN	CHINA
-CY	CYPRUS
-CZ	CZECH_REPUBLIC
-DE	GERMANY
-DK	DENMARK
-DZ	ALGERIA
-EE	ESTONIA
-EG	EGYPT
-ES	SPAIN
-FI	FINLAND
-FO	CTR21EUROPE
-FR	FRANCE
-GB	UK
-GI	CTR21EUROPE
-GL	CTR21EUROPE
-GP	FRANCE
-GR	GREECE
-HK	HONG_KONG
-HU	HUNGARY
-ID	INDONESIA
-IE	IRELAND
-IL	ISRAEL
-IN	INDIA
-IS	ICELAND
-IT	ITALY
-JO	JORDAN
-JP	JAPAN
-KR	KOREA
-KT	SOUTHKOREA
-KW	KUWAIT
-LB	LEBANON
-LI	CTR21EUROPE
-LK	SRILANKA
-LT	LITHUANIA
-LU	LUXEMBOURG
-LV	LATVIA
-MA	MOROCCO
-MC	CTR21EUROPE
-MQ	FRANCE
-MT	MALTA
-MX	MEXICO
-MY	MALAYSIA
-NC	FRANCE
-NL	NETHERLANDS
-NO	NORWAY
-NZ	NEW_ZEALAND
-OM	OMAN
-PE	PERU
-PH	PHILIPPINES
-PJ	FRANCE
-PK	PAKISTAN
-PL	POLAND
-PT	PORTUGAL
-RO	ROMANIA
-RU	RUSSIA
-SA	SAUDIARABIA
-SE	SWEDEN
-SG	SINGAPORE
-SI	SLOVENIA
-SK	SLOVAKIA
-SM	CTR21EUROPE
-TH	THAILAND
-TN	TUNISIA
-TR	TURKEY
-TW	TAIWAN
-US	USA
-UY	URUGUAY
-VN	VIETNAM
-ZA	SOUTHAFRICA
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/slmodem.init
--- a/get-softmodem-driver/stuff/slmodem.init	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#!/bin/sh
-# /etc/init.d/slmodem: Start, stop and restart slmodemd deamon on SliTaz, at boot
-# time or with the command line.
-#
-# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
-# variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
-#
-. /etc/init.d/rc.functions
-. /etc/daemons.conf
-
-NAME="Smartlink modem"
-DESC="Smart Link Modem deamon"
-DAEMON=/usr/sbin/slmodemd
-OPTIONS=$SLMODEM_OPTIONS
-PIDFILE=/var/run/slmodemd.pid
-
-case "$1" in
-  start)
-    if active_pidfile $PIDFILE slmodemd ; then
-      echo "$NAME already running."
-      exit 1
-    fi
-    echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
-    status
-    ;;
-  stop)
-    if ! active_pidfile $PIDFILE slmodemd ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Stopping $DESC: $NAME... "
-    kill `cat $PIDFILE`
-    status
-    ;;
-  restart)
-    if ! active_pidfile $PIDFILE slmodemd ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Restarting $DESC: $NAME... "
-    kill `cat $PIDFILE`
-    sleep 2
-    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
-    status
-    ;;
-  *)
-    echo ""
-    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
-    echo ""
-    exit 1
-    ;;
-esac
-
-exit 0
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/slmodem.receipt
--- a/get-softmodem-driver/stuff/slmodem.receipt	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="slmodem"
-VERSION="2.9.11-20090222"
-CATEGORY="non-free"
-SHORT_DESC="Support for the SmartLink Softmodem and ALSA supported chipsets."
-MAINTAINER="domcox@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="alsa-lib module-init-tools linux-source"
-WEB_SITE="http://linmodems.technion.ac.il"
-WGET_URL="http://linmodems.technion.ac.il/packages/smartlink/$TARBALL"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
-	# Country detection
-	if [ -e /etc/TZ ]; then
-		ZONE=`cat /etc/TZ`
-		CODE=`grep $ZONE /usr/share/slmodem/zone.tab | cut -f1'`
-		if [ -n $CODE ]; then
-			COUNTRY=`grep ^$CODE /usr/share/slmodem/slmodem.country | cut -f2`
-		fi
-	fi
-	if [ -z $COUNTRY ]; then
-		COUNTRY="USA"
-	fi
-	echo "Automatic country setting: $COUNTRY"
-	# Save options
-	if [ `grep -c SLMODEM_OPTIONS /etc/daemons.conf` -gt 0 ]; then
-		sed -i 's/SLMODEM_OPTIONS=.*/SLMODEM_OPTIONS="--country='"$COUNTRY"' \/dev\/slamr0"/' /etc/daemons.conf
-	else
-		echo "# slmodemd daemon options." >> $root/etc/daemons.conf
-		echo "SLMODEM_OPTIONS=\"--country=$COUNTRY /dev/slamr0\"" >> $root/etc/daemons.conf
-		echo  >> $root/etc/daemons.conf
-	fi
-	# Load module 
-	depmod -a
-	/sbin/modprobe slamr && /etc/init.d/slmodem start
-}
-
-post_remove()
-{
-	/etc/init.d/slmodem stop
-	rm -rf /usr/share/slmodem
-}
\ No newline at end of file
diff -r 7f0fea8ad9f4 -r af9070ffbe85 get-softmodem-driver/stuff/zone.tab
--- a/get-softmodem-driver/stuff/zone.tab	Sat Mar 03 11:14:56 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-# @(#)zone.tab	1.32
-#
-# TZ zone descriptions
-#
-# From Paul Eggert (1996-08-05):
-#
-# This file contains a table with the following columns:
-# 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
-# 2.  Latitude and longitude of the zone's principal location
-#     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
-#     first latitude (+ is north), then longitude (+ is east).
-# 3.  Zone name used in value of TZ environment variable.
-# 4.  Comments; present if and only if the country has multiple rows.
-#
-# Columns are separated by a single tab.
-# The table is sorted first by country, then an order within the country that
-# (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
-#
-# Lines beginning with `#' are comments.
-#
-#country-
-#code	coordinates	TZ			comments
-AD	+4230+00131	Europe/Andorra
-AE	+2518+05518	Asia/Dubai
-AF	+3431+06912	Asia/Kabul
-AG	+1703-06148	America/Antigua
-AI	+1812-06304	America/Anguilla
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AN	+1211-06900	America/Curacao
-AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
-AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, S Magnetic Pole
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Base, Terre Adelie
-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-3124-06411	America/Argentina/Tucuman	Tucuman (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS	-1416-17042	Pacific/Pago_Pago
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
-AU	-3956+14352	Australia/Currie	Tasmania - King Island
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia
-AW	+1230-06858	America/Aruba
-AX	+6006+01957	Europe/Mariehamn
-AZ	+4023+04951	Asia/Baku
-BA	+4352+01825	Europe/Sarajevo
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE	+5050+00420	Europe/Brussels
-BF	+1222-00131	Africa/Ouagadougou
-BG	+4241+02319	Europe/Sofia
-BH	+2623+05035	Asia/Bahrain
-BI	-0323+02922	Africa/Bujumbura
-BJ	+0629+00237	Africa/Porto-Novo
-BM	+3217-06446	Atlantic/Bermuda
-BN	+0456+11455	Asia/Brunei
-BO	-1630-06809	America/La_Paz
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Amapa, E Para
-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0846-06354	America/Porto_Velho	W Para, Rondonia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	E Amazonas
-BR	-0640-06952	America/Eirunepe	W Amazonas
-BR	-0958-06748	America/Rio_Branco	Acre
-BS	+2505-07721	America/Nassau
-BT	+2728+08939	Asia/Thimphu
-BW	-2545+02555	Africa/Gaborone
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland Island
-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
-CA	+5320-06025	America/Goose_Bay	Atlantic Time - E Labrador
-CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
-CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut
-CA	+6408-08310	America/Coral_Harbour	Eastern Standard Time - Southampton Island
-CA	+6245-09210	America/Rankin_Inlet	Central Time - central Nunavut
-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
-CA	+4843-09429	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
-CA	+6903-10505	America/Cambridge_Bay	Central Time - west Nunavut
-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
-CA	+6825-11330	America/Inuvik	Mountain Time - west Northwest Territories
-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
-CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
-CF	+0422+01835	Africa/Bangui
-CG	-0416+01517	Africa/Brazzaville
-CH	+4723+00832	Europe/Zurich
-CI	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most locations
-CL	-2710-10927	Pacific/Easter	Easter Island & Sala y Gomez
-CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	east China - Beijing, Guangdong, Shanghai, etc.
-CN	+4545+12641	Asia/Harbin	Heilongjiang
-CN	+2934+10635	Asia/Chongqing	central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
-CN	+4348+08735	Asia/Urumqi	Tibet & most of Xinjiang Uyghur
-CN	+3929+07559	Asia/Kashgar	southwest Xinjiang Uyghur
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CS	+4450+02030	Europe/Belgrade
-CU	+2308-08222	America/Havana
-CV	+1455-02331	Atlantic/Cape_Verde
-CX	-1025+10543	Indian/Christmas
-CY	+3510+03322	Asia/Nicosia
-CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin
-DJ	+1136+04309	Africa/Djibouti
-DK	+5540+01235	Europe/Copenhagen
-DM	+1518-06124	America/Dominica
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	mainland
-EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ER	+1520+03853	Africa/Asmera
-ES	+4024-00341	Europe/Madrid	mainland
-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-ET	+0902+03842	Africa/Addis_Ababa
-FI	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Truk	Truk (Chuuk) and Yap
-FM	+0658+15813	Pacific/Ponape	Ponape (Pohnpei)
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faeroe
-FR	+4852+00220	Europe/Paris
-GA	+0023+00927	Africa/Libreville
-GB	+512830-0001845	Europe/London
-GD	+1203-06145	America/Grenada
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GH	+0533-00013	Africa/Accra
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Godthab	most locations
-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
-GL	+7030-02215	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule / Pituffik
-GM	+1328-01639	Africa/Banjul
-GN	+0931-01343	Africa/Conakry
-GP	+1614-06132	America/Guadeloupe
-GQ	+0345+00847	Africa/Malabo
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HR	+4548+01558	Europe/Zagreb
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
-ID	-0002+10920	Asia/Pontianak	west & central Borneo
-ID	-0507+11924	Asia/Makassar	east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor
-ID	-0232+14042	Asia/Jayapura	Irian Jaya & the Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+3146+03514	Asia/Jerusalem
-IN	+2232+08822	Asia/Calcutta
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IS	+6409-02151	Atlantic/Reykjavik
-IT	+4154+01229	Europe/Rome
-JM	+1800-07648	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KH	+1133+10455	Asia/Phnom_Penh
-KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KM	-1141+04316	Indian/Comoro
-KN	+1718-06243	America/St_Kitts
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KW	+2920+04759	Asia/Kuwait
-KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most locations
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LA	+1758+10236	Asia/Vientiane
-LB	+3353+03530	Asia/Beirut
-LC	+1401-06100	America/St_Lucia
-LI	+4709+00931	Europe/Vaduz
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LS	-2928+02730	Africa/Maseru
-LT	+5441+02519	Europe/Vilnius
-LU	+4936+00609	Europe/Luxembourg
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
-MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most locations
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MK	+4159+02126	Europe/Skopje
-ML	+1239-00800	Africa/Bamako
-MM	+1647+09610	Asia/Rangoon
-MN	+4755+10653	Asia/Ulaanbaatar	most locations
-MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
-MO	+2214+11335	Asia/Macau
-MP	+1512+14545	Pacific/Saipan
-MQ	+1436-06105	America/Martinique
-MR	+1806-01557	Africa/Nouakchott
-MS	+1644-06213	America/Montserrat
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Indian/Maldives
-MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Time - most locations
-MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
-MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas
-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
-MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua
-MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
-MX	+3232-11701	America/Tijuana	Pacific Time
-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
-MZ	-2558+03235	Africa/Maputo
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16530	Pacific/Noumea
-NE	+1331+00207	Africa/Niamey
-NF	-2903+16758	Pacific/Norfolk
-NG	+0627+00324	Africa/Lagos
-NI	+1209-08617	America/Managua
-NL	+5222+00454	Europe/Amsterdam
-NO	+5955+01045	Europe/Oslo
-NP	+2743+08519	Asia/Katmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901+16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most locations
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-OM	+2336+05835	Asia/Muscat
-PA	+0858-07932	America/Panama
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-PL	+5215+02100	Europe/Warsaw
-PM	+4703-05620	America/Miquelon
-PN	-2504-13005	Pacific/Pitcairn
-PR	+182806-0660622	America/Puerto_Rico
-PS	+3130+03428	Asia/Gaza
-PT	+3843-00908	Europe/Lisbon	mainland
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA	+2517+05132	Asia/Qatar
-RE	-2052+05528	Indian/Reunion
-RO	+4426+02606	Europe/Bucharest
-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
-RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
-RU	+5312+05009	Europe/Samara	Moscow+01 - Caspian Sea
-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
-RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
-RU	+5301+15839	Asia/Kamchatka	Moscow+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	Moscow+10 - Bering Sea
-RW	-0157+03004	Africa/Kigali
-SA	+2438+04643	Asia/Riyadh
-SB	-0932+16012	Pacific/Guadalcanal
-SC	-0440+05528	Indian/Mahe
-SD	+1536+03232	Africa/Khartoum
-SE	+5920+01803	Europe/Stockholm
-SG	+0117+10351	Asia/Singapore
-SH	-1555-00542	Atlantic/St_Helena
-SI	+4603+01431	Europe/Ljubljana
-SJ	+7800+01600	Arctic/Longyearbyen	Svalbard
-SJ	+7059-00805	Atlantic/Jan_Mayen	Jan Mayen
-SK	+4809+01707	Europe/Bratislava
-SL	+0830-01315	Africa/Freetown
-SM	+4355+01228	Europe/San_Marino
-SN	+1440-01726	Africa/Dakar
-SO	+0204+04522	Africa/Mogadishu
-SR	+0550-05510	America/Paramaribo
-ST	+0020+00644	Africa/Sao_Tome
-SV	+1342-08912	America/El_Salvador
-SY	+3330+03618	Asia/Damascus
-SZ	-2618+03106	Africa/Mbabane
-TC	+2128-07108	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Indian/Kerguelen
-TG	+0608+00113	Africa/Lome
-TH	+1345+10031	Asia/Bangkok
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-2110+17510	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TT	+1039-06131	America/Port_of_Spain
-TV	-0831+17913	Pacific/Funafuti
-TW	+2503+12130	Asia/Taipei
-TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kiev	most locations
-UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk
-UA	+4457+03406	Europe/Simferopol	central Crimea
-UG	+0019+03225	Africa/Kampala
-UM	+1700-16830	Pacific/Johnston	Johnston Atoll
-UM	+2813-17722	Pacific/Midway	Midway Islands
-UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern Time
-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Standard Time - Indiana - most locations
-US	+382232-0862041	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
-US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
-US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
-US	+415100-0873900	America/Chicago	Central Time
-US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
-US	+394421-1045903	America/Denver	Mountain Time
-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
-US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona
-US	+340308-1181434	America/Los_Angeles	Pacific Time
-US	+611305-1495401	America/Anchorage	Alaska Time
-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
-US	+515248-1763929	America/Adak	Aleutian Islands
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-3453-05611	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
-VA	+4154+01227	Europe/Vatican
-VC	+1309-06114	America/St_Vincent
-VE	+1030-06656	America/Caracas
-VG	+1827-06437	America/Tortola
-VI	+1821-06456	America/St_Thomas
-VN	+1045+10640	Asia/Saigon
-VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Pacific/Wallis
-WS	-1350-17144	Pacific/Apia
-YE	+1245+04512	Asia/Aden
-YT	-1247+04514	Indian/Mayotte
-ZA	-2615+02800	Africa/Johannesburg
-ZM	-1525+02817	Africa/Lusaka
-ZW	-1750+03103	Africa/Harare