From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RJFxb-0003Bi-2I for garchives@archives.gentoo.org; Thu, 27 Oct 2011 02:44:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ECA721C020; Thu, 27 Oct 2011 02:44:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 26DA521C020 for ; Thu, 27 Oct 2011 02:44:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69DF71B401A for ; Thu, 27 Oct 2011 02:44:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C46BA80042 for ; Thu, 27 Oct 2011 02:44:40 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-misc/networkmanager/files/networkmanager-0.9.1.90-force-libnl1.1.patch net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-1.patch net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-2.patch net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-3.patch net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild X-VCS-Directories: net-misc/networkmanager/ net-misc/networkmanager/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: edb312863255b2e4ee69a1f0818d83aa83fa8987 Date: Thu, 27 Oct 2011 02:44:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6cc0f043a3064d5b9cb21a5528543414 commit: edb312863255b2e4ee69a1f0818d83aa83fa8987 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Thu Oct 27 02:42:42 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu Oct 27 02:42:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dedb31286 net-misc/networkmanager: force building against libnl:1.1 Build against libnl:1.1. Otherwise, networkmanager[wimax] will link to libnl-3.so and to libiWmxSdk from wimax-1.5.2 which links to libnl.so, and explode at runtime due to symbol collisions. --- .../networkmanager-0.9.1.90-force-libnl1.1.patch | 33 ++++++++++ .../networkmanager-0.9.1.90-libnl-check-1.patch | 67 --------------= ------ .../networkmanager-0.9.1.90-libnl-check-2.patch | 26 -------- .../networkmanager-0.9.1.90-libnl-check-3.patch | 31 --------- ...r2.ebuild =3D> networkmanager-0.9.1.90-r3.ebuild} | 8 ++- 5 files changed, 38 insertions(+), 127 deletions(-) diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-force-= libnl1.1.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-fo= rce-libnl1.1.patch new file mode 100644 index 0000000..e4da7b3 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.9.1.90-force-libnl1.= 1.patch @@ -0,0 +1,33 @@ +Build against libnl:1.1 only. Otherwise, networkmanager will link to +libnl-3.so and to libiWmxSdk (from wimax-1.5.2) which links to libnl.so, +and then explode spectacularly at runtime due to symbol collisions. + +diff --git a/configure.ac b/configure.ac +index 117dd91..b8b11de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -323,24 +323,6 @@ if (test "${have_libnl1}" =3D "yes"); then + have_libnl=3D"yes" + fi +=20 +-PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=3Dyes], [have_libnl2=3D= no]) +-if (test "${have_libnl2}" =3D "yes"); then +- AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 supp= ort]) +- LIBNL_CFLAGS=3D"$LIBNL2_CFLAGS" +- LIBNL_LIBS=3D"$LIBNL2_LIBS" +- libnl_version=3D"2" +- have_libnl=3D"yes" +-fi +- +-PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl2=3Dyes], [have_libnl2=3D= no]) +-if (test "${have_libnl2}" =3D "yes"); then +- AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 supp= ort]) +- LIBNL_CFLAGS=3D"$LIBNL3_CFLAGS" +- LIBNL_LIBS=3D"$LIBNL3_LIBS" +- libnl_version=3D"3" +- have_libnl=3D"yes" +-fi +- + if (test "${have_libnl}" =3D "no"); then + AC_MSG_ERROR([libnl development header are required]) + fi diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-= check-1.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-lib= nl-check-1.patch deleted file mode 100644 index 1c6785b..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-1= .patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 6764711cc910d557b75b632d8c83a2d302e32051 -Author: Thomas Graf -Date: Fri Sep 23 12:52:39 2011 +0200 - - configure: Only check for older libnl versions if newer is unavailab= le - =20 - More recent libnl versions can be installed in parallel. Therefore i= t is - possible for more than one libnl check to pass successful. The way - the #ifdefs are done this results in code for multiple libnl version= s - to be included. - =20 - Signed-off-by: Thomas Graf - -diff --git a/configure.ac b/configure.ac -index 117dd91..57e3aea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -314,24 +314,6 @@ fi - AC_DEFINE_UNQUOTED(NO_CONSOLEKIT, $no_ck, [Define to disable use of Con= soleKit]) -=20 - have_libnl=3D"no" --PKG_CHECK_MODULES(LIBNL1, libnl-1 >=3D 1.0-pre8, [have_libnl1=3Dyes], [= have_libnl1=3Dno]) --if (test "${have_libnl1}" =3D "yes"); then -- AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy suppor= t]) -- LIBNL_CFLAGS=3D"$LIBNL1_CFLAGS" -- LIBNL_LIBS=3D"$LIBNL1_LIBS" -- libnl_version=3D"1" -- have_libnl=3D"yes" --fi -- --PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=3Dyes], [have_libnl2=3D= no]) --if (test "${have_libnl2}" =3D "yes"); then -- AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 supp= ort]) -- LIBNL_CFLAGS=3D"$LIBNL2_CFLAGS" -- LIBNL_LIBS=3D"$LIBNL2_LIBS" -- libnl_version=3D"2" -- have_libnl=3D"yes" --fi -- - PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl2=3Dyes], [have_libnl2=3D= no]) - if (test "${have_libnl2}" =3D "yes"); then - AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 supp= ort]) -@@ -339,6 +321,24 @@ if (test "${have_libnl2}" =3D "yes"); then - LIBNL_LIBS=3D"$LIBNL3_LIBS" - libnl_version=3D"3" - have_libnl=3D"yes" -+else -+ PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=3Dyes], [have_libnl2= =3Dno]) -+ if (test "${have_libnl2}" =3D "yes"); then -+ AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 sup= port]) -+ LIBNL_CFLAGS=3D"$LIBNL2_CFLAGS" -+ LIBNL_LIBS=3D"$LIBNL2_LIBS" -+ libnl_version=3D"2" -+ have_libnl=3D"yes" -+ else -+ PKG_CHECK_MODULES(LIBNL1, libnl-1 >=3D 1.0-pre8, [have_libnl1=3Dyes],= [have_libnl1=3Dno]) -+ if (test "${have_libnl1}" =3D "yes"); then -+ AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy supp= ort]) -+ LIBNL_CFLAGS=3D"$LIBNL1_CFLAGS" -+ LIBNL_LIBS=3D"$LIBNL1_LIBS" -+ libnl_version=3D"1" -+ have_libnl=3D"yes" -+ fi -+ fi - fi -=20 - if (test "${have_libnl}" =3D "no"); then diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-= check-2.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-lib= nl-check-2.patch deleted file mode 100644 index 06cfc57..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-2= .patch +++ /dev/null @@ -1,26 +0,0 @@ -commit fcc128516e3c3d81773fbdee76d684ad93cb5071 -Author: Thomas Graf -Date: Fri Sep 23 12:58:54 2011 +0200 - - configure: Fix typo in libnl3 check - =20 - Check for libnl3 sets $have_libnl2 variable instead of $have_libnl3.= Mostly a - cosmetic fix since the only usage also has the typo in it. - =20 - Signed-off-by: Thomas Graf - -diff --git a/configure.ac b/configure.ac -index 57e3aea..8b6782a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -314,8 +314,8 @@ fi - AC_DEFINE_UNQUOTED(NO_CONSOLEKIT, $no_ck, [Define to disable use of Con= soleKit]) -=20 - have_libnl=3D"no" --PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl2=3Dyes], [have_libnl2=3D= no]) --if (test "${have_libnl2}" =3D "yes"); then -+PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=3Dyes], [have_libnl3=3D= no]) -+if (test "${have_libnl3}" =3D "yes"); then - AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 supp= ort]) - LIBNL_CFLAGS=3D"$LIBNL3_CFLAGS" - LIBNL_LIBS=3D"$LIBNL3_LIBS" diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-= check-3.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-lib= nl-check-3.patch deleted file mode 100644 index c439701..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-3= .patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 61099e30f6814f9f4428f5be682aeb1d5cff33f2 -Author: Thomas Graf -Date: Fri Sep 23 13:43:01 2011 +0200 - - configure: Check for libnl-route-3 package - =20 - NM not only depends on libnl but also on libnl-route. Therefore chec= k for the - corresponding pkg-config file and use its CFLAGS and LIBS. Otherwise= fall - back to using libnl-2 or libnl-1. - =20 - Signed-off-by: Thomas Graf - -diff --git a/configure.ac b/configure.ac -index 8b6782a..932164b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -315,10 +315,11 @@ AC_DEFINE_UNQUOTED(NO_CONSOLEKIT, $no_ck, [Define = to disable use of ConsoleKit]) -=20 - have_libnl=3D"no" - PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=3Dyes], [have_libnl3=3D= no]) --if (test "${have_libnl3}" =3D "yes"); then -+PKG_CHECK_MODULES(LIBNL_ROUTE3, libnl-route-3.0, [have_libnl_route3=3Dy= es], [have_libnl_route3=3Dno]) -+if (test "${have_libnl3}" =3D "yes" -a "${have_libnl_route3}" =3D "yes"= ); then - AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 supp= ort]) -- LIBNL_CFLAGS=3D"$LIBNL3_CFLAGS" -- LIBNL_LIBS=3D"$LIBNL3_LIBS" -+ LIBNL_CFLAGS=3D"$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS" -+ LIBNL_LIBS=3D"$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS" - libnl_version=3D"3" - have_libnl=3D"yes" - else diff --git a/net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild b/= net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild similarity index 94% rename from net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild rename to net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild index 1568963..496b53b 100644 --- a/net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild +++ b/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild @@ -22,6 +22,8 @@ REQUIRED_USE=3D" =20 # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +# libnl:1.1 is needed for linking to net-wireless/wimax libraries +# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 ! # TODO: Qt support? COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.2 >=3Ddev-libs/dbus-glib-0.75 @@ -29,7 +31,7 @@ COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.2 || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-147[extras] ) >=3Ddev-libs/glib-2.26 >=3Dsys-auth/polkit-0.97 - dev-libs/libnl:3 + dev-libs/libnl:1.1 >=3Dnet-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=3Dnet-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) @@ -91,8 +93,8 @@ pkg_setup() { src_prepare() { # Don't build tests epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch" - # Fix libnl detection, will be in next release - epatch "${FILESDIR}/${P}-libnl-check-"{1,2,3}.patch + # Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility + epatch "${FILESDIR}/${P}-force-libnl1.1.patch" # Fix & conflict, in next release (bug #388609) epatch "${FILESDIR}/${P}-if.h.patch" # Fix rfkill handling, will be in next release