1 |
qiaomuf 11/01/25 02:46:46 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: networkmanager-0.8.2-r4.ebuild |
5 |
Removed: networkmanager-0.8.2-r3.ebuild |
6 |
Log: |
7 |
Fix parsing dhclient.conf wrt bug #352638 |
8 |
|
9 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.94 net-misc/networkmanager/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.94&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.94&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.93&r2=1.94 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v |
21 |
retrieving revision 1.93 |
22 |
retrieving revision 1.94 |
23 |
diff -u -r1.93 -r1.94 |
24 |
--- ChangeLog 24 Jan 2011 07:31:48 -0000 1.93 |
25 |
+++ ChangeLog 25 Jan 2011 02:46:46 -0000 1.94 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for net-misc/networkmanager |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.93 2011/01/24 07:31:48 qiaomuf Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.94 2011/01/25 02:46:46 qiaomuf Exp $ |
31 |
+ |
32 |
+*networkmanager-0.8.2-r4 (25 Jan 2011) |
33 |
+ |
34 |
+ 25 Jan 2011; Mu Qiao <qiaomuf@g.o> -networkmanager-0.8.2-r3.ebuild, |
35 |
+ +networkmanager-0.8.2-r4.ebuild, |
36 |
+ files/networkmanager-0.8.2-shared-connection.patch: |
37 |
+ Fix parsing dhclient.conf wrt bug #352638 |
38 |
|
39 |
*networkmanager-0.8.2-r3 (24 Jan 2011) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: networkmanager-0.8.2-r4.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild,v 1.1 2011/01/25 02:46:46 qiaomuf Exp $ |
54 |
|
55 |
EAPI="2" |
56 |
|
57 |
inherit gnome.org linux-info |
58 |
|
59 |
# NetworkManager likes itself with capital letters |
60 |
MY_PN=${PN/networkmanager/NetworkManager} |
61 |
MY_P=${MY_PN}-${PV} |
62 |
|
63 |
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." |
64 |
HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" |
65 |
SRC_URI="${SRC_URI//${PN}/${MY_PN}}" |
66 |
|
67 |
LICENSE="GPL-2" |
68 |
SLOT="0" |
69 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
70 |
IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" |
71 |
|
72 |
RDEPEND=">=sys-apps/dbus-1.2 |
73 |
>=dev-libs/dbus-glib-0.75 |
74 |
>=net-wireless/wireless-tools-28_pre9 |
75 |
>=sys-fs/udev-145[extras] |
76 |
>=dev-libs/glib-2.18 |
77 |
>=sys-auth/polkit-0.92 |
78 |
>=dev-libs/libnl-1.1 |
79 |
>=net-misc/modemmanager-0.4 |
80 |
>=net-wireless/wpa_supplicant-0.5.10[dbus] |
81 |
bluetooth? ( net-wireless/bluez ) |
82 |
|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) |
83 |
avahi? ( net-dns/avahi[autoipd] ) |
84 |
gnutls? ( |
85 |
nss? ( >=dev-libs/nss-3.11 ) |
86 |
!nss? ( dev-libs/libgcrypt |
87 |
net-libs/gnutls ) ) |
88 |
!gnutls? ( >=dev-libs/nss-3.11 ) |
89 |
dhclient? ( |
90 |
dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
91 |
!dhcpcd? ( net-misc/dhcp ) ) |
92 |
!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
93 |
resolvconf? ( net-dns/openresolv ) |
94 |
connection-sharing? ( |
95 |
net-dns/dnsmasq |
96 |
net-firewall/iptables )" |
97 |
|
98 |
DEPEND="${RDEPEND} |
99 |
dev-util/pkgconfig |
100 |
dev-util/intltool |
101 |
>=net-dialup/ppp-2.4.5 |
102 |
doc? ( >=dev-util/gtk-doc-1.8 )" |
103 |
|
104 |
S=${WORKDIR}/${MY_P} |
105 |
|
106 |
sysfs_deprecated_check() { |
107 |
ebegin "Checking for SYSFS_DEPRECATED support" |
108 |
|
109 |
if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
110 |
eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
111 |
eerror "or NetworkManager will not work correctly." |
112 |
eerror "See http://bugs.gentoo.org/333639 for more info." |
113 |
die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
114 |
fi |
115 |
eend $? |
116 |
} |
117 |
|
118 |
pkg_setup() { |
119 |
|
120 |
if use kernel_linux; then |
121 |
get_version |
122 |
if linux_config_exists; then |
123 |
sysfs_deprecated_check |
124 |
else |
125 |
ewarn "Was unable to determine your kernel .config" |
126 |
ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
127 |
ewarn "See http://bugs.gentoo.org/333639 for more info." |
128 |
fi |
129 |
|
130 |
fi |
131 |
} |
132 |
|
133 |
src_prepare() { |
134 |
# dbus policy patch |
135 |
epatch "${FILESDIR}/${P}-confchanges.patch" |
136 |
# accept "gw" in /etc/conf.d/net (bug #339215) |
137 |
epatch "${FILESDIR}/${P}-accept-gw.patch" |
138 |
# fix shared connection wrt bug #350476 |
139 |
# fix parsing dhclient.conf wrt bug #352638 |
140 |
epatch "${FILESDIR}/${P}-shared-connection.patch" |
141 |
# Backports #1 |
142 |
epatch "${FILESDIR}/${P}-1.patch" |
143 |
} |
144 |
|
145 |
src_configure() { |
146 |
ECONF="--disable-more-warnings |
147 |
--localstatedir=/var |
148 |
--with-distro=gentoo |
149 |
--with-dbus-sys-dir=/etc/dbus-1/system.d |
150 |
--with-udev-dir=/etc/udev |
151 |
--with-iptables=/sbin/iptables |
152 |
$(use_enable doc gtk-doc) |
153 |
$(use_with doc docs) |
154 |
$(use_with resolvconf)" |
155 |
|
156 |
# default is dhcpcd (if none or both are specified), ISC dchclient otherwise |
157 |
if use dhclient ; then |
158 |
if use dhcpcd ; then |
159 |
ECONF="${ECONF} --with-dhcpcd --without-dhclient" |
160 |
else |
161 |
ECONF="${ECONF} --with-dhclient --without-dhcpcd" |
162 |
fi |
163 |
else |
164 |
ECONF="${ECONF} --with-dhcpcd --without-dhclient" |
165 |
fi |
166 |
|
167 |
# default is NSS (if none or both are specified), GnuTLS otherwise |
168 |
if use gnutls ; then |
169 |
if use nss ; then |
170 |
ECONF="${ECONF} --with-crypto=nss" |
171 |
else |
172 |
ECONF="${ECONF} --with-crypto=gnutls" |
173 |
fi |
174 |
else |
175 |
ECONF="${ECONF} --with-crypto=nss" |
176 |
fi |
177 |
|
178 |
econf ${ECONF} |
179 |
} |
180 |
|
181 |
src_install() { |
182 |
emake DESTDIR="${D}" install || die "emake install failed" |
183 |
|
184 |
# Need to keep the /var/run/NetworkManager directory |
185 |
keepdir /var/run/NetworkManager |
186 |
|
187 |
# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
188 |
keepdir /etc/NetworkManager/dispatcher.d |
189 |
|
190 |
dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" |
191 |
|
192 |
# Add keyfile plugin support |
193 |
keepdir /etc/NetworkManager/system-connections |
194 |
insinto /etc/NetworkManager |
195 |
newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ |
196 |
|| die "newins failed" |
197 |
} |
198 |
|
199 |
pkg_postinst() { |
200 |
elog "You will need to reload DBus if this is your first time installing" |
201 |
elog "NetworkManager, or if you're upgrading from 0.7 or older." |
202 |
elog "" |
203 |
} |