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 1RJDE8-0001N8-J9 for garchives@archives.gentoo.org; Wed, 26 Oct 2011 23:49:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BCF921C376; Wed, 26 Oct 2011 23:49:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BE99C21C376 for ; Wed, 26 Oct 2011 23:49:35 +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 0345F1B4021 for ; Wed, 26 Oct 2011 23:49:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3F99180042 for ; Wed, 26 Oct 2011 23:49:34 +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: <60325139d8bcdc47c2cea70664e480ec30fe7bcd.tetromino@gentoo> 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-if.h.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-r1.ebuild net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild X-VCS-Directories: net-misc/networkmanager/ net-misc/networkmanager/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 60325139d8bcdc47c2cea70664e480ec30fe7bcd Date: Wed, 26 Oct 2011 23:49:34 +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: f1c11e193e68531f025b4f398a04e565 commit: 60325139d8bcdc47c2cea70664e480ec30fe7bcd Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Oct 26 23:45:09 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Oct 26 23:45:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D60325139 net-misc/networkmanager: build against libnl3 (#388609) Build against libnl3 now that it has been unmasked, since nm automagically detects the libnl version. Add some upstream patches to allow libnl3 to be detected correctly. Add a patch to consistently use linux/if.h instead of net/if.h (a good idea in general, and not doing so leads to build failure with libnl3). Fixes bug #388609, thanks to Yellowhat gmail.com> for reporting. --- .../files/networkmanager-0.9.1.90-if.h.patch | 117 ++++++++++++++= ++++++ .../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 +++++ ...r1.ebuild =3D> networkmanager-0.9.1.90-r2.ebuild} | 6 +- 5 files changed, 246 insertions(+), 1 deletions(-) diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.p= atch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch new file mode 100644 index 0000000..2078569 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch @@ -0,0 +1,117 @@ +commit 00f2b0a9bb806be64c5868af44f43dbe55bdd75b +Author: Thomas Graf +Date: Fri Sep 23 13:46:41 2011 +0200 + + core: Include instead of + =20 + NM already includes in some places, f.e. nm-netlink-mon= itor and + we can't mix usage of the two. Stick to using as it pro= vides + additional flag definitions such as operational link state and link = mode. + =20 + Signed-off-by: Thomas Graf + =20 + [ Alexandre Rostovtsev : remove parts of commi= t + unrelated to if.h changes. ] + +diff --git a/include/wireless-helper.h b/include/wireless-helper.h +index d150ef7..2e4509a 100644 +--- a/include/wireless-helper.h ++++ b/include/wireless-helper.h +@@ -27,6 +27,6 @@ + #include + #include + #include +-#include ++#include + #include +=20 +diff --git a/src/nm-device.c b/src/nm-device.c +index c0b1b87..559606c 100644 +--- a/src/nm-device.c ++++ b/src/nm-device.c +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -34,6 +33,7 @@ + #include + #include + #include ++#include +=20 + #include "nm-glib-compat.h" + #include "nm-device-interface.h" +diff --git a/src/nm-system.c b/src/nm-system.c +index 0b29468..473fcec 100644 +--- a/src/nm-system.c ++++ b/src/nm-system.c +@@ -40,7 +40,7 @@ + #include + #include + #include +-#include ++#include +=20 + #include "nm-system.h" + #include "nm-device.h" +diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-m= anager.c +index 522c075..3546f8d 100644 +--- a/src/ppp-manager/nm-ppp-manager.c ++++ b/src/ppp-manager/nm-ppp-manager.c +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include +=20 + #include +diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugi= ns/ifcfg-rh/reader.c +index 691a176..910cca3 100644 +--- a/src/settings/plugins/ifcfg-rh/reader.c ++++ b/src/settings/plugins/ifcfg-rh/reader.c +@@ -28,10 +28,10 @@ + #include + #include + #include +-#include + #include + #include + #include ++#include +=20 + #ifndef __user + #define __user +diff --git a/src/wimax/iwmxsdk.c b/src/wimax/iwmxsdk.c +index ff6b553..9c3a78b 100644 +--- a/src/wimax/iwmxsdk.c ++++ b/src/wimax/iwmxsdk.c +@@ -27,7 +27,8 @@ + #include + #include + #include +-#include ++#include ++#include +=20 + #include +=20 +diff --git a/src/wimax/nm-device-wimax.c b/src/wimax/nm-device-wimax.c +index b6afc27..6654140 100644 +--- a/src/wimax/nm-device-wimax.c ++++ b/src/wimax/nm-device-wimax.c +@@ -23,7 +23,8 @@ + #include + #include + #include +-#include ++#include ++#include +=20 + #include + #include 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 new file mode 100644 index 0000000..1c6785b --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-1= .patch @@ -0,0 +1,67 @@ +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 new file mode 100644 index 0000000..06cfc57 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-2= .patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 0000000..c439701 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.9.1.90-libnl-check-3= .patch @@ -0,0 +1,31 @@ +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-r1.ebuild b/= net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild similarity index 94% rename from net-misc/networkmanager/networkmanager-0.9.1.90-r1.ebuild rename to net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild index 1d0734b..1568963 100644 --- a/net-misc/networkmanager/networkmanager-0.9.1.90-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-0.9.1.90-r2.ebuild @@ -29,7 +29,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 - >=3Ddev-libs/libnl-1.1 + dev-libs/libnl:3 >=3Dnet-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=3Dnet-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) @@ -91,6 +91,10 @@ 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 + # Fix & conflict, in next release (bug #388609) + epatch "${FILESDIR}/${P}-if.h.patch" # Fix rfkill handling, will be in next release epatch "${FILESDIR}/${P}-rfkill.patch" eautoreconf