[pkg-wpa-devel] r1399 - in /wireless-regdb/trunk/debian: README.maintainer control install patches/disable_pubkeys.patch patches/distro_pubkey.patch patches/series pubkeys/ rules

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

Author: kelmo-guest
Date: Tue Jun  2 09:19:50 2009
New Revision: 1399

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

Added:
    wireless-regdb/trunk/debian/patches/disable_pubkeys.patch
Removed:
    wireless-regdb/trunk/debian/README.maintainer
    wireless-regdb/trunk/debian/install
    wireless-regdb/trunk/debian/patches/distro_pubkey.patch
    wireless-regdb/trunk/debian/pubkeys/
Modified:
    wireless-regdb/trunk/debian/control
    wireless-regdb/trunk/debian/patches/series
    wireless-regdb/trunk/debian/rules

Modified: wireless-regdb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/control?rev=1399&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/control (original)
+++ wireless-regdb/trunk/debian/control Tue Jun  2 09:19:50 2009
@@ -5,16 +5,16 @@
 Uploaders: Kel Modderman <kel at otaku42.de>
 Build-Depends: debhelper (>= 7.0.50),
  quilt(>= 0.46-7),
- python,
- python-m2crypto
+ python
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wireless-regdb/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/
-Homepage: http://wireless.kernel.org/en/developers/Regulatory
+Homepage: http://wireless.kernel.org/en/developers/Regulatory/#Theregulatorydatabase
 
 Package: wireless-regdb
 Architecture: all
-Depends: ${misc:Depends}, crda
+Depends: ${misc:Depends}
+Suggests: crda
 Description: wireless regulatory database
  This package contains the wireless regulatory database used by the Central
  Regulatory Database Agent (CRDA) to configure wireless devices to operate

Added: wireless-regdb/trunk/debian/patches/disable_pubkeys.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/patches/disable_pubkeys.patch?rev=1399&op=file
==============================================================================
--- wireless-regdb/trunk/debian/patches/disable_pubkeys.patch (added)
+++ wireless-regdb/trunk/debian/patches/disable_pubkeys.patch Tue Jun  2 09:19:50 2009
@@ -1,0 +1,47 @@
+Do not generate or install public gpg key(s).
+---
+--- a/Makefile
++++ b/Makefile
+@@ -9,6 +9,7 @@ SHA1SUM ?= /usr/bin/sha1sum
+ LSB_RELEASE ?= /usr/bin/lsb_release
+ WHOAMI ?= /usr/bin/whoami
+ 
++ifdef USE_PUBKEYS
+ # 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"
+@@ -77,6 +78,19 @@ endif
+ 
+ install-distro-key: maintainer-clean $(DISTRO_PRIVKEY)
+ 
++else
++
++.PHONY: all clean install
++
++all: regulatory.bin
++
++clean:
++	@rm -f *.pyc *.gz regulatory.bin
++
++regulatory.bin: db.txt
++	./db2bin.py regulatory.bin db.txt
++endif
++
+ %.gz: %
+ 	gzip < $< > $@
+ 
+@@ -98,12 +112,14 @@ install-distro-key: maintainer-clean $(D
+ #	sudo make install
+ install: regulatory.bin.5.gz
+ 	install -m 755 -d $(DESTDIR)/$(CRDA_PATH)
++ifdef USE_PUBKEYS
+ 	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)
++endif
+ 	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

Modified: wireless-regdb/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/patches/series?rev=1399&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/patches/series (original)
+++ wireless-regdb/trunk/debian/patches/series Tue Jun  2 09:19:50 2009
@@ -1,2 +1,2 @@
-distro_pubkey.patch
+disable_pubkeys.patch
 fix_manual_page_section.patch

Modified: wireless-regdb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/rules?rev=1399&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/rules (original)
+++ wireless-regdb/trunk/debian/rules Tue Jun  2 09:19:50 2009
@@ -1,24 +1,15 @@
 #!/usr/bin/make -f
 
-# LSB_ID is used in name of private/public key pair, setting it to our
-# packaging group is more descriptive than `Debian' or `Ubuntu' and
-# saves from executing lsb_release (and build-depending on lsb-release).
-LSB_ID    := pkg-wpa-devel
-CRDA_PATH := /lib/crda
-export LSB_ID CRDA_PATH
+# Path to which regulatory.bin should be installed by
+# dh_auto_install.
+export CRDA_PATH=/lib/crda
+# Set this explicitly to avoid calling lsb_release in
+# upstream build system.
+export LSB_ID=Debian
 
 %:
 	dh --with quilt $@
 
-override_dh_auto_clean:
-	$(MAKE) mrproper
-
-override_dh_auto_configure:
-	$(MAKE) mrproper
-	$(MAKE) check-distro-key
-
-install-distro-key:
-	@test -e debian/patches/series && dh_quilt_patch   || true
-	$(MAKE) $@
-	@test -e debian/patches/series && dh_quilt_unpatch || true
-	@dh_clean
+override_dh_auto_build:
+	$(RM) regulatory.bin
+	$(MAKE)