/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.9.4.0-force-libnl1.1.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.9.4.0-force-libnl1.1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Wed Jul 4 07:56:22 2012 UTC (2 years ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Fix default ipv6 route issue on some networks (bug #417529, thanks to Marien Zwart). Install polkit-1/rules.d file for polkit-0.106 support (bug #421577, thanks to Samuli Suominen). Add epatch_user to make it easier for users to locally patch networkmanager. Drop old.

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

1 From 5e3cd811a5f3f1f2d719d16610b0904ea598bbc8 Mon Sep 17 00:00:00 2001
2 From: Alexandre Rostovtsev <tetromino@gentoo.org>
3 Date: Sun, 13 Nov 2011 17:51:47 -0500
4 Subject: [PATCH] Build against libnl:1.1 only
5
6 Build against libnl:1.1 only. Otherwise, networkmanager will link to
7 libnl-3.so and to libiWmxSdk (from wimax-1.5.2) which links to libnl.so,
8 and then explode spectacularly at runtime due to symbol collisions.
9 ---
10 configure.ac | 32 ++++++--------------------------
11 1 files changed, 6 insertions(+), 26 deletions(-)
12
13 diff --git a/configure.ac b/configure.ac
14 index ed66b3d..0a431c2 100644
15 --- a/configure.ac
16 +++ b/configure.ac
17 @@ -379,33 +379,13 @@ AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "x$with_session_tracking" = "xsyst
18
19
20 have_libnl="no"
21 -PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=yes], [have_libnl3=no])
22 -PKG_CHECK_MODULES(LIBNL_ROUTE3, libnl-route-3.0, [have_libnl_route3=yes], [have_libnl_route3=no])
23 -PKG_CHECK_MODULES(LIBNL_GENL3, libnl-genl-3.0, [have_libnl_genl3=yes], [have_libnl_genl3=no])
24 -if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes" -a "${have_libnl_genl3}" = "yes"); then
25 - AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
26 - LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS $LIBNL_GENL3_CFLAGS"
27 - LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS $LIBNL_GENL3_LIBS"
28 - libnl_version="3"
29 +PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
30 +if (test "${have_libnl1}" = "yes"); then
31 + AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
32 + LIBNL_CFLAGS="$LIBNL1_CFLAGS"
33 + LIBNL_LIBS="$LIBNL1_LIBS"
34 + libnl_version="1"
35 have_libnl="yes"
36 -else
37 - PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no])
38 - if (test "${have_libnl2}" = "yes"); then
39 - AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 support])
40 - LIBNL_CFLAGS="$LIBNL2_CFLAGS"
41 - LIBNL_LIBS="$LIBNL2_LIBS"
42 - libnl_version="2"
43 - have_libnl="yes"
44 - else
45 - PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
46 - if (test "${have_libnl1}" = "yes"); then
47 - AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
48 - LIBNL_CFLAGS="$LIBNL1_CFLAGS"
49 - LIBNL_LIBS="$LIBNL1_LIBS"
50 - libnl_version="1"
51 - have_libnl="yes"
52 - fi
53 - fi
54 fi
55
56 if (test "${have_libnl}" = "no"); then
57 --
58 1.7.8.5

  ViewVC Help
Powered by ViewVC 1.1.20