Hello community, here is the log from the commit of package wireless-regdb for openSUSE:Factory checked in at 2013-01-03 13:49:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireless-regdb (Old) and /work/SRC/openSUSE:Factory/.wireless-regdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireless-regdb", Maintainer is "mac...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wireless-regdb/wireless-regdb.changes 2012-07-12 15:39:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wireless-regdb.new/wireless-regdb.changes 2013-01-03 13:49:26.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 31 03:15:22 UTC 2012 - crrodrig...@opensuse.org + +- Update database to the most recent 2012.06.08 + +------------------------------------------------------------------- Old: ---- wireless-regdb-2009.11.25.tar.bz2 New: ---- wireless-regdb-2012.06.08.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-regdb.spec ++++++ --- /var/tmp/diff_new_pack.XK54ys/_old 2013-01-03 13:49:26.000000000 +0100 +++ /var/tmp/diff_new_pack.XK54ys/_new 2013-01-03 13:49:26.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package wireless-regdb (Version 2009.11.25) +# spec file for package wireless-regdb # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Url: http://wireless.kernel.org/en/developers/Regulatory#The_regulatory_database Name: wireless-regdb Summary: 802.11 regulatory domain database -Version: 2009.11.25 -Release: 1 -%define tarversion %{version} -Group: Hardware/Wifi License: ISC +Group: Hardware/Wifi +Version: 2012.06.08 +Release: 0 +%define tarversion %{version} Source: %{name}-%{tarversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq %install_info_prereq @@ -44,7 +43,7 @@ Michael Green <michael.gr...@atheros.com> %prep -%setup -n %{name}-%{tarversion} +%setup -q -n %{name}-%{tarversion} %build ++++++ wireless-regdb-2009.11.25.tar.bz2 -> wireless-regdb-2012.06.08.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.11.25/Makefile new/wireless-regdb-2012.06.08/Makefile --- old/wireless-regdb-2009.11.25/Makefile 2009-11-25 20:12:40.000000000 +0100 +++ new/wireless-regdb-2012.06.08/Makefile 2012-06-08 19:27:41.000000000 +0200 @@ -34,16 +34,14 @@ REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem -REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt; \ - if [ $$? -eq 0 ]; then \ - echo ; \ - else \ +REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt >/dev/null 2>&1; \ + if [ $$? -ne 0 ]; then \ echo maintainer-clean $(REGDB_PUBKEY); \ fi) .PHONY: all clean mrproper install maintainer-clean install-distro-key -all: $(REGDB_CHANGED) regulatory.bin +all: $(REGDB_CHANGED) regulatory.bin sha1sum.txt clean: @rm -f *.pyc *.gz @@ -59,6 +57,9 @@ @echo Generating $@ digitally signed by $(REGDB_AUTHOR)... ./db2bin.py regulatory.bin db.txt $(REGDB_PRIVKEY) +sha1sum.txt: db.txt + sha1sum $< > $@ + $(REGDB_PUBKEY): $(REGDB_PRIVKEY) @echo "Generating public key for $(REGDB_AUTHOR)..." openssl rsa -in $(REGDB_PRIVKEY) -out $(REGDB_PUBKEY) -pubout -outform PEM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.11.25/db.txt new/wireless-regdb-2012.06.08/db.txt --- old/wireless-regdb-2009.11.25/db.txt 2009-11-25 20:12:40.000000000 +0100 +++ new/wireless-regdb-2012.06.08/db.txt 2012-06-08 19:27:41.000000000 +0200 @@ -14,6 +14,9 @@ country AE: (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS country AL: (2402 - 2482 @ 20), (N/A, 20) @@ -30,13 +33,13 @@ (5490 - 5710 @ 40), (N/A, 27), DFS country AR: - (2402 - 2482 @ 20), (N/A, 20) + (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (3, 17) (5250 - 5330 @ 40), (3, 20), DFS (5490 - 5710 @ 40), (3, 20), DFS (5735 - 5835 @ 40), (3, 30) -country AT: +country AT: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -59,7 +62,7 @@ (5170 - 5250 @ 40), (N/A, 18) (5250 - 5330 @ 40), (N/A, 18), DFS -country BA: +country BA: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -71,13 +74,16 @@ (5250 - 5330 @ 40), (3, 23), DFS (5735 - 5835 @ 40), (3, 30) -country BE: +country BD: + (2402 - 2482 @ 40), (N/A, 20) + +country BE: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country BG: +country BG: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 23) (5250 - 5290 @ 40), (N/A, 23), DFS @@ -105,11 +111,11 @@ (5735 - 5835 @ 40), (N/A, 30) country BR: - (2402 - 2482 @ 20), (N/A, 20) - (5170 - 5250 @ 20), (3, 17) - (5250 - 5330 @ 20), (3, 20), DFS - (5490 - 5710 @ 20), (3, 20), DFS - (5735 - 5835 @ 20), (3, 30) + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) country BY: (2402 - 2482 @ 40), (N/A, 20) @@ -128,7 +134,7 @@ (5490 - 5710 @ 40), (3, 20), DFS (5735 - 5835 @ 40), (3, 30) -country CH: +country CH: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -146,9 +152,9 @@ country CO: (2402 - 2472 @ 40), (3, 27) - (5170 - 5250 @ 20), (3, 17) - (5250 - 5330 @ 20), (3, 23), DFS - (5735 - 5835 @ 20), (3, 30) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) country CR: (2402 - 2482 @ 40), (N/A, 20) @@ -162,7 +168,7 @@ (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country CY: +country CY: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -170,25 +176,37 @@ # Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf # and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf -country CZ: +# Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is +# implemented. +country CZ: DFS-ETSI (2400 - 2483.5 @ 40), (N/A, 100 mW) (5150 - 5250 @ 40), (N/A, 200 mW), NO-OUTDOOR - (5250 - 5350 @ 40), (N/A, 200 mW), NO-OUTDOOR, DFS - (5470 - 5725 @ 40), (N/A, 1000 mW), DFS + (5250 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS + (5470 - 5725 @ 40), (N/A, 500 mW), DFS + +# Data from "Frequenznutzungsplan" (as published in April 2008), downloaded from +# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38448/publicationFile/2659/Frequenznutzungsplan2008_Id17448pdf.pdf +# For the 5GHz range also see +# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38216/publicationFile/6579/WLAN5GHzVfg7_2010_28042010pdf.pdf +# The values have been reduced by a factor of 2 (3db) for non TPC devices +# (in other words: devices with TPC can use twice the tx power of this table). +# Note that the docs do not require TPC for 5150--5250; the reduction to +# 100mW thus is not strictly required -- however the conservative 100mW +# limit is used here as the non-interference with radar and satellite +# apps relies on the attenuation by the building walls only in the +# absence of DFS; the neighbour countries have 100mW limit here as well. -# Data from "Frequenznutzungsplan" (as published in April 2008), -# downloaded from http://www.bundesnetzagentur.de/media/archive/13358.pdf -# Also applicable is http://www.bundesnetzagentur.de/media/archive/5009.pdf -# On the 5 GHz ranges TX power can be doubled if TPC is implemented. -country DE: +country DE: DFS-ETSI # entries 279004 and 280006 (2400 - 2483.5 @ 40), (N/A, 100 mW) - # entries 303005, 304002 and 305002 - (5150 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS + # entry 303005 + (5150 - 5250 @ 40), (N/A, 100 mW), NO-OUTDOOR + # entries 304002 and 305002 + (5250 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS # entries 308002, 309001 and 310003 - (5470 - 5725 @ 40), (N/A, 500 mW), NO-OUTDOOR, DFS + (5470 - 5725 @ 40), (N/A, 500 mW), DFS -country DK: +country DK: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -201,7 +219,7 @@ (5735 - 5835 @ 40), (3, 30) country DZ: - (2402 - 2482 @ 20), (N/A, 20) + (2402 - 2482 @ 40), (N/A, 20) country EC: (2402 - 2482 @ 40), (N/A, 20) @@ -209,7 +227,7 @@ (5250 - 5330 @ 20), (3, 23), DFS (5735 - 5835 @ 20), (3, 30) -country EE: +country EE: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -220,19 +238,19 @@ (5170 - 5250 @ 20), (N/A, 20) (5250 - 5330 @ 20), (N/A, 20), DFS -country ES: +country ES: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country FI: +country FI: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country FR: +country FR: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -243,7 +261,7 @@ (5170 - 5250 @ 40), (N/A, 18) (5250 - 5330 @ 40), (N/A, 18), DFS -country GB: +country GB: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -256,13 +274,13 @@ (5490 - 5710 @ 40), (3, 20), DFS (5735 - 5835 @ 40), (3, 30) -country GR: +country GR: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country GL: +country GL: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 20), (N/A, 20) (5250 - 5330 @ 20), (N/A, 20), DFS @@ -282,6 +300,10 @@ country HN: (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) country HK: (2402 - 2482 @ 40), (N/A, 20) @@ -290,7 +312,7 @@ (5490 - 5710 @ 40), (3, 20), DFS (5735 - 5835 @ 40), (3, 30) -country HR: +country HR: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -302,7 +324,7 @@ (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country HU: +country HU: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -311,7 +333,7 @@ country ID: (2402 - 2482 @ 40), (N/A, 20) -country IE: +country IE: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -319,14 +341,16 @@ country IL: (2402 - 2482 @ 40), (N/A, 20) + (5150 - 5250 @ 40), (N/A, 200 mW), NO-OUTDOOR + (5250 - 5350 @ 40), (N/A, 200 mW), NO-OUTDOOR, DFS country IN: (2402 - 2482 @ 40), (N/A, 20) - (5170 - 5250 @ 20), (N/A, 20) - (5250 - 5330 @ 20), (N/A, 20), DFS - (5735 - 5835 @ 20), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5735 - 5835 @ 40), (N/A, 20) -country IS: +country IS: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -336,7 +360,7 @@ (2402 - 2482 @ 40), (N/A, 20) (5735 - 5835 @ 40), (N/A, 30) -country IT: +country IT: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -367,6 +391,10 @@ (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 18) +country KE: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) + country KH: (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) @@ -397,8 +425,9 @@ country LB: (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) -country LI: +country LI: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -411,25 +440,25 @@ (5490 - 5710 @ 20), (3, 20), DFS (5735 - 5835 @ 20), (3, 30) -country LT: +country LT: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country LU: +country LU: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country LV: +country LV: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country MC: +country MC: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 18) (5250 - 5330 @ 40), (N/A, 18), DFS @@ -443,19 +472,22 @@ (5250 - 5330 @ 40), (3, 23), DFS (5735 - 5835 @ 40), (3, 30) -country MK: +country MK: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS -country MT: +country MT: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS country MY: - (2402 - 2482 @ 20), (N/A, 20) - (5250 - 5330 @ 20), (N/A, 30), DFS - (5735 - 5835 @ 20), (N/A, 30) + (2402 - 2482 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 30), DFS + (5735 - 5835 @ 40), (N/A, 30) country MX: (2402 - 2472 @ 40), (3, 27) @@ -463,13 +495,13 @@ (5250 - 5330 @ 40), (3, 23), DFS (5735 - 5835 @ 40), (3, 30) -country NL: +country NL: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) - (5170 - 5250 @ 40), (N/A, 20) - (5250 - 5330 @ 40), (N/A, 20), DFS + (5170 - 5250 @ 40), (N/A, 20), NO-OUTDOOR + (5250 - 5330 @ 40), (N/A, 20), NO-OUTDOOR, DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country NO: +country NO: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -500,7 +532,7 @@ country PE: (2402 - 2482 @ 40), (N/A, 20) - (5735 - 5835 @ 20), (N/A, 30) + (5735 - 5835 @ 40), (N/A, 30) country PG: (2402 - 2482 @ 40), (N/A, 20) @@ -514,14 +546,15 @@ country PK: (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) -country PL: +country PL: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country PT: +country PT: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -537,16 +570,27 @@ (2402 - 2482 @ 40), (N/A, 20) (5735 - 5835 @ 40), (N/A, 30) -country RO: +country RO: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS country RU: (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 20), (N/A, 30) + +country RW: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) country SA: (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (3, 23) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) -country SE: +country SE: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -558,13 +602,13 @@ (5250 - 5330 @ 40), (N/A, 20), DFS (5735 - 5835 @ 40), (N/A, 20) -country SI: +country SI: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS (5490 - 5710 @ 40), (N/A, 27), DFS -country SK: +country SK: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 40), (N/A, 20) (5250 - 5330 @ 40), (N/A, 20), DFS @@ -603,7 +647,7 @@ (5170 - 5250 @ 20), (N/A, 20) (5250 - 5330 @ 20), (N/A, 20), DFS -country TR: +country TR: DFS-ETSI (2402 - 2482 @ 40), (N/A, 20) (5170 - 5250 @ 20), (N/A, 20) (5250 - 5330 @ 20), (N/A, 20), DFS @@ -611,7 +655,7 @@ country UA: (2402 - 2482 @ 40), (N/A, 20) -country US: +country US: DFS-FCC (2402 - 2472 @ 40), (3, 27) (5170 - 5250 @ 40), (3, 17) (5250 - 5330 @ 40), (3, 20), DFS @@ -634,21 +678,23 @@ (5735 - 5835 @ 40), (3, 30) country VE: - (2402 - 2482 @ 40), (N/A, 30) - (5735 - 5815 @ 20), (N/A, 23) + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5815 @ 40), (N/A, 23) country VN: (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS country YE: (2402 - 2482 @ 40), (N/A, 20) country ZA: (2402 - 2482 @ 40), (N/A, 20) - (5170 - 5250 @ 20), (3, 17) - (5250 - 5330 @ 20), (3, 20), DFS - (5490 - 5710 @ 20), (3, 20), DFS - (5735 - 5835 @ 20), (3, 30) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) country ZW: (2402 - 2482 @ 40), (N/A, 20) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.11.25/db2bin.py new/wireless-regdb-2012.06.08/db2bin.py --- old/wireless-regdb-2009.11.25/db2bin.py 2009-11-25 20:12:40.000000000 +0100 +++ new/wireless-regdb-2012.06.08/db2bin.py 2012-06-08 19:27:41.000000000 +0200 @@ -116,7 +116,7 @@ for alpha2 in countrynames: coll = countries[alpha2] # struct regdb_file_reg_country - output.write(struct.pack('>ccxxI', str(alpha2[0]), str(alpha2[1]), reg_rules_collections[coll.permissions])) + output.write(struct.pack('>ccxBI', str(alpha2[0]), str(alpha2[1]), coll.dfs_region, reg_rules_collections[coll.permissions])) if len(sys.argv) > 3: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.11.25/dbparse.py new/wireless-regdb-2012.06.08/dbparse.py --- old/wireless-regdb-2009.11.25/dbparse.py 2009-11-25 20:12:40.000000000 +0100 +++ new/wireless-regdb-2012.06.08/dbparse.py 2012-06-08 19:27:41.000000000 +0200 @@ -18,6 +18,12 @@ 'NO-HT40': 1<<10, } +dfs_regions = { + 'DFS-FCC': 1, + 'DFS-ETSI': 2, + 'DFS-JP': 3, +} + class FreqBand(object): def __init__(self, start, end, bw, comments=None): self.start = start @@ -61,6 +67,10 @@ s = self return hash((s.max_ant_gain, s.max_eirp)) +class DFSRegionError(Exception): + def __init__(self, dfs_region): + self.dfs_region = dfs_region + class FlagError(Exception): def __init__(self, flag): self.flag = flag @@ -90,9 +100,15 @@ return hash(self._as_tuple()) class Country(object): - def __init__(self, permissions=None, comments=None): + def __init__(self, dfs_region, permissions=None, comments=None): self._permissions = permissions or [] self.comments = comments or [] + self.dfs_region = 0 + + if dfs_region: + if not dfs_region in dfs_regions: + raise DFSRegionError(dfs_region) + self.dfs_region = dfs_regions[dfs_region] def add(self, perm): assert isinstance(perm, Permission) @@ -224,11 +240,10 @@ def _parse_country(self, line): try: - cname, line = line.split(':', 1) + cname, cvals= line.split(':', 1) + dfs_region = cvals.strip() if not cname: self._syntax_error("'country' keyword must be followed by name") - if line: - self._syntax_error("extra data at end of country line") except ValueError: self._syntax_error("country name must be followed by colon") @@ -239,7 +254,7 @@ if len(cname) != 2: self._warn("country '%s' not alpha2" % cname) if not cname in self._countries: - self._countries[cname] = Country(comments=self._comments) + self._countries[cname] = Country(dfs_region, comments=self._comments) self._current_countries[cname] = self._countries[cname] self._comments = [] Files old/wireless-regdb-2009.11.25/regulatory.bin and new/wireless-regdb-2012.06.08/regulatory.bin differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.11.25/sha1sum.txt new/wireless-regdb-2012.06.08/sha1sum.txt --- old/wireless-regdb-2009.11.25/sha1sum.txt 2009-11-25 20:12:40.000000000 +0100 +++ new/wireless-regdb-2012.06.08/sha1sum.txt 2012-06-08 19:27:41.000000000 +0200 @@ -1 +1 @@ -f4b4e10f3435a580300d44d08f21392bcda4e28a db.txt +43481a6202cd8419a055fd470f0d19a018da406d db.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.11.25/web/Regulatory.py new/wireless-regdb-2012.06.08/web/Regulatory.py --- old/wireless-regdb-2009.11.25/web/Regulatory.py 2009-11-25 20:12:40.000000000 +0100 +++ new/wireless-regdb-2012.06.08/web/Regulatory.py 2012-06-08 19:27:41.000000000 +0200 @@ -3,7 +3,7 @@ Regulatory Database @copyright: 2008 Johannes Berg - @license: GNU GPL, see COPYING for details. + @license: ISC, see LICENSE for details. """ import codecs, math -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
