Hello community, here is the log from the commit of package wireless-regdb for openSUSE:Factory checked in at Thu Jul 30 17:04:33 CEST 2009. -------- --- wireless-regdb/wireless-regdb.changes 2009-02-09 17:24:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/wireless-regdb/wireless-regdb.changes 2009-07-28 21:28:51.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 28 21:05:17 CEST 2009 - aj@suse.de + +- Update to 2009.04.30: + * KR,BN,DE reg updates + * enable passive scanning for world regdomain on other channels + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix_makefile.patch wireless-regdb-2009.01.30.tar.bz2 New: ---- wireless-regdb-2009.04.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-regdb.spec ++++++ --- /var/tmp/diff_new_pack.aTX8nN/_old 2009-07-30 17:04:18.000000000 +0200 +++ /var/tmp/diff_new_pack.aTX8nN/_new 2009-07-30 17:04:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wireless-regdb (Version 2009.01.30) +# spec file for package wireless-regdb (Version 2009.04.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,16 +21,15 @@ Name: wireless-regdb Summary: 802.11 regulatory domain database -Version: 2009.01.30 -Release: 3 +Version: 2009.04.17 +Release: 1 %define tarversion %{version} Group: Hardware/Wifi -License: BSD 3-Clause +License: BSD 3-clause (or similar) Source: %{name}-%{tarversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq %install_info_prereq BuildArch: noarch -Patch0: fix_makefile.patch %description The 802.11 regulatory domain database is used by CRDA and provides @@ -46,7 +45,6 @@ %prep %setup -n %{name}-%{tarversion} -%patch0 -p2 %build @@ -56,7 +54,9 @@ %files %defattr(-,root,root) %dir %{_prefix}/lib/crda +%dir %{_prefix}/lib/crda/pubkeys %{_prefix}/lib/crda/regulatory.bin +%{_prefix}/lib/crda/pubkeys/*pem %{_prefix}/share/man/man5/regulatory.bin.5.gz %clean ++++++ wireless-regdb-2009.01.30.tar.bz2 -> wireless-regdb-2009.04.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/Makefile new/wireless-regdb-2009.04.17/Makefile --- old/wireless-regdb-2009.01.30/Makefile 2009-01-30 21:39:04.000000000 +0100 +++ new/wireless-regdb-2009.04.17/Makefile 2009-04-17 20:55:28.000000000 +0200 @@ -1,38 +1,112 @@ # Install prefix -PREFIX = /usr -CDRA_PATH = $(PREFIX)/lib/crda +PREFIX ?= /usr +CRDA_PATH ?= $(PREFIX)/lib/crda +CRDA_KEY_PATH ?= $(CRDA_PATH)/pubkeys MANDIR ?= $(PREFIX)/share/man/ +SHA1SUM ?= /usr/bin/sha1sum +LSB_RELEASE ?= /usr/bin/lsb_release +WHOAMI ?= /usr/bin/whoami + +# Distro name: Ubuntu, Debian, Fedora, if not present you get +# "custom-distro", if your distribution does not have the LSB stuff, +# then set this variable when calling make if you don't want "custom-distro" +LSB_ID ?= $(shell if [ -f $(LSB_RELEASE) ]; then \ + $(LSB_RELEASE) -i -s; \ + else \ + echo custom-distro; \ + fi) + +DISTRO_PRIVKEY ?= ~/.wireless-regdb-$(LSB_ID).key.priv.pem +DISTRO_PUBKEY ?= ~/.wireless-regdb-$(LSB_ID).key.priv.pem + +REGDB_AUTHOR ?= $(shell if [ -f $(DISTRO_PRIVKEY) ]; then \ + echo $(LSB_ID) ; \ + elif [ -f $(WHOAMI) ]; then \ + $(WHOAMI); \ + else \ + echo custom-user; \ + fi) + +REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem +REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem + +REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem + +REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt; \ + if [ $$? -eq 0 ]; then \ + echo ; \ + else \ + echo maintainer-clean $(REGDB_PUBKEY); \ + fi) -.PHONY: all clean install maintainer-clean +.PHONY: all clean mrproper install maintainer-clean install-distro-key -all: regulatory.bin key.pub.pem +all: $(REGDB_CHANGED) regulatory.bin clean: - rm -f *.pyc *.gz + @rm -f *.pyc *.gz maintainer-clean: clean - rm -f regulatory.bin key.pub.pem + @rm -f regulatory.bin -ifneq ($(wildcard key.priv.pem),) -regulatory.bin: db.txt key.priv.pem - ./db2bin.py regulatory.bin db.txt key.priv.pem - -key.pub.pem: key.priv.pem - openssl rsa -in key.priv.pem -out key.pub.pem -pubout -outform PEM +mrproper: clean maintainer-clean + @echo Removed public key, regulatory.bin and compresed man pages + @rm -f $(REGDB_PUBKEY) .custom + +regulatory.bin: db.txt $(REGDB_PRIVKEY) $(REGDB_PUBKEY) + @echo Generating $@ digitally signed by $(REGDB_AUTHOR)... + ./db2bin.py regulatory.bin db.txt $(REGDB_PRIVKEY) + +$(REGDB_PUBKEY): $(REGDB_PRIVKEY) + @echo "Generating public key for $(REGDB_AUTHOR)..." + openssl rsa -in $(REGDB_PRIVKEY) -out $(REGDB_PUBKEY) -pubout -outform PEM + @echo $(REGDB_PUBKEY) > .custom + + +$(REGDB_PRIVKEY): + @echo "Generating private key for $(REGDB_AUTHOR)..." + openssl genrsa -out $(REGDB_PRIVKEY) 2048 + +ifneq ($(shell test -e $(DISTRO_PRIVKEY) && echo yes),yes) +$(DISTRO_PRIVKEY): + @echo "Generating private key for $(LSB_ID) packager..." + openssl genrsa -out $(DISTRO_PRIVKEY) 2048 endif -key.priv.pem: - openssl genrsa -out key.priv.pem 2048 +install-distro-key: maintainer-clean $(DISTRO_PRIVKEY) %.gz: % gzip < $< > $@ -# Distributions wishing to just use John's database -# can just call make install. +# Users should just do: +# sudo make install +# +# Developers should do: +# make maintainer-clean +# make +# sudo make install +# +# Distributions packagers should do only once: +# make install-distro-key +# This will create a private key for you and install it into +# ~/.wireless-regdb-$(LSB_ID).key.priv.pem +# To make new releaes just do: +# make maintainer-clean +# make +# sudo make install install: regulatory.bin.5.gz - install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CDRA_PATH) - install -o 0 -g 0 -m 644 regulatory.bin $(DESTDIR)/$(CDRA_PATH)/regulatory.bin - mkdir -p $(DESTDIR)/$(MANDIR)/man5/ + install -m 755 -d $(DESTDIR)/$(CRDA_PATH) + install -m 755 -d $(DESTDIR)/$(CRDA_KEY_PATH) + if [ -f .custom ]; then \ + install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(shell cat .custom); \ + fi + @# In linville we trust + install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(REGDB_UPSTREAM_PUBKEY) + install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin + install -m 755 -d $(DESTDIR)/$(MANDIR)/man5/ install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz + +uninstall: + rm -rf $(DESTDIR)/$(CRDA_PATH)/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/db.txt new/wireless-regdb-2009.04.17/db.txt --- old/wireless-regdb-2009.01.30/db.txt 2009-01-30 21:39:04.000000000 +0100 +++ new/wireless-regdb-2009.04.17/db.txt 2009-04-17 20:55:28.000000000 +0200 @@ -1,5 +1,16 @@ +# This is the world regulatory domain country 00: (2402 - 2472 @ 40), (3, 20) + # Channel 12 - 13. No HT40 channel fits here + (2457 - 2482 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS + # Channel 14. Only JP enables this and for 802.11b only + (2474 - 2494 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS, NO-OFDM + # Channel 36 - 48 + (5170 - 5250 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS + # NB: 5260 MHz - 5700 MHz requies DFS + # Channel 149 - 165 + (5735 - 5835 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS + country AE: (2402 - 2482 @ 40), (N/A, 20) @@ -71,6 +82,8 @@ country BN: (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS (5735 - 5835 @ 40), (N/A, 30) country BO: @@ -151,13 +164,15 @@ # 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: # entries 279004 and 280006 (2400 - 2483.5 @ 40), (N/A, 100 mW) - # entries 303005 and 304002 - (5150 - 5255 @ 40), (N/A, 200 mW), NO-OUTDOOR, DFS - # entries 308002 and 309001 - (5470 - 5650 @ 40), (N/A, 1000 mW), DFS + # entries 303005, 304002 and 305002 + (5150 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS + # entries 308002, 309001 and 310003 + (5470 - 5725 @ 40), (N/A, 500 mW), NO-OUTDOOR, DFS country DK: (2402 - 2482 @ 40), (N/A, 20) @@ -321,8 +336,8 @@ country KR: (2402 - 2482 @ 20), (N/A, 20) (5170 - 5250 @ 20), (3, 20) - (5260 - 5330 @ 20), (3, 20), DFS - (5490 - 5710 @ 20), (3, 30), DFS + (5250 - 5330 @ 20), (3, 20), DFS + (5490 - 5630 @ 20), (3, 30), DFS (5735 - 5815 @ 20), (3, 30) country KW: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/dbparse.py new/wireless-regdb-2009.04.17/dbparse.py --- old/wireless-regdb-2009.01.30/dbparse.py 2009-01-30 21:39:04.000000000 +0100 +++ new/wireless-regdb-2009.04.17/dbparse.py 2009-04-17 20:55:28.000000000 +0200 @@ -136,6 +136,19 @@ start, end = freqs.split('-') start = float(start) end = float(end) + # The kernel will reject these, so might as well reject this + # upon building it. + if start <= 0: + self._syntax_error("Invalid start freq (%d)" % start) + if end <= 0: + self._syntax_error("Invalid end freq (%d)" % end) + if start > end: + self._syntax_error("Inverted freq range (%d - %d)" % (start, end)) + if start == end: + self._syntax_error("Start and end freqs are equal (%d)" % start) + if end - start < bw: + self._syntax_error("Invalid bandwidth: %d width channel " + "cannot possibly fit between %d - %d" % (bw, start, end)) except ValueError: self._syntax_error("band must have frequency range") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/debian-example/rules new/wireless-regdb-2009.04.17/debian-example/rules --- old/wireless-regdb-2009.01.30/debian-example/rules 2009-01-30 21:39:04.000000000 +0100 +++ new/wireless-regdb-2009.04.17/debian-example/rules 2009-04-17 20:55:28.000000000 +0200 @@ -3,8 +3,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk PREFIX = /usr -CDRA_LIB = $(PREFIX)/lib/crda +CRDA_LIB ?= $(PREFIX)/lib/crda install/wireless-regdb:: - install -o 0 -g 0 -m 755 -d debian/$(cdbs_curpkg)/$(CDRA_LIB) - install -o 0 -g 0 -m 644 regulatory.bin debian/$(cdbs_curpkg)/$(CDRA_LIB)/regulatory.bin + install -o 0 -g 0 -m 755 -d debian/$(cdbs_curpkg)/$(CRDA_LIB) + install -o 0 -g 0 -m 644 regulatory.bin debian/$(cdbs_curpkg)/$(CRDA_LIB)/regulatory.bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/key.pub.pem new/wireless-regdb-2009.04.17/key.pub.pem --- old/wireless-regdb-2009.01.30/key.pub.pem 2009-01-30 21:39:04.000000000 +0100 +++ new/wireless-regdb-2009.04.17/key.pub.pem 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1leZcYjTXc4qLq1oN2Ak -8vLP85P5cFTrCpqdSI5W4VOwdaJB4TtaxU2fATcH/A2EsE3h1rOfzI0+fBV9DcOO -qyID+zdILBMb8xK5Zv+78OkBGls/WzvDDVhdmn1TRHvRvmJy7cX1mCT56cnHrZM/ -ZBaFwVfiD9TcqqisyF1sqE5+cMHTWRbxc1+rtojr0eGYrNfK20awlD5KVj6Ejzot -r9EDWAsL1bH/kGfMdnputcyMapLQpRVruO/jEdjSmhAE/sj1tmHcAXBT6j5al4Oa -LiBaWnP++rune7rjimwfzp0549/rupQUM7nAZRDLyzXj3J/KEci6dXtjonBUFqDY -4QIDAQAB ------END PUBLIC KEY----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/linville.key.pub.pem new/wireless-regdb-2009.04.17/linville.key.pub.pem --- old/wireless-regdb-2009.01.30/linville.key.pub.pem 1970-01-01 01:00:00.000000000 +0100 +++ new/wireless-regdb-2009.04.17/linville.key.pub.pem 2009-04-17 20:55:28.000000000 +0200 @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1leZcYjTXc4qLq1oN2Ak +8vLP85P5cFTrCpqdSI5W4VOwdaJB4TtaxU2fATcH/A2EsE3h1rOfzI0+fBV9DcOO +qyID+zdILBMb8xK5Zv+78OkBGls/WzvDDVhdmn1TRHvRvmJy7cX1mCT56cnHrZM/ +ZBaFwVfiD9TcqqisyF1sqE5+cMHTWRbxc1+rtojr0eGYrNfK20awlD5KVj6Ejzot +r9EDWAsL1bH/kGfMdnputcyMapLQpRVruO/jEdjSmhAE/sj1tmHcAXBT6j5al4Oa +LiBaWnP++rune7rjimwfzp0549/rupQUM7nAZRDLyzXj3J/KEci6dXtjonBUFqDY +4QIDAQAB +-----END PUBLIC KEY----- Files old/wireless-regdb-2009.01.30/regulatory.bin and new/wireless-regdb-2009.04.17/regulatory.bin differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2009.01.30/sha1sum.txt new/wireless-regdb-2009.04.17/sha1sum.txt --- old/wireless-regdb-2009.01.30/sha1sum.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/wireless-regdb-2009.04.17/sha1sum.txt 2009-04-17 20:55:28.000000000 +0200 @@ -0,0 +1 @@ +f4b4e10f3435a580300d44d08f21392bcda4e28a db.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org