Fixing bug 388991

Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index edb207ad71c72159bd2c4c571a53b3641b177646..14ee0bb48e9e508bec5627c6a95b580bde1ed38b 100644 (file)
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.27 2011/10/30 16:47:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.28 2011/11/07 19:59:53 gurligebis Exp $
+
+  07 Nov 2011; <gurligebis@gentoo.org> files/libnl31-support.diff:
+  Updated patch with patch from bug #388991
 
   30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> crda-1.1.2.ebuild:
   Fix filename in epatch -line wrt #388991

diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 4cb7da63d2a5ff0106e5ba82d43cdf30b00d596c..6027671b87a6edbec7eb52c883a368f86667786e 100644 (file)
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libnl31-support.diff 1768 RMD160 8b01e71c0d7cedd3aaa3fc437924eee6788c6e4e SHA1 c678c7f0cfabad2ea5e57e46c3010f6450702182 SHA256 efb386f47f88a35b0537591619f96bd94bb1f8d832021be1f2ce0f6dc805c3db
+AUX libnl31-support.diff 1963 RMD160 3fe1689a9c9e91d63a97c8f0c5719ccdb30cdfa9 SHA1 efe57db6c0583433a93624624b69ae5151101e38 SHA256 5a2fce22089b49733cd2315840d2812e4590e12d987086a04dcb69d6d9fcbac7
 DIST crda-1.0.1.tar.bz2 21013 RMD160 9fd99a0cac4e09926b9a97ded4f3f6e3f27298b2 SHA1 5574374fed2de53a0bee49702d6e7448c0c1bf5c SHA256 6b0cfb4d0340b6e239488a46ce92c8d26cec84fe0da06d4c7b7327bf0e932f1f
 DIST crda-1.0.2.tar.bz2 21270 RMD160 1724426caa3903fedd6727ccfd624d87290f391b SHA1 77d403d97fd7e7647778f8c121a1cb46dc47bb77 SHA256 b26f7af080925bc03a5782578291b614fbcb47563bc2f9d9363cf12825772459
 DIST crda-1.1.2.tar.bz2 21754 RMD160 b36254bead7c1561646430f945ca484d301c082c SHA1 a180b8cd2b3f37a157ca27da3fc603795e618906 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864
 EBUILD crda-1.0.1-r1.ebuild 979 RMD160 3f8352b066e9c0b32b173a25c838ac628bd4a6dc SHA1 3d2de561b02e7be68c4a50f34a780d5148b5dab5 SHA256 e5620fd9078b9b8e80e84518d6210b0de645567c1e64093c9c2542ebf08bbfe3
 EBUILD crda-1.0.2.ebuild 980 RMD160 7e2c757d4f11a4564a07432c663db9f6019d57b8 SHA1 dc59c4501ea3bac766d6a1ae8032135dd48cf3a8 SHA256 b3bf772200e0c4c706faccf53c2e687f7e1757b201a25fcd08b23ff889467f08
 EBUILD crda-1.1.2.ebuild 979 RMD160 914a6e99bec28247fb884e868cd5773e8026a30b SHA1 7175c44495b8774ac93ee328022470a18a9fd6f9 SHA256 27432be5b8d4f1c66d0311fa264e36a0ce57f4b8eed33c9057d96620766b251c
-MISC ChangeLog 4770 RMD160 fc06eff5b9a512fce9c6ff3c72720f2b053a09d6 SHA1 1b377d01e2216798a8a5df6f5d3f5f982a79246b SHA256 b6ce3ff3ee9b31cd12bc4fc916ef07d5f3e625a492e8945c8bca057bf1df4222
+MISC ChangeLog 4883 RMD160 efe9ab4b32bf15bd18cd03b00e2d01e8f8713a8a SHA1 e1fbcaa801b2db51593a1c4d9becc3c1f9d77d76 SHA256 16ba78bca88febc084f8c3a75a0e806045614a24cc3fc169bcb9ec8ac8c3434c
 MISC metadata.xml 350 RMD160 f6595505b25e3a4f18c8a80bf2c43a39e9ed3217 SHA1 056be77ff0338c0c07de32cde88815054eec1999 SHA256 fed024e4a74466ff8ac845800a5b1290825fbcee9bdba8f7f3ebc39236e63cb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrX+NAAoJEEdUh39IaPFN4SYH/1C8QZbyFh54d9tZxRtD6uVM
-Og034J11Bb4mM3e/aJKxz3I+uu6SnsK9EPyfsLYJjMpqhvfkrK361W5wRgdg1wyo
-iCUu4Fh4a/dNfofFFQhw+XDF4FhCW2kxOTMXpipFZoi9D5XUkcOJVfHuXztmivXE
-gzNtwXO+DvpXMV/rz/gvDGiAxyrx3kKMDzCSjtNLvfR8anCf3ljiBcLx1joqtl/2
-MD5AYr9QN4OI1y1jRDbHRgwn8u1HpKeZvU/RTieU7Op3S/qKJzOpA7T7qGNtjlNz
-CLbC29On2Lbs3b9AIxWbLdCkWOi1/OGZdYJlknZbs04O62CavC8PFA4kaVs83/M=
-=zOLE
+iEYEARECAAYFAk64OK0ACgkQsR7PQhRXYElBMACfUn39wP5itm/t6BzfVZaILte0
+nGIAnA0rhyt37AhELayUZ62nXkO6lVur
+=2XdX
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff
index caa28997096f7ff31293162878e6d3f8c3d201e9..56243ee9c6977d0455ffa3802a0f4bcc98821af7 100644 (file)
--- a/net-wireless/crda/files/libnl31-support.diff
+++ b/net-wireless/crda/files/libnl31-support.diff
@@ -1,6 +1,6 @@
-diff -aurp a/crda.c b/crda.c
---- a/crda.c   2011-09-09 23:36:23.742094512 +0000
-+++ b/crda.c   2011-09-09 23:36:02.109096391 +0000
+diff -aurp a/crda-1.1.2/crda.c b/crda-1.1.2/crda.c
+--- a/crda-1.1.2/crda.c        2011-11-07 19:52:28.884873650 +0000
++++ b/crda-1.1.2/crda.c        2011-11-07 19:53:30.501874372 +0000
 @@ -21,7 +21,7 @@
  #include "regdb.h"
  #include "reglib.h"
@@ -19,9 +19,9 @@ diff -aurp a/crda.c b/crda.c
  
  struct nl80211_state {
        struct nl_sock *nl_sock;
-diff -aurp a/Makefile b/Makefile
---- a/Makefile 2011-09-09 23:36:23.743094561 +0000
-+++ b/Makefile 2011-09-09 23:36:02.109096391 +0000
+diff -aurp a/crda-1.1.2/Makefile b/crda-1.1.2/Makefile
+--- a/crda-1.1.2/Makefile      2011-11-07 19:52:28.884873650 +0000
++++ b/crda-1.1.2/Makefile      2011-11-07 19:54:25.906872386 +0000
 @@ -48,19 +48,26 @@ INSTALL ?= install
  NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)
  NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y)
@@ -31,16 +31,18 @@ diff -aurp a/Makefile b/Makefile
 -ifeq ($(NL3FOUND),Y)
 +ifeq ($(NL31FOUND),Y)
  CFLAGS += -DCONFIG_LIBNL30
- NLLIBS += -lnl-genl
+-NLLIBS += -lnl-genl
 -NLLIBNAME = libnl-3.0
++NLLIBS += $(shell pkg-config --libs libnl-genl-3.1)
 +NLLIBNAME = libnl-3.1
  else
 -      ifeq ($(NL2FOUND),Y)
 -      CFLAGS += -DCONFIG_LIBNL20
+-      NLLIBS += -lnl-genl
+-      NLLIBNAME = libnl-2.0
 +      ifeq ($(NL3FOUND),Y)
 +      CFLAGS += -DCONFIG_LIBNL30
-       NLLIBS += -lnl-genl
--      NLLIBNAME = libnl-2.0
++      NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
 +      NLLIBNAME = libnl-3.0
        else
 -              ifeq ($(NL1FOUND),Y)