commit f1366f313b3c7f7a9f6fa4b104bfc3de9b6ab864
Author: Jakub Bogusz <[email protected]>
Date: Fri Feb 6 22:21:18 2015 +0100
- updated to 3.18
- updated destdir,link patches
crda-destdir.patch | 21 +++++----------------
crda-link.patch | 41 +++++++++++++++++++++++++++++++++++++----
crda.spec | 4 ++--
3 files changed, 44 insertions(+), 22 deletions(-)
---
diff --git a/crda.spec b/crda.spec
index 8709fbe..d7ea276 100644
--- a/crda.spec
+++ b/crda.spec
@@ -6,12 +6,12 @@
Summary: udev helper: Central Regulatory Domain Agent
Summary(pl.UTF-8): Program pomocniczy udev: Central Regulatory Domain Agent
Name: crda
-Version: 3.13
+Version: 3.18
Release: 1
License: ISC
Group: Networking/Daemons
Source0:
https://www.kernel.org/pub/software/network/crda/%{name}-%{version}.tar.xz
-# Source0-md5: 66b1b0417c1ad19f0009a5c0c0c1aebc
+# Source0-md5: 0431fef3067bf503dfb464069f06163a
Patch0: %{name}-regdb.patch
Patch1: %{name}-destdir.patch
Patch2: %{name}-link.patch
diff --git a/crda-destdir.patch b/crda-destdir.patch
index e736904..1314788 100644
--- a/crda-destdir.patch
+++ b/crda-destdir.patch
@@ -1,21 +1,10 @@
---- crda-3.13/Makefile.orig 2013-11-20 13:12:54.000000000 +0100
-+++ crda-3.13/Makefile 2014-02-09 14:55:48.603465772 +0100
-@@ -119,14 +119,14 @@
-
- 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:
+--- crda-3.18/Makefile.orig 2015-02-06 21:24:21.404318610 +0100
++++ crda-3.18/Makefile 2015-02-06 21:24:53.997650579 +0100
+@@ -129,7 +129,7 @@
$(NQ) ' INSTALL libreg'
-- $(Q)mkdir -p $(LIBDIR)
-- $(Q)cp $(LIBREG) $(LIBDIR)/
+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
- $(Q)ldconfig
-+ $(Q)mkdir -p $(DESTDIR)$(LIBDIR)
-+ $(Q)cp $(LIBREG) $(DESTDIR)$(LIBDIR)/
+ $(Q)-ldconfig
%.o: %.c regdb.h $(LIBREG)
diff --git a/crda-link.patch b/crda-link.patch
index 8220803..dcf9efb 100644
--- a/crda-link.patch
+++ b/crda-link.patch
@@ -1,11 +1,44 @@
---- crda-3.13/Makefile.orig 2014-02-09 14:56:57.600129540 +0100
-+++ crda-3.13/Makefile 2014-02-09 15:02:37.646781938 +0100
-@@ -115,7 +115,7 @@
+--- crda-3.18/Makefile.orig 2015-02-06 21:24:01.990986095 +0100
++++ crda-3.18/Makefile 2015-02-06 21:24:21.404318610 +0100
+@@ -29,8 +29,7 @@
+ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
+ CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+-LDLIBS += $(LDLIBREG)
+-LDLIBS += -lm
++LIBLIBS += -lm
+ LIBREG += libreg.so
+ LDFLAGS += -L ./
+
+@@ -40,17 +39,20 @@
+
+ ifeq ($(USE_OPENSSL),1)
+ CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config
--cflags openssl`
+-LDLIBS += `pkg-config --libs openssl`
++LIBLIBS += `pkg-config --libs openssl`
+
+ $(LIBREG): keys-ssl.c
+
+ else
+ CFLAGS += -DUSE_GCRYPT
+-LDLIBS += -lgcrypt
++LIBLIBS += -lgcrypt
+
+ $(LIBREG): keys-gcrypt.c
+
+ endif
++LDLIBS += $(LIBLIBS)
++LDLIBS += $(LDLIBREG)
++
+ MKDIR ?= mkdir -p
+ INSTALL ?= install
+
+@@ -116,7 +118,7 @@
$(LIBREG): regdb.h reglib.h reglib.c
$(NQ) ' CC ' $@
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
-+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
$(LDLIBS)
++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
$(LIBLIBS)
install-libreg-headers:
$(NQ) ' INSTALL libreg-headers'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crda.git/commitdiff/f1366f313b3c7f7a9f6fa4b104bfc3de9b6ab864
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
