[pkg-wpa-devel] r1400 - in /crda/trunk/debian: control parse_zone_tab patches/disable_gcrypt.patch patches/series rules setregdomain

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jun  2 09:20:01 2009
New Revision: 1400

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1400
Log:
revert to disabling gpg crypto verification.

Added:
    crda/trunk/debian/patches/disable_gcrypt.patch
Removed:
    crda/trunk/debian/parse_zone_tab
Modified:
    crda/trunk/debian/control
    crda/trunk/debian/patches/series
    crda/trunk/debian/rules
    crda/trunk/debian/setregdomain

Modified: crda/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/control?rev=1400&op=diff
==============================================================================
--- crda/trunk/debian/control (original)
+++ crda/trunk/debian/control Tue Jun  2 09:20:01 2009
@@ -4,16 +4,13 @@
 Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
 Uploaders: Kel Modderman <kel at otaku42.de>
 Build-Depends: debhelper (>= 7.0.50),
- quilt(>= 0.46-7),
+ quilt (>= 0.46-7),
  libnl-dev,
- pkg-config,
- libgcrypt-dev,
- wireless-regdb,
- tzdata
+ pkg-config
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/crda/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/
-Homepage: http://wireless.kernel.org/en/developers/Regulatory/
+Homepage: http://wireless.kernel.org/en/developers/Regulatory/#CRDA
 
 Package: crda
 Architecture: any

Added: crda/trunk/debian/patches/disable_gcrypt.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/patches/disable_gcrypt.patch?rev=1400&op=file
==============================================================================
--- crda/trunk/debian/patches/disable_gcrypt.patch (added)
+++ crda/trunk/debian/patches/disable_gcrypt.patch Tue Jun  2 09:20:01 2009
@@ -1,0 +1,28 @@
+Do not embed gpg keys into crda binary.
+---
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@ PUBKEY_DIR?=pubkeys
+ 
+ CFLAGS += -Wall -g
+ 
+-all: $(REG_BIN) crda intersect verify
++all: crda intersect regdbdump
+ 
+ ifeq ($(USE_OPENSSL),1)
+ CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl`
+@@ -33,12 +33,14 @@ LDLIBS += `pkg-config --libs openssl`
+ reglib.o: keys-ssl.c
+ 
+ else
++ifeq ($(USE_GCRYPT),1)
+ CFLAGS += -DUSE_GCRYPT
+ LDLIBS += -lgcrypt
+ 
+ reglib.o: keys-gcrypt.c
+ 
+ endif
++endif
+ MKDIR ?= mkdir -p
+ INSTALL ?= install
+ 

Modified: crda/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/patches/series?rev=1400&op=diff
==============================================================================
--- crda/trunk/debian/patches/series (original)
+++ crda/trunk/debian/patches/series Tue Jun  2 09:20:01 2009
@@ -1,1 +1,2 @@
+disable_gcrypt.patch
 regulatory_rules_setregdomain.patch

Modified: crda/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/rules?rev=1400&op=diff
==============================================================================
--- crda/trunk/debian/rules (original)
+++ crda/trunk/debian/rules Tue Jun  2 09:20:01 2009
@@ -1,16 +1,6 @@
 #!/usr/bin/make -f
-
-REG_BIN    := /lib/crda/regulatory.bin
-PUBKEY_DIR := /lib/crda/pubkeys
-export REG_BIN PUBKEY_DIR
-
 %:
 	dh --with quilt $@
-
-override_dh_install:
-	dh_install
-	chmod a+rx debian/parse_zone_tab
-	debian/parse_zone_tab debian/crda/lib/crda/setregdomain_zone_codes
 
 override_dh_fixperms:
 	dh_fixperms

Modified: crda/trunk/debian/setregdomain
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/setregdomain?rev=1400&op=diff
==============================================================================
--- crda/trunk/debian/setregdomain (original)
+++ crda/trunk/debian/setregdomain Tue Jun  2 09:20:01 2009
@@ -2,6 +2,7 @@
 
 REGDOM_CONFIG=/etc/default/crda
 TZDATA_CONFIG=/etc/timezone
+TZDATA_MATRIX=/usr/share/zoneinfo/zone.tab
 
 REGDOMAIN=
 TIME_ZONE=
@@ -38,15 +39,13 @@
 	fi
 fi
 
-if [ -s "$TZDATA_CONFIG" ]; then
-	TIME_ZONE="$(sed -e 's# #_#g' $TZDATA_CONFIG)"
-
-	# Source the zone code snippet generated at package build time from
-	# information in /usr/share/zoneinfo/zone.tab to set ZONE_CODE
-	. /lib/crda/setregdomain_zone_codes
+if [ -s "$TZDATA_CONFIG" ] && [ -s "$TZDATA_MATRIX" ]; then
+	TIME_ZONE="$(cat $TZDATA_CONFIG)"
+	_TIMEZONE="$(echo $TIME_ZONE | sed -e 's# #_#g' -e 's#/#\\\\/#g')"
+	ZONE_CODE="$(sed -r -n '/'$_TIMEZONE'/s/^([A-Z]{2})\s+.*/\1/p' \
+		     $TZDATA_MATRIX)"
 	if [ -n "$ZONE_CODE" ]; then
-		setreg_ftw "$ZONE_CODE" "$TIME_ZONE"
-		exit
+		setreg_ftw "$ZONE_CODE" "$TZDATA_CONFIG - $TIME_ZONE"
 	else
 		setreg_err "Domain could not be determined from timezone" \
 			   "information in $TZDATA_CONFIG."