| 1 |
pacho 13/10/05 13:39:26 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: networkmanager-0.9.8.6.ebuild |
| 5 |
Removed: networkmanager-0.9.8.2-r3.ebuild |
| 6 |
networkmanager-0.9.6.4-r1.ebuild |
| 7 |
Log: |
| 8 |
Version bump, use keyfile plugin instead of ifnet for systemd to prevent collisions and problems like bug #485658 |
| 9 |
|
| 10 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.182 net-misc/networkmanager/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.182&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.182&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.181&r2=1.182 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v |
| 22 |
retrieving revision 1.181 |
| 23 |
retrieving revision 1.182 |
| 24 |
diff -u -r1.181 -r1.182 |
| 25 |
--- ChangeLog 1 Oct 2013 22:19:42 -0000 1.181 |
| 26 |
+++ ChangeLog 5 Oct 2013 13:39:26 -0000 1.182 |
| 27 |
@@ -1,6 +1,13 @@ |
| 28 |
# ChangeLog for net-misc/networkmanager |
| 29 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.181 2013/10/01 22:19:42 tetromino Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.182 2013/10/05 13:39:26 pacho Exp $ |
| 32 |
+ |
| 33 |
+*networkmanager-0.9.8.6 (05 Oct 2013) |
| 34 |
+ |
| 35 |
+ 05 Oct 2013; Pacho Ramos <pacho@g.o> +networkmanager-0.9.8.6.ebuild, |
| 36 |
+ -networkmanager-0.9.6.4-r1.ebuild, -networkmanager-0.9.8.2-r3.ebuild: |
| 37 |
+ Version bump, use keyfile plugin instead of ifnet for systemd to prevent |
| 38 |
+ collisions and problems like bug #485658 |
| 39 |
|
| 40 |
01 Oct 2013; Alexandre Rostovtsev <tetromino@g.o> |
| 41 |
networkmanager-0.9.6.4.ebuild, networkmanager-0.9.6.4-r1.ebuild, |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 net-misc/networkmanager/networkmanager-0.9.8.6.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.6.ebuild?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.6.ebuild?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: networkmanager-0.9.8.6.ebuild |
| 51 |
=================================================================== |
| 52 |
# Copyright 1999-2013 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.6.ebuild,v 1.1 2013/10/05 13:39:26 pacho Exp $ |
| 55 |
|
| 56 |
EAPI="5" |
| 57 |
GNOME_ORG_MODULE="NetworkManager" |
| 58 |
VALA_MIN_API_VERSION="0.18" |
| 59 |
VALA_USE_DEPEND="vapigen" |
| 60 |
|
| 61 |
inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils |
| 62 |
|
| 63 |
DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" |
| 64 |
HOMEPAGE="http://projects.gnome.org/NetworkManager/" |
| 65 |
|
| 66 |
LICENSE="GPL-2+" |
| 67 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 68 |
IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala +wext" # wimax |
| 69 |
|
| 70 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 71 |
|
| 72 |
REQUIRED_USE=" |
| 73 |
modemmanager? ( ppp ) |
| 74 |
^^ ( nss gnutls ) |
| 75 |
^^ ( dhclient dhcpcd ) |
| 76 |
" |
| 77 |
|
| 78 |
# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
| 79 |
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
| 80 |
# TODO: Qt support? |
| 81 |
COMMON_DEPEND=" |
| 82 |
>=sys-apps/dbus-1.2 |
| 83 |
>=dev-libs/dbus-glib-0.94 |
| 84 |
>=dev-libs/glib-2.30 |
| 85 |
>=dev-libs/libnl-3.2.7:3= |
| 86 |
>=sys-auth/polkit-0.106 |
| 87 |
>=net-libs/libsoup-2.26:2.4= |
| 88 |
>=net-wireless/wpa_supplicant-0.7.3-r3[dbus] |
| 89 |
>=virtual/udev-165[gudev] |
| 90 |
bluetooth? ( >=net-wireless/bluez-4.82 ) |
| 91 |
avahi? ( net-dns/avahi:=[autoipd] ) |
| 92 |
connection-sharing? ( |
| 93 |
net-dns/dnsmasq[dhcp] |
| 94 |
net-firewall/iptables ) |
| 95 |
gnutls? ( |
| 96 |
dev-libs/libgcrypt:= |
| 97 |
net-libs/gnutls:= ) |
| 98 |
modemmanager? ( >=net-misc/modemmanager-0.7.991 ) |
| 99 |
nss? ( >=dev-libs/nss-3.11:= ) |
| 100 |
dhclient? ( =net-misc/dhcp-4*[client] ) |
| 101 |
dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
| 102 |
introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) |
| 103 |
ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) |
| 104 |
resolvconf? ( net-dns/openresolv ) |
| 105 |
systemd? ( >=sys-apps/systemd-183 ) |
| 106 |
|| ( sys-power/upower >=sys-apps/systemd-183 ) |
| 107 |
" |
| 108 |
RDEPEND="${COMMON_DEPEND} |
| 109 |
consolekit? ( sys-auth/consolekit ) |
| 110 |
" |
| 111 |
DEPEND="${COMMON_DEPEND} |
| 112 |
dev-util/gtk-doc-am |
| 113 |
>=dev-util/intltool-0.40 |
| 114 |
>=sys-devel/gettext-0.17 |
| 115 |
>=sys-kernel/linux-headers-2.6.29 |
| 116 |
virtual/pkgconfig |
| 117 |
vala? ( $(vala_depend) ) |
| 118 |
test? ( |
| 119 |
dev-lang/python:2.7 |
| 120 |
dev-python/dbus-python[python_targets_python2_7] |
| 121 |
dev-python/pygobject:2[python_targets_python2_7] ) |
| 122 |
" |
| 123 |
|
| 124 |
sysfs_deprecated_check() { |
| 125 |
ebegin "Checking for SYSFS_DEPRECATED support" |
| 126 |
|
| 127 |
if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
| 128 |
eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
| 129 |
eerror "or NetworkManager will not work correctly." |
| 130 |
eerror "See http://bugs.gentoo.org/333639 for more info." |
| 131 |
die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
| 132 |
fi |
| 133 |
eend $? |
| 134 |
} |
| 135 |
|
| 136 |
pkg_pretend() { |
| 137 |
if use kernel_linux; then |
| 138 |
get_version |
| 139 |
if linux_config_exists; then |
| 140 |
sysfs_deprecated_check |
| 141 |
else |
| 142 |
ewarn "Was unable to determine your kernel .config" |
| 143 |
ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
| 144 |
ewarn "See http://bugs.gentoo.org/333639 for more info." |
| 145 |
fi |
| 146 |
|
| 147 |
fi |
| 148 |
} |
| 149 |
|
| 150 |
pkg_setup() { |
| 151 |
enewgroup plugdev |
| 152 |
} |
| 153 |
|
| 154 |
src_prepare() { |
| 155 |
DOC_CONTENTS="To modify system network connections without needing to enter the |
| 156 |
root password, add your user account to the 'plugdev' group." |
| 157 |
|
| 158 |
# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832 |
| 159 |
epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch" |
| 160 |
|
| 161 |
# Use python2.7 shebangs for test scripts |
| 162 |
sed -e 's@\(^#!.*python\)@\12.7@' \ |
| 163 |
-i */tests/*.py || die |
| 164 |
|
| 165 |
# Fix completiondir, avoid eautoreconf, bug #465100 |
| 166 |
sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ |
| 167 |
cli/completion/Makefile.in || die "sed completiondir failed" |
| 168 |
|
| 169 |
## Force use of /run, avoid eautoreconf |
| 170 |
sed -e 's:$localstatedir/run/:/run/:' -i configure || die |
| 171 |
|
| 172 |
use vala && vala_src_prepare |
| 173 |
|
| 174 |
epatch_user # don't remove, users often want custom patches for NM |
| 175 |
} |
| 176 |
|
| 177 |
src_configure() { |
| 178 |
# TODO: enable wimax when we have a libnl:3 compatible revision of it |
| 179 |
# We are not ready for bluez5 yet |
| 180 |
econf \ |
| 181 |
--enable-bluez4 \ |
| 182 |
--disable-more-warnings \ |
| 183 |
--disable-static \ |
| 184 |
--localstatedir=/var \ |
| 185 |
$(usex systemd '--disable-ifnet' '--enable-ifnet') \ |
| 186 |
--without-netconfig \ |
| 187 |
--with-dbus-sys-dir=/etc/dbus-1/system.d \ |
| 188 |
--with-udev-dir="$(udev_get_udevdir)" \ |
| 189 |
--with-iptables=/sbin/iptables \ |
| 190 |
--enable-concheck \ |
| 191 |
--with-crypto=$(usex nss nss gnutls) \ |
| 192 |
--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \ |
| 193 |
--with-suspend-resume=$(usex systemd systemd upower) \ |
| 194 |
$(use_enable introspection) \ |
| 195 |
$(use_enable ppp) \ |
| 196 |
--disable-wimax \ |
| 197 |
$(use_with dhclient) \ |
| 198 |
$(use_with dhcpcd) \ |
| 199 |
$(use_with modemmanager modem-manager-1) \ |
| 200 |
$(use_with resolvconf) \ |
| 201 |
$(use_enable test tests) \ |
| 202 |
$(use_enable vala) \ |
| 203 |
$(use_with wext) \ |
| 204 |
"$(systemd_with_unitdir)" |
| 205 |
} |
| 206 |
|
| 207 |
src_test() { |
| 208 |
# bug #???? |
| 209 |
cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die |
| 210 |
Xemake check |
| 211 |
} |
| 212 |
|
| 213 |
src_install() { |
| 214 |
default |
| 215 |
|
| 216 |
readme.gentoo_create_doc |
| 217 |
|
| 218 |
# Gentoo init script |
| 219 |
newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager |
| 220 |
|
| 221 |
# /var/run/NetworkManager is used by some distros, but not by Gentoo |
| 222 |
rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" |
| 223 |
|
| 224 |
# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
| 225 |
keepdir /etc/NetworkManager/dispatcher.d |
| 226 |
|
| 227 |
# Provide openrc net dependency only when nm is connected |
| 228 |
exeinto /etc/NetworkManager/dispatcher.d |
| 229 |
newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
| 230 |
sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
| 231 |
-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
| 232 |
|
| 233 |
# Default conf.d file |
| 234 |
newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
| 235 |
|
| 236 |
# Add keyfile plugin support |
| 237 |
keepdir /etc/NetworkManager/system-connections |
| 238 |
chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765 |
| 239 |
|
| 240 |
if ! use systemd; then |
| 241 |
insinto /etc/NetworkManager |
| 242 |
newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf |
| 243 |
fi |
| 244 |
|
| 245 |
# Allow users in plugdev group to modify system connections |
| 246 |
insinto /usr/share/polkit-1/rules.d/ |
| 247 |
doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
| 248 |
|
| 249 |
prune_libtool_files --modules |
| 250 |
} |
| 251 |
|
| 252 |
pkg_postinst() { |
| 253 |
readme.gentoo_print_elog |
| 254 |
|
| 255 |
if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
| 256 |
ewarn "The ${PN} system configuration file has moved to a new location." |
| 257 |
ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
| 258 |
ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
| 259 |
ewarn |
| 260 |
ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
| 261 |
fi |
| 262 |
|
| 263 |
# The polkit rules file moved to /usr/share |
| 264 |
old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
| 265 |
if [[ -f "${old_rules}" ]]; then |
| 266 |
case "$(md5sum ${old_rules})" in |
| 267 |
574d0cfa7e911b1f7792077003060240* ) |
| 268 |
# Automatically delete the old rules.d file if the user did not change it |
| 269 |
elog |
| 270 |
elog "Removing old ${old_rules} ..." |
| 271 |
rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
| 272 |
;; |
| 273 |
* ) |
| 274 |
elog "The ${old_rules}" |
| 275 |
elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" |
| 276 |
elog "If you edited ${old_rules}" |
| 277 |
elog "without changing its behavior, you may want to remove it." |
| 278 |
;; |
| 279 |
esac |
| 280 |
fi |
| 281 |
|
| 282 |
if use systemd; then |
| 283 |
if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; then |
| 284 |
ewarn "Ifnet plugin won't be used with systemd support enabled" |
| 285 |
ewarn "as it is meant to be used with openRC and can cause collisions" |
| 286 |
ewarn "(like bug #485658)." |
| 287 |
ewarn "Because of this, you will likely need to reintroduce passwords" |
| 288 |
ewarn "for your used routers." |
| 289 |
fi |
| 290 |
fi |
| 291 |
} |
Archives