Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/networkmanager: networkmanager-9999.ebuild ChangeLog networkmanager-0.9.7.995.ebuild
Date: Mon, 28 Jan 2013 07:05:10
Message-Id: 20130128070505.507CB2171D@flycatcher.gentoo.org
1 tetromino 13/01/28 07:05:05
2
3 Modified: ChangeLog
4 Added: networkmanager-9999.ebuild
5 networkmanager-0.9.7.995.ebuild
6 Log:
7 Add 0.9.8 development pre-release and a live git ebuild (bug #444814, thanks to Pavel Šimerda and Sobhan Mohammadpour). Lots of improvements and bugfixes. Wimax support has been disabled until we have a libnl:3 compatible version in portage.
8
9 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
10
11 Revision Changes Path
12 1.164 net-misc/networkmanager/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.164&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.164&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.163&r2=1.164
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v
21 retrieving revision 1.163
22 retrieving revision 1.164
23 diff -u -r1.163 -r1.164
24 --- ChangeLog 27 Jan 2013 13:54:47 -0000 1.163
25 +++ ChangeLog 28 Jan 2013 07:05:05 -0000 1.164
26 @@ -1,6 +1,18 @@
27 # ChangeLog for net-misc/networkmanager
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.163 2013/01/27 13:54:47 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.164 2013/01/28 07:05:05 tetromino Exp $
31 +
32 +*networkmanager-9999 (28 Jan 2013)
33 +*networkmanager-0.9.7.995 (28 Jan 2013)
34 +
35 + 28 Jan 2013; Alexandre Rostovtsev <tetromino@g.o>
36 + +networkmanager-0.9.7.995.ebuild,
37 + +files/networkmanager-0.9.7.995-pre-sleep.patch, +networkmanager-9999.ebuild,
38 + +files/init.d.NetworkManager:
39 + Add 0.9.8 development pre-release and a live git ebuild (bug #444814, thanks
40 + to Pavel Šimerda and Sobhan Mohammadpour). Lots of improvements and
41 + bugfixes. Wimax support has been disabled until we have a libnl:3 compatible
42 + version in portage.
43
44 27 Jan 2013; Agostino Sarubbo <ago@g.o> networkmanager-0.9.6.4.ebuild:
45 Stable for ppc, wrt bug #448006
46
47
48
49 1.1 net-misc/networkmanager/networkmanager-9999.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-9999.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-9999.ebuild?rev=1.1&content-type=text/plain
53
54 Index: networkmanager-9999.ebuild
55 ===================================================================
56 # Copyright 1999-2013 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-9999.ebuild,v 1.1 2013/01/28 07:05:05 tetromino Exp $
59
60 EAPI="5"
61 GNOME_ORG_MODULE="NetworkManager"
62 VALA_MIN_API_VERSION="0.18"
63 VALA_USE_DEPEND="vapigen"
64
65 inherit autotools eutils git-2 gnome.org linux-info systemd user toolchain-funcs vala virtualx udev
66
67 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
68 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
69
70 LICENSE="GPL-2+"
71 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
72 IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls
73 +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
74 +wext" # wimax
75 KEYWORDS=
76 SRC_URI=
77 EGIT_REPO_URI="git://anongit.freedesktop.org/NetworkManager/NetworkManager"
78
79 REQUIRED_USE="
80 modemmanager? ( ppp )
81 ^^ ( nss gnutls )
82 ^^ ( dhclient dhcpcd )
83 ?? ( consolekit systemd )
84 "
85
86 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
87 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
88 # TODO: Qt support?
89 COMMON_DEPEND=">=sys-apps/dbus-1.2
90 >=dev-libs/dbus-glib-0.94
91 >=dev-libs/glib-2.30
92 >=dev-libs/libnl-3.2.7:3=
93 >=sys-auth/polkit-0.106
94 >=net-libs/libsoup-2.26:2.4=
95 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
96 >=virtual/udev-165[gudev]
97 bluetooth? ( >=net-wireless/bluez-4.82 )
98 avahi? ( net-dns/avahi:=[autoipd] )
99 connection-sharing? (
100 net-dns/dnsmasq
101 net-firewall/iptables )
102 gnutls? (
103 dev-libs/libgcrypt:=
104 net-libs/gnutls:= )
105 modemmanager? ( >=net-misc/modemmanager-0.7.990 )
106 nss? ( >=dev-libs/nss-3.11:= )
107 dhclient? ( =net-misc/dhcp-4*[client] )
108 dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
109 introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
110 ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
111 resolvconf? ( net-dns/openresolv )
112 systemd? ( >=sys-apps/systemd-183 )
113 !systemd? ( sys-power/upower )
114 "
115 RDEPEND="${COMMON_DEPEND}
116 consolekit? ( sys-auth/consolekit )
117 "
118 DEPEND="${COMMON_DEPEND}
119 >=dev-util/intltool-0.40
120 >=sys-devel/gettext-0.17
121 >=sys-kernel/linux-headers-2.6.29
122 virtual/pkgconfig
123 doc? ( >=dev-util/gtk-doc-1.8 )
124 vala? ( $(vala_depend) )
125 test? (
126 dev-lang/python:2.7
127 dev-python/dbus-python[python_targets_python2_7]
128 dev-python/pygobject:2[python_targets_python2_7] )
129
130 dev-libs/vala-common
131 dev-util/gtk-doc-am
132 "
133
134 sysfs_deprecated_check() {
135 ebegin "Checking for SYSFS_DEPRECATED support"
136
137 if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
138 eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
139 eerror "or NetworkManager will not work correctly."
140 eerror "See http://bugs.gentoo.org/333639 for more info."
141 die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
142 fi
143 eend $?
144 }
145
146 pkg_pretend() {
147 if use kernel_linux; then
148 get_version
149 if linux_config_exists; then
150 sysfs_deprecated_check
151 else
152 ewarn "Was unable to determine your kernel .config"
153 ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
154 ewarn "See http://bugs.gentoo.org/333639 for more info."
155 fi
156
157 fi
158 }
159
160 pkg_setup() {
161 enewgroup plugdev
162 }
163
164 src_unpack() {
165 git-2_src_unpack
166 }
167
168 src_prepare() {
169 # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
170 epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
171
172 # Use python2.7 shebangs for test scripts
173 sed -e 's@\(^#!.*python\)@\12.7@' \
174 -i */tests/*.py || die
175
176 epatch_user
177
178 use vala && vala_src_prepare
179 eautoreconf # for 9999
180
181 # Force use of /run, avoid eautoreconf
182 sed -e 's:$localstatedir/run/:/run/:' -i configure || die
183
184 default
185 }
186
187 src_configure() {
188 # TODO: enable wimax when we have a libnl:3 compatible revision of it
189 econf \
190 --disable-more-warnings \
191 --disable-static \
192 --localstatedir=/var \
193 --enable-ifnet \
194 --without-netconfig \
195 --with-dbus-sys-dir=/etc/dbus-1/system.d \
196 --with-udev-dir="$(udev_get_udevdir)" \
197 --with-iptables=/sbin/iptables \
198 --enable-concheck \
199 --with-crypto=$(usex nss nss gnutls) \
200 --with-session-tracking=$(usex consolekit consolekit $(usex systemd systemd no)) \
201 --with-suspend-resume=$(usex systemd systemd upower) \
202 $(use_enable doc) \
203 $(use_enable introspection) \
204 $(use_enable ppp) \
205 --disable-wimax \
206 $(use_with dhclient) \
207 $(use_with dhcpcd) \
208 $(use_with doc docs) \
209 $(use_with modemmanager modem-manager-1) \
210 $(use_with resolvconf) \
211 $(use_enable test tests) \
212 $(use_enable vala) \
213 $(use_with wext) \
214 "$(systemd_with_unitdir)"
215 }
216
217 src_test() {
218 cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
219 Xemake check
220 }
221
222 src_install() {
223 default
224
225 # Gentoo init script
226 newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
227
228 # /var/run/NetworkManager is used by some distros, but not by Gentoo
229 rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
230
231 # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
232 keepdir /etc/NetworkManager/dispatcher.d
233
234 if use systemd; then
235 # Our init.d script requires running a dispatcher script that annoys
236 # systemd users; bug #434692
237 rm -rv "${ED}/etc/init.d" || die "rm failed"
238 else
239 # Provide openrc net dependency only when nm is connected
240 exeinto /etc/NetworkManager/dispatcher.d
241 newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
242 sed -e "s:@EPREFIX@:${EPREFIX}:g" \
243 -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
244
245 # Default conf.d file
246 newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
247 fi
248
249 # Add keyfile plugin support
250 keepdir /etc/NetworkManager/system-connections
251 chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
252 insinto /etc/NetworkManager
253 newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
254
255 # Allow users in plugdev group to modify system connections
256 insinto /usr/share/polkit-1/rules.d/
257 doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
258
259 # Remove useless .la files
260 prune_libtool_files --modules
261 }
262
263 pkg_postinst() {
264 elog "To modify system network connections without needing to enter the"
265 elog "root password, add your user account to the 'plugdev' group."
266
267 if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
268 ewarn "The ${PN} system configuration file has moved to a new location."
269 ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
270 ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
271 ewarn
272 ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
273 fi
274
275 # The polkit rules file moved to /usr/share
276 old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
277 if [[ -f "${old_rules}" ]]; then
278 case "$(md5sum ${old_rules})" in
279 574d0cfa7e911b1f7792077003060240* )
280 # Automatically delete the old rules.d file if the user did not change it
281 elog
282 elog "Removing old ${old_rules} ..."
283 rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
284 ;;
285 * )
286 elog "The ${old_rules}"
287 elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
288 elog "If you edited ${old_rules}"
289 elog "without changing its behavior, you may want to remove it."
290 ;;
291 esac
292 fi
293 }
294
295
296
297 1.1 net-misc/networkmanager/networkmanager-0.9.7.995.ebuild
298
299 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild?rev=1.1&view=markup
300 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild?rev=1.1&content-type=text/plain
301
302 Index: networkmanager-0.9.7.995.ebuild
303 ===================================================================
304 # Copyright 1999-2013 Gentoo Foundation
305 # Distributed under the terms of the GNU General Public License v2
306 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild,v 1.1 2013/01/28 07:05:05 tetromino Exp $
307
308 EAPI="5"
309 GNOME_ORG_MODULE="NetworkManager"
310 VALA_MIN_API_VERSION="0.18"
311 VALA_USE_DEPEND="vapigen"
312
313 inherit eutils gnome.org linux-info systemd user toolchain-funcs vala virtualx udev
314
315 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
316 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
317
318 LICENSE="GPL-2+"
319 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
320 IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls
321 +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
322 +wext" # wimax
323 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
324
325 REQUIRED_USE="
326 modemmanager? ( ppp )
327 ^^ ( nss gnutls )
328 ^^ ( dhclient dhcpcd )
329 ?? ( consolekit systemd )
330 "
331
332 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
333 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
334 # TODO: Qt support?
335 COMMON_DEPEND=">=sys-apps/dbus-1.2
336 >=dev-libs/dbus-glib-0.94
337 >=dev-libs/glib-2.30
338 >=dev-libs/libnl-3.2.7:3=
339 >=sys-auth/polkit-0.106
340 >=net-libs/libsoup-2.26:2.4=
341 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
342 >=virtual/udev-165[gudev]
343 bluetooth? ( >=net-wireless/bluez-4.82 )
344 avahi? ( net-dns/avahi:=[autoipd] )
345 connection-sharing? (
346 net-dns/dnsmasq
347 net-firewall/iptables )
348 gnutls? (
349 dev-libs/libgcrypt:=
350 net-libs/gnutls:= )
351 modemmanager? ( >=net-misc/modemmanager-0.7.990 )
352 nss? ( >=dev-libs/nss-3.11:= )
353 dhclient? ( =net-misc/dhcp-4*[client] )
354 dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
355 introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
356 ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
357 resolvconf? ( net-dns/openresolv )
358 systemd? ( >=sys-apps/systemd-183 )
359 !systemd? ( sys-power/upower )
360 "
361 RDEPEND="${COMMON_DEPEND}
362 consolekit? ( sys-auth/consolekit )
363 "
364 DEPEND="${COMMON_DEPEND}
365 >=dev-util/intltool-0.40
366 >=sys-devel/gettext-0.17
367 >=sys-kernel/linux-headers-2.6.29
368 virtual/pkgconfig
369 doc? ( >=dev-util/gtk-doc-1.8 )
370 vala? ( $(vala_depend) )
371 test? (
372 dev-lang/python:2.7
373 dev-python/dbus-python[python_targets_python2_7]
374 dev-python/pygobject:2[python_targets_python2_7] )
375 "
376
377 sysfs_deprecated_check() {
378 ebegin "Checking for SYSFS_DEPRECATED support"
379
380 if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
381 eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
382 eerror "or NetworkManager will not work correctly."
383 eerror "See http://bugs.gentoo.org/333639 for more info."
384 die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
385 fi
386 eend $?
387 }
388
389 pkg_pretend() {
390 if use kernel_linux; then
391 get_version
392 if linux_config_exists; then
393 sysfs_deprecated_check
394 else
395 ewarn "Was unable to determine your kernel .config"
396 ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
397 ewarn "See http://bugs.gentoo.org/333639 for more info."
398 fi
399
400 fi
401 }
402
403 pkg_setup() {
404 enewgroup plugdev
405 }
406
407 src_prepare() {
408 # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
409 epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
410
411 # Use python2.7 shebangs for test scripts
412 sed -e 's@\(^#!.*python\)@\12.7@' \
413 -i */tests/*.py || die
414
415 epatch_user
416
417 use vala && vala_src_prepare
418
419 # Force use of /run, avoid eautoreconf
420 sed -e 's:$localstatedir/run/:/run/:' -i configure || die
421
422 default
423 }
424
425 src_configure() {
426 # TODO: enable wimax when we have a libnl:3 compatible revision of it
427 econf \
428 --disable-more-warnings \
429 --disable-static \
430 --localstatedir=/var \
431 --enable-ifnet \
432 --without-netconfig \
433 --with-dbus-sys-dir=/etc/dbus-1/system.d \
434 --with-udev-dir="$(udev_get_udevdir)" \
435 --with-iptables=/sbin/iptables \
436 --enable-concheck \
437 --with-crypto=$(usex nss nss gnutls) \
438 --with-session-tracking=$(usex consolekit consolekit $(usex systemd systemd no)) \
439 --with-suspend-resume=$(usex systemd systemd upower) \
440 $(use_enable doc) \
441 $(use_enable introspection) \
442 $(use_enable ppp) \
443 --disable-wimax \
444 $(use_with dhclient) \
445 $(use_with dhcpcd) \
446 $(use_with doc docs) \
447 $(use_with modemmanager modem-manager-1) \
448 $(use_with resolvconf) \
449 $(use_enable test tests) \
450 $(use_enable vala) \
451 $(use_with wext) \
452 "$(systemd_with_unitdir)"
453 }
454
455 src_test() {
456 cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
457 Xemake check
458 }
459
460 src_install() {
461 default
462
463 # Gentoo init script
464 newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
465
466 # /var/run/NetworkManager is used by some distros, but not by Gentoo
467 rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
468
469 # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
470 keepdir /etc/NetworkManager/dispatcher.d
471
472 if use systemd; then
473 # Our init.d script requires running a dispatcher script that annoys
474 # systemd users; bug #434692
475 rm -rv "${ED}/etc/init.d" || die "rm failed"
476 else
477 # Provide openrc net dependency only when nm is connected
478 exeinto /etc/NetworkManager/dispatcher.d
479 newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
480 sed -e "s:@EPREFIX@:${EPREFIX}:g" \
481 -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
482
483 # Default conf.d file
484 newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
485 fi
486
487 # Add keyfile plugin support
488 keepdir /etc/NetworkManager/system-connections
489 chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
490 insinto /etc/NetworkManager
491 newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
492
493 # Allow users in plugdev group to modify system connections
494 insinto /usr/share/polkit-1/rules.d/
495 doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
496
497 # Remove useless .la files
498 prune_libtool_files --modules
499 }
500
501 pkg_postinst() {
502 elog "To modify system network connections without needing to enter the"
503 elog "root password, add your user account to the 'plugdev' group."
504
505 if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
506 ewarn "The ${PN} system configuration file has moved to a new location."
507 ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
508 ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
509 ewarn
510 ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
511 fi
512
513 # The polkit rules file moved to /usr/share
514 old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
515 if [[ -f "${old_rules}" ]]; then
516 case "$(md5sum ${old_rules})" in
517 574d0cfa7e911b1f7792077003060240* )
518 # Automatically delete the old rules.d file if the user did not change it
519 elog
520 elog "Removing old ${old_rules} ..."
521 rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
522 ;;
523 * )
524 elog "The ${old_rules}"
525 elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
526 elog "If you edited ${old_rules}"
527 elog "without changing its behavior, you may want to remove it."
528 ;;
529 esac
530 fi
531 }