diff options
author | Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-05-19 16:27:35 +0200 |
---|---|---|
committer | Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-05-19 16:27:35 +0200 |
commit | ba7a09e2ab217b5e4d1aad1921265d1825da3310 (patch) | |
tree | 1e7a11a182267d39289ce11a13c2edeccf992e49 | |
parent | sys-apps/systemd-26: Depend on >=plymouth-0.8.4 (diff) | |
download | systemd-ba7a09e2ab217b5e4d1aad1921265d1825da3310.tar.gz systemd-ba7a09e2ab217b5e4d1aad1921265d1825da3310.tar.bz2 systemd-ba7a09e2ab217b5e4d1aad1921265d1825da3310.zip |
net-misc/networkmananger-0.8.4.0-r1: Version bump
Also, use main-tree systemd eclass and always install systemd unit
files.
13 files changed, 22 insertions, 758 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 6468f10..ea390f4 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,17 +1,9 @@ AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e -AUX networkmanager-0.8.2-1.patch 6642 RMD160 466f7c2bd34043d13d1b265f4a52b172c594430e SHA1 7af80cb4ea3cf1d60566c8dacd3eadc3ef4cc186 SHA256 f29cfa186c9b77452266e9c303711c2368986fb7e5455e388a5dfe064e80b3e3 -AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af -AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28 -AUX networkmanager-0.8.2-fix-dnsmasq-config.patch 1391 RMD160 4210e22419c897ecfd506b1b313908d71fbb79ba SHA1 91bbc910091c7c4625414640132cd10d0b4b2f19 SHA256 b36a4b4f0f7937c832371494b3149d9f864ec62820dcd286858a96f7c60a9333 -AUX networkmanager-0.8.2-fix-shutdown.patch 1412 RMD160 122ce2b089f976e63706b8a81784d561dc73d76b SHA1 a0e4d3389049775201971e4a3b8c2ff1bcc40f4c SHA256 cd2e9c07dc191729afe2ea40e467babd2a694ccb5dbda8bcc990d3a6b04da4e5 -AUX networkmanager-0.8.2-fix-tempfiles.patch 6758 RMD160 c403c33e71a38ca548b6ad8d8a3094094f11a686 SHA1 ee9818f898a34af688f507eabbdbda860108f418 SHA256 76951a82d62de94cd5d5862d26cd6c1b598623ae7b66c6592dff66c8fcb5a926 -AUX networkmanager-0.8.2-fix-tests.patch 2156 RMD160 b549d50e96efe7f26402f5d974560b3f9307dde5 SHA1 c38ae50f82a65c8e7e8c4a4fe65634e5ee9873c8 SHA256 d6cf4ceac6893a9893c916f1a5298cd1817ed0fb357f2e55539a3e6aae5e855e -AUX networkmanager-0.8.2-fix-timestamp.patch 950 RMD160 4217e0332457eae47eb6c2f87a91f87adad37970 SHA1 d9fcaed9f2622937137bb977fba2d1c123b35893 SHA256 7d1d123b0da02ca8f02ce13b805eec912334bf1981032a38dcd2ef7e422bbf81 -AUX networkmanager-0.8.2-ifnet-smarter-write.patch 5969 RMD160 d401c8eae69ea70f5bf08f2950a6e476a03f460b SHA1 9a1fde1c789b42ce6e3b0766125862bde962b4c8 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a -AUX networkmanager-0.8.2-openrc-and-systemd.patch 1782 RMD160 fdecb60c118d3018e85828d5a26e74d04633cc63 SHA1 6a0bfa8e8c448bb9927e659a0fc9e1f5963b8520 SHA256 1d60042d767efc01c081323513b761c514a89187d34bf86c329e0e1f5736390e -AUX networkmanager-0.8.2-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6 +AUX networkmanager-0.8.4.0-fix-tests.patch 2079 RMD160 8e867d51abbd0418e4eeb92d5e9d8315cafe78fe SHA1 31f9ab7e9f35798590e5c35965f9b96874055550 SHA256 33ca19856777794b558b88972a5ba15a13c53d77834eaf2339a64c6b072c31a7 +AUX networkmanager-0.8.4.0-ifnet-smarter-write.patch 5969 RMD160 d401c8eae69ea70f5bf08f2950a6e476a03f460b SHA1 9a1fde1c789b42ce6e3b0766125862bde962b4c8 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a +AUX networkmanager-0.8.4.0-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f -DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1 -EBUILD networkmanager-0.8.2-r10.ebuild 5308 RMD160 e37da14f410915bb2d0bc7dd4c74d4e7c3afd9da SHA1 0f79880d0a1de3a5cfb3b173fbf4088421515182 SHA256 f223aeb915c6b529754d3ed2f0de58a37f8b76b7917baad2ebd42a509229b3d4 +DIST NetworkManager-0.8.4.0.tar.bz2 1672926 RMD160 d2f20c4130b1a0015973358920802ad6796e7400 SHA1 85a75f7ed80cbdd4b35797ae5698cafad10084c8 SHA256 e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588 +EBUILD networkmanager-0.8.4.0-r1.ebuild 4281 RMD160 6238e680ca9a6921d46c58001dbe1a2ba6ee91de SHA1 e2ea1dcfb7a6ab5e6b7fa3da5193e703cbac4839 SHA256 feada613690a4925c40e3984407d94c687610b7ddfe50bc2bf6f96b2ee29f27c MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch deleted file mode 100644 index 1df4019..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch +++ /dev/null @@ -1,174 +0,0 @@ -From d60a988518cb0851488bc21732271a971877cdcd Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Thu, 18 Nov 2010 22:30:00 +0000 -Subject: dhcpcd: prevent dhcpcd from messing with routing (bgo #634983) - -Since NM is already handling that. ---- -diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c -index 378a97b..4fb703c 100644 ---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c -+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c -@@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client, - - g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */ - -+ g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */ -+ - g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ - g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH ); - --- -cgit v0.8.3-6-g21f6 -From 83e02840b5ce1cf8c122cc70918ddd57396c91db Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Wed, 24 Nov 2010 04:17:21 +0000 -Subject: core: suppress error message when user settings service is not active - -Don't bother trying to initialize the user settings proxy when it -isn't even active. Would trigger a warning to syslog if PolicyKit -permissions changed via changes to /usr/share/polkit-1/actions/. ---- -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 48f2173..afcc6ad 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -1356,6 +1356,12 @@ user_proxy_init (NMManager *self) - g_return_if_fail (self != NULL); - g_return_if_fail (priv->user_proxy == NULL); - -+ /* Don't try to initialize the user settings proxy if the user -+ * settings service doesn't actually exist. -+ */ -+ if (!nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) -+ return; -+ - bus = nm_dbus_manager_get_connection (priv->dbus_mgr); - priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus, - NM_DBUS_SERVICE_USER_SETTINGS, -@@ -3975,8 +3981,7 @@ nm_manager_start (NMManager *self) - * they will be queried when the user settings service shows up on the - * bus in nm_manager_name_owner_changed(). - */ -- if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) -- user_proxy_init (self); -+ user_proxy_init (self); - - nm_udev_manager_query_devices (priv->udev_mgr); - bluez_manager_resync_devices (self); --- -cgit v0.8.3-6-g21f6 -From 45ae52523158f4e7c0cc3fb5af56859c41512f66 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Wed, 24 Nov 2010 11:51:08 +0000 -Subject: dns: fix a crash due to uninitialized nis_domain (novell #655685) - -Reported and tested by Raymond Wooninck. Thanks! ---- -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 7a6fbbc..b0cdcc2 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -583,6 +583,7 @@ update_dns (NMDnsManager *self, - rc.nameservers = g_ptr_array_new (); - rc.domain = NULL; - rc.searches = g_ptr_array_new (); -+ rc.nis_domain = NULL; - rc.nis_servers = g_ptr_array_new (); - - if (priv->ip4_vpn_config) --- -cgit v0.8.3-6-g21f6 -From 71fcccbacd51e939f168d44301393301e9dcb5fe Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Mon, 13 Dec 2010 19:55:02 +0000 -Subject: libnm-util: fix a memory leaks in nm_setting_to_string() - ---- -diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c -index 06994c7..190199c 100644 ---- a/libnm-util/nm-setting.c -+++ b/libnm-util/nm-setting.c -@@ -620,6 +620,8 @@ nm_setting_to_string (NMSetting *setting) - is_serializable = prop_spec->flags & NM_SETTING_PARAM_SERIALIZE; - is_default = g_param_value_defaults (prop_spec, &value); - -+ g_value_unset (&value); -+ - if (is_serializable || is_default) { - g_string_append (string, " ("); - --- -cgit v0.8.3-6-g21f6 -From 7c2ba8a4a55899e4f4bd5bd243e10ce8a0c0f13a Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Thu, 16 Dec 2010 12:49:28 +0000 -Subject: libnm-util: fix nm_utils_security_valid() checks for Ad-Hoc APs (rh #632123) - -Without the fix fake Ad-Hoc APs created by nm-applet's "Create New Wireless -Network..." don't pass the check and nm-applet can crash. ---- -diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c -index ce13da3..9c3662f 100644 ---- a/libnm-util/nm-utils.c -+++ b/libnm-util/nm-utils.c -@@ -1269,14 +1269,24 @@ nm_utils_security_valid (NMUtilsSecurityType type, - if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA)) - return FALSE; - if (have_ap) { -- /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */ -- if ((ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) { -- if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP) -+ /* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and -+ * they don't have any pairwise ciphers. */ -+ if (adhoc) { -+ if ( (ap_wpa & NM_802_11_AP_SEC_GROUP_TKIP) - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) - return TRUE; -- if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP) -+ if ( (ap_wpa & NM_802_11_AP_SEC_GROUP_CCMP) - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) - return TRUE; -+ } else { -+ if (ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) { -+ if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) -+ return TRUE; -+ if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) -+ return TRUE; -+ } - } - return FALSE; - } -@@ -1285,14 +1295,22 @@ nm_utils_security_valid (NMUtilsSecurityType type, - if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) - return FALSE; - if (have_ap) { -- /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */ -- if ((ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) { -- if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) -- && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) -+ /* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and -+ * they don't have any pairwise ciphers, nor any RSA flags yet. */ -+ if (adhoc) { -+ if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP) - return TRUE; -- if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP) -- && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) -+ if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP) - return TRUE; -+ } else { -+ if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) { -+ if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) -+ return TRUE; -+ if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) -+ return TRUE; -+ } - } - return FALSE; - } --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch deleted file mode 100644 index b2911db..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- NetworkManager_Patched/system-settings/plugins/ifnet/net_utils.c 2010-11-04 04:10:52.000000000 +0800 -+++ NetworkManager-0.8.2/system-settings/plugins/ifnet/net_utils.c 2010-11-23 15:11:08.024000011 +0800 -@@ -19,7 +19,6 @@ - * Copyright (C) 1999-2010 Gentoo Foundation, Inc. - */ - --#include <config.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -194,6 +193,32 @@ - return error_quark; - } - -+static char * -+find_default_gateway_str (char *str) -+{ -+ char *tmp; -+ -+ if ((tmp = strstr (str, "default via ")) != NULL) { -+ return tmp + strlen ("default via "); -+ } else if ((tmp = strstr (str, "default gw ")) != NULL) { -+ return tmp + strlen ("default gw "); -+ } -+ return NULL; -+} -+ -+static char * -+find_gateway_str (char *str) -+{ -+ char *tmp; -+ -+ if ((tmp = strstr (str, "via ")) != NULL) { -+ return tmp + strlen ("via "); -+ } else if ((tmp = strstr (str, "gw ")) != NULL) { -+ return tmp + strlen ("gw "); -+ } -+ return NULL; -+} -+ - gboolean - reload_parsers () - { -@@ -362,11 +387,10 @@ - if (!tmp) - return FALSE; - routes = g_strdup (tmp); -- tmp = strstr (routes, "default via "); -+ tmp = find_default_gateway_str (routes); - if (!tmp) { - goto error; - } -- tmp += strlen ("default via "); - g_strstrip (tmp); - if ((end = strstr (tmp, "\"")) != NULL) - *end = '\0'; -@@ -483,8 +507,13 @@ - - if (!gateway) - return 0; -- tmp = strstr (gateway, "via "); -- tmp = g_strdup (tmp + strlen ("via ")); -+ tmp = find_gateway_str(gateway); -+ if (!tmp) { -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, -+ "Couldn't obtain gateway in \"%s\"", gateway); -+ return 0; -+ } -+ tmp = g_strdup (tmp); - strip_string (tmp, ' '); - strip_string (tmp, '"'); - if ((split = strstr (tmp, "\"")) != NULL) -@@ -509,8 +538,13 @@ - - if (!next_hop) - return 0; -- tmp = strstr (next_hop, "via "); -- tmp = g_strdup (tmp + strlen ("via ")); -+ tmp = find_gateway_str(next_hop); -+ if (!tmp) { -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, -+ "Couldn't obtain next_hop in \"%s\"", next_hop); -+ return 0; -+ } -+ tmp = g_strdup (tmp); - strip_string (tmp, ' '); - strip_string (tmp, '"'); - g_strstrip (tmp); -@@ -671,8 +705,8 @@ - length = g_strv_length (ipset); - for (i = 0; i < length; i++) { - ip = ipset[i]; -- if (strstr (ip, "default via ") || strstr (ip, "::") -- || !strstr (ip, "via")) -+ if (find_default_gateway_str (ip) || strstr (ip, "::") -+ || !find_gateway_str (ip)) - continue; - ip = strip_string (ip, '"'); - iblock = create_ip4_block (ip); -@@ -712,9 +746,7 @@ - ip = strip_string (ip, '"'); - if (ip[0] == '\0') - continue; -- printf ("ip:%s\n", ip); -- if ((tmp_addr = strstr (ip, "default via ")) != NULL) { -- tmp_addr += strlen ("default via "); -+ if ((tmp_addr = find_default_gateway_str (ip)) != NULL) { - if (!is_ip6_address (tmp_addr)) - continue; - else { -@@ -855,7 +887,7 @@ - void - get_dhcp_hostname_and_client_id (char **hostname, char **client_id) - { -- gchar *dhcp_client = ifnet_get_global_setting ("main", "dhcp"); -+ gchar *dhcp_client = NULL; - const gchar *dhcpcd_conf = "/etc/dhcpcd.conf"; - const gchar *dhclient_conf = "/etc/dhcp/dhclient.conf"; - gchar *line = NULL, *tmp = NULL, *contents = NULL; -@@ -864,6 +896,7 @@ - - *hostname = NULL; - *client_id = NULL; -+ dhcp_client = ifnet_get_global_setting ("main", "dhcp"); - if (dhcp_client) { - if (!strcmp (dhcp_client, "dhclient")) - g_file_get_contents (dhclient_conf, &contents, NULL, -@@ -871,6 +904,7 @@ - else if (!strcmp (dhcp_client, "dhcpcd")) - g_file_get_contents (dhcpcd_conf, &contents, NULL, - NULL); -+ g_free (dhcp_client); - } else { - if (g_file_test (dhclient_conf, G_FILE_TEST_IS_REGULAR)) - g_file_get_contents (dhclient_conf, &contents, NULL, diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch deleted file mode 100644 index a5acc38..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/NetworkManager.conf~ 2010-11-03 13:04:05.000000000 +0000 -+++ src/NetworkManager.conf 2010-12-17 12:12:48.391177001 +0000 -@@ -57,6 +57,9 @@ - <allow send_destination="org.freedesktop.NetworkManager" - send_interface="org.freedesktop.NetworkManager.VPN.Connection"/> - -+ <allow send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/> -+ - <deny send_destination="org.freedesktop.NetworkManager" - send_interface="org.freedesktop.NetworkManager" - send_member="SetLogging"/> -@@ -73,6 +76,12 @@ - send_interface="org.freedesktop.NetworkManager" - send_member="wake"/> - </policy> -+ <policy group="plugdev"> -+ <allow send_destination="org.freedesktop.NetworkManager"/> -+ -+ <deny send_destination="org.freedesktop.NetworkManager" -+ send_interface="org.freedesktop.NetworkManager.PPP"/> -+ </policy> - <policy context="default"> - <deny own="org.freedesktop.NetworkManager"/> - <deny own="org.freedesktop.NetworkManagerSystemSettings"/> diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch deleted file mode 100644 index 67afdd6..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b05b77fa2668df4a4d8830685b138b4c57b1e777 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Sat, 05 Mar 2011 05:52:44 +0000 -Subject: dnsmasq: send no config file instead of a bogus one (lp:725041) (debian #615082) - ---- -diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index 701c078..3ca4b21 100644 ---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c -+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c -@@ -278,17 +278,10 @@ create_dm_cmd_line (const char *iface, - /* dnsmasq may read from it's default config file location, which if that - * location is a valid config file, it will combine with the options here - * and cause undesirable side-effects. Like sending bogus IP addresses -- * as the gateway or whatever. So give dnsmasq a bogus config file -- * location to avoid screwing up the configuration we're passing to it. -+ * as the gateway or whatever. So tell dnsmasq not to use any config file -+ * at all. - */ -- memset (buf, 0, sizeof (buf)); -- strcpy (buf, "/tmp/"); -- for (i = 5; i < 15; i++) -- buf[i] = (char) (g_random_int_range ((guint32) 'a', (guint32) 'z') & 0xFF); -- strcat (buf, ".conf"); -- - nm_cmd_line_add_string (cmd, "--conf-file"); -- nm_cmd_line_add_string (cmd, buf); - - nm_cmd_line_add_string (cmd, "--no-hosts"); - nm_cmd_line_add_string (cmd, "--keep-in-foreground"); --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch deleted file mode 100644 index 265c637..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/nm-manager.c b/src/nm-manager.c -index afcc6ad..9bd5354 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4364,10 +4364,11 @@ dispose (GObject *object) - - /* Unregister property filter */ - bus = nm_dbus_manager_get_connection (priv->dbus_mgr); -- g_assert (bus); -- dbus_connection = dbus_g_connection_get_connection (bus); -- g_assert (dbus_connection); -- dbus_connection_remove_filter (dbus_connection, prop_filter, manager); -+ if (bus) { -+ dbus_connection = dbus_g_connection_get_connection (bus); -+ g_assert (dbus_connection); -+ dbus_connection_remove_filter (dbus_connection, prop_filter, manager); -+ } - g_object_unref (priv->dbus_mgr); - - if (priv->bluez_mgr) --- -cgit v0.8.3-6-g21f6 - -diff --git a/src/nm-policy.c b/src/nm-policy.c -index b5c2129..5355703 100644 ---- a/src/nm-policy.c -+++ b/src/nm-policy.c -@@ -1222,15 +1222,6 @@ nm_policy_destroy (NMPolicy *policy) - } - g_slist_free (policy->dev_signal_ids); - -- /* Rewrite /etc/hosts on exit to ensure we don't leave stale IP addresses -- * lying around. FIXME: this will take out a valid IP address of an -- * ethernet device we're leaving active (ie, a connection we can "assume" -- * when NM starts again). -- */ -- policy->default_device4 = NULL; -- policy->default_device6 = NULL; -- update_system_hostname (policy, NULL, NULL); -- - g_free (policy->orig_hostname); - g_free (policy->cur_hostname); - --- -cgit v0.8.3-6-g21f6 - diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tempfiles.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tempfiles.patch deleted file mode 100644 index 12621d2..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tempfiles.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 0376f6b1ceda64e279e64bfb37ab67f0c36478b6 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Wed, 10 Nov 2010 15:21:25 +0000 -Subject: keyfile: ignore temporary files (bgo #602868) - -Ignore temporary files created by vim editor and temporary files created -internally by g_file_set_contents() (mkstemp()) when writing connections. ---- -diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am -index c519adc..128775e 100644 ---- a/system-settings/plugins/keyfile/Makefile.am -+++ b/system-settings/plugins/keyfile/Makefile.am -@@ -16,6 +16,8 @@ libkeyfile_io_la_SOURCES = \ - writer.c \ - writer.h \ - errors.c \ -+ utils.c \ -+ utils.h \ - common.h - - libkeyfile_io_la_CPPFLAGS = \ -diff --git a/system-settings/plugins/keyfile/common.h b/system-settings/plugins/keyfile/common.h -index 7d94a70..6c8f9ce 100644 ---- a/system-settings/plugins/keyfile/common.h -+++ b/system-settings/plugins/keyfile/common.h -@@ -23,6 +23,9 @@ - - #include <glib.h> - -+#define SWP_TAG ".swp" -+#define SWPX_TAG ".swpx" -+ - #define KEYFILE_PLUGIN_NAME "keyfile" - #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc. To report bugs please use the NetworkManager mailing list." - -diff --git a/system-settings/plugins/keyfile/plugin.c b/system-settings/plugins/keyfile/plugin.c -index f57a4b6..5a927ce 100644 ---- a/system-settings/plugins/keyfile/plugin.c -+++ b/system-settings/plugins/keyfile/plugin.c -@@ -39,6 +39,7 @@ - #include "nm-keyfile-connection.h" - #include "writer.h" - #include "common.h" -+#include "utils.h" - - #define CONF_FILE SYSCONFDIR "/NetworkManager/NetworkManager.conf" - #define OLD_CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf" -@@ -89,6 +90,9 @@ read_connections (NMSystemConfigInterface *config) - NMKeyfileConnection *connection; - char *full_path; - -+ if (utils_should_ignore_file (item)) -+ continue; -+ - full_path = g_build_filename (KEYFILE_DIR, item, NULL); - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "parsing %s ... ", item); - connection = nm_keyfile_connection_new (full_path, &error); -@@ -192,6 +196,11 @@ dir_changed (GFileMonitor *monitor, - GError *error = NULL; - - name = g_file_get_path (file); -+ if (utils_should_ignore_file (name)) { -+ g_free (name); -+ return; -+ } -+ - connection = g_hash_table_lookup (priv->hash, name); - - switch (event_type) { -diff --git a/system-settings/plugins/keyfile/utils.c b/system-settings/plugins/keyfile/utils.c -new file mode 100644 -index 0000000..de64f79 ---- a/dev/null -+++ b/system-settings/plugins/keyfile/utils.c -@@ -0,0 +1,97 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* NetworkManager system settings service -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2010 Red Hat, Inc. -+ */ -+ -+#include <glib.h> -+#include <stdlib.h> -+#include <string.h> -+#include "utils.h" -+ -+ -+static const char temp_letters[] = -+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -+ -+/* -+ * Check '.[a-zA-Z0-9]{6}' file suffix used for temporary files by g_file_set_contents() (mkstemp()). -+ */ -+static gboolean -+check_mkstemp_suffix (const char *path) -+{ -+ const char *ptr; -+ -+ g_return_val_if_fail (path != NULL, FALSE); -+ -+ /* Matches *.[a-zA-Z0-9]{6} suffix of mkstemp()'s temporary files */ -+ ptr = strrchr (path, '.'); -+ if (ptr && (strspn (ptr + 1, temp_letters) == 6) && (! ptr[7])) -+ return TRUE; -+ return FALSE; -+} -+ -+static gboolean -+check_prefix (const char *base, const char *tag) -+{ -+ int len, tag_len; -+ -+ g_return_val_if_fail (base != NULL, TRUE); -+ g_return_val_if_fail (tag != NULL, TRUE); -+ -+ len = strlen (base); -+ tag_len = strlen (tag); -+ if ((len > tag_len) && !strncasecmp (base, tag, tag_len)) -+ return TRUE; -+ return FALSE; -+} -+ -+static gboolean -+check_suffix (const char *base, const char *tag) -+{ -+ int len, tag_len; -+ -+ g_return_val_if_fail (base != NULL, TRUE); -+ g_return_val_if_fail (tag != NULL, TRUE); -+ -+ len = strlen (base); -+ tag_len = strlen (tag); -+ if ((len > tag_len) && !strcasecmp (base + len - tag_len, tag)) -+ return TRUE; -+ return FALSE; -+} -+ -+gboolean -+utils_should_ignore_file (const char *filename) -+{ -+ char *base; -+ gboolean ignore = FALSE; -+ -+ g_return_val_if_fail (filename != NULL, TRUE); -+ -+ base = g_path_get_basename (filename); -+ g_return_val_if_fail (base != NULL, TRUE); -+ -+ /* Ignore files with certain patterns */ -+ if ( (check_prefix (base, ".") && check_suffix (base, SWP_TAG)) /* vim temporary files: .filename.swp */ -+ || (check_prefix (base, ".") && check_suffix (base, SWPX_TAG)) /* vim temporary files: .filename.swpx */ -+ || check_mkstemp_suffix (base)) /* temporary files created by mkstemp() */ -+ ignore = TRUE; -+ -+ g_free (base); -+ return ignore; -+} -+ -diff --git a/system-settings/plugins/keyfile/utils.h b/system-settings/plugins/keyfile/utils.h -new file mode 100644 -index 0000000..3c1a610 ---- a/dev/null -+++ b/system-settings/plugins/keyfile/utils.h -@@ -0,0 +1,30 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* NetworkManager system settings service -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2010 Red Hat, Inc. -+ */ -+ -+#ifndef _UTILS_H_ -+#define _UTILS_H_ -+ -+#include <glib.h> -+#include "common.h" -+ -+gboolean utils_should_ignore_file (const char *filename); -+ -+#endif /* _UTILS_H_ */ -+ --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch deleted file mode 100644 index 736a58c..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4b022ed32bb3d729fd21d2e33483fda03c6a6333 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Tue, 23 Nov 2010 18:06:58 +0000 -Subject: core: correct TIMESTAMP type; fixes potential crash when time() is 32bit - -The Crash appeared on some platforms in glib while processing variable -arguments. ---- -diff --git a/src/system-settings/nm-default-wired-connection.c b/src/system-settings/nm-default-wired-connection.c -index 1cda3d9..0d19dea 100644 ---- a/src/system-settings/nm-default-wired-connection.c -+++ b/src/system-settings/nm-default-wired-connection.c -@@ -163,7 +163,7 @@ constructor (GType type, - NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, - NM_SETTING_CONNECTION_UUID, uuid, - NM_SETTING_CONNECTION_READ_ONLY, priv->read_only, -- NM_SETTING_CONNECTION_TIMESTAMP, time (NULL), -+ NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), - NULL); - - g_free (id); --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-openrc-and-systemd.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-openrc-and-systemd.patch deleted file mode 100644 index 0c109cd..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-openrc-and-systemd.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -burN NetworkManager-0.8.2/src/backends/NetworkManagerGentoo.c NetworkManager-0.8.2.systemd/src/backends/NetworkManagerGentoo.c ---- NetworkManager-0.8.2/src/backends/NetworkManagerGentoo.c 2010-10-07 14:09:52.000000000 -0500 -+++ NetworkManager-0.8.2.systemd/src/backends/NetworkManagerGentoo.c 2010-12-08 18:56:32.000000000 -0600 -@@ -30,12 +30,22 @@ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -+#include <gio/gio.h> - - #include "NetworkManagerGeneric.h" - #include "nm-system.h" - #include "NetworkManagerUtils.h" - #include "nm-logging.h" - -+#define BUFFER_SIZE 512 -+ -+static void openrc_start_lo_if_necessary() -+{ -+ /* No need to run net.lo if it is already running */ -+ if (nm_spawn_process ("/etc/init.d/net.lo status") != 0) -+ nm_spawn_process ("/etc/init.d/net.lo start"); -+} -+ - /* - * nm_system_enable_loopback - * -@@ -44,9 +54,27 @@ - */ - void nm_system_enable_loopback (void) - { -- /* No need to run net.lo if it is already running */ -- if (nm_spawn_process ("/etc/init.d/net.lo status") != 0) -- nm_spawn_process("/etc/init.d/net.lo start"); -+ gchar *comm; -+ -+ /* If anything goes wrong trying to open /proc/1/comm, we will assume -+ OpenRC. */ -+ if (!g_file_get_contents ("/proc/1/comm", &comm, NULL, NULL)) { -+ nm_log_info (LOGD_CORE, "NetworkManager is running with OpenRC..."); -+ openrc_start_lo_if_necessary (); -+ return; -+ } -+ -+ if (g_strstr_len (comm, -1, "systemd")) { -+ /* We use the generic loopback enabler if using systemd. */ -+ nm_log_info (LOGD_CORE, "NetworkManager is running with systemd..."); -+ nm_generic_enable_loopback (); -+ } else { -+ /* OpenRC otherwise. */ -+ nm_log_info (LOGD_CORE, "NetworkManager is running with OpenRC..."); -+ openrc_start_lo_if_necessary(); -+ } -+ -+ g_free (comm); - } - - /* diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.8.4.0-fix-tests.patch index dc3a99b..d8af30f 100644 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch +++ b/net-misc/networkmanager/files/networkmanager-0.8.4.0-fix-tests.patch @@ -1,21 +1,20 @@ -From 803277ff3b91f721846c90c092bb6306f2073810 Mon Sep 17 00:00:00 2001 +From 21e7fda25507e68c13b97040b3b9e5dc3c9726bf Mon Sep 17 00:00:00 2001 From: Mu Qiao <qiaomuf@gentoo.org> -Date: Sun, 6 Feb 2011 22:23:58 +0000 -Subject: [PATCH] remove tests - Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> +Date: Wed, 18 May 2011 19:02:40 +0800 +Subject: [PATCH] fix-tests --- configure.ac | 1 - system-settings/plugins/ifnet/Makefile.am | 1 - - system-settings/plugins/ifnet/tests/Makefile.am | 14 -------------- - 3 files changed, 0 insertions(+), 16 deletions(-) + system-settings/plugins/ifnet/tests/Makefile.am | 13 ------------- + 3 files changed, 0 insertions(+), 15 deletions(-) delete mode 100644 system-settings/plugins/ifnet/tests/Makefile.am diff --git a/configure.ac b/configure.ac -index 9cb0e9c..6c51a2a 100644 +index d8a266e..8304aa4 100644 --- a/configure.ac +++ b/configure.ac -@@ -541,7 +541,6 @@ system-settings/plugins/Makefile +@@ -571,7 +571,6 @@ system-settings/plugins/Makefile system-settings/plugins/ifupdown/Makefile system-settings/plugins/ifupdown/tests/Makefile system-settings/plugins/ifnet/Makefile @@ -24,7 +23,7 @@ index 9cb0e9c..6c51a2a 100644 system-settings/plugins/ifcfg-rh/tests/Makefile system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am -index f63f8ca..b09cc8f 100644 +index 86d5ea2..f61e112 100644 --- a/system-settings/plugins/ifnet/Makefile.am +++ b/system-settings/plugins/ifnet/Makefile.am @@ -1,4 +1,3 @@ @@ -34,10 +33,10 @@ index f63f8ca..b09cc8f 100644 -I$(top_srcdir)/include \ diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am deleted file mode 100644 -index ead3f1f..0000000 +index 17a081f..0000000 --- a/system-settings/plugins/ifnet/tests/Makefile.am +++ /dev/null -@@ -1,14 +0,0 @@ +@@ -1,13 +0,0 @@ -INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\ - -I$(top_srcdir)/libnm-glib \ - -I$(top_srcdir)/libnm-util \ @@ -46,8 +45,7 @@ index ead3f1f..0000000 -TESTS = check_ifnet -check_PROGRAMS = check_ifnet -check_ifnet_SOURCES = test_all.c --check_ifnet_LDFLAGS = -g --check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS) -g +-check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS) -check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\ - $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\ - $(CHECK_LIBS)\ diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch b/net-misc/networkmanager/files/networkmanager-0.8.4.0-ifnet-smarter-write.patch index ff4c1f2..ff4c1f2 100644 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch +++ b/net-misc/networkmanager/files/networkmanager-0.8.4.0-ifnet-smarter-write.patch diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.4.0-shared-connection.patch index 3ce883a..3ce883a 100644 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch +++ b/net-misc/networkmanager/files/networkmanager-0.8.4.0-shared-connection.patch diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild index 486411d..9a2753b 100644 --- a/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild,v 1.1 2011/03/09 14:14:23 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild,v 1.1 2011/05/18 11:20:12 qiaomuf Exp $ EAPI="2" -inherit autotools eutils gnome.org linux-info systemd-local +inherit autotools eutils gnome.org linux-info systemd # NetworkManager likes itself with capital letters MY_PN=${PN/networkmanager/NetworkManager} @@ -43,8 +43,7 @@ RDEPEND=">=sys-apps/dbus-1.2 resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq - net-firewall/iptables ) - systemd? ( sys-apps/systemd )" + net-firewall/iptables )" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -67,10 +66,6 @@ sysfs_deprecated_check() { } pkg_setup() { - # FIXME. Required by -confchanges.patch, but the patch is invalid as - # ConsoleKit and PolicyKit is enough to get authorization. - enewgroup plugdev - if use kernel_linux; then get_version if linux_config_exists; then @@ -85,29 +80,10 @@ pkg_setup() { } src_prepare() { - # dbus policy patch - epatch "${FILESDIR}/${P}-confchanges.patch" - # accept "gw" in /etc/conf.d/net (bug #339215) - epatch "${FILESDIR}/${P}-accept-gw.patch" - # fix shared connection wrt bug #350476 - # fix parsing dhclient.conf wrt bug #352638 + # backported ifnet patches epatch "${FILESDIR}/${P}-shared-connection.patch" - # Backports #1 - epatch "${FILESDIR}/${P}-1.patch" - # won't crash upon startup for 32bit machines wrt bug #353807 - epatch "${FILESDIR}/${P}-fix-timestamp.patch" - # fix tests wrt bug #353549 epatch "${FILESDIR}/${P}-fix-tests.patch" - # fix temporary files creation bug #349003 - epatch "${FILESDIR}/${P}-fix-tempfiles.patch" - # won't write when nothing changed (bug #356339) epatch "${FILESDIR}/${P}-ifnet-smarter-write.patch" - # don't pass trash arguments to dnsmasq. Fixes bug #357671 - epatch "${FILESDIR}/${P}-fix-dnsmasq-config.patch" - # fix some crashes at shutdown - epatch "${FILESDIR}/${P}-fix-shutdown.patch" - # allow autodetection of openrc and systemd - epatch "${FILESDIR}/${P}-openrc-and-systemd.patch" eautoreconf } @@ -116,12 +92,12 @@ src_configure() { --localstatedir=/var --with-distro=gentoo --with-dbus-sys-dir=/etc/dbus-1/system.d - --with-udev-dir=/etc/udev + --with-udev-dir=/lib/udev --with-iptables=/sbin/iptables $(use_enable doc gtk-doc) $(use_with doc docs) $(use_with resolvconf) - $(use_with_systemdsystemunitdir)" + $(systemd_with_unitdir)" # default is dhcpcd (if none or both are specified), ISC dchclient otherwise if use dhclient ; then |