diff options
author | 2015-08-04 04:31:37 +0000 | |
---|---|---|
committer | 2015-08-04 04:31:37 +0000 | |
commit | 00d80f40c6f008a1b90bdf48e6582a2ebfe7114a (patch) | |
tree | df5673b0a340856047384c47e37539f8223c3ed1 /net-misc | |
parent | Bump (diff) | |
download | historical-00d80f40c6f008a1b90bdf48e6582a2ebfe7114a.tar.gz historical-00d80f40c6f008a1b90bdf48e6582a2ebfe7114a.tar.bz2 historical-00d80f40c6f008a1b90bdf48e6582a2ebfe7114a.zip |
Add multilib support (bug #548114, thanks to Jonathan Callen for the ebuild).
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/networkmanager/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/networkmanager/Manifest | 23 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild | 342 |
3 files changed, 367 insertions, 6 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index bfdbd4d33436..1c89dd6c569b 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.242 2015/07/19 09:19:12 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.243 2015/08/04 04:31:32 tetromino Exp $ + +*networkmanager-1.0.4-r1 (04 Aug 2015) + + 04 Aug 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + +networkmanager-1.0.4-r1.ebuild: + Add multilib support (bug #548114, thanks to Jonathan Callen for the ebuild). *networkmanager-1.0.4 (19 Jul 2015) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index afa845141546..6532c6610d10 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -23,13 +23,26 @@ EBUILD networkmanager-0.9.8.10-r1.ebuild 8440 SHA256 580948a52d8f47ab225af2e221b EBUILD networkmanager-1.0.0.ebuild 10740 SHA256 6ed3ac5cfac555c1897ae9ea87205cf7749ad7376cc2392385827cda75915204 SHA512 7b9f1963df0b21f5234494b396a9158bdaff4d2a7080d8c8463b7de1b198f678e4a5c76a3104f818c3a65ddc651cf6d2eafaf7faffb1c710568ce2b0c7ee15ed WHIRLPOOL 1ed47bbcf3cc13cd4826d5741dd240dc59d82d5782bc293780d63389dfe8cca1e59df4d4e8115c1496f5247bb719b71344071d8fa568b623d918be330d651d44 EBUILD networkmanager-1.0.2-r1.ebuild 10463 SHA256 e81a5c2bfa38db3e94c3de82b5a4f7521931bf534979145bebecc61076e71d02 SHA512 6f9b3f71ec973de7cfbe5c961714a4e4544f03d5ee7395ccc8a98f0516e349ca8a4ab3a29e674ca9f94d588e47ba0bf971cb4e9c6de62d2903ec5c7280979263 WHIRLPOOL ae2665358dbf717f392a35dc70a616053569e16e609139f6cffab1276e506dd5009e76dfe6b339bbee8495fe5446ab2ff4ac56aff05d2354ff59dc78a418d0ff EBUILD networkmanager-1.0.2.ebuild 10305 SHA256 da32ac0b3ae4403ea6fd76415064b10acbf8f54a9c6d0d2ff77588653fc5c6ae SHA512 aae6a3ad4a21a4711b4ff2e69588dece7a0f0fee8e25b8db7a7c2f2b8f17b928a94c59890d53c5859165cdf4a8fe2e014eaa662eba59e708838c7ae8f1931989 WHIRLPOOL d4946abb21f48cdcfee9197a87321c234d52504a6be6e04b9b686260cab51c39bf0e1e460d5be1012379df0ed89b0c945487ddc873644d31f08de1bf391af0ec +EBUILD networkmanager-1.0.4-r1.ebuild 12028 SHA256 bda1f67ff877e7cb0504b925ddc196b0c87dcfa815982d384cccb2eba99753bd SHA512 befc51ca3bab7189a48684349e375420ed236b864bab9e946e88a7d56bbcffd87531ba97823b78bd2dff95095fcd7066c575ecb531ddef0402186a748a41297f WHIRLPOOL 2401e1bdff35a2b7cf565f3862d4407768d566a5f5fa3ef6fedcc1264b01aab4350db07959321734e17989d810d12b6ae9299cffa3f3cedbf9e3f3546e08a9fc EBUILD networkmanager-1.0.4.ebuild 10369 SHA256 16c3085c7b3a8acacf5a421f17fea48e6d29dba0bcaf0d01627a49fb0ce636ca SHA512 50ff3d04509c893dc9b7da95236671222f2a4c627618d54c2f91b944f0e25c8ad383e03531ec482a4db002d044521ae3dc99dcd114dc8cb5b84f6ef97345876a WHIRLPOOL 0589a53f4e7e74ed081348514744d137070bacee6205ce2383f89814a04155b968a691ebfac23aa92e707c5850304dd343968a22426f7ae1ce6660a2eb7493c3 -MISC ChangeLog 56392 SHA256 515224a1e8bece0dd83a77279f79a320fed283d3b110fa05c9d1dcaa41947b2f SHA512 62797f6f203f19217edbae57d58175bb0ae665eaadd23aa188e9680f024063526df9605e65ef9d2a4d8bd3cbe3884bae09449e572838bc52eceb2e615b572eea WHIRLPOOL 9db4afd3d38e476f03f6d69a5c337f143d1f690c73efee63c96832ca9a4cf7b5819617f0f8cc79b1923d6ec991ec3742153e6faac5de9c31ad4554733b013c86 +MISC ChangeLog 56611 SHA256 3a5616b4b70d9c27c41e9453c4ae843c9552789745411327a3ce2d531abcea6f SHA512 4581b5b2308ca21f579669c3fd7aeb1a85b39a1788a43eae300fd2b9c9bd2a0806a70bc3ef8fe17ffe4fe6c931975264a4e6c497d902a3741b58e69d5ef856ff WHIRLPOOL 9a00863fef6d0a0a23b55ee5222bbbddb098e10cb3d725b22b1571d4bc3e492368e24c70f2a4694833cb5d3b38d099787df7a58a614180d34c3465fa42b6f514 MISC metadata.xml 1313 SHA256 7b9488247558149363d2a36cf46f8f007482796cc400c481fb7f73ac70968274 SHA512 e824980bcdf6a80ec84fae9fbe2ebe76ce4f0512171908726e753c67dd59553d7f62285a3b937fc0f42219a1195b95ece7a03a616290d486684cff8a1e362121 WHIRLPOOL fddc2cc08d2a64525abe59133b02e7bf690793a5c04e219260238ae0cea244cefbd7ee1ae5f668227e1629f6e393ce38f3f94417fe56c0e6a3b0e115b40e0666 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iEYEAREIAAYFAlWra5IACgkQCaWpQKGI+9SyZwCcD3HAk+W2YUPyoZncblz3HxFb -HvUAnimoXKJw02GTdgvQWnzfGlMVra1x -=FBbI +iQJ8BAEBCABmBQJVwEAlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNQfsQAJu9lnZ2G350zlMTfzeoM9mO ++WnPeoWT1VeA65JOdmZbFYCdvjRuzrdBXN5QRsMqrVOHfkbdNDER2e2urE3yAVJr +m/WTsAFhbDwe/FV5DUGUa/H/6i9km8Ft3RbMfTFdLNHqtPzMrAetPEuFX+Q782QU +5ZTg1VJJS8GDWZ7iKQMLNxu06LAtSSB/7lfTuOA80lMXh8JNFWJEuo9R8m2FOgqp +NR/3F83SIeZ+QiE30nf88WwllwdAILzRvPaqKFa2DPOILatilo2Y4BR5rK2m72d9 +rPxa83Iv0LBCJgT3GXABexR6rpsNfauGk7V8N5GFwFCCLqglx1dxdRAzASY/NvU2 +c5zOaR54bmv9P8UqaWROLiZG8IGCMfVfdbyIa431Q/ZB7jCrlYNuupokvzq3XOS1 +7alO/Eolq7vEQsoz7jtnWMXxEJjh2vMwvB/PRBEeK3eOdIpdgIFufGqUU+b8l5tY +iJt2l5kVcMGoP6jzkjfQ9XwbjokDewsowu+xWntwoY9vY0fNytVdTBkaZ/1HNolO +C/MuUxlFc/KG1bhoxYSS2zzy+MCYxQlfy7FhW78iq1S/Q1e8rY9yLcN9ALDn143c +psP2TsmGYQThshjjNbF8wfSuBz4kch/EVsAnHRxzuN+MBEm2bTROJc0Qi//UVcrH +luTW50MRnwCXRCRBsTm5 +=O+45 -----END PGP SIGNATURE----- diff --git a/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild new file mode 100644 index 000000000000..e8f33779bd4b --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild @@ -0,0 +1,342 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild,v 1.1 2015/08/04 04:31:32 tetromino Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME_ORG_MODULE="NetworkManager" +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ + user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal + +DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+" +SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version + +IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \ +kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ +vala +wext +wifi zeroconf" # wimax + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +REQUIRED_USE=" + modemmanager? ( ppp ) + wext? ( wifi ) + ^^ ( nss gnutls ) + ^^ ( dhclient dhcpcd ) +" + +# gobject-introspection-0.10.3 is needed due to gnome bug 642300 +# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +# TODO: Qt support? +COMMON_DEPEND=" + >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] + >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] + >=dev-libs/libnl-3.2.8:3= + >=sys-auth/polkit-0.106 + net-libs/libndp + >=net-libs/libsoup-2.26:2.4= + net-misc/iputils + sys-libs/readline + >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] + bluetooth? ( >=net-wireless/bluez-5 ) + connection-sharing? ( + net-dns/dnsmasq[dhcp] + net-firewall/iptables ) + gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + modemmanager? ( >=net-misc/modemmanager-0.7.991 ) + ncurses? ( >=dev-libs/newt-0.52.15 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) + resolvconf? ( net-dns/openresolv ) + systemd? ( >=sys-apps/systemd-209:0= ) + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) + teamd? ( >=net-misc/libteam-1.9 ) + zeroconf? ( net-dns/avahi:=[autoipd] ) +" +RDEPEND="${COMMON_DEPEND} + consolekit? ( sys-auth/consolekit ) + wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gdbus-codegen + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + >=sys-kernel/linux-headers-2.6.29 + virtual/pkgconfig + vala? ( $(vala_depend) ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:2[${PYTHON_USEDEP}]') + ) +" + +sysfs_deprecated_check() { + ebegin "Checking for SYSFS_DEPRECATED support" + + if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then + eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" + eerror "or NetworkManager will not work correctly." + eerror "See http://bugs.gentoo.org/333639 for more info." + die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" + fi + eend $? +} + +pkg_pretend() { + if use kernel_linux; then + get_version + if linux_config_exists; then + sysfs_deprecated_check + else + ewarn "Was unable to determine your kernel .config" + ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." + ewarn "See http://bugs.gentoo.org/333639 for more info." + fi + + fi +} + +pkg_setup() { + enewgroup plugdev +} + +src_prepare() { + DOC_CONTENTS="To modify system network connections without needing to enter the + root password, add your user account to the 'plugdev' group." + + # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master' + sed -e 's:$localstatedir/run/:/run/:' -i configure || die + + use vala && vala_src_prepare + + epatch_user # don't remove, users often want custom patches for NM + + eautoreconf + + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=() + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + # unit files directory needs to be passed only when systemd is enabled, + # otherwise systemd support is not disabled completely, bug #524534 + use systemd && myconf+=( "$(systemd_with_unitdir)" ) + + if multilib_is_native_abi; then + # work-around man out-of-source brokenness, must be done before configure + mkdir man || die + find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die + else + # libnl, libndp are only used for executables, not libraries + myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) + fi + + # TODO: enable wimax when we have a libnl:3 compatible revision of it + # wimax will be removed, bug #522822 + # ifnet plugin always disabled until someone volunteers to actively + # maintain and fix it + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-more-warnings \ + --disable-static \ + --localstatedir=/var \ + --disable-lto \ + --disable-config-plugin-ibft \ + --disable-ifnet \ + --without-netconfig \ + --with-dbus-sys-dir=/etc/dbus-1/system.d \ + --with-udev-dir="$(get_udevdir)" \ + --with-config-plugins-default=keyfile \ + --with-iptables=/sbin/iptables \ + $(multilib_native_with libsoup) \ + $(multilib_native_enable concheck) \ + --with-crypto=$(usex nss nss gnutls) \ + --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ + --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ + $(multilib_native_use_enable bluetooth bluez5-dun) \ + $(multilib_native_use_enable introspection) \ + $(multilib_native_use_enable ppp) \ + --disable-wimax \ + $(use_with dhclient) \ + $(use_with dhcpcd) \ + $(multilib_native_use_with modemmanager modem-manager-1) \ + $(multilib_native_use_with ncurses nmtui) \ + $(multilib_native_use_with resolvconf) \ + $(multilib_native_use_with selinux) \ + $(multilib_native_use_enable teamd teamdctl) \ + $(multilib_native_use_enable test tests) \ + $(multilib_native_use_enable vala) \ + --without-valgrind \ + $(multilib_native_use_with wext) \ + $(multilib_native_use_enable wifi) \ + "${myconf[@]}" + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + local d + for d in api libnm libnm-util libnm-glib; do + ln -s "${S}"/docs/${d}/html docs/${d}/html || die + done + fi +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + emake all-am + emake -C include + emake -C introspection # generated headers, needed for libnm + emake -C libnm-core + emake -C libnm + emake -C libnm-util + emake -C libnm-glib + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + python_setup + Xemake check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + # Install completions at proper place, bug #465100 + gnome2_src_install completiondir="$(get_bashcompdir)" + else + emake DESTDIR="${D}" install-am + emake DESTDIR="${D}" install -C include + emake DESTDIR="${D}" install -C introspection + emake DESTDIR="${D}" install -C libnm-core + emake DESTDIR="${D}" install -C libnm + emake DESTDIR="${D}" install -C libnm-util + emake DESTDIR="${D}" install -C libnm-glib + fi +} + +multilib_src_install_all() { + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager + newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager + + # /var/run/NetworkManager is used by some distros, but not by Gentoo + rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" + rmdir -v "${ED}/var/run" || die "rmdir failed" + + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + # Provide openrc net dependency only when nm is connected + exeinto /etc/NetworkManager/dispatcher.d + newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status + sed -e "s:@EPREFIX@:${EPREFIX}:g" \ + -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die + + keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765 + + # Allow users in plugdev group to modify system connections + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" +} + +pkg_postinst() { + gnome2_pkg_postinst + ! use systemd && readme.gentoo_print_elog + + if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then + ewarn "The ${PN} system configuration file has moved to a new location." + ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn + ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" + fi + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + 574d0cfa7e911b1f7792077003060240* ) + # Automatically delete the old rules.d file if the user did not change it + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" + ;; + * ) + elog "The ${old_rules}" + elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + # ifnet plugin was disabled for systemd users with 0.9.8.6 version + # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) + if use systemd; then + if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then + ewarn "Ifnet plugin won't be used with systemd support enabled" + ewarn "as it is meant to be used with openRC and can cause collisions" + ewarn "(like bug #485658)." + ewarn "Because of this, you will likely need to reconfigure some of" + ewarn "your networks. To do this you can rely on Gnome control center," + ewarn "nm-connection-editor or nmtui tools for example once updated" + ewarn "NetworkManager version is installed." + fi + else + if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then + ewarn "Ifnet plugin is now disabled because of it being unattended" + ewarn "and unmaintained for a long time, leading to some unfixed bugs" + ewarn "and new problems appearing. We will now use upstream 'keyfile'" + ewarn "plugin." + ewarn "Because of this, you will likely need to reconfigure some of" + ewarn "your networks. To do this you can rely on Gnome control center," + ewarn "nm-connection-editor or nmtui tools for example once updated" + ewarn "NetworkManager version is installed." + fi + fi + + # NM fallbacks to plugin specified at compile time (upstream bug #738611) + # but still show a warning to remember people to have cleaner config file + if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then + if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then + ewarn + ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." + ewarn + fi + fi + + # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 + if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then + ewarn "You have psk-flags=1 setting in above files, you will need to" + ewarn "either reconfigure affected networks or, at least, set the flag" + ewarn "value to '0'." + fi +} |