[crda] 11/16: Update packaging for new upstream version
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Wed Jan 18 02:22:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository crda.
commit b6c1c4313ede5558fdb7fd4e8a16868ac0f6e754
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Wed Jan 18 01:25:19 2017 +0000
Update packaging for new upstream version
Drop/refresh patches.
---
debian/changelog | 3 +-
...STDIR-support-in-install-libreg-rules-in-.patch | 33 ---------------
...e-linking-order-to-avoid-compilation-erro.patch | 49 ----------------------
debian/patches/do_not_embed_pubkeys.patch | 8 ++--
debian/patches/series | 2 -
5 files changed, 6 insertions(+), 89 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f5809f4..d8efa4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-crda (3.13-2) UNRELEASED; urgency=medium
+crda (3.18-1) UNRELEASED; urgency=medium
+ * New upstream version (Closes: #840623)
* debian/control: Change Vcs-Git, Vcs-Browser and Homepage to canonical
HTTP-S URLs
* debian/copyright: Change Source to HTTP-S URL
diff --git a/debian/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/debian/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
deleted file mode 100644
index e03c3c9..0000000
--- a/debian/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: "John W. Linville" <linville at tuxdriver.com>
-Date: Fri, 14 Feb 2014 13:58:44 -0500
-Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in Makefile
-Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=2cabb2588da56735369131b709f191453c080be0
-
-Signed-off-by: John W. Linville <linville at tuxdriver.com>
-Signed-off-by: Luis R. Rodriguez <mcgrof at do-not-panic.com>
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0b2f0d7..1f25509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c
-
- install-libreg-headers:
- $(NQ) ' INSTALL libreg-headers'
-- $(Q)mkdir -p $(INCLUDE_DIR)
-- $(Q)cp *.h $(INCLUDE_DIR)/
-+ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR)
-+ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/
-
- install-libreg:
- $(NQ) ' INSTALL libreg'
-- $(Q)mkdir -p $(LIBDIR)
-- $(Q)cp $(LIBREG) $(LIBDIR)/
-+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
-+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
- $(Q)ldconfig
-
- %.o: %.c regdb.h $(LIBREG)
diff --git a/debian/patches/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/debian/patches/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
deleted file mode 100644
index 50db97e..0000000
--- a/debian/patches/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Krishna Chaitanya <chaitanya.mgit at gmail.com>
-Date: Mon, 16 Dec 2013 21:57:39 +0530
-Subject: [PATCH] crda: Fix the linking order to avoid compilation error
-Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=fefefdb2c52c8fbedbb339b4badb8226cad7e7e0
-
-While linking the crda.o and libreg.so, first put crda.o
-and then -lreg. This fixed the below error:
-
- GEN keys-gcrypt.c
- Trusted pubkeys: pubkeys/linville.key.pub.pem
- CC libreg.so
- CC crda.o
- LD crda
-crda.o: In function `main':
-crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2'
-collect2: ld returned 1 exit status
-make: *** [crda] Error 1
-
-Note: This still doesn't fix the below error (will send another mail)
-
- CHK /usr/lib/crda/regulatory.bin
-Database signature verification failed.
-Invalid or empty regulatory file, note: a binary regulatory file should be used.
-make: *** [verify] Error 234
-
-Signed-off-by: Luis R. Rodriguez <mcgrof at do-not-panic.com>
-Signed-off-by: Chaitanya T K <chaitanya.mgit at gmail.com>
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4a351c6..0b2f0d7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
- CFLAGS += -O2 -fpic
- CFLAGS += -std=gnu99 -Wall -Werror -pedantic
- CFLAGS += -Wall -g
--LDLIBS += -lm
- LDLIBREG += -lreg
-+LDLIBS += $(LDLIBREG)
-+LDLIBS += -lm
- LIBREG += libreg.so
--LDFLAGS += -L ./ $(LDLIBREG)
-+LDFLAGS += -L ./
-
- all: all_noverify verify
-
diff --git a/debian/patches/do_not_embed_pubkeys.patch b/debian/patches/do_not_embed_pubkeys.patch
index 68b4432..600ed5a 100644
--- a/debian/patches/do_not_embed_pubkeys.patch
+++ b/debian/patches/do_not_embed_pubkeys.patch
@@ -3,7 +3,7 @@ Description: Allow build without embedding pubkey data into crda/regdbdump
From: Kel Modderman <kel at otaku42.de>
--- a/Makefile
+++ b/Makefile
-@@ -41,7 +41,12 @@ ifeq ($(USE_OPENSSL),1)
+@@ -42,7 +42,12 @@ ifeq ($(USE_OPENSSL),1)
CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
LDLIBS += `pkg-config --libs openssl`
@@ -27,7 +27,7 @@ From: Kel Modderman <kel at otaku42.de>
#include "keys-ssl.c"
#endif
-@@ -94,7 +94,6 @@ int reglib_verify_db_signature(uint8_t *
+@@ -83,7 +83,6 @@ int reglib_verify_db_signature(uint8_t *
{
RSA *rsa;
uint8_t hash[SHA_DIGEST_LENGTH];
@@ -35,7 +35,7 @@ From: Kel Modderman <kel at otaku42.de>
int ok = 0;
DIR *pubkey_dir;
struct dirent *nextfile;
-@@ -106,6 +105,8 @@ int reglib_verify_db_signature(uint8_t *
+@@ -95,6 +94,8 @@ int reglib_verify_db_signature(uint8_t *
goto out;
}
@@ -44,7 +44,7 @@ From: Kel Modderman <kel at otaku42.de>
for (i = 0; (i < sizeof(keys)/sizeof(keys[0])) && (!ok); i++) {
rsa = RSA_new();
if (!rsa) {
-@@ -123,6 +124,7 @@ int reglib_verify_db_signature(uint8_t *
+@@ -112,6 +113,7 @@ int reglib_verify_db_signature(uint8_t *
rsa->n = NULL;
RSA_free(rsa);
}
diff --git a/debian/patches/series b/debian/patches/series
index ccc8fb9..a6bd72a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
do_not_embed_pubkeys.patch
-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
do-not-run-ldconfig-if-destdir-is-set.patch
fix-linking-of-libraries-used-by-reglib.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/crda.git
More information about the Kernel-svn-changes
mailing list