vapier 15/03/04 19:52:37
Added: crda-3.18-no-werror.patch crda-3.18-cflags.patch
crda-3.18-no-ldconfig.patch crda-3.18-openssl.patch
Log:
Version bump.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.1 net-wireless/crda/files/crda-3.18-no-werror.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-no-werror.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-no-werror.patch?rev=1.1&content-type=text/plain
Index: crda-3.18-no-werror.patch
===================================================================
>From 37384d22ba0ab622a5848a9a794084e6064fc905 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
Date: Wed, 4 Mar 2015 14:03:44 -0500
Subject: [PATCH] allow people to turn off -Werror
Forcing -Werror at build time easily breaks across compiler settings,
compiler versions, architectures, C libraries, etc... Add a knob so
distro peeps can turn it off.
Signed-off-by: Mike Frysinger <[email protected]>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 46c683d..5f988f4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,9 @@ UDEV_RULE_DIR?=/lib/udev/rules.d/
PUBKEY_DIR?=pubkeys
RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+WERROR = -Werror
CFLAGS += -O2 -fpic
-CFLAGS += -std=gnu99 -Wall -Werror -pedantic
+CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic
CFLAGS += -Wall -g
LDLIBREG += -lreg
LDLIBS += $(LDLIBREG)
--
2.3.1
1.1 net-wireless/crda/files/crda-3.18-cflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-cflags.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-cflags.patch?rev=1.1&content-type=text/plain
Index: crda-3.18-cflags.patch
===================================================================
>From c5b0741ea7fc12e9f6a2a309296ed412a999d0f7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
Date: Wed, 4 Mar 2015 14:09:50 -0500
Subject: [PATCH] clean up CFLAGS handling
Rather than append -O2 -g all the time to the user's CFLAGS (and thus
clobbering whatever they have set up), initialize the default value to
that and let the user override it entirely.
Signed-off-by: Mike Frysinger <[email protected]>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 5f988f4..8e345a1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,9 @@ PUBKEY_DIR?=pubkeys
RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
WERROR = -Werror
-CFLAGS += -O2 -fpic
+CFLAGS ?= -O2 -g
+CFLAGS += -fpic
CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic
-CFLAGS += -Wall -g
LDLIBREG += -lreg
LDLIBS += $(LDLIBREG)
LDLIBS += -lm
--
2.3.1
1.1 net-wireless/crda/files/crda-3.18-no-ldconfig.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-no-ldconfig.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-no-ldconfig.patch?rev=1.1&content-type=text/plain
Index: crda-3.18-no-ldconfig.patch
===================================================================
>From b11d83df189670defe4a29c624f2930351c13df2 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
Date: Wed, 4 Mar 2015 13:56:36 -0500
Subject: [PATCH] do not run ldconfig
Let the distro/user deal with ldconfig updating. Running it blindly like
this breaks DESTDIR installs as `ldconfig` only operates on system paths.
Signed-off-by: Mike Frysinger <[email protected]>
---
Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Makefile b/Makefile
index a3ead30..46c683d 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,6 @@ install-libreg:
$(NQ) ' INSTALL libreg'
$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
- $(Q)ldconfig
%.o: %.c regdb.h $(LIBREG)
$(NQ) ' CC ' $@
--
2.3.1
1.1 net-wireless/crda/files/crda-3.18-openssl.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-openssl.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-openssl.patch?rev=1.1&content-type=text/plain
Index: crda-3.18-openssl.patch
===================================================================
>From af009b7599d705a1023d7bc95c485e5a8776d2b8 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
Date: Wed, 4 Mar 2015 14:07:37 -0500
Subject: [PATCH] fix openssl generation
This file uses BN_ULONG but doesn't include the openssl headers leading
to build failures:
keys-ssl.c:2:8: error: unknown type name 'BN_ULONG'
static BN_ULONG e_0[1] = {
The large unqualified constants also break building:
keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow]
0x63a2705416a0d8e1, 0xdc9fca11c8ba757b,
^
Signed-off-by: Mike Frysinger <[email protected]>
---
utils/key2pub.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/utils/key2pub.py b/utils/key2pub.py
index 3e84cd2..c504aca 100755
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val):
for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
if not idx:
output.write('\t')
- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1),
ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
+ output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1),
ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
idx += 1
if idx == 2:
idx = 0
@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val):
def print_ssl(output, name, val):
import struct
output.write('#include <stdint.h>\n')
+ output.write('#include <openssl/bn.h>\n')
if len(struct.pack('@L', 0)) == 8:
return print_ssl_64(output, name, val)
else:
--
2.3.1
