# ChangeLog for net-misc/networkmanager
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.214 2014/11/30 10:16:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.215 2014/12/01 10:16:21 pacho Exp $
+
+ 01 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+ -files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla,
+ -files/10-openrc-status-r3,
+ -files/networkmanager-0.9.2.0-init-provide-net-r1.patch,
+ -files/networkmanager-0.9.2.0-pre-sleep.patch,
+ -files/networkmanager-0.9.4.0-dhclient-ipv6.patch,
+ -files/networkmanager-0.9.4.0-fix-quote-handling.patch,
+ -files/networkmanager-0.9.4.0-force-libnl1.1-r1.patch,
+ -files/networkmanager-0.9.4.0-ip_ppp.h.patch,
+ -files/networkmanager-0.9.4.0-ipv6-route.patch,
+ -files/networkmanager-0.9.4.0-libnm-glib-ensure_inited.patch,
+ -files/networkmanager-0.9.4.0-libnm-glib-init-gerror.patch,
+ -files/networkmanager-0.9.4.0-nl80211-encryption-caps.patch,
+ -files/networkmanager-0.9.4.0-wifi-kernel-api.patch,
+ -files/networkmanager-0.9.6.0-daemon-signals.patch,
+ -files/networkmanager-0.9.7.995-pre-sleep.patch,
+ -files/networkmanager-0.9.8.2-allow-new-dhcpcd.patch,
+ -networkmanager-0.9.10.0-r1.ebuild, -networkmanager-0.9.10.0.ebuild,
+ -networkmanager-0.9.6.4.ebuild, metadata.xml:
+ drop old
30 Nov 2014; Michał Górny <mgorny@gentoo.org>
networkmanager-0.9.10.1_pre20141101.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 01-org.freedesktop.NetworkManager.settings.modify.system.pkla 187 SHA256 909356b25e2d887a31c0f9f2a23a466957f27b163bbd5172fa852988a1db1860 SHA512 b0f24294cf9a0c09ffa323c4d79a6758b128ae60d35eebc7db3a6de35a2117a5aeb58ede132be8170876ab069a2afc81cca3c75ee0e9f6e3a37fe5c9e45bbce4 WHIRLPOOL 54cb4687452bbba2ba78ed7fc237ef72f7b8e07fb30d239a1b7d5845c73eada0442ec1f18a9e3730169f30a621f0f45b4f715fa29d2e31084eefa8877925531d
AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 SHA256 702e1e702ec633608fd75dfd44f66437896421c9d2d7fe9966df8e4ef1d93a6c SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 WHIRLPOOL b89a4069cc973cf55001a5f0028c75a90ce4ea070c4424b5a22f3e9b8e61ee34ff7b06891eb1c6f8fa24735b3e5d98e61f0bfefca7dd12eeb615b83e72225c8b
-AUX 10-openrc-status-r3 1103 SHA256 3ee158de440df6e6a8ddcc7c0622cb94039cffe6b0cc0b88d35a53333d32f73d SHA512 b848327b0975a59420a4e7132c45a15267a7d98b0f430f52d95991e7946eca787faf5b9a5adb3f1b294f5cc761f14d693d9d4e604ff091160da9610b76cb72e8 WHIRLPOOL 7745a0469e1bec653736c14e4e6f5f9593ef9a752d4973ad538350a1f934bcdf1e2cd4c276ce3f57515e9d8c34168014e138ab9627e57cd3cef79b852ebacc40
AUX 10-openrc-status-r4 1182 SHA256 f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65 SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec WHIRLPOOL c71c923c293730894a660c8db3371fee2697666388f49947ecc2508b18a0a0d16a72643f34e8a1dadb559743ea1b56a34d3abfd95bced85dc0d753a33d661fb8
AUX conf.d.NetworkManager 230 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a WHIRLPOOL 7dbb15bf184e918369187605af91816ed11c460147066ede11f200d73103bb6f7f63ccc7abe7996d485294f44282d6bbd9520cc9e50f04ce41262c9817f7b994
AUX init.d.NetworkManager 1895 SHA256 5f368362ef5c6deed538f20dc582d6da3c86871bd42297fa78536c0312021843 SHA512 c9a874976fa422778cc37e522d08da953c738fa971e8ae58f76952db374ad4fb8a5c65d1d0ddd2f2ad9ceae05996c21d24c98df214ebf5b9d338257f95c9cd5c WHIRLPOOL 036ef59d76e5a7e28de30345774a7bc446c6acf0e9d2499127d7f395b40f28b2078d02e91c24f7b421f5c90f907c3e799a40efb724ad2d02c546bbac1a446b30
AUX networkmanager-0.9.10.0-arpingpath.patch 859 SHA256 ea8c0e293e3af198412e2ea95757330d7c978d89809b39b4a6caddc0fc1cafa6 SHA512 9d7c2512e4d124c14de3cd7e49694ad79c1cb2774d89466960f6debcf117f1409b1bf43ee2d2ee09a3be2be1dd96054073fe4e1342d02749c966d36ac5d06b62 WHIRLPOOL c27921ff23df7c1d55d7b673a48c46efe7784c651a2f74f2b157ad53622ab354ac3f7beac480207ad0ebf4c276f75abf84a511328f298b6dbc4c3ee17477f618
-AUX networkmanager-0.9.2.0-init-provide-net-r1.patch 2282 SHA256 fd46086be527bdd79978142eb8b46653ecc919f2dcab0a02dea2d0fd28232f92 SHA512 d639f1bc6442a92ad9d759d09abc963131ca13ddae13129c0ef21affb3888426a8301aad6fe4b71eddfca2a9f21213d515ba90662abff981701090581ed6bb9e WHIRLPOOL fee0fa3b2b148e210d9bb547a327d42866a70fb817b0a8e5375ece10c09bbe1a67b048ca25cadba0296eeb4e8359245369e9b0c213fd0343a6e75792755bc0d3
-AUX networkmanager-0.9.2.0-pre-sleep.patch 9163 SHA256 e391907c8699b22b6c48ff27bf4d7a116600e643d788bd579339adc180e1ed97 SHA512 ca71814dec88e294776d8b9155063eeb10128b1236e19f159fe6f4071109716d2dce4422b8efa733ddbef222b44d02f909e75861623118d744966c45f097cea7 WHIRLPOOL f676bc5951ed07c07bb713894b576710b9e56495d2d80ef5e41b0845c0bccbc74a9bc76ae07981cbd5bec0de89f25129809798734da529f72b65881db08e6719
-AUX networkmanager-0.9.4.0-dhclient-ipv6.patch 1230 SHA256 5db0d4654c9844cc329f30ef3d6370eddc00148a60e6dd0935cd91206239f52c SHA512 9fbbdf6d7af6dc6d59b4f6c4e6ebd90de85feac1e62c2f4f019ba25036fe1c5ae8437b2404ffafb7f8fe614db78d7c583df269dc5caafc15658c2842663dbdc9 WHIRLPOOL c345f75533e3a1c85263f0e5e89ce70eef2c63756c265573addc70bae59130e397d07c6df24e50ad27e2d077f596660d65246c0ca394a7bc0f685b74e72c0527
-AUX networkmanager-0.9.4.0-fix-quote-handling.patch 2878 SHA256 15c46523e22fcdb1b885b08ea545f5664f7419fe82f065898eeada066c6fcead SHA512 e7f6ad5a22fe19d5edadd98d64ca305b0206154338f609b271579510b35dd89d092ec6915e213030734e6c1f246e2f6e31022c94c4b4217a601d8ad40e2cfd26 WHIRLPOOL 4ef1519e3b55e4093534e531ddd86238582a819a35c44046eb612b07bdd2f8c431f2ccd180c932e73f669526440061765e270c635ff65ecbcdb66febf3ee00f5
-AUX networkmanager-0.9.4.0-force-libnl1.1-r1.patch 3422 SHA256 191511187731eab1d796104647b2fb93f35d9f315cb70d72f7927d1103a979d5 SHA512 b23ae707db485b52692dba3e8e3060650af78ff2a8fb0ac00b018cb5ebef25643362088236590bb893b56b56d5ed15a3f6bc30a094dfed49f7c04fffe769c2d1 WHIRLPOOL 91c9b37fa32a308a053ec14c5dc3228ba2880358adb5d8c36fbc1c576c23dd3909539ed20c20e55c719397a9a441a6f4b7b6493e54e6dff717f6fb6fa2762bf6
-AUX networkmanager-0.9.4.0-ip_ppp.h.patch 1617 SHA256 5fe243f9c2a1dff8f4d8ee79ee21c1383bcd310ddf0c3410248234c03e2f7606 SHA512 087b40402e861bbc0dc963145d62b097e96382f8a78c763fbff959912e59e91d006b38e2a9bc32fddac4fb753c60e5c12eb173b2eb87487b1cfd023785eb7ef2 WHIRLPOOL bd250a18af1104d3e41ec2ee0a0aa128f4c504f7e325a3e8bf03fb399f71a4318b22325ed162583527f229dbc0e468775ccc69cd2e5819ac6800be7c0897de3a
-AUX networkmanager-0.9.4.0-ipv6-route.patch 4395 SHA256 de25e5e6eeaf43fddfd0f41349dbe961c797aa4cc1db8869687be86b79a617b6 SHA512 dabd0dd1640e9dc5c83d87d768eaac3cfea58b3f314c5990fe1b74a8fffd7e7bb050175c81ccf0fb302949cd7407c71eda1b842d665cc7ae6aa6e7422293269a WHIRLPOOL d0fbe6ff812b0f612394582e788bad4a002d3c0ecaa80394eacdf0f6ae25170b2d972788a39cb2e638742075ed7008d5a7da6184787efa9bc219cbe2f69cf276
-AUX networkmanager-0.9.4.0-libnm-glib-ensure_inited.patch 10590 SHA256 7852a4842f2d59ee00be8f323b785913f47879ff1a705130a61dd20f41673252 SHA512 cc30e75b9df99d4fb632e72809b0a7ac9c420e3f3621745020ff3a2827df0f700b2ab66aa6417aac3b44bccbd8880a24ee8d5666243856a6b3ba171f35a0ce76 WHIRLPOOL 421c9bf9cde2fba6db8a0db159aeabba5e0442c6b93f2b16040d4481cbfe4d50130b6f047b0e61ea93edbfbe6cda89e80610db6a61115aa99ac81aa9addfbf81
-AUX networkmanager-0.9.4.0-libnm-glib-init-gerror.patch 866 SHA256 edd0f9405cdff185ec2aba179378a736723a546695448b2251a96ce38e67c16a SHA512 0b382454172ae64b8750cf1957679bd185d88fe7c34a9a036dd434b9eb89987bb7f7e9b677496e3f0844b4f4fb47de589c2a52f73a96afad4a3dfd1dfc7adf42 WHIRLPOOL 892362299a91e757a5a6ae63c63c587e8f5ad9121f74a08d597426bdfcc5d51ef6dcf9c03d7a7ff364dcac1c7c2eec43fc16e457be9fdaefdb8aa492c53166c9
-AUX networkmanager-0.9.4.0-nl80211-encryption-caps.patch 1486 SHA256 bfff23072a2610a1f5d896123fa083f767c2627ce65af4b8b2bae6e4d49ee2ee SHA512 c2a8d103221a2e7c39066c7dc3f2d328ba87777c1e91eefbc5b52eb0b6fe8a265d112f820f796e96875844c6e34eb7906f97d35526dc20074443f48f7b04ce73 WHIRLPOOL 04973744e81b4d93adf54c35f931188d5487fda529ac1f6473d461bc58a0f8d07f7985996edf9e4ac44c3ab016b33fe989d50da6610d01edb5e3e085f492da24
-AUX networkmanager-0.9.4.0-wifi-kernel-api.patch 2734 SHA256 e442f9ea526ae37f2169d7e205ed3cdc268fba6e2c2970064999150a01fa6499 SHA512 4d0353c267fc109d5acbd23e083a92ab7f9fabe63a3a6088c611c98d96200a332f25971153f48d7d75e08d07cc6529d3be6548a32ab11658623b9b85b03f7c0e WHIRLPOOL 619361264b1e75e98b8e2f217814a1c4fcbfa178db42da24bd06c182de6869f36c3dc7f6467452dd8f56a82723bf185486a4dae5dcb28961e54e0303fbc1d022
-AUX networkmanager-0.9.6.0-daemon-signals.patch 1045 SHA256 eb9e01f5622aabf611f881e3bf7989cdaa9df25dc19b0087747f04c423efe503 SHA512 2f6e7fcb76eb3944ae5df0fcc7b894ed45a8e852b0cba425fc6001de8a5532a1691ed847bb6c0b54988b9f2df5e9fa1720e4c6306e295477d7c8d246d00bf29a WHIRLPOOL 3243def958145d734954b8baaf4fefce4b9becf7e274f297010be9fb80998ae43df987061a7e0d00348df68bb84e92e1f90b5419567b88ed5a72e0db200a9598
-AUX networkmanager-0.9.7.995-pre-sleep.patch 4585 SHA256 d01d598846fccacbc5d4ddda8d31b6113c193bdbf2adbd72786d8385b9ae3d2a SHA512 d7e4b9a0dc934382e3fa3c49dcae0f9d5fb5eed39c67ca4f4a372acdfcd84beee4bbf7f9ce484f04b063cd0626d5c81ba69de1bdb3496746a0fff7a434864719 WHIRLPOOL 0d7f59fb2bbce67dce03e2286c294658e571cf57e1fc9915462a947def16ee695fc55e36abd171f491db9d23c184bdf5ea65e9e235cd5a76e7c0a656db800c52
-AUX networkmanager-0.9.8.2-allow-new-dhcpcd.patch 917 SHA256 b3a69fd9850634edc19a0db4d3ba5e8e3127c7aab518d3249e9b90420a98c667 SHA512 82aab846312f4932560b141c59fe2be75050879c1200a12391cca64fbcb62f7ccbb081eaf8a0b4af296c694c6936a48ede05303aef2b2566a23ca20770e31f85 WHIRLPOOL 105af5b1127ded7f121bcbaa41009f3d185c444f3541ce0af58c316c11f61a7c911205b399013015a0d12fb12fa876b6c7f055feb6482d99c982569bc2a8f253
AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
AUX networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch 2015 SHA256 b883506591031ebda11beed149975137950449c0c17a4c3f06745c89d782256c SHA512 3435d9ab85df69e6cd8284a34bf689331d338d13a5d64d52abc36f4ffb5c3ba31aa4336560a7e0e082c58dd916ba4364dfb75246f1bd8c22c81aa195f4ff18a7 WHIRLPOOL eb9fbd2ff5471539dcfbb0cee8213ae479c191695f798a7475484c7061d636f5cb6e6be3eebbb74e0781481477002846d37957768e5b089c2b0bbc143f9d4991
AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
-DIST NetworkManager-0.9.10.0.tar.xz 2540228 SHA256 66a88346bb04d4f402540281181340313b2ec433e75aa9d9ea13f31697f9487e SHA512 099ae0b18cd9c37a2dccce8d7c8e0a3aca54bd0d00f8da04e0f3bc07b8f1ad47f7310c33b712f78329669db47416363722c7cf5f12dc74eebb1a12e7429a9a66 WHIRLPOOL 676055a1fd528a5ee14f200b3c3f6bea52c900a9644b498b3c7c6af338add1c4f066f04ebb71c95b10881dc7f5b70864b7663b07c7548ea2ddef6ce212c5b307
DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9ebb755c23c9aca279f321eb924247c282bdd50c2c8337fe40 SHA512 0cc4ec34e5933229a9b25e25b26d7619ac1a61275cd4c33a658c98578e6a27d4d2b1337c1e839467c625739a6ae2175ab6d883c4bfbe35642dbbafb7b11a421d WHIRLPOOL 1d0fb976ffc26aba74fc8b8bee081efc236ea647da0970a5564730522f2f837bfa5cd0853268d5098126810a4429b2ff7840f9cf66e6faa3bd5829b175679681
-DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
-EBUILD networkmanager-0.9.10.0-r1.ebuild 9947 SHA256 9a25aa761b1ac77856ed6bd098e005cab93965f5b36129e1d68f569f36399256 SHA512 99dc2f7e115efbd7c6c41bd55c352625bae32d894ea285419f7a2265f12dc418ea28b012b1e28a23a174969329ae3f9b62598596ea69bbf271c09b1c6b828544 WHIRLPOOL 9681a41a72a9148d549c7078a670195da12a0e8c209780e6f8c9f143af930aad042ece586668f220c4eae8ee8257ed1b9ac368fad66c4debb5461fb37c459ecf
-EBUILD networkmanager-0.9.10.0.ebuild 8612 SHA256 432cbf6ebe66364faa5a33ff4f83c6f83b053d6a5268d32ad347d97354203fe5 SHA512 8138d203d07feaff1b30a09b6fc9c48256b41c6e2cec2e2ca4fcf70c23f6a7cbe7954c950ba3d11cb4fde4765322131f06ec3413d1f4b40f07c55f1507cda069 WHIRLPOOL 9608a2bf71f76dc3e98e6f067fc7f623b4c660bc7a6107093c0d6e3fb11638447df3e59a1ed61d974a0fb3669a304b06ee4d3ad60fe6c10f64ff85aac1dbc24e
EBUILD networkmanager-0.9.10.1_pre20141101.ebuild 10288 SHA256 a9ef69dff8f4cc8d592f47ce0a2f51eb1875f6d1fff1cf2e3ddc624a1c825220 SHA512 469d169e40d99df47d4883b992cce61bad39fe8a1ba49552e230b9ea66a8ba8311a09d3e17a2f2ebfe7d2151850a91080147cf6fd5c21908398e9bd26c3ada99 WHIRLPOOL e91244d1ed007c4dc7c4bd0aa7af663f2d4114fd9eb265b3fee4d5d5fe3088241b1621c3568aeec9730ef2f71b3e559ee1860308c8b034fde699999d12a69a32
-EBUILD networkmanager-0.9.6.4.ebuild 7539 SHA256 eb79f3dba76cd9efa4920358166aad907dd18a12c0ef7fdfc2e4ace25d6e98b9 SHA512 b0835ef38289c740f694468e2ba261e94a148041ca0256a26061283f1219d1fd476cfda89745d5b3a9c6b73013062c1848a05ba5bd80c8a207be2abe605d40b0 WHIRLPOOL 1a4fda18bea548ad9615639ed8c7e55d5bd6572072abd234bdaefbde90aa54a76f69eb1b19d5ad6ae45af82ff7da6f1f02f447f24c524391416b6ed1336ed37d
EBUILD networkmanager-0.9.8.10-r1.ebuild 8440 SHA256 580948a52d8f47ab225af2e221b04d25ac1a4cc14f9c352dad3ef066e996635c SHA512 182fa0697cbfd27b4d502e318b77b2271c9e746e13bd6ad6c88f83ecba2ccc7cd9b1b182e14eb7974460e61ee82b1280a00aba70b7e9baf36f27e515b4a70ee7 WHIRLPOOL a9bdeae4e4eb7fc08ac26f6e6318e79921f18f5679b75d5670aca3085b9aaa46363c49e06df0e319d129ae58cc9990b903603ee64ef05c34a7e9f4fb9bc0ee5a
-MISC ChangeLog 51657 SHA256 bae5fb1d7a137f1d95ef5ac659a46c1bdb16de41f14f49146bac3744a5fba870 SHA512 3e60fb2f3995ff924f64e82719d24adfce920db7a81a2a8453586053e375b340709783dd0ce9933d09b3d6762000a91ce45ffda1e1020b295a6d0c9bc0255ad2 WHIRLPOOL 9c7e1e3e248697afc0eae3e379cb984a52c758d6991b47d9cefa381156af7f659757c412636fad71705c4ad88bb6a910b54a56097f725204ba8da3120c125875
-MISC metadata.xml 1489 SHA256 c8ebe531a40ce36414b0ea2e101c3d5bc7b6810c14f433731d532ac6ebaf34bf SHA512 f25d96afe7d6f793309a5e2b1cb0a9ca89df375e4cc55ca48caabf0bb40a672fd75b4c06083d6976220f08af205aba717bde17454e750a08182b4ec4aa412326 WHIRLPOOL d4188a7ec2a52520f684ab847565b110168899c9e7e73429e781694f53cd2cbd4f39746f6d9cc355d0f9bf82960c05951c7d3b78151cd2bc9d2aab568f00f063
+MISC ChangeLog 52714 SHA256 6879eb405f03ad5beb6c9ac5ea547bb6a08de0514d21b40d295b4ff53b1bda15 SHA512 011eacc8967b26d991f30704209338cf41677991eb8063246054420bbae4b0cac7e041dba322ce622f4c0511e9be311442cf50295f27a83d26f23d4ba95be9b6 WHIRLPOOL b0026a35eac7b71d6339e6283e40fe4570cf58933b1cf5dd07b955a9895e151d63a3923a772541f4d9500e122ea795fafdd5c637d4ecb84491cb182d8b92c705
+MISC metadata.xml 1385 SHA256 d04ab1cb16ef0a6a26f7c33bd86d675d523a66a5b0bca93d8400e6856ca34f41 SHA512 2c7f04f034612dee8b6b52c9048bc5344d733f4666889472af5efaaf603127b570d564936b8c5c95bb54ba868d594fc5eb0a11b8b223cac47dc64c1ffd999a0c WHIRLPOOL 3713878a1db910af3904203485c31b5364d1ff4c9c67ab38a0b246c378811a2e33112215134731e760f3fc8155c692a25f5277239f6d2ea6d8f4aa32c4f9a61a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJUeu5wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObt4P/13g1L/A+0KRnY5WuuN6Vgyb
-Kb/rgPUrV0BrFgmMBMJolVlHgApEcIDLcaJLR+COH4W1N/9yi9DTmjp+yPNIHXNT
-VensLbEkgVv7gP0iJtCo4NHc+XBwBWOCNdlymqI7bKZwLjsH8bH+4vQ1PX7PqJTL
-rofzfiQeTvJjBkQMU4Htcd4vK9VaqsgDogDUcEDrBfhJWsy9yTjp5N9/QnL9pq8q
-olKNVPhTgoOYn06A04i59IH4FNe9vxytz2lufakCEKvH+n7gFNqQIcTDi5qoBzX+
-4hhjxHIRD8Zu8eWlBF7HddKcYusTu5YBV/XcCM4iFlG6sJeb/9AYRA/nsepgOqQt
-jRe1XLZ6zAn504dcyqUpm2ZUxlrzIhge8dv0itZYAHWIWp1JtfOt30s3RUPciBEc
-0QNPCo9JvQ9o/7MKDKaESdaV45C9LdiJrtxcAjeGDfGOhs5mD9QOXNPv15SZMGN9
-bAvMIYOvD5P3jyy0dGKb2DVVk8VSFmNEfW+E6ZxFeyfce//lM7jvP6Mh3JkaQVJR
-Nn5DSiTDgGTW+Pz5A2BE2gJzMkxnwgTgGhLMW3PNl5h27qaQFVqN9hn2kYvIrGB5
-q8/nBWxqKd4ma7CjWmkVwSnVKkpZcSe5s/GIhjrsqbI/aeC4ErGl9jjDcy7Qe6DQ
-9dcQvV+LpUhYnB3vNILh
-=vDVa
+iEYEAREIAAYFAlR8P/YACgkQCaWpQKGI+9Tm7ACeNCt7P4t3jeydUXCjHxsdwPAk
+8ocAn1vl4rBRdtNRc5v8Z8nBIgq5Ggum
+=TKkh
-----END PGP SIGNATURE-----
+++ /dev/null
-[Let users in plugdev group modify NetworkManager]
-Identity=unix-group:plugdev
-Action=org.freedesktop.NetworkManager.settings.modify.system
-ResultAny=no
-ResultInactive=no
-ResultActive=yes
\ No newline at end of file
+++ /dev/null
-#!/bin/sh
-# Copyright (c) 2012 Alexandre Rostovtsev
-# Released under the 2-clause BSD license.
-
-# Ensures that the NetworkManager OpenRC service is marked as started and
-# providing net only when it has a successful connection.
-
-# Ensure rc-service is in PATH
-PATH="${PATH}:@EPREFIX@/sbin:@EPREFIX@/usr/sbin"
-
-# Exit if the NetworkManager OpenRC service is not running
-rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0
-
-# Call rc-service in background mode so that the start/stop functions update
-# NetworkManager service status to started or inactive instead of actually
-# starting or stopping the daemon
-export IN_BACKGROUND=YES
-
-case "$2" in
- up) nm-online -t 0 -x &&
- ! rc-service NetworkManager status 2>&1 | grep -q started &&
- exec rc-service NetworkManager start ;;
- down) nm-online -t 0 -x ||
- rc-service NetworkManager status 2>&1 | grep -q stopped ||
- exec rc-service NetworkManager stop ;;
- pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped ||
- exec rc-service NetworkManager stop ;;
-esac
-exit 0
-# vim: set ts=4:
+++ /dev/null
-From 705b9978ed914aba87e5a5191a1d0acacaf70a81 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 1 Feb 2012 05:51:20 -0500
-Subject: [PATCH] gentoo: provide net and use inactive status when not
- connected
-
-The status will be reset to started via a dispatcher script on up/down
-events. See https://bugs.gentoo.org/show_bug.cgi?id=252137
----
- initscript/Gentoo/NetworkManager.in | 26 +++++++++++++++++++++++++-
- 1 files changed, 25 insertions(+), 1 deletions(-)
-
-diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in
-index 7db410b..1960795 100755
---- a/initscript/Gentoo/NetworkManager.in
-+++ b/initscript/Gentoo/NetworkManager.in
-@@ -3,18 +3,42 @@
- # Distributed under the terms of the GNU General Purpose License v2
- # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.9.2.0-init-provide-net-r1.patch,v 1.2 2012/02/21 23:19:19 tetromino Exp $
-
-+description="NetworkManager daemon. The service is marked as started only \
-+when a network connection is established."
-+
- depend() {
- need dbus
-+ provide net
- }
-
- start() {
-+ # If we are re-called by a dispatcher event, we want to mark the service
-+ # as started without starting the daemon again
-+ yesno "${IN_BACKGROUND}" && return 0
-+
-+ [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
-+
- ebegin "Starting NetworkManager"
- start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
- --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
-- eend $?
-+ local _retval=$?
-+ eend "${_retval}"
-+ if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
-+ einfo "Marking NetworkManager as inactive. It will automatically be marked"
-+ einfo "as started after a network connection has been established."
-+ mark_service_inactive
-+ fi
-+ return "${_retval}"
- }
-
- stop() {
-+ # If we are re-called by a dispatcher event, we want to mark the service
-+ # as inactive without stopping the daemon
-+ if yesno "${IN_BACKGROUND}"; then
-+ mark_service_inactive "${SVCNAME}"
-+ return 0
-+ fi
-+
- ebegin "Stopping NetworkManager"
- start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
- eend $?
---
-1.7.8.4
-
+++ /dev/null
-From 00b5c3785f7f5ce8da6db5da3fab814680ff82bc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 20 Feb 2012 02:14:26 -0500
-Subject: [PATCH] Implement "pre-sleep" action dispatch
-
-Based on work by Christian Becke <christianbecke@gmail.com> in
-https://bugzilla.gnome.org/show_bug.cgi?id=387832
-
-Adds a nm_utils_call_dispatcher_with_notify variant of the dispatcher
-call, and uses it to dispatch a "pre-sleep" action before sleeping.
----
- callouts/nm-dispatcher-utils.c | 3 +-
- src/NetworkManagerUtils.c | 70 ++++++++++++++++++++++++++++++++++------
- src/NetworkManagerUtils.h | 12 +++++++
- src/nm-manager.c | 28 ++++++++++++----
- 4 files changed, 95 insertions(+), 18 deletions(-)
-
-diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
-index 887e80d..db66b61 100644
---- a/callouts/nm-dispatcher-utils.c
-+++ b/callouts/nm-dispatcher-utils.c
-@@ -407,7 +407,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
- g_return_val_if_fail (*out_iface == NULL, NULL);
-
- /* Hostname changes don't require a device nor contain a connection */
-- if (!strcmp (action, "hostname"))
-+ if (!strcmp (action, "hostname") ||
-+ !strcmp (action, "pre-sleep"))
- return g_new0 (char *, 1);
-
- /* Canonicalize the VPN interface name; "" is used when passing it through
-diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
-index 451de6d..008b94e 100644
---- a/src/NetworkManagerUtils.c
-+++ b/src/NetworkManagerUtils.c
-@@ -44,6 +44,13 @@
- #include "nm-setting-wireless-security.h"
- #include "nm-manager-auth.h"
-
-+typedef struct
-+{
-+ NMDBusManager *dbus_mgr;
-+ NMUtilsDispatcherDoneCallback notify;
-+ gpointer user_data;
-+} NMUtilsCallDispatcherNotifyData;
-+
- /*
- * nm_ethernet_address_is_valid
- *
-@@ -475,18 +482,36 @@ fill_vpn_props (NMIP4Config *ip4_config,
- static void
- dispatcher_done_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
- {
-+ NMUtilsCallDispatcherNotifyData *notify_data = (NMUtilsCallDispatcherNotifyData *) user_data;
-+
- dbus_g_proxy_end_call (proxy, call, NULL, G_TYPE_INVALID);
- g_object_unref (proxy);
-+ if (notify_data->notify != NULL)
-+ notify_data->notify (notify_data->user_data);
-+}
-+
-+static void
-+nm_utils_call_dispatcher_notify_data_free (NMUtilsCallDispatcherNotifyData *data)
-+{
-+ if (data == NULL)
-+ return;
-+
-+ if (data->dbus_mgr != NULL)
-+ g_object_unref (data->dbus_mgr);
-+ g_free (data);
- }
-
- void
--nm_utils_call_dispatcher (const char *action,
-- NMConnection *connection,
-- NMDevice *device,
-- const char *vpn_iface,
-- NMIP4Config *vpn_ip4_config,
-- NMIP6Config *vpn_ip6_config)
-+nm_utils_call_dispatcher_with_notify (const char *action,
-+ NMConnection *connection,
-+ NMDevice *device,
-+ const char *vpn_iface,
-+ NMIP4Config *vpn_ip4_config,
-+ NMIP6Config *vpn_ip6_config,
-+ NMUtilsDispatcherDoneCallback notify,
-+ gpointer user_data)
- {
-+ NMUtilsCallDispatcherNotifyData *notify_data;
- NMDBusManager *dbus_mgr;
- DBusGProxy *proxy;
- DBusGConnection *g_connection;
-@@ -503,7 +528,8 @@ nm_utils_call_dispatcher (const char *action,
- g_return_if_fail (action != NULL);
-
- /* All actions except 'hostname' require a device */
-- if (strcmp (action, "hostname") != 0)
-+ if (strcmp (action, "hostname") != 0 &&
-+ strcmp (action, "pre-sleep") != 0)
- g_return_if_fail (NM_IS_DEVICE (device));
- /* VPN actions require at least an IPv4 config (for now) */
- if (strcmp (action, "vpn-up") == 0)
-@@ -544,7 +570,8 @@ nm_utils_call_dispatcher (const char *action,
- vpn_ip6_props = value_hash_create ();
-
- /* hostname actions only send the hostname */
-- if (strcmp (action, "hostname") != 0) {
-+ if (strcmp (action, "hostname") != 0 &&
-+ strcmp (action, "pre-sleep") != 0) {
- fill_device_props (device,
- device_props,
- device_ip4_props,
-@@ -555,6 +582,11 @@ nm_utils_call_dispatcher (const char *action,
- fill_vpn_props (vpn_ip4_config, NULL, vpn_ip4_props, vpn_ip6_props);
- }
-
-+ notify_data = g_new0 (NMUtilsCallDispatcherNotifyData, 1);
-+ notify_data->dbus_mgr = dbus_mgr;
-+ notify_data->notify = notify;
-+ notify_data->user_data = user_data;
-+
- /* Do a non-blocking call, but wait for the reply, because dbus-glib
- * sometimes needs time to complete internal housekeeping. If we use
- * dbus_g_proxy_call_no_reply(), that housekeeping (specifically the
-@@ -563,8 +595,8 @@ nm_utils_call_dispatcher (const char *action,
- */
- dbus_g_proxy_begin_call_with_timeout (proxy, "Action",
- dispatcher_done_cb,
-- dbus_mgr, /* automatically unref the dbus mgr when call is done */
-- g_object_unref,
-+ notify_data, /* automatically unref the dbus mgr when call is done */
-+ (GDestroyNotify) nm_utils_call_dispatcher_notify_data_free,
- 5000,
- G_TYPE_STRING, action,
- DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, connection_hash,
-@@ -589,6 +621,24 @@ nm_utils_call_dispatcher (const char *action,
- g_hash_table_destroy (vpn_ip6_props);
- }
-
-+void
-+nm_utils_call_dispatcher (const char *action,
-+ NMConnection *connection,
-+ NMDevice *device,
-+ const char *vpn_iface,
-+ NMIP4Config *vpn_ip4_config,
-+ NMIP6Config *vpn_ip6_config)
-+{
-+ nm_utils_call_dispatcher_with_notify (action,
-+ connection,
-+ device,
-+ vpn_iface,
-+ vpn_ip4_config,
-+ vpn_ip6_config,
-+ NULL,
-+ NULL);
-+}
-+
- gboolean
- nm_match_spec_hwaddr (const GSList *specs, const char *hwaddr)
- {
-diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
-index 1bf741e..bdc0fef 100644
---- a/src/NetworkManagerUtils.h
-+++ b/src/NetworkManagerUtils.h
-@@ -49,6 +49,18 @@ void nm_utils_call_dispatcher (const char *action,
- NMIP4Config *vpn_ip4_config,
- NMIP6Config *vpn_ip6_config);
-
-+typedef void (*NMUtilsDispatcherDoneCallback) (gpointer user_data);
-+
-+void
-+nm_utils_call_dispatcher_with_notify (const char *action,
-+ NMConnection *connection,
-+ NMDevice *device,
-+ const char *vpn_iface,
-+ NMIP4Config *vpn_ip4_config,
-+ NMIP6Config *vpn_ip6_config,
-+ NMUtilsDispatcherDoneCallback notify,
-+ gpointer user_data);
-+
- gboolean nm_match_spec_hwaddr (const GSList *specs, const char *hwaddr);
- gboolean nm_match_spec_s390_subchannels (const GSList *specs, const char *subchannels);
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 7205c7a..9e70071 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -2433,6 +2433,23 @@ impl_manager_deactivate_connection (NMManager *self,
- }
-
- static void
-+pre_sleep_dispatcher_done (gpointer user_data)
-+{
-+ NMManager *self = (NMManager *) user_data;
-+ NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-+ GSList *iter;
-+
-+ /* Just deactivate and down all devices from the device list,
-+ * to keep things fast the device list will get resynced when
-+ * the manager wakes up.
-+ */
-+ for (iter = priv->devices; iter; iter = iter->next)
-+ nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
-+
-+ nm_manager_update_state (self);
-+}
-+
-+static void
- do_sleep_wake (NMManager *self)
- {
- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-@@ -2442,13 +2459,10 @@ do_sleep_wake (NMManager *self)
- if (manager_sleeping (self)) {
- nm_log_info (LOGD_SUSPEND, "sleeping or disabling...");
-
-- /* Just deactivate and down all devices from the device list,
-- * to keep things fast the device list will get resynced when
-- * the manager wakes up.
-- */
-- for (iter = priv->devices; iter; iter = iter->next)
-- nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
--
-+ nm_utils_call_dispatcher_with_notify ("pre-sleep",
-+ NULL, NULL, NULL, NULL, NULL,
-+ pre_sleep_dispatcher_done, self);
-+ return;
- } else {
- nm_log_info (LOGD_SUSPEND, "waking up and re-enabling...");
-
---
-1.7.8.4
-
+++ /dev/null
-From cc9f8102859cccd95ba7a13c00bc3cc4fb53aa0a Mon Sep 17 00:00:00 2001
-From: Rick Harris <rickfharris@yahoo.com.au>
-Date: Sun, 15 Apr 2012 09:44:55 +0000
-Subject: [PATCH] dhcp: do not require dhclient-4 to be built with DHCPv6
-
-The "-4" flag is the default if dhclient-4 was built with DHCPv6 support
-enabled, and it's invalid if dhclient-4 was built without DHCPv6.
-Therefore, we simply should not use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679428
----
- src/dhcp-manager/nm-dhcp-dhclient.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
-index 043cd63..14be5b2 100644
---- a/src/dhcp-manager/nm-dhcp-dhclient.c
-+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -490,9 +490,10 @@ dhclient_start (NMDHCPClient *client,
- g_ptr_array_add (argv, (gpointer) "-6");
- if (mode_opt)
- g_ptr_array_add (argv, (gpointer) mode_opt);
-- } else {
-- g_ptr_array_add (argv, (gpointer) "-4");
- }
-+ /* We never want the "-4" flag: it's the default if dhclient was
-+ * built with DHCPv6 support, and invalid otherwise.
-+ */
- #endif
-
- g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
---
-1.7.8.6
-
+++ /dev/null
-From 593f87514484aa82c9f1b39c96ee859671186831 Mon Sep 17 00:00:00 2001
-From: Mu Qiao <qiaomuf@gentoo.org>
-Date: Thu, 5 Apr 2012 10:12:37 +0800
-Subject: [PATCH] ifnet: fix quote handling for global data
-
----
- src/settings/plugins/ifnet/net_parser.c | 13 +++++++------
- src/settings/plugins/ifnet/tests/net | 2 ++
- src/settings/plugins/ifnet/tests/test_all.c | 3 +++
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c
-index 38765f5..c230138 100644
---- a/src/settings/plugins/ifnet/net_parser.c
-+++ b/src/settings/plugins/ifnet/net_parser.c
-@@ -143,12 +143,13 @@ init_block_by_line (gchar * buf)
- pos = g_strrstr (key_value[0], "_");
- if (pos == NULL || is_global_setting (key_value[0])) {
- /* global data */
-- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "global:%s-%s\n", key_value[0],
-- key_value[1]);
-- g_hash_table_insert (global_settings_table,
-- g_strdup (key_value[0]),
-- g_strdup (key_value[1]));
-+ data = g_strdup (key_value[1]);
-+ tmp = strip_string (data, '"');
-+ strip_string (tmp, '\'');
-+ PLUGIN_PRINT (IFNET_PLUGIN_NAME, "global:%s-%s\n", key_value[0], tmp);
-+ g_hash_table_insert (global_settings_table, g_strdup (key_value[0]), g_strdup (tmp));
- g_strfreev (key_value);
-+ g_free (data);
- return;
- }
- *pos++ = '\0';
-@@ -593,7 +594,7 @@ ifnet_flush_to_file (const char *config_file)
- /* Writing global data */
- while (g_hash_table_iter_next (&iter, &key, &value)) {
- out_line =
-- g_strdup_printf ("%s=%s\n", (gchar *) key, (gchar *) value);
-+ g_strdup_printf ("%s=\"%s\"\n", (gchar *) key, (gchar *) value);
- g_io_channel_write_chars (channel, out_line, -1,
- &bytes_written, error);
- if (bytes_written == 0 || (error && *error))
-diff --git a/src/settings/plugins/ifnet/tests/net b/src/settings/plugins/ifnet/tests/net
-index 27d39f4..a5ac9ca 100644
---- a/src/settings/plugins/ifnet/tests/net
-+++ b/src/settings/plugins/ifnet/tests/net
-@@ -3,6 +3,8 @@
- # please review /etc/conf.d/net.example and save your configuration
- # in /etc/conf.d/net (this file :]!).
-
-+modules="!wpa_supplicant"
-+
- config_eth0=(
- "202.117.16.121 netmask 255.255.255.0 brd 202.117.16.255"
- "192.168.4.121/24"
-diff --git a/src/settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c
-index 50441d4..974258b 100644
---- a/src/settings/plugins/ifnet/tests/test_all.c
-+++ b/src/settings/plugins/ifnet/tests/test_all.c
-@@ -56,6 +56,9 @@ test_getdata ()
- && strcmp (ifnet_get_data ("ppp0", "password"),
- "password") == 0, "get data",
- "config_ppp0 password is not correctly read");
-+ ASSERT (ifnet_get_global_data ("modules")
-+ && strcmp ("!wpa_supplicant", ifnet_get_global_data ("modules")) == 0,
-+ "get data", "config_eth1 is not correct");
- }
-
- static void
---
-1.7.3.4
-
+++ /dev/null
-From d6fd1cf98a617aaf78ee98ec0a3ac5c468ac666f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 13 Nov 2011 17:51:47 -0500
-Subject: [PATCH] Allow building against libnl:1.1 only
-
-Allow building against libnl:1.1 only for wimax. Otherwise, networkmanager
-will link to libnl-3.so and to libiWmxSdk (from wimax-1.5.2) which links
-to libnl.so, and then explode spectacularly at runtime due to symbol
-collisions.
----
- configure.ac | 47 +++++++++++++++++++----------------------------
- 1 files changed, 19 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ed66b3d..c88cbe4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -379,32 +379,27 @@ AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "x$with_session_tracking" = "xsyst
-
-
- have_libnl="no"
--PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=yes], [have_libnl3=no])
--PKG_CHECK_MODULES(LIBNL_ROUTE3, libnl-route-3.0, [have_libnl_route3=yes], [have_libnl_route3=no])
--PKG_CHECK_MODULES(LIBNL_GENL3, libnl-genl-3.0, [have_libnl_genl3=yes], [have_libnl_genl3=no])
--if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes" -a "${have_libnl_genl3}" = "yes"); then
-- AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
-- LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS $LIBNL_GENL3_CFLAGS"
-- LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS $LIBNL_GENL3_LIBS"
-- libnl_version="3"
-- have_libnl="yes"
-+AC_ARG_WITH(libnl-1, AS_HELP_STRING([--with-libnl-1], [use legacy libnl-1 instead of libnl-3]), ,[with_libnl_1=no])
-+if (test "${with_libnl_1}" = "yes"); then
-+ PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
-+ if (test "${have_libnl1}" = "yes"); then
-+ AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
-+ LIBNL_CFLAGS="$LIBNL1_CFLAGS"
-+ LIBNL_LIBS="$LIBNL1_LIBS"
-+ libnl_version="1"
-+ have_libnl="yes"
-+ NM_LIBNL_CHECK
-+ fi
- else
-- PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no])
-- if (test "${have_libnl2}" = "yes"); then
-- AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 support])
-- LIBNL_CFLAGS="$LIBNL2_CFLAGS"
-- LIBNL_LIBS="$LIBNL2_LIBS"
-- libnl_version="2"
-+ PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=yes], [have_libnl3=no])
-+ PKG_CHECK_MODULES(LIBNL_ROUTE3, libnl-route-3.0, [have_libnl_route3=yes], [have_libnl_route3=no])
-+ PKG_CHECK_MODULES(LIBNL_GENL3, libnl-genl-3.0, [have_libnl_genl3=yes], [have_libnl_genl3=no])
-+ if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes" -a "${have_libnl_genl3}" = "yes"); then
-+ AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
-+ LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS $LIBNL_GENL3_CFLAGS"
-+ LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS $LIBNL_GENL3_LIBS"
-+ libnl_version="3"
- have_libnl="yes"
-- else
-- PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
-- if (test "${have_libnl1}" = "yes"); then
-- AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
-- LIBNL_CFLAGS="$LIBNL1_CFLAGS"
-- LIBNL_LIBS="$LIBNL1_LIBS"
-- libnl_version="1"
-- have_libnl="yes"
-- fi
- fi
- fi
-
-@@ -414,10 +409,6 @@ fi
- AC_SUBST(LIBNL_CFLAGS)
- AC_SUBST(LIBNL_LIBS)
-
--if (test "${libnl_version}" = "1"); then
-- NM_LIBNL_CHECK
--fi
--
- PKG_CHECK_MODULES(UUID, uuid)
- AC_SUBST(UUID_CFLAGS)
- AC_SUBST(UUID_LIBS)
---
-1.7.8.5
-
+++ /dev/null
-From 6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
-Date: Wed, 28 Mar 2012 16:42:24 +0200
-Subject: [PATCH] ppp: don't use struct ifpppstatsreq that was removed from
- linux/ip_ppp.h
-
-in recent kernels.
-
-We can use ifreq and ppp_stats structures separately. They needn't have to
-to be packed in a structure.
----
- src/ppp-manager/nm-ppp-manager.c | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
-index 59698c3..243d2e1 100644
---- a/src/ppp-manager/nm-ppp-manager.c
-+++ b/src/ppp-manager/nm-ppp-manager.c
-@@ -304,18 +304,20 @@ monitor_cb (gpointer user_data)
- {
- NMPPPManager *manager = NM_PPP_MANAGER (user_data);
- NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager);
-- struct ifpppstatsreq req;
-+ struct ifreq req;
-+ struct ppp_stats stats;
-
- memset (&req, 0, sizeof (req));
-- req.stats_ptr = (caddr_t) &req.stats;
-+ memset (&stats, 0, sizeof (stats));
-+ req.ifr_data = (caddr_t) &stats;
-
-- strncpy (req.ifr__name, priv->ip_iface, sizeof (req.ifr__name));
-+ strncpy (req.ifr_name, priv->ip_iface, sizeof (req.ifr_name));
- if (ioctl (priv->monitor_fd, SIOCGPPPSTATS, &req) < 0) {
- nm_log_warn (LOGD_PPP, "could not read ppp stats: %s", strerror (errno));
- } else {
- g_signal_emit (manager, signals[STATS], 0,
-- req.stats.p.ppp_ibytes,
-- req.stats.p.ppp_obytes);
-+ stats.p.ppp_ibytes,
-+ stats.p.ppp_obytes);
- }
-
- return TRUE;
---
-1.7.8.6
-
+++ /dev/null
-From 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 19 Apr 2012 14:27:12 -0400
-Subject: [PATCH] core: don't fight with the kernel over the default IPv6
- route
-
-The kernel wants there to be a default route over every RA-ed IPv6
-interface, and it gets confused and annoyed if we remove that default
-route and replace it with our own (causing it to effectively drop all
-further RAs on the floor, which is particularly bad if some of the
-information in the earlier RA had an expiration time).
-
-So, rather than replacing the kernel's default route(s), just add an
-additional one of our own, with a lower (ie, higher priority) metric.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=785772
----
- src/nm-system.c | 57 +++++++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 47 insertions(+), 10 deletions(-)
-
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 91153ec..4cebb13 100644
---- a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct in6_addr *gw)
- }
-
- static int
--replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
-+add_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
- struct rtnl_route *route = NULL;
- struct nl_sock *nlh;
-@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- route = nm_netlink_route_new (ifindex, AF_INET6, 0,
- NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE,
- NMNL_PROP_TABLE, RT_TABLE_MAIN,
-+ NMNL_PROP_PRIO, 1,
- NULL);
- g_return_val_if_fail (route != NULL, -ENOMEM);
-
- /* Add the new default route */
-- err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE);
-- if (err == -NLE_EXIST) {
-- /* FIXME: even though we use NLM_F_REPLACE the kernel won't replace
-- * the route if it's the same. Suppress the pointless error.
-- */
-+ err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE);
-+ if (err == -NLE_EXIST)
- err = 0;
-- }
-
- rtnl_route_put (route);
- return err;
- }
-
-+static struct rtnl_route *
-+find_static_default_routes (struct rtnl_route *route,
-+ struct nl_addr *dst,
-+ const char *iface,
-+ gpointer user_data)
-+{
-+ GList **def_routes = user_data;
-+
-+ if ( nl_addr_get_prefixlen (dst) == 0
-+ && rtnl_route_get_protocol (route) == RTPROT_STATIC) {
-+ rtnl_route_get (route);
-+ *def_routes = g_list_prepend (*def_routes, route);
-+ }
-+
-+ return NULL;
-+}
-+
- /*
- * nm_system_replace_default_ip6_route
- *
-@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- gboolean
- nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
-- struct rtnl_route *gw_route = NULL;
-+ GList *def_routes, *iter;
-+ struct rtnl_route *route, *gw_route = NULL;
- gboolean success = FALSE;
- char *iface;
- int err;
-
-- err = replace_default_ip6_route (ifindex, gw);
-+ /* We can't just use NLM_F_REPLACE here like in the IPv4 case, because
-+ * the kernel doesn't like it if we replace the default routes it
-+ * creates. (See rh#785772.) So we delete any non-kernel default routes,
-+ * and then add a new default route of our own with a lower metric than
-+ * the kernel ones.
-+ */
-+ def_routes = NULL;
-+ nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE,
-+ find_static_default_routes, &def_routes);
-+ for (iter = def_routes; iter; iter = iter->next) {
-+ route = iter->data;
-+ if (!nm_netlink_route_delete (route)) {
-+ iface = nm_netlink_index_to_iface (ifindex);
-+ nm_log_err (LOGD_DEVICE | LOGD_IP6,
-+ "(%s): failed to delete existing IPv6 default route",
-+ iface);
-+ g_free (iface);
-+ }
-+ rtnl_route_put (route);
-+ }
-+ g_list_free (def_routes);
-+
-+ err = add_default_ip6_route (ifindex, gw);
- if (err == 0)
- return TRUE;
-
-@@ -1091,7 +1128,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- goto out;
-
- /* Try adding the original route again */
-- err = replace_default_ip6_route (ifindex, gw);
-+ err = add_default_ip6_route (ifindex, gw);
- if (err != 0) {
- nm_netlink_route_delete (gw_route);
- nm_log_err (LOGD_DEVICE | LOGD_IP6,
---
-1.7.8.6
-
+++ /dev/null
-From a4f450aa0bf087453a8d605db81a83368cbe3b0a Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Wed, 28 Mar 2012 09:06:12 -0400
-Subject: [PATCH] libnm-glib: more ensure_inited() fixing
-
-We need to do _nm_object_ensure_inited() /
-_nm_remote_settings_ensure_inited() from the get_property()
-implementations; in most cases, get_property() just calls another
-accessor method (which will call _nm_object_ensure_inited()), but in a
-few places, it reads priv->whatever directly, so we need to make sure
-that it's valid.
----
- libnm-glib/nm-access-point.c | 2 ++
- libnm-glib/nm-active-connection.c | 2 ++
- libnm-glib/nm-client.c | 2 ++
- libnm-glib/nm-device-bond.c | 2 ++
- libnm-glib/nm-device-bt.c | 2 ++
- libnm-glib/nm-device-ethernet.c | 2 ++
- libnm-glib/nm-device-infiniband.c | 2 ++
- libnm-glib/nm-device-modem.c | 2 ++
- libnm-glib/nm-device-olpc-mesh.c | 2 ++
- libnm-glib/nm-device-vlan.c | 2 ++
- libnm-glib/nm-device-wifi.c | 2 ++
- libnm-glib/nm-device-wimax.c | 2 ++
- libnm-glib/nm-device.c | 2 ++
- libnm-glib/nm-dhcp4-config.c | 2 ++
- libnm-glib/nm-dhcp6-config.c | 2 ++
- libnm-glib/nm-ip4-config.c | 2 ++
- libnm-glib/nm-ip6-config.c | 2 ++
- libnm-glib/nm-remote-settings.c | 2 ++
- libnm-glib/nm-vpn-connection.c | 2 ++
- libnm-glib/nm-wimax-nsp.c | 2 ++
- 20 files changed, 40 insertions(+), 0 deletions(-)
-
-diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
-index 53993b0..a6218ed 100644
---- a/libnm-glib/nm-access-point.c
-+++ b/libnm-glib/nm-access-point.c
-@@ -464,6 +464,8 @@ get_property (GObject *object,
- {
- NMAccessPoint *ap = NM_ACCESS_POINT (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_FLAGS:
- g_value_set_uint (value, nm_access_point_get_flags (ap));
-diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c
-index 59d8a6a..81b1f01 100644
---- a/libnm-glib/nm-active-connection.c
-+++ b/libnm-glib/nm-active-connection.c
-@@ -394,6 +394,8 @@ get_property (GObject *object,
- {
- NMActiveConnection *self = NM_ACTIVE_CONNECTION (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_CONNECTION:
- g_value_set_string (value, nm_active_connection_get_connection (self));
-diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
-index b879206..3949b6d 100644
---- a/libnm-glib/nm-client.c
-+++ b/libnm-glib/nm-client.c
-@@ -1600,6 +1600,8 @@ get_property (GObject *object,
- NMClient *self = NM_CLIENT (object);
- NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_VERSION:
- g_value_set_string (value, nm_client_get_version (self));
-diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
-index 034b7b3..7d8bf57 100644
---- a/libnm-glib/nm-device-bond.c
-+++ b/libnm-glib/nm-device-bond.c
-@@ -241,6 +241,8 @@ get_property (GObject *object,
- {
- NMDeviceBond *device = NM_DEVICE_BOND (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_bond_get_hw_address (device));
-diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c
-index 8e0ff20..bd8ccd2 100644
---- a/libnm-glib/nm-device-bt.c
-+++ b/libnm-glib/nm-device-bt.c
-@@ -303,6 +303,8 @@ get_property (GObject *object,
- {
- NMDeviceBt *device = NM_DEVICE_BT (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_bt_get_hw_address (device));
-diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
-index 62aedbb..2c35a97 100644
---- a/libnm-glib/nm-device-ethernet.c
-+++ b/libnm-glib/nm-device-ethernet.c
-@@ -311,6 +311,8 @@ get_property (GObject *object,
- {
- NMDeviceEthernet *device = NM_DEVICE_ETHERNET (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_ethernet_get_hw_address (device));
-diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c
-index ec5f4a8..4f28823 100644
---- a/libnm-glib/nm-device-infiniband.c
-+++ b/libnm-glib/nm-device-infiniband.c
-@@ -250,6 +250,8 @@ get_property (GObject *object,
- {
- NMDeviceInfiniband *device = NM_DEVICE_INFINIBAND (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_infiniband_get_hw_address (device));
-diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c
-index f1d1389..09b6df1 100644
---- a/libnm-glib/nm-device-modem.c
-+++ b/libnm-glib/nm-device-modem.c
-@@ -205,6 +205,8 @@ get_property (GObject *object,
- {
- NMDeviceModem *self = NM_DEVICE_MODEM (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_MODEM_CAPS:
- g_value_set_uint (value, nm_device_modem_get_modem_capabilities (self));
-diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c
-index ed48ecb..96e1c36 100644
---- a/libnm-glib/nm-device-olpc-mesh.c
-+++ b/libnm-glib/nm-device-olpc-mesh.c
-@@ -257,6 +257,8 @@ get_property (GObject *object,
- {
- NMDeviceOlpcMesh *device = NM_DEVICE_OLPC_MESH (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_olpc_mesh_get_hw_address (device));
-diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c
-index 08b1142..7ebc8dd 100644
---- a/libnm-glib/nm-device-vlan.c
-+++ b/libnm-glib/nm-device-vlan.c
-@@ -264,6 +264,8 @@ get_property (GObject *object,
- {
- NMDeviceVlan *device = NM_DEVICE_VLAN (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_vlan_get_hw_address (device));
-diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
-index 6975898..aba43f9 100644
---- a/libnm-glib/nm-device-wifi.c
-+++ b/libnm-glib/nm-device-wifi.c
-@@ -501,6 +501,8 @@ get_property (GObject *object,
- {
- NMDeviceWifi *self = NM_DEVICE_WIFI (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_wifi_get_hw_address (self));
-diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
-index 48a518d..e49b4f3 100644
---- a/libnm-glib/nm-device-wimax.c
-+++ b/libnm-glib/nm-device-wimax.c
-@@ -444,6 +444,8 @@ get_property (GObject *object,
- {
- NMDeviceWimax *self = NM_DEVICE_WIMAX (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_HW_ADDRESS:
- g_value_set_string (value, nm_device_wimax_get_hw_address (self));
-diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
-index 96a037d..a8a6338 100644
---- a/libnm-glib/nm-device.c
-+++ b/libnm-glib/nm-device.c
-@@ -313,6 +313,8 @@ get_property (GObject *object,
- NMDevice *device = NM_DEVICE (object);
- NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_DEVICE_TYPE:
- g_value_set_uint (value, nm_device_get_device_type (device));
-diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
-index 2074e6d..89ccf25 100644
---- a/libnm-glib/nm-dhcp4-config.c
-+++ b/libnm-glib/nm-dhcp4-config.c
-@@ -132,6 +132,8 @@ get_property (GObject *object,
- {
- NMDHCP4Config *self = NM_DHCP4_CONFIG (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_OPTIONS:
- g_value_set_boxed (value, nm_dhcp4_config_get_options (self));
-diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c
-index 3764cbf..88b3b10 100644
---- a/libnm-glib/nm-dhcp6-config.c
-+++ b/libnm-glib/nm-dhcp6-config.c
-@@ -132,6 +132,8 @@ get_property (GObject *object,
- {
- NMDHCP6Config *self = NM_DHCP6_CONFIG (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_OPTIONS:
- g_value_set_boxed (value, nm_dhcp6_config_get_options (self));
-diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c
-index 5667854..862e7a0 100644
---- a/libnm-glib/nm-ip4-config.c
-+++ b/libnm-glib/nm-ip4-config.c
-@@ -187,6 +187,8 @@ get_property (GObject *object,
- NMIP4Config *self = NM_IP4_CONFIG (object);
- NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_ADDRESSES:
- nm_utils_ip4_addresses_to_gvalue (priv->addresses, value);
-diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c
-index c9a2627..988dcd3 100644
---- a/libnm-glib/nm-ip6-config.c
-+++ b/libnm-glib/nm-ip6-config.c
-@@ -268,6 +268,8 @@ get_property (GObject *object,
- NMIP6Config *self = NM_IP6_CONFIG (object);
- NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_ADDRESSES:
- nm_utils_ip6_addresses_to_gvalue (priv->addresses, value);
-diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
-index b6b6c18..70285f1 100644
---- a/libnm-glib/nm-remote-settings.c
-+++ b/libnm-glib/nm-remote-settings.c
-@@ -1066,6 +1066,8 @@ get_property (GObject *object, guint prop_id,
- {
- NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (object);
-
-+ _nm_remote_settings_ensure_inited (NM_REMOTE_SETTINGS (object));
-+
- switch (prop_id) {
- case PROP_BUS:
- g_value_set_boxed (value, priv->bus);
-diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c
-index 5393421..1fe59e5 100644
---- a/libnm-glib/nm-vpn-connection.c
-+++ b/libnm-glib/nm-vpn-connection.c
-@@ -211,6 +211,8 @@ get_property (GObject *object,
- {
- NMVPNConnection *self = NM_VPN_CONNECTION (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_VPN_STATE:
- g_value_set_uint (value, nm_vpn_connection_get_vpn_state (self));
-diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c
-index c3b222d..39553ce 100644
---- a/libnm-glib/nm-wimax-nsp.c
-+++ b/libnm-glib/nm-wimax-nsp.c
-@@ -247,6 +247,8 @@ get_property (GObject *object,
- {
- NMWimaxNsp *nsp = NM_WIMAX_NSP (object);
-
-+ _nm_object_ensure_inited (NM_OBJECT (object));
-+
- switch (prop_id) {
- case PROP_NAME:
- g_value_set_string (value, nm_wimax_nsp_get_name (nsp));
---
-1.7.8.5
-
+++ /dev/null
-From 8bb278944496102a4afad46b53e1e8279425aaac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
-Date: Mon, 2 Apr 2012 16:37:55 +0200
-Subject: [PATCH] libnm-glib: initialize GError, else invalid free() crash can
- occur (rh #809123)
-
----
- libnm-glib/nm-remote-settings.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
-index 9a81a8d..68aaeb4 100644
---- a/libnm-glib/nm-remote-settings.c
-+++ b/libnm-glib/nm-remote-settings.c
-@@ -109,7 +109,7 @@ static void
- _nm_remote_settings_ensure_inited (NMRemoteSettings *self)
- {
- NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
-- GError *error;
-+ GError *error = NULL;
-
- if (!priv->inited) {
- if (!g_initable_init (G_INITABLE (self), NULL, &error)) {
---
-1.7.8.5
-
+++ /dev/null
-From de3353d58c22ba9882784e9cf0653c7ac427eb9b Mon Sep 17 00:00:00 2001
-From: Mathieu Trudel-Lapierre <mathieu@canonical.com>
-Date: Thu, 12 Apr 2012 12:01:28 +0200
-Subject: [PATCH] wifi: check the driver reports any encryption caps with
- nl80211 (bgo #673717)
-
-Some drivers, such as ipw2200 doesn't report any encryption with newer kernels.
-See also https://bugs.launchpad.net/ubuntu/+source/linux/+bug/973241
----
- src/wifi/wifi-utils-nl80211.c | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/src/wifi/wifi-utils-nl80211.c b/src/wifi/wifi-utils-nl80211.c
-index 4a4e661..048d9d2 100644
---- a/src/wifi/wifi-utils-nl80211.c
-+++ b/src/wifi/wifi-utils-nl80211.c
-@@ -650,6 +650,9 @@ static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg)
- info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_CCMP |
- NM_WIFI_DEVICE_CAP_RSN;
- break;
-+ default:
-+ nm_log_err (LOGD_HW | LOGD_WIFI, "Don't know the meaning of NL80211_ATTR_CIPHER_SUITES %#8.8x.", ciphers[i]);
-+ break;
- }
- }
- }
-@@ -735,6 +738,13 @@ wifi_nl80211_init (const char *iface, int ifindex)
- goto error;
- }
-
-+ if (device_info.caps == 0) {
-+ nm_log_err (LOGD_HW | LOGD_WIFI,
-+ "(%s): driver doesn't report support of any encryption",
-+ nl80211->parent.iface);
-+ goto error;
-+ }
-+
- nl80211->freqs = device_info.freqs;
- nl80211->num_freqs = device_info.num_freqs;
- nl80211->parent.can_scan_ssid = device_info.can_scan_ssid;
---
-1.7.8.6
-
+++ /dev/null
-From 50435e1d5deff17233f1de73ee030a5982e9fd05 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 4 May 2012 14:26:10 -0500
-Subject: [PATCH] wifi: attempt to use same kernel API wpa_supplicant does
- (bgo #675017)
-
-Some drivers (ipw2x00) support capabilities reporting via nl80211 but
-absolutely nothing else. NM was only checking for capabilities
-when deciding whether or not to use nl80211 to communicate with the
-driver for associated AP, signal strength, and channel info, and that
-clearly fails with half-implementations of nl80211 in the kernel.
-
-Instead, match the logic that wpa_supplicant uses to determine whether
-to stick with nl80211 or fall back to WEXT. For these drivers
-NM will now fall back to WEXT and should return to the behavior we
-had with 0.9.2 for these devices.
----
- src/wifi/wifi-utils-nl80211.c | 32 +++++++++++++++++++++++++++-----
- 1 files changed, 27 insertions(+), 5 deletions(-)
-
-diff --git a/src/wifi/wifi-utils-nl80211.c b/src/wifi/wifi-utils-nl80211.c
-index 048d9d2..663cbc2 100644
---- a/src/wifi/wifi-utils-nl80211.c
-+++ b/src/wifi/wifi-utils-nl80211.c
-@@ -535,7 +535,9 @@ struct nl80211_device_info {
- guint32 *freqs;
- int num_freqs;
- guint32 caps;
-- gboolean can_scan, can_scan_ssid;
-+ gboolean can_scan;
-+ gboolean can_scan_ssid;
-+ gboolean supported;
- gboolean success;
- };
-
-@@ -579,11 +581,24 @@ static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg)
- struct nlattr *nl_cmd;
- int i;
-
-- nla_for_each_nested (nl_cmd,
-- tb[NL80211_ATTR_SUPPORTED_COMMANDS], i) {
-- guint32 cmd = nla_get_u32 (nl_cmd);
-- if (cmd == NL80211_CMD_TRIGGER_SCAN)
-+ nla_for_each_nested (nl_cmd, tb[NL80211_ATTR_SUPPORTED_COMMANDS], i) {
-+ switch (nla_get_u32 (nl_cmd)) {
-+ case NL80211_CMD_TRIGGER_SCAN:
- info->can_scan = TRUE;
-+ break;
-+ case NL80211_CMD_CONNECT:
-+ case NL80211_CMD_AUTHENTICATE:
-+ /* Only devices that support CONNECT or AUTH actually support
-+ * 802.11, unlike say ipw2x00 (up to at least kernel 3.4) which
-+ * has minimal info support, but no actual command support.
-+ * This check mirrors what wpa_supplicant does to determine
-+ * whether or not to use the nl80211 driver.
-+ */
-+ info->supported = TRUE;
-+ break;
-+ default:
-+ break;
-+ }
- }
- }
-
-@@ -724,6 +739,13 @@ wifi_nl80211_init (const char *iface, int ifindex)
- goto error;
- }
-
-+ if (!device_info.supported) {
-+ nm_log_dbg (LOGD_HW | LOGD_WIFI,
-+ "(%s): driver does not fully support nl80211, falling back to WEXT",
-+ nl80211->parent.iface);
-+ goto error;
-+ }
-+
- if (!device_info.can_scan_ssid) {
- nm_log_err (LOGD_HW | LOGD_WIFI,
- "(%s): driver does not support SSID scans",
---
-1.7.8.6
-
+++ /dev/null
-From 24e875ab6cd24deed32fc85639dc0a4b196d1eed Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 05:32:53 -0400
-Subject: [PATCH] core: wait until we daemonized before setting up signals
- (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
- src/main.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..edf4b5f 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- exit (1);
- }
-
-- /* Set up unix signal handling */
-- if (!setup_signals ())
-- exit (1);
--
- /* Set locale to be able to use environment variables */
- setlocale (LC_ALL, "");
-
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- wrote_pidfile = TRUE;
- }
-
-+ /* Set up unix signal handling */
-+ if (!setup_signals ())
-+ exit (1);
-+
- if (g_fatal_warnings) {
- GLogLevelFlags fatal_mask;
-
---
-1.7.12
-
+++ /dev/null
-From 83dd792c8678337aba0af100bb4590c6325b696e Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 27 Jan 2013 23:39:56 -0500
-Subject: [PATCH] Implement "pre-sleep" action dispatch
-
-Based on work by Christian Becke <christianbecke@gmail.com> in
-https://bugzilla.gnome.org/show_bug.cgi?id=387832
----
- callouts/nm-dispatcher-utils.c | 3 ++-
- src/nm-dispatcher.c | 8 ++++++--
- src/nm-dispatcher.h | 3 ++-
- src/nm-manager.c | 28 +++++++++++++++++++++-------
- 4 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
-index 887e80d..db66b61 100644
---- a/callouts/nm-dispatcher-utils.c
-+++ b/callouts/nm-dispatcher-utils.c
-@@ -407,7 +407,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
- g_return_val_if_fail (*out_iface == NULL, NULL);
-
- /* Hostname changes don't require a device nor contain a connection */
-- if (!strcmp (action, "hostname"))
-+ if (!strcmp (action, "hostname") ||
-+ !strcmp (action, "pre-sleep"))
- return g_new0 (char *, 1);
-
- /* Canonicalize the VPN interface name; "" is used when passing it through
-diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
-index 61dfd7c..c4a2829 100644
---- a/src/nm-dispatcher.c
-+++ b/src/nm-dispatcher.c
-@@ -237,6 +237,8 @@ action_to_string (DispatcherAction action)
- return "dhcp4-change";
- case DISPATCHER_ACTION_DHCP6_CHANGE:
- return "dhcp6-change";
-+ case DISPATCHER_ACTION_PRE_SLEEP:
-+ return "pre-sleep";
- default:
- break;
- }
-@@ -269,7 +271,8 @@ _dispatcher_call (DispatcherAction action,
- DispatchInfo *info;
-
- /* All actions except 'hostname' require a device */
-- if (action != DISPATCHER_ACTION_HOSTNAME)
-+ if (action != DISPATCHER_ACTION_HOSTNAME &&
-+ action != DISPATCHER_ACTION_PRE_SLEEP)
- g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
- /* VPN actions require at least an IPv4 config (for now) */
- if (action == DISPATCHER_ACTION_VPN_UP)
-@@ -308,7 +311,8 @@ _dispatcher_call (DispatcherAction action,
- vpn_ip6_props = value_hash_create ();
-
- /* hostname actions only send the hostname */
-- if (action != DISPATCHER_ACTION_HOSTNAME) {
-+ if (action != DISPATCHER_ACTION_HOSTNAME &&
-+ action != DISPATCHER_ACTION_PRE_SLEEP) {
- fill_device_props (device,
- device_props,
- device_ip4_props,
-diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
-index 05a6c87..8e95834 100644
---- a/src/nm-dispatcher.h
-+++ b/src/nm-dispatcher.h
-@@ -39,7 +39,8 @@ typedef enum {
- DISPATCHER_ACTION_VPN_PRE_DOWN,
- DISPATCHER_ACTION_VPN_DOWN,
- DISPATCHER_ACTION_DHCP4_CHANGE,
-- DISPATCHER_ACTION_DHCP6_CHANGE
-+ DISPATCHER_ACTION_DHCP6_CHANGE,
-+ DISPATCHER_ACTION_PRE_SLEEP = 999,
- } DispatcherAction;
-
- typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index fbc9d23..197b213 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -71,6 +71,7 @@
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
- #include "nm-sleep-monitor.h"
-+#include "nm-dispatcher.h"
-
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -3149,6 +3150,23 @@ impl_manager_deactivate_connection (NMManager *self,
- }
-
- static void
-+pre_sleep_dispatcher_done (gpointer call, gpointer user_data)
-+{
-+ NMManager *self = (NMManager *) user_data;
-+ NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-+ GSList *iter;
-+
-+ /* Just deactivate and down all devices from the device list,
-+ * to keep things fast the device list will get resynced when
-+ * the manager wakes up.
-+ */
-+ for (iter = priv->devices; iter; iter = iter->next)
-+ nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
-+
-+ nm_manager_update_state (self);
-+}
-+
-+static void
- do_sleep_wake (NMManager *self)
- {
- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-@@ -3158,13 +3176,9 @@ do_sleep_wake (NMManager *self)
- if (manager_sleeping (self)) {
- nm_log_info (LOGD_SUSPEND, "sleeping or disabling...");
-
-- /* Just deactivate and down all devices from the device list,
-- * to keep things fast the device list will get resynced when
-- * the manager wakes up.
-- */
-- for (iter = priv->devices; iter; iter = iter->next)
-- nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
--
-+ nm_dispatcher_call (DISPATCHER_ACTION_PRE_SLEEP, NULL, NULL,
-+ pre_sleep_dispatcher_done, self);
-+ return;
- } else {
- nm_log_info (LOGD_SUSPEND, "waking up and re-enabling...");
-
---
-1.8.1.1
-
+++ /dev/null
-From 89512ec5c49de8d29e25d2758f7065ded09a1bd9 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 19 Jul 2013 18:32:44 +0000
-Subject: build: allow dhcpcd versions higher than 5
-
-No reason to exclude them, just that configure.ac hasn't tracked new
-versions of dhcpcd.
----
-diff --git a/configure.ac b/configure.ac
-index d28e4bf..6b70bbd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -506,8 +506,8 @@ fi
- if test "$with_dhcpcd" = "yes"; then
- AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
- if test "$with_dhcpcd" != "no"; then
-- if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[45]]\."; then
-- AC_MSG_WARN([Cannot use dhcpcd, version 4.x or 5.x is required])
-+ if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then
-+ AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required])
- with_dhcpcd=no
- fi
- fi
---
-cgit v0.9.0.2-2-gbebe
<flag name="wext">Enable support for the deprecated Wext (Wireless
Extensions) API; needed for some older drivers (e.g. ipw2200,
ndiswrapper)</flag>
- <flag name="wimax">Enable support for WiMAX connections using
- <pkg>net-wireless/wimax</pkg></flag>
</use>
</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild,v 1.5 2014/10/31 21:05:46 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 eutils gnome2 linux-info multilib systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-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="avahi connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi" # wimax
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( 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?
-#
-# iputils version needed due path changes (#523632). Upstream fixed
-# it with a major refactor committed to 'master' for handling different
-# paths for arping and other tools and, then, the version requirement
-# will be able to be dropped on next major NM version
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.32:2
- >=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-20121221-r1
- sys-libs/readline
- >=virtual/libgudev-165:=
- avahi? ( net-dns/avahi:=[autoipd] )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:= )
- 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] )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-183:0= )
- teamd? ( >=net-misc/libteam-1.9 )
- || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- 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? (
- dev-lang/python:2.7
- dev-python/dbus-python[python_targets_python2_7]
- dev-python/pygobject:2[python_targets_python2_7] )
-"
-
-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."
-
- # Find arping at proper place, bug #523632
- epatch "${FILESDIR}/${PN}-0.9.10.0-arpingpath.patch"
-
- # Use python2.7 shebangs for test scripts, upstream bug #739448
- sed -e 's@\(^#!.*python\)@\12.7@' \
- -i */tests/*.py || die
-
- # Force use of /run, avoid eautoreconf, upstream bug #737139
- 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
-
- gnome2_src_prepare
-}
-
-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="${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="${myconf} "$(systemd_with_unitdir)""
-
- # 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
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-ifnet \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-iptables=/sbin/iptables \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with ncurses nmtui) \
- $(use_with resolvconf) \
- $(use_with selinux) \
- $(use_enable teamd teamdctl) \
- $(use_enable test tests) \
- $(use_enable vala) \
- --without-valgrind \
- $(use_with wext) \
- ${myconf}
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
-
- 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"
-
- # 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
- 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."
- 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."
- fi
- fi
-
- # NM doesn't fallback to the second listed plugin, upstream bug #738611
- 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 when running under Systemd, you will need to stop setting"
- ewarn "ifnet plugin there to allow NetworkManager to work."
- ewarn
- fi
- fi
-}
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.0.ebuild,v 1.2 2014/09/23 11:53:15 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 eutils gnome2 linux-info multilib systemd user readme.gentoo toolchain-funcs vala virtualx udev
-
-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="avahi connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi" # wimax
-
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( 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
- >=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.32:2
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.26:2.4=
- sys-libs/readline
- >=virtual/libgudev-165:=
- avahi? ( net-dns/avahi:=[autoipd] )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:= )
- 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] )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-183:0= )
- teamd? ( >=net-misc/libteam-1.9 )
- || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- 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? (
- dev-lang/python:2.7
- dev-python/dbus-python[python_targets_python2_7]
- dev-python/pygobject:2[python_targets_python2_7] )
-"
-
-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."
-
- # Use python2.7 shebangs for test scripts
- sed -e 's@\(^#!.*python\)@\12.7@' \
- -i */tests/*.py || die
-
- # Force use of /run, avoid eautoreconf, upstream bug #737139
- 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
-
- gnome2_src_prepare
-}
-
-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="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
- fi
-
- # TODO: enable wimax when we have a libnl:3 compatible revision of it
- # wimax will be removed, bug #522822
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- $(usex systemd '--disable-ifnet' '--enable-ifnet') \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-iptables=/sbin/iptables \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with ncurses nmtui) \
- $(use_with resolvconf) \
- $(use_with selinux) \
- $(use_enable teamd teamdctl) \
- $(use_enable test tests) \
- $(use_enable vala) \
- --without-valgrind \
- $(use_with wext) \
- "$(systemd_with_unitdir)" \
- ${myconf}
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
-
- readme.gentoo_create_doc
-
- # Gentoo init script
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || 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
-
- # Default conf.d file
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Add keyfile plugin support
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
- if ! use systemd; then
- insinto /etc/NetworkManager
- newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
- fi
-
- # 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
- 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
-
- if use systemd; then
- if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; 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."
- fi
-
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep -q plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used when running under Systemd, you will need to stop setting"
- ewarn "ifnet plugin there to allow NetworkManager to work."
- fi
- fi
- fi
-}
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild,v 1.20 2014/07/24 17:07:05 ssuominen Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs vala udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0" # TODO: add subslot on 0.9.8 bump
-IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf vala +wext wimax" # systemd
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
-"
-# ?? ( consolekit systemd )
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# libnl:1.1 is needed for linking to net-wireless/wimax libraries
-# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
-# TODO: Qt support?
-COMMON_DEPEND=">=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.94
- virtual/libgudev:=
- >=dev-libs/glib-2.26
- >=sys-auth/polkit-0.97
- >=net-libs/libsoup-2.26:2.4=
- >=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
- bluetooth? ( >=net-wireless/bluez-4.82 )
- avahi? ( net-dns/avahi:=[autoipd] )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- nss? ( >=dev-libs/nss-3.11:= )
- dhclient? ( net-misc/dhcp[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] )
- resolvconf? ( net-dns/openresolv )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- wimax? (
- dev-libs/libnl:1.1=
- >=net-wireless/wimax-1.5.1 )
- !wimax? ( dev-libs/libnl:3= )
-"
-RDEPEND="${COMMON_DEPEND}
- virtual/udev
- modemmanager? ( >=net-misc/modemmanager-0.4 )
- consolekit? ( sys-auth/consolekit )
-"
-# systemd? ( >=sys-apps/systemd-31 )
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- doc? ( >=dev-util/gtk-doc-1.8 )
- vala? ( $(vala_depend) )
- !wimax? ( !=dev-libs/libnl-3.2.20 )
-"
-
-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() {
- # Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
- epatch "${FILESDIR}/${PN}-0.9.4.0-force-libnl1.1-r1.patch"
- # Update init.d script to provide net and use inactive status if not connected
- epatch "${FILESDIR}/${PN}-0.9.2.0-init-provide-net-r1.patch"
- # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
- epatch "${FILESDIR}/${PN}-0.9.2.0-pre-sleep.patch"
- # Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
- epatch "${FILESDIR}/${PN}-0.9.4.0-dhclient-ipv6.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=683932
- epatch "${FILESDIR}/${PN}-0.9.6.0-daemon-signals.patch"
-
- epatch_user
-
- use vala && vala_src_prepare
- eautoreconf
- default
-}
-
-src_configure() {
- econf \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --with-distro=gentoo \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-iptables=/sbin/iptables \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex consolekit ck none) \
- $(use_enable doc gtk-doc) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- $(use_enable wimax) \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with doc docs) \
- $(use_with resolvconf) \
- $(use_enable vala) \
- $(use_with wext) \
- $(use_with wimax libnl-1) \
- "$(systemd_with_unitdir)"
-}
-
-src_test() {
- cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
- default
-}
-
-src_install() {
- default
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
-# if use systemd; then
- # Our init.d script requires running a dispatcher script that annoys
- # systemd users; bug #434692
-# rm -rv "${ED}/etc/init.d" || die "rm failed"
-# else
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- # Default conf.d file
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-# fi
-
- # Add keyfile plugin support
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
- insinto /etc/NetworkManager
- newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
-
- # 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"
- if has_version '<sys-auth/polkit-0.106'; then
- insinto /etc/polkit-1/localauthority/10-vendor.d
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
- fi
-
- # Remove useless .la files
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- elog "To modify system network connections without needing to enter the"
- elog "root password, add your user account to the 'plugdev' group."
-
- 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
-}
projects / gentoo.git / commitdiff