1 |
commit: 1c793ce1e6a5eba36ea6687425ef2bdb169bf924 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 7 19:00:32 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 7 19:16:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c793ce1 |
7 |
|
8 |
net-misc/networkmanager: Version bump |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-misc/networkmanager/Manifest | 1 + |
13 |
.../networkmanager/networkmanager-1.2.2.ebuild | 335 +++++++++++++++++++++ |
14 |
2 files changed, 336 insertions(+) |
15 |
|
16 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
17 |
index b9cb5ae..ddbbb88 100644 |
18 |
--- a/net-misc/networkmanager/Manifest |
19 |
+++ b/net-misc/networkmanager/Manifest |
20 |
@@ -1,3 +1,4 @@ |
21 |
DIST NetworkManager-1.0.10.tar.xz 3488600 SHA256 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc SHA512 0c5df37565c1ec6fafe60fad0ede34d28e7d87200e338489f35eec18c3e88920f47d58eae5a8aba5caeddb26a6f7074e79e8f6a7d4f7584ce3cc9be0df99f1ef WHIRLPOOL e1a0158d69e444224c25a6287bbe4f3b89d623c85f39a59eb2aeffca83b38cd85ccf067af14e5ff79b23b4346f606e15e3d33b9d097c7ef8d50054fdc5056379 |
22 |
DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac |
23 |
DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97 |
24 |
+DIST NetworkManager-1.2.2.tar.xz 3752592 SHA256 41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9 SHA512 5360f22073dc78d5ff440a3cae8126f263c8ba8230eb77ea2b421ff26e1615c0a44b00c21abddcd0b50a38634b1a44d15c24becb72c735b5abe3ee7bbc3211d5 WHIRLPOOL 9324725793090d551e48e158c46ca283e120d4ac210ad0f14a800442fa62db17c448629f51bb7e18d0b4c602bdf7ebbb8a65cd9e1ea82b6384e8019652403683 |
25 |
|
26 |
diff --git a/net-misc/networkmanager/networkmanager-1.2.2.ebuild b/net-misc/networkmanager/networkmanager-1.2.2.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..a596c46 |
29 |
--- /dev/null |
30 |
+++ b/net-misc/networkmanager/networkmanager-1.2.2.ebuild |
31 |
@@ -0,0 +1,335 @@ |
32 |
+# Copyright 1999-2016 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=6 |
37 |
+GNOME_ORG_MODULE="NetworkManager" |
38 |
+GNOME2_LA_PUNT="yes" |
39 |
+VALA_USE_DEPEND="vapigen" |
40 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
41 |
+ |
42 |
+inherit autotools bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ |
43 |
+ user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal |
44 |
+ |
45 |
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" |
46 |
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
47 |
+ |
48 |
+LICENSE="GPL-2+" |
49 |
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
50 |
+ |
51 |
+IUSE="bluetooth connection-sharing consolekit +dhclient gnutls +introspection \ |
52 |
+kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ |
53 |
+vala +wext +wifi zeroconf" |
54 |
+ |
55 |
+REQUIRED_USE=" |
56 |
+ modemmanager? ( ppp ) |
57 |
+ wext? ( wifi ) |
58 |
+ ^^ ( nss gnutls ) |
59 |
+" |
60 |
+ |
61 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
62 |
+ |
63 |
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
64 |
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
65 |
+COMMON_DEPEND=" |
66 |
+ >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
67 |
+ >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
68 |
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] |
69 |
+ >=dev-libs/libnl-3.2.8:3= |
70 |
+ >=sys-auth/polkit-0.106 |
71 |
+ net-libs/libndp |
72 |
+ >=net-libs/libsoup-2.40:2.4= |
73 |
+ net-misc/iputils |
74 |
+ sys-libs/readline:0 |
75 |
+ >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] |
76 |
+ bluetooth? ( >=net-wireless/bluez-5 ) |
77 |
+ connection-sharing? ( |
78 |
+ net-dns/dnsmasq[dhcp] |
79 |
+ net-firewall/iptables ) |
80 |
+ gnutls? ( |
81 |
+ dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
82 |
+ >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) |
83 |
+ modemmanager? ( >=net-misc/modemmanager-0.7.991 ) |
84 |
+ ncurses? ( >=dev-libs/newt-0.52.15 ) |
85 |
+ nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
86 |
+ dhclient? ( >=net-misc/dhcp-4[client] ) |
87 |
+ introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
88 |
+ ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) |
89 |
+ resolvconf? ( net-dns/openresolv ) |
90 |
+ systemd? ( >=sys-apps/systemd-209:0= ) |
91 |
+ !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) |
92 |
+ teamd? ( >=net-misc/libteam-1.9 ) |
93 |
+ zeroconf? ( net-dns/avahi:=[autoipd] ) |
94 |
+" |
95 |
+RDEPEND="${COMMON_DEPEND} |
96 |
+ consolekit? ( sys-auth/consolekit ) |
97 |
+ wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
98 |
+" |
99 |
+DEPEND="${COMMON_DEPEND} |
100 |
+ dev-util/gdbus-codegen |
101 |
+ dev-util/gtk-doc-am |
102 |
+ >=dev-util/intltool-0.40 |
103 |
+ >=sys-devel/gettext-0.17 |
104 |
+ >=sys-kernel/linux-headers-2.6.29 |
105 |
+ virtual/pkgconfig |
106 |
+ vala? ( $(vala_depend) ) |
107 |
+ test? ( |
108 |
+ $(python_gen_any_dep ' |
109 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
110 |
+ dev-python/pygobject:2[${PYTHON_USEDEP}]') |
111 |
+ ) |
112 |
+" |
113 |
+ |
114 |
+sysfs_deprecated_check() { |
115 |
+ ebegin "Checking for SYSFS_DEPRECATED support" |
116 |
+ |
117 |
+ if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
118 |
+ eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
119 |
+ eerror "or NetworkManager will not work correctly." |
120 |
+ eerror "See https://bugs.gentoo.org/333639 for more info." |
121 |
+ die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
122 |
+ fi |
123 |
+ eend $? |
124 |
+} |
125 |
+ |
126 |
+pkg_pretend() { |
127 |
+ if use kernel_linux; then |
128 |
+ get_version |
129 |
+ if linux_config_exists; then |
130 |
+ sysfs_deprecated_check |
131 |
+ else |
132 |
+ ewarn "Was unable to determine your kernel .config" |
133 |
+ ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
134 |
+ ewarn "See https://bugs.gentoo.org/333639 for more info." |
135 |
+ fi |
136 |
+ |
137 |
+ fi |
138 |
+} |
139 |
+ |
140 |
+pkg_setup() { |
141 |
+ enewgroup plugdev |
142 |
+} |
143 |
+ |
144 |
+src_prepare() { |
145 |
+ DOC_CONTENTS="To modify system network connections without needing to enter the |
146 |
+ root password, add your user account to the 'plugdev' group." |
147 |
+ |
148 |
+ # Don't build examples, they are not needed and can cause build failure |
149 |
+ sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die |
150 |
+ |
151 |
+ use vala && vala_src_prepare |
152 |
+ gnome2_src_prepare |
153 |
+} |
154 |
+ |
155 |
+multilib_src_configure() { |
156 |
+ local myconf=() |
157 |
+ |
158 |
+ # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
159 |
+ if use ppp; then |
160 |
+ local PPPD_VER=`best_version net-dialup/ppp` |
161 |
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
162 |
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
163 |
+ myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
164 |
+ fi |
165 |
+ |
166 |
+ # unit files directory needs to be passed only when systemd is enabled, |
167 |
+ # otherwise systemd support is not disabled completely, bug #524534 |
168 |
+ use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) |
169 |
+ |
170 |
+ if multilib_is_native_abi; then |
171 |
+ # work-around man out-of-source brokenness, must be done before configure |
172 |
+ mkdir man || die |
173 |
+ find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die |
174 |
+ else |
175 |
+ # libnl, libndp are only used for executables, not libraries |
176 |
+ myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) |
177 |
+ fi |
178 |
+ |
179 |
+ # ifnet plugin always disabled until someone volunteers to actively |
180 |
+ # maintain and fix it |
181 |
+ # Also disable dhcpcd support as it's also completely unmaintained |
182 |
+ # and facing bugs like #563938 and many others |
183 |
+ # |
184 |
+ # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
185 |
+ # still not ready for removing that lib |
186 |
+ ECONF_SOURCE=${S} \ |
187 |
+ runstatedir="/run" \ |
188 |
+ gnome2_src_configure \ |
189 |
+ --disable-more-warnings \ |
190 |
+ --disable-static \ |
191 |
+ --localstatedir=/var \ |
192 |
+ --disable-lto \ |
193 |
+ --disable-config-plugin-ibft \ |
194 |
+ --disable-ifnet \ |
195 |
+ --without-netconfig \ |
196 |
+ --with-dbus-sys-dir=/etc/dbus-1/system.d \ |
197 |
+ --with-libnm-glib \ |
198 |
+ --with-nmcli=yes \ |
199 |
+ --with-udev-dir="$(get_udevdir)" \ |
200 |
+ --with-config-plugins-default=keyfile \ |
201 |
+ --with-iptables=/sbin/iptables \ |
202 |
+ $(multilib_native_with libsoup) \ |
203 |
+ $(multilib_native_enable concheck) \ |
204 |
+ --with-crypto=$(usex nss nss gnutls) \ |
205 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ |
206 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ |
207 |
+ $(multilib_native_use_enable bluetooth bluez5-dun) \ |
208 |
+ $(multilib_native_use_enable introspection) \ |
209 |
+ $(multilib_native_use_enable ppp) \ |
210 |
+ $(use_with dhclient) \ |
211 |
+ --without-dhcpcd \ |
212 |
+ $(multilib_native_use_with modemmanager modem-manager-1) \ |
213 |
+ $(multilib_native_use_with ncurses nmtui) \ |
214 |
+ $(multilib_native_use_with resolvconf) \ |
215 |
+ $(multilib_native_use_with selinux) \ |
216 |
+ $(multilib_native_use_with systemd systemd-journal) \ |
217 |
+ $(multilib_native_use_enable teamd teamdctl) \ |
218 |
+ $(multilib_native_use_enable test tests) \ |
219 |
+ $(multilib_native_use_enable vala) \ |
220 |
+ --without-valgrind \ |
221 |
+ $(multilib_native_use_with wext) \ |
222 |
+ $(multilib_native_use_enable wifi) \ |
223 |
+ "${myconf[@]}" |
224 |
+ |
225 |
+ # work-around gtk-doc out-of-source brokedness |
226 |
+ if multilib_is_native_abi; then |
227 |
+ local d |
228 |
+ for d in api libnm libnm-util libnm-glib; do |
229 |
+ ln -s "${S}"/docs/${d}/html docs/${d}/html || die |
230 |
+ done |
231 |
+ fi |
232 |
+} |
233 |
+ |
234 |
+multilib_src_compile() { |
235 |
+ if multilib_is_native_abi; then |
236 |
+ emake |
237 |
+ else |
238 |
+ emake all-am |
239 |
+ emake -C include |
240 |
+ emake -C introspection # generated headers, needed for libnm |
241 |
+ emake -C libnm-core |
242 |
+ emake -C libnm |
243 |
+ emake -C libnm-util |
244 |
+ emake -C libnm-glib |
245 |
+ fi |
246 |
+} |
247 |
+ |
248 |
+multilib_src_test() { |
249 |
+ if multilib_is_native_abi; then |
250 |
+ python_setup |
251 |
+ virtx emake check |
252 |
+ fi |
253 |
+} |
254 |
+ |
255 |
+multilib_src_install() { |
256 |
+ if multilib_is_native_abi; then |
257 |
+ # Install completions at proper place, bug #465100 |
258 |
+ gnome2_src_install completiondir="$(get_bashcompdir)" |
259 |
+ else |
260 |
+ emake DESTDIR="${D}" install-am |
261 |
+ emake DESTDIR="${D}" install -C include |
262 |
+ emake DESTDIR="${D}" install -C introspection |
263 |
+ emake DESTDIR="${D}" install -C libnm-core |
264 |
+ emake DESTDIR="${D}" install -C libnm |
265 |
+ emake DESTDIR="${D}" install -C libnm-util |
266 |
+ emake DESTDIR="${D}" install -C libnm-glib |
267 |
+ fi |
268 |
+} |
269 |
+ |
270 |
+multilib_src_install_all() { |
271 |
+ ! use systemd && readme.gentoo_create_doc |
272 |
+ |
273 |
+ newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager |
274 |
+ newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
275 |
+ |
276 |
+ # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
277 |
+ keepdir /etc/NetworkManager/dispatcher.d |
278 |
+ |
279 |
+ # Provide openrc net dependency only when nm is connected |
280 |
+ exeinto /etc/NetworkManager/dispatcher.d |
281 |
+ newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
282 |
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
283 |
+ -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
284 |
+ |
285 |
+ keepdir /etc/NetworkManager/system-connections |
286 |
+ chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 |
287 |
+ |
288 |
+ # Allow users in plugdev group to modify system connections |
289 |
+ insinto /usr/share/polkit-1/rules.d/ |
290 |
+ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
291 |
+} |
292 |
+ |
293 |
+pkg_postinst() { |
294 |
+ gnome2_pkg_postinst |
295 |
+ ! use systemd && readme.gentoo_print_elog |
296 |
+ |
297 |
+ if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
298 |
+ ewarn "The ${PN} system configuration file has moved to a new location." |
299 |
+ ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
300 |
+ ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
301 |
+ ewarn |
302 |
+ ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
303 |
+ fi |
304 |
+ |
305 |
+ # The polkit rules file moved to /usr/share |
306 |
+ old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
307 |
+ if [[ -f "${old_rules}" ]]; then |
308 |
+ case "$(md5sum ${old_rules})" in |
309 |
+ 574d0cfa7e911b1f7792077003060240* ) |
310 |
+ # Automatically delete the old rules.d file if the user did not change it |
311 |
+ elog |
312 |
+ elog "Removing old ${old_rules} ..." |
313 |
+ rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
314 |
+ ;; |
315 |
+ * ) |
316 |
+ elog "The ${old_rules}" |
317 |
+ elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" |
318 |
+ elog "If you edited ${old_rules}" |
319 |
+ elog "without changing its behavior, you may want to remove it." |
320 |
+ ;; |
321 |
+ esac |
322 |
+ fi |
323 |
+ |
324 |
+ # ifnet plugin was disabled for systemd users with 0.9.8.6 version |
325 |
+ # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) |
326 |
+ if use systemd; then |
327 |
+ if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then |
328 |
+ ewarn "Ifnet plugin won't be used with systemd support enabled" |
329 |
+ ewarn "as it is meant to be used with openRC and can cause collisions" |
330 |
+ ewarn "(like bug #485658)." |
331 |
+ ewarn "Because of this, you will likely need to reconfigure some of" |
332 |
+ ewarn "your networks. To do this you can rely on Gnome control center," |
333 |
+ ewarn "nm-connection-editor or nmtui tools for example once updated" |
334 |
+ ewarn "NetworkManager version is installed." |
335 |
+ fi |
336 |
+ else |
337 |
+ if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then |
338 |
+ ewarn "Ifnet plugin is now disabled because of it being unattended" |
339 |
+ ewarn "and unmaintained for a long time, leading to some unfixed bugs" |
340 |
+ ewarn "and new problems appearing. We will now use upstream 'keyfile'" |
341 |
+ ewarn "plugin." |
342 |
+ ewarn "Because of this, you will likely need to reconfigure some of" |
343 |
+ ewarn "your networks. To do this you can rely on Gnome control center," |
344 |
+ ewarn "nm-connection-editor or nmtui tools for example once updated" |
345 |
+ ewarn "NetworkManager version is installed." |
346 |
+ fi |
347 |
+ fi |
348 |
+ |
349 |
+ # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
350 |
+ # but still show a warning to remember people to have cleaner config file |
351 |
+ if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
352 |
+ if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
353 |
+ ewarn |
354 |
+ ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
355 |
+ ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
356 |
+ ewarn |
357 |
+ fi |
358 |
+ fi |
359 |
+ |
360 |
+ # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
361 |
+ if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
362 |
+ ewarn "You have psk-flags=1 setting in above files, you will need to" |
363 |
+ ewarn "either reconfigure affected networks or, at least, set the flag" |
364 |
+ ewarn "value to '0'." |
365 |
+ fi |
366 |
+} |