diff options
Diffstat (limited to 'net-misc/networkmanager')
12 files changed, 0 insertions, 1154 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 7d1a02e73495..e6604f9279b2 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,9 +1,4 @@ AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e -AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f -AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af -AUX networkmanager-0.7.0-gentoo-dhclient.patch 956 RMD160 7d7cb94256350c92e95d9adcf57cc891a84cc086 SHA1 95663877b428803bdbb540cda6effe5a29dda9c5 SHA256 da9c943969ad22a9ad465efc914644c7a6c600c0c88b8b2a8b8807ff05e5f7ae -AUX networkmanager-0.7.1-bad-link.patch 655 RMD160 24a431665b604d111a9b10efa33ff066a4363aad SHA1 9de1073f681623cb156444fed53c19d03e06076d SHA256 92bf60b9a10d804d0c295e73f8525bce67e9d6e36dc7ccf5468243c21183c113 -AUX networkmanager-0.7.1-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437 AUX networkmanager-0.8-confchanges.patch 1063 RMD160 25a0d45410fa5590098386556e9947dd15507eda SHA1 ba6eaa63188f97f93bbbb327676d8104bbf7e8c8 SHA256 9fcbe0b9ab4cc38c9057a0dde2f5153efc12515ed4d28920a455dad7fc2b1e09 AUX networkmanager-0.8-nscd-clear-cache.patch 1214 RMD160 2381f455593202a740e634601c0ba8245ecb8fac SHA1 b4a0cec446b6f8fa81c06d5992db61b296f17057 SHA256 2d981bafa96607acb06740d78b8e33afdc675c52b0cf3ce5b098c67566362c99 AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65d30a94d91ab9a04 SHA1 f7d57c686e9bd1f1ac58e67efcd8255c0fc9a5c5 SHA256 5ee07a0fb949c7ce299f0d2459c4f9840ace765308cd1a208d89eecec51a63fe @@ -13,22 +8,12 @@ AUX networkmanager-0.8.1-dhclient3-fix.patch 295 RMD160 986359b62d5cb7d4ca34b015 AUX networkmanager-0.8.1-dhclient3.patch 4658 RMD160 d229c87a41f882a6162520ee3f2afdc5650c283a SHA1 06ca671ba76cd1591556cdcc96a88060ca89e727 SHA256 45b1c302cea8605cc489a77250404e4457d0747ca3cab9ed993eb51551da3290 AUX networkmanager-0.8.1-dhcp-configure.patch 2447 RMD160 1c222ce867a7f92167b2ffcbc401f8ea83b24193 SHA1 f17b676ad65788b5b665c16b29d01a88e3cdd041 SHA256 7bda5db2d937b2562c98435620774bba487bf8b53da5c035422b2bc2ed21a400 AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a6148244dedd341b35185c07ca267f06 SHA1 926acbd76076750ab4ec48ac34fe73679693a4ca SHA256 a00523ad7d6bdced76be82b980788af4c313fc59aff8b9d258343e17ad6bf969 -AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e -AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43 -AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402 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.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2 -DIST NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2 36726 RMD160 201e68e6760d6154744e0570e63fc4c7b62bdfb7 SHA1 c2df56df89f652a84287951dcb5c89497fc62b46 SHA256 e4684f0c49c3f1c55f8028a1a2fbe18d726a9aa1592f25e1bd61b9443bfe3060 -DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a -DIST NetworkManager-0.7.2.tar.bz2 1315036 RMD160 b4cfe2cdb8df5a7ae7f6e7d580337e9cc9094e2b SHA1 0de68cb77698b4788f415b0361b48258f4734119 SHA256 8d6f47432ae372aaffdc78f056cec9e9fc6bb1547a454e0c1ad7d130a9198470 DIST NetworkManager-0.8.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1 DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05 DIST networkmanager-ifnet-540e40f.patch 268068 RMD160 954ffb9915fdd8ae650963b66aba7e185ddfe0c6 SHA1 0bd0cfcb02a0511d17179d2994e40a663b49dd6f SHA256 8a870fb5ed708eea5523b954e23be05471c5b6783cd2d0a19071a1d253fcab51 -EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5 -EBUILD networkmanager-0.7.1-r6.ebuild 4033 RMD160 a0629b415c2cbcc2de8569dac2c67552a61d03d4 SHA1 5f1c4fa2d71818685a7dc0c1fdc3bfdab392df8d SHA256 7602f8b235552c2be536cb41bc60a3095cc86fe4754dd0ac141f294770607f98 -EBUILD networkmanager-0.7.2.ebuild 3707 RMD160 18fe37ad670fe2a39422502963ec2cf0c710b73d SHA1 68701111f54980fb1a66596b35700e9b73060391 SHA256 fcc749b95097b7e69ff913c4db82378f367097912c90bf5e4ba75774d82ed5ab EBUILD networkmanager-0.8-r1.ebuild 3516 RMD160 8722fcf8330e8f11a1e3dd83f2e2b53c8f34be5b SHA1 ebb761da259e1e76abe6645f35ff654fc5385984 SHA256 6142178a7ee9177a978c451eb9e02ccdf11de09b2f5b13ca0be79382d07883aa EBUILD networkmanager-0.8.1-r6.ebuild 4632 RMD160 15481e54c0f3e9502c8357fd6a6b772a53c7ceab SHA1 b656512bcd456c4b621cff0876e846954a6545df SHA256 ec4be6303fd338df4efc0e4c51bce67985b295a14a9b6eea0e0a46460fffe557 EBUILD networkmanager-0.8.2.ebuild 4018 RMD160 78d0726dafa4d3e768f17ad1938909bf0e76aa1f SHA1 d2bffb3bfbae6bcf07a04a54157c68463f7c84fc SHA256 47bef482328648fbd39d933b9e5aa4f277a3bcd0c1b7f7594fe61f77ced0ac4d diff --git a/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch deleted file mode 100644 index 8969cdae18cb..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/NetworkManager.conf.orig 2006-10-28 04:43:50.426682976 +0100 -+++ src/NetworkManager.conf 2006-10-28 04:44:36.883620448 +0100 -@@ -8,14 +8,14 @@ - <allow send_destination="org.freedesktop.NetworkManager"/> - <allow send_interface="org.freedesktop.NetworkManager"/> - </policy> -- <policy at_console="true"> -+ <policy group="plugdev"> - <allow send_destination="org.freedesktop.NetworkManager"/> - <allow send_interface="org.freedesktop.NetworkManager"/> - </policy> - <policy context="default"> -- <deny own="org.freedesktop.NetworkManager"/> -- <deny send_destination="org.freedesktop.NetworkManager"/> -- <deny send_interface="org.freedesktop.NetworkManager"/> -+ <allow own="org.freedesktop.NetworkManager"/> -+ <allow send_destination="org.freedesktop.NetworkManager"/> -+ <allow send_interface="org.freedesktop.NetworkManager"/> - </policy> - </busconfig> - diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch deleted file mode 100644 index 1372c1203ed7..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/NetworkManager.conf -=================================================================== ---- src/NetworkManager.conf.orig -+++ src/NetworkManager.conf -@@ -11,7 +11,7 @@ - <allow send_destination="org.freedesktop.NetworkManager.PPP"/> - <allow send_interface="org.freedesktop.NetworkManager.PPP"/> - </policy> -- <policy at_console="true"> -+ <policy group="plugdev"> - <allow send_destination="org.freedesktop.NetworkManager"/> - <allow send_interface="org.freedesktop.NetworkManager"/> - </policy> diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch deleted file mode 100644 index fa21c7680817..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 33547b8d8b64a10187b9c452eef7325d909889a1 Mon Sep 17 00:00:00 2001 -From: Daniel Gryniewicz <dang@gentoo.org> -Date: Thu, 23 Apr 2009 10:42:43 -0400 -Subject: [PATCH] dhcp: use correct dhclient config file location for Gentoo (bgo #579737) - ---- - src/dhcp-manager/nm-dhcp-dhclient.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index 946be0c..34b36f1 100644 ---- a/src/dhcp-manager/nm-dhcp-dhclient.c -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c -@@ -167,6 +167,8 @@ create_dhclient_config (NMDHCPDevice *device, NMSettingIP4Config *s_ip4) - orig = g_strdup (SYSCONFDIR "/dhclient.conf"); - #elif defined(TARGET_DEBIAN) - orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); -+#elif defined(TARGET_GENTOO) -+ orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); - #else - orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", device->iface); - #endif --- -1.6.2 - diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch deleted file mode 100644 index ea074bae821a..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am NetworkManager-0.7.1/src/ppp-manager/Makefile.am ---- NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am 2009-03-03 11:55:47.000000000 -0500 -+++ NetworkManager-0.7.1/src/ppp-manager/Makefile.am 2009-04-24 11:32:58.000000000 -0400 -@@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \ - nm_pppd_plugin_la_LDFLAGS = -module -avoid-version - - nm_pppd_plugin_la_LIBADD = \ -+ $(top_builddir)/libnm-util/libnm-util.la \ - $(DBUS_LIBS) \ -- $(GLIB_LIBS) \ -- $(top_builddir)/libnm-util/libnm-util.la -+ $(GLIB_LIBS) - - BUILT_SOURCES = nm-ppp-manager-glue.h - diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch deleted file mode 100644 index ca5332815e1c..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/NetworkManager.conf NetworkManager-0.7.1/src/NetworkManager.conf ---- NetworkManager-0.7.1.orig/src/NetworkManager.conf 2009-03-03 11:55:47.000000000 -0500 -+++ NetworkManager-0.7.1/src/NetworkManager.conf 2009-05-01 20:04:33.000000000 -0400 -@@ -15,6 +15,12 @@ - <deny send_destination="org.freedesktop.NetworkManager" - send_interface="org.freedesktop.NetworkManager.PPP"/> - </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 send_destination="org.freedesktop.NetworkManager"/> diff --git a/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch b/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch deleted file mode 100644 index a76c419807cc..000000000000 --- a/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/named-manager/nm-named-manager.c.orig 2006-03-25 00:38:24.000000000 -0500 -+++ src/named-manager/nm-named-manager.c 2006-03-25 00:44:15.000000000 -0500 -@@ -31,6 +31,7 @@ - #include <resolv.h> - #include <sys/socket.h> - #include <sys/types.h> -+#include <sys/stat.h> - #include <arpa/inet.h> - #include <syslog.h> - #include <glib.h> -@@ -396,6 +397,8 @@ - if (rename (tmp_resolv_conf, RESOLV_CONF) < 0) - goto lose; - nm_system_update_dns (); -+ -+ chmod(RESOLV_CONF, S_IREAD | S_IWRITE | S_IRGRP | S_IROTH); - return TRUE; - - lose: diff --git a/net-misc/networkmanager/files/networkmanager-updatedbackend.patch b/net-misc/networkmanager/files/networkmanager-updatedbackend.patch deleted file mode 100644 index 767284a28233..000000000000 --- a/net-misc/networkmanager/files/networkmanager-updatedbackend.patch +++ /dev/null @@ -1,657 +0,0 @@ -Index: NetworkManager/trunk/src/backends/NetworkManagerGentoo.c -=================================================================== ---- NetworkManagerGentoo.c (revision 15) -+++ NetworkManagerGentoo.c (revision 38) -@@ -1,2 +1,3 @@ -+ - /* NetworkManager -- Network link manager - * -@@ -250,8 +251,20 @@ - */ - void nm_system_restart_mdns_responder (void) --{ -- nm_spawn_process("/etc/init.d/mDNSResponder stop"); -- nm_spawn_process("/etc/init.d/mDNSResponder zap"); -- nm_spawn_process("/etc/init.d/mDNSResponder start"); -+{ -+ /* Check if the daemon was already running - do not start a new instance */ -+ /* Howl */ -+ if (g_file_test("/var/run/mDNSResponder.pid", G_FILE_TEST_EXISTS)) -+ { -+ nm_info("Restarting mDNSResponder"); -+ nm_spawn_process("/etc/init.d/mDNSResponder stop"); -+ nm_spawn_process("/etc/init.d/mDNSResponder zap"); -+ nm_spawn_process("/etc/init.d/mDNSResponder start"); -+ } -+ /* Apple's mDNSResponder */ -+ if (g_file_test("/var/run/mDNSResponderPosix.pid", G_FILE_TEST_EXISTS)) -+ { -+ nm_info("Restarting mDNSResponderPosix"); -+ nm_spawn_process("/etc/init.d/mDNSResponderPosix restart"); -+ } - } - -@@ -266,5 +279,4 @@ - { - char *buf; -- char *addr; - struct ether_addr hw_addr; - unsigned char eui[8]; -@@ -288,4 +300,258 @@ - g_free(buf); - } -+/* Get the array associated with the key, and leave the current pointer -+ * pointing at the line containing the key. The char** returned MUST -+ * be freed by the caller. -+ */ -+gchar ** -+svGetArray(shvarFile *s, const char *key) -+{ -+ gchar **values = NULL, **lines, *line, *value; -+ GList *restore; -+ int len, strvlen, i, j; -+ -+ g_assert(s); -+ g_assert(key); -+ -+ /* Attempt to do things the easy way first */ -+ line = svGetValue(s, key); -+ if (!line) -+ return NULL; -+ -+ restore = s->current; -+ -+ g_strstrip(strtok(line, "#")); /* Remove comments and whitespace */ -+ -+ if (line[0] != '(') -+ { -+ /* This isn't an array, so pretend it's a one item array. */ -+ values = g_renew(char*, values, 2); -+ values[0] = line; -+ values[1] = NULL; -+ return values; -+ } -+ -+ while(!strrchr(line, ')')) -+ { -+ s->current = s->current->next; -+ value = g_strjoin(" ", line, g_strstrip(strtok(s->current->data, "#")), NULL); -+ g_free(line); -+ line = value; -+ value = NULL; -+ } -+ -+ lines = g_strsplit(line, "\"", 0); -+ -+ strvlen = g_strv_length(lines); -+ if (strvlen == 0) -+ { -+ /* didn't split, something's wrong */ -+ g_free(line); -+ return NULL; -+ } -+ -+ j = 0; -+ for (i = 0; i <= strvlen - 1; i++) -+ { -+ value = lines[i]; -+ len = strlen(g_strstrip(value)); -+ if ((value[0] == '(') || (value[0] == ')') || (len == 0)) -+ continue; -+ -+ values = g_renew(char*, values, j + 2); -+ values[j+1] = NULL; -+ values[j++] = g_strdup(value); -+ } -+ -+ g_free(line); -+ g_strfreev(lines); -+ s->current = restore; -+ -+ return values; -+} -+ -+/* -+* GentooReadConfig -+* -+* Most of this comes from the arch backend, no need to re-invent. -+* Read platform dependant config file and fill hash with relevant info -+*/ -+static GHashTable * GentooReadConfig(const char* dev) -+{ -+ GHashTable *ifs; -+ shvarFile *file; -+ int len, hits, i = 0; -+ guint32 maskval; -+ gchar buf[16], *value, *cidrprefix, *gateway; -+ gchar *config_str, *iface_str, *route_str, *mtu_str, *dnsserver_str, *dnssearch_str; /* Lookup keys */ -+ gchar **conf, **config = NULL, **routes = NULL; -+ struct in_addr mask; -+ -+ file = svNewFile(SYSCONFDIR"/conf.d/net"); -+ if (!file) -+ return NULL; -+ -+ ifs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); -+ if (ifs == NULL) -+ { -+ nm_debug("Unable to create g_hash_table."); -+ svCloseFile(file); -+ return NULL; -+ } -+ -+ /* Keys we will use for lookups later */ -+ config_str = g_strdup_printf("config_%s", dev); -+ iface_str = g_strdup_printf("iface_%s", dev); -+ route_str = g_strdup_printf("routes_%s", dev); -+ mtu_str = g_strdup_printf("mtu_%s", dev); -+ dnsserver_str = g_strdup_printf("dns_servers_%s", dev); -+ dnssearch_str = g_strdup_printf("dns_search_%s", dev); -+ -+ -+ if ((config = svGetArray(file, iface_str))) -+ { -+ /* This isn't tested, (or supported, really) so hopefully it works */ -+ nm_info("You are using a deprecated configuration syntax for %s.", dev); -+ nm_info("You are advised to read /etc/conf.d/net.example and upgrade it accordingly."); -+ value = svGetValue(file, "gateway"); -+ if ((value) && (gateway = strstr(value, dev)) && strtok(gateway, "/")) -+ { -+ /* Is it possible to specify multiple gateways using this variable? */ -+ gateway = strtok(NULL, "/"); -+ routes = g_renew(char*, routes, 2); -+ routes[0] = g_strdup_printf("default via %s", gateway); -+ routes[1] = NULL; -+ g_free(value); -+ } -+ } -+ else -+ { -+ config = svGetArray(file, config_str); -+ routes = svGetArray(file, route_str); -+ } -+ -+ -+ if ((config) && g_ascii_strcasecmp(config[0], "dhcp")) -+ { -+ nm_debug("Found %s in %s.", config_str, SYSCONFDIR"/conf.d/net"); -+ -+ if (!g_ascii_strcasecmp(config[0], "null")) -+ { -+ nm_debug("Config disables device %s.", dev); -+ g_hash_table_insert(ifs, g_strdup("disabled"), g_strdup("true")); -+ } -+ else -+ { -+ /* TODO: Handle "noop". */ -+ conf = g_strsplit(config[0], " ", 0); -+ hits = g_strv_length(conf); -+ -+ strtok(conf[0], "/"); -+ if ((cidrprefix = strtok(NULL, "/"))) -+ { -+ maskval = 0xffffffff; -+ maskval <<= (32 - atoi(cidrprefix)); -+ mask.s_addr = htonl(maskval); -+ g_hash_table_insert(ifs, g_strdup("netmask"), g_strdup(inet_ntoa(mask))); -+ } -+ -+ -+ if ((hits > 0) && inet_aton(conf[0], &mask)) -+ { -+ g_hash_table_insert(ifs, g_strdup(dev), g_strdup(conf[i++])); -+ while ((hits -= 2) > 0) -+ { -+ g_hash_table_insert(ifs, g_strdup(conf[i]), g_strdup(conf[i+1])); -+ i += 2; -+ } -+ } -+ else -+ { -+ nm_debug("Unhandled configuration. Switching to DHCP."); -+ nm_debug("\t%s = %s", config_str, config[0]); -+ g_hash_table_insert(ifs, g_strdup("dhcp"), g_strdup("true")); -+ } -+ g_strfreev(conf); -+ } -+ } -+ else -+ { -+ nm_debug("Enabling DHCP for device %s.", dev); -+ g_hash_table_insert(ifs, g_strdup("dhcp"), g_strdup("true")); -+ } -+ -+ g_strfreev(config); -+ -+ if (routes) -+ { -+ nm_debug("Found %s in config.", route_str); -+ -+ len = g_strv_length(routes); -+ for (i = 0; i < len; i++) -+ { -+ if (!sscanf(routes[i], "default via %[0-9.:]", buf)) -+ continue; -+ -+ g_hash_table_insert(ifs,g_strdup("gateway"),g_strdup( (char*) buf)); -+ } -+ } -+ -+ g_strfreev(routes); -+ -+ if ((value = svGetValue(file, mtu_str))) -+ { -+ nm_debug("Found %s in config.", mtu_str); -+ g_hash_table_insert(ifs, g_strdup("mtu"), g_strdup(value)); -+ } -+ -+ g_free(value); -+ -+ if (!(value = svGetValue(file, dnsserver_str))) -+ { -+ value = svGetValue(file, "dns_servers"); -+ } -+ if (value) -+ { -+ nm_debug("Found DNS nameservers in config."); -+ g_hash_table_insert(ifs, g_strdup("nameservers"), g_strdup(value)); -+ } -+ -+ g_free(value); -+ -+ if (!(value = svGetValue(file, dnssearch_str))) -+ { -+ value = svGetValue(file, "dns_search"); -+ } -+ if (value) -+ { -+ nm_debug("Found DNS search in config."); -+ g_hash_table_insert(ifs, g_strdup("dnssearch"), g_strdup(value)); -+ } -+ -+ g_free(value); -+ svCloseFile(file); -+ -+ if ((file = svNewFile(SYSCONFDIR"/conf.d/hostname"))) -+ { -+ if ((value = svGetValue(file, "HOSTNAME")) && (strlen(value) > 0)) -+ { -+ nm_debug("Found hostname."); -+ g_hash_table_insert(ifs, g_strdup("hostname"), g_strdup(value)); -+ } -+ -+ g_free(value); -+ svCloseFile(file); -+ } -+ -+ -+ g_free(config_str); -+ g_free(iface_str); -+ g_free(route_str); -+ g_free(mtu_str); -+ g_free(dnsserver_str); -+ g_free(dnssearch_str); -+ -+ return ifs; -+} - - typedef struct GentooSystemConfigData -@@ -293,6 +559,7 @@ - NMIP4Config * config; - gboolean use_dhcp; -+ gboolean system_disabled; -+ guint32 mtu; - } GentooSystemConfigData; -- - - /* -@@ -304,133 +571,172 @@ - * - */ --void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data) --{ -- char *cfg_file_path = NULL; -- FILE *file = NULL; -- char buffer[100]; -- char confline[100], dhcpline[100], ipline[100]; -- int ipa, ipb, ipc, ipd; -- int nNext = 0, bNext = 0, count = 0; -- char *confToken; -- gboolean data_good = FALSE; -- gboolean use_dhcp = TRUE; -- GentooSystemConfigData *sys_data = NULL; -- guint32 ip4_address = 0; -- guint32 ip4_netmask = 0; -- guint32 ip4_gateway = 0; -- guint32 ip4_broadcast = 0; -- -- g_return_val_if_fail (dev != NULL, NULL); -- -- sys_data = g_malloc0 (sizeof (GentooSystemConfigData)); -- sys_data->config = nm_device_get_ip4_config(dev); -- /* We use DHCP on an interface unless told not to */ -+void* nm_system_device_get_system_config (NMDevice * dev, NMData *app_data) -+{ -+ GHashTable* ifh; -+ gpointer val; -+ gchar **strarr; -+ GentooSystemConfigData* sys_data = NULL; -+ int len, i; -+ -+ g_return_val_if_fail(dev != NULL, NULL); -+ -+ sys_data = g_malloc0(sizeof (GentooSystemConfigData)); - sys_data->use_dhcp = TRUE; -- nm_device_set_use_dhcp (dev, TRUE); --// nm_ip4_config_set_address (sys_data->config, 0); --// nm_ip4_config_set_gateway (sys_data->config, 0); --// nm_ip4_config_set_netmask (sys_data->config, 0); -- -- /* Gentoo systems store this information in -- * /etc/conf.d/net, this is for all interfaces. -- */ -- -- cfg_file_path = g_strdup_printf ("/etc/conf.d/net"); -- if (!cfg_file_path) -+ sys_data->system_disabled = FALSE; -+ sys_data->mtu = 0; -+ sys_data->config=NULL; -+ -+ ifh = GentooReadConfig(nm_device_get_iface(dev)); -+ if (ifh == NULL) -+ { -+ g_free(sys_data); - return NULL; -- -- if (!(file = fopen (cfg_file_path, "r"))) -- { -- g_free (cfg_file_path); -- return NULL; -- } -- sprintf(confline, "iface_%s", nm_device_get_iface (dev)); -- sprintf(dhcpline, "iface_%s=\"dhcp\"", nm_device_get_iface (dev)); -- while (fgets (buffer, 499, file) && !feof (file)) -- { -- /* Kock off newline if any */ -- g_strstrip (buffer); -- -- if (strncmp (buffer, confline, strlen(confline)) == 0) -+ } -+ -+ val = g_hash_table_lookup(ifh, "disabled"); -+ if (val) -+ { -+ if (!strcasecmp (val, "true")) -+ { -+ nm_info ("System configuration disables device %s", nm_device_get_iface (dev)); -+ sys_data->system_disabled = TRUE; -+ } -+ } -+ -+ val = g_hash_table_lookup(ifh, "mtu"); -+ if (val) -+ { -+ guint32 mtu; -+ -+ mtu = strtoul(val, NULL, 10); -+ if (mtu > 500 && mtu < INT_MAX) -+ { -+ nm_debug("System configuration specifies a MTU of %i for device %s", mtu, nm_device_get_iface(dev)); -+ sys_data->mtu = mtu; -+ } -+ } -+ val = g_hash_table_lookup(ifh, "hostname"); -+ if (val) -+ { -+ nm_ip4_config_set_hostname(sys_data->config, val); -+ } -+ -+ val = g_hash_table_lookup(ifh, nm_device_get_iface(dev)); -+ if (val && !g_hash_table_lookup(ifh, "dhcp")) -+ { -+ /* This device does not use DHCP */ -+ -+ sys_data->use_dhcp=FALSE; -+ sys_data->config = nm_ip4_config_new(); -+ -+ nm_ip4_config_set_address (sys_data->config, inet_addr (val)); -+ -+ val = g_hash_table_lookup(ifh, "gateway"); -+ if (val) -+ nm_ip4_config_set_gateway (sys_data->config, inet_addr (val)); -+ else -+ { -+ nm_info ("Network configuration for device '%s' does not specify a gateway but is " -+ "statically configured (non-DHCP).", nm_device_get_iface (dev)); -+ } -+ -+ val = g_hash_table_lookup(ifh, "netmask"); -+ if (val) -+ nm_ip4_config_set_netmask (sys_data->config, inet_addr (val)); -+ else -+ { -+ guint32 addr = nm_ip4_config_get_address (sys_data->config); -+ -+ /* Make a default netmask if we have an IP address */ -+ if (((ntohl (addr) & 0xFF000000) >> 24) <= 127) -+ nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000)); -+ else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191) -+ nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000)); -+ else -+ nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00)); -+ } -+ -+ val = g_hash_table_lookup(ifh, "broadcast"); -+ if (val) -+ nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val)); -+ else if ((val = g_hash_table_lookup(ifh, "brd"))) -+ nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val)); -+ else -+ { -+ guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config)) -+ | ~nm_ip4_config_get_netmask (sys_data->config)); -+ nm_ip4_config_set_broadcast (sys_data->config, broadcast); -+ } -+ -+ val = g_hash_table_lookup(ifh, "nameservers"); -+ if (val) -+ { -+ nm_debug("Using DNS nameservers \"%s\" from config for device %s.", val, nm_device_get_iface(dev)); -+ if ((strarr = g_strsplit(val, " ", 0))) - { -- /* Make sure this config file is for this device */ -- if (strncmp (&buffer[strlen(confline) - strlen(nm_device_get_iface (dev))], -- nm_device_get_iface (dev), strlen(nm_device_get_iface (dev))) != 0) -+ len = g_strv_length(strarr); -+ for(i = 0; i < len; i++) - { -- nm_warning ("System config file '%s' does not define device '%s'\n", -- cfg_file_path, nm_device_get_iface (dev)); -- break; -- } -- else -- data_good = TRUE; -- -- if (strncmp (buffer, dhcpline, strlen(dhcpline)) == 0) -- { -- use_dhcp = TRUE; -+ guint32 addr = (guint32) (inet_addr (strarr[i])); -+ -+ if (addr != (guint32) -1) -+ nm_ip4_config_add_nameserver(sys_data->config, addr); -+ } -+ -+ g_strfreev(strarr); - } - else - { -- use_dhcp = FALSE; -- confToken = strtok(&buffer[strlen(confline) + 2], " "); -- while (count < 3) -- { -- if (nNext == 1 && bNext == 1) -- { -- ip4_address = inet_addr (confToken); -- count++; -- continue; -- } -- if (strcmp(confToken, "netmask") == 0) -- { -- confToken = strtok(NULL, " "); -- ip4_netmask = inet_addr (confToken); -- count++; -- nNext = 1; -- } -- else if (strcmp(confToken, "broadcast") == 0) -- { -- confToken = strtok(NULL, " "); -- count++; -- bNext = 1; -- } -- else -- { -- ip4_address = inet_addr (confToken); -- count++; -- } -- confToken = strtok(NULL, " "); -- } -+ guint32 addr = (guint32) (inet_addr (val)); -+ -+ if (addr != (guint32) -1) -+ nm_ip4_config_add_nameserver(sys_data->config, addr); -+ } -+ } -+ -+ val = g_hash_table_lookup(ifh, "dnssearch"); -+ if (val) -+ { -+ nm_debug("Using DNS search \"%s\" from config for device %s.", val, nm_device_get_iface(dev)); -+ if ((strarr = g_strsplit(val, " ", 0))) -+ { -+ len = g_strv_length(strarr); -+ for(i = 0; i < len; i++) -+ { -+ if (strarr[i]) -+ nm_ip4_config_add_domain(sys_data->config, strarr[i]); - } -+ -+ g_strfreev(strarr); - } -- /* If we aren't using dhcp, then try to get the gateway */ -- if (!use_dhcp) -+ else - { -- sprintf(ipline, "gateway=\"%s/", nm_device_get_iface (dev)); -- if (strncmp(buffer, ipline, strlen(ipline) - 1) == 0) -+ nm_ip4_config_add_domain(sys_data->config, val); -+ } -+ } -+ -+ nm_ip4_config_set_mtu (sys_data->config, sys_data->mtu); -+ -+#if 0 -+ { -+ int j; -+ nm_debug ("------ Config (%s)", nm_device_get_iface (dev)); -+ nm_debug (" ADDR=%d", nm_ip4_config_get_address (sys_data->config)); -+ nm_debug (" GW =%d", nm_ip4_config_get_gateway (sys_data->config)); -+ nm_debug (" NM =%d", nm_ip4_config_get_netmask (sys_data->config)); -+ nm_debug (" NSs =%d",nm_ip4_config_get_num_nameservers(sys_data->config)); -+ for (j=0;j<nm_ip4_config_get_num_nameservers(sys_data->config);j++) - { -- sprintf(ipline, "gateway=\"%s/%%d.%%d.%%d.%%d\"", nm_device_get_iface (dev) ); -- sscanf(buffer, ipline, &ipa, &ipb, &ipc, &ipd); -- sprintf(ipline, "%d.%d.%d.%d", ipa, ipb, ipc, ipd); -- ip4_gateway = inet_addr (ipline); -+ nm_debug (" NS =%d",nm_ip4_config_get_nameserver(sys_data->config,j)); - } -- } -- } -- fclose (file); -- g_free (cfg_file_path); -- -- /* If successful, set values on the device */ -- if (data_good) -- { -- nm_warning("data good :-)"); -- nm_device_set_use_dhcp (dev, use_dhcp); -- if (ip4_address) -- nm_ip4_config_set_address (sys_data->config, ip4_address); -- if (ip4_gateway) -- nm_ip4_config_set_gateway (sys_data->config, ip4_gateway); -- if (ip4_netmask) -- nm_ip4_config_set_netmask (sys_data->config, ip4_netmask); -- if (ip4_broadcast) -- nm_ip4_config_set_broadcast (sys_data->config, ip4_broadcast); -- } -+ nm_debug ("---------------------\n"); -+ } -+#endif -+ -+ } -+ -+ g_hash_table_destroy(ifh); -+ -+ - return (void *)sys_data; - } -@@ -519,4 +825,11 @@ - gboolean nm_system_device_get_disabled (NMDevice *dev) - { -+ GentooSystemConfigData *sys_data; -+ -+ g_return_val_if_fail (dev != NULL, FALSE); -+ -+ if ((sys_data = nm_device_get_system_config_data (dev))) -+ return sys_data->system_disabled; -+ - return FALSE; - } -@@ -576,4 +889,35 @@ - void nm_system_set_hostname (NMIP4Config *config) - { -+ char *h_name = NULL; -+ const char *hostname; -+ -+ g_return_if_fail (config != NULL); -+ -+ hostname = nm_ip4_config_get_hostname (config); -+ if (!hostname) -+ { -+ struct in_addr temp_addr; -+ struct hostent *host; -+ -+ /* try to get hostname via dns */ -+ temp_addr.s_addr = nm_ip4_config_get_address (config); -+ host = gethostbyaddr ((char *) &temp_addr, sizeof (temp_addr), AF_INET); -+ if (host) -+ { -+ h_name = g_strdup (host->h_name); -+ hostname = strtok (h_name, "."); -+ } -+ else -+ nm_warning ("nm_system_set_hostname(): gethostbyaddr failed, h_errno = %d", h_errno); -+ } -+ -+ if (hostname) -+ { -+ nm_info ("Setting hostname to '%s'", hostname); -+ if (sethostname (hostname, strlen (hostname)) < 0) -+ nm_warning ("Could not set hostname."); -+ } -+ -+ g_free (h_name); - } - -@@ -596,4 +940,11 @@ - guint32 nm_system_get_mtu (NMDevice *dev) - { -+ GentooSystemConfigData *sys_data; -+ -+ g_return_val_if_fail (dev != NULL, 0); -+ -+ if ((sys_data = nm_device_get_system_config_data (dev))) -+ return sys_data->mtu; -+ - return 0; - } diff --git a/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch b/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch deleted file mode 100644 index e74c3c54834a..000000000000 --- a/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN NetworkManager-0.5.2.orig/src/nm-device-802-3-ethernet.c NetworkManager-0.5.2/src/nm-device-802-3-ethernet.c ---- NetworkManager-0.5.2.orig/src/nm-device-802-3-ethernet.c 2006-02-04 05:20:00.000000000 -0600 -+++ NetworkManager-0.5.2/src/nm-device-802-3-ethernet.c 2006-02-04 05:20:26.000000000 -0600 -@@ -18,7 +18,7 @@ - * - * (C) Copyright 2005 Red Hat, Inc. - */ -- -+#define HEADERS_KERNEL - #include <glib.h> - #include <glib/gi18n.h> - #include <dbus/dbus.h> diff --git a/net-misc/networkmanager/networkmanager-0.6.6.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild deleted file mode 100644 index 4b76fece7216..000000000000 --- a/net-misc/networkmanager/networkmanager-0.6.6.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.6 2009/04/22 13:30:43 rbu Exp $ - -inherit gnome2 eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -# Release candidate for 0.6.6, Hosted in dcbw's redhat space. -SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="crypt doc gnome" - -# Yes, I know that configure will accept libnl 1.0-pre8, however we only have -# 1.1 in the tree, therefore dep on it. -RDEPEND=">=sys-apps/dbus-0.60 - >=sys-apps/hal-0.5.10 - sys-apps/iproute2 - >=dev-libs/libnl-1.1 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.4.8 - >=dev-libs/glib-2.8 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - crypt? ( dev-libs/libgcrypt )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" -PDEPEND="gnome? ( >gnome-extra/nm-applet-0.6.5 )" - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --localstatedir=/var \ - --with-distro=gentoo \ - --with-dbus-sys=/etc/dbus-1/system.d" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if built_with_use sys-apps/iproute2 minimal ; then - eerror "Please rebuild sys-apps/iproute2 without the minimal useflag." - die "Fix iproute2 first." - fi -} - -src_unpack () { - unpack ${A} - cd "${S}" - - # Use the kernel headers - epatch "${FILESDIR}/${PN}-use-kernel-headers.patch" - # Fix the resolv.conf permissions - epatch "${FILESDIR}/${PN}-resolvconf-perms.patch" - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch" -} - -src_install() { - gnome2_src_install - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager -} - -pkg_postinst() { - gnome2_icon_cache_update - elog "You need to be in the plugdev group in order to use NetworkManager" - elog "Problems with your hostname getting changed?" - elog "" - elog "Add the following to /etc/dhcp/dhclient.conf" - elog 'send host-name "YOURHOSTNAME";' - elog 'supersede host-name "YOURHOSTNAME";' - - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." -} diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild deleted file mode 100644 index e0ac0e4eb748..000000000000 --- a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild,v 1.7 2010/01/06 21:44:06 ranger Exp $ - -EAPI="2" -inherit eutils autotools - -PATCH_VERSION="1b" - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -MY_P=${MY_PN}-${PV} -PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}" - -DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2 - http://dev.gentoo.org/~dagger/files/${PATCHNAME}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86" -IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing" -# modemmanager" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=sys-apps/hal-0.5.10 - >=net-wireless/wireless-tools-28_pre9 - >=dev-libs/glib-2.16 - <sys-auth/policykit-0.92 - >=dev-libs/libnl-1.1 - >=net-wireless/wpa_supplicant-0.5.10[dbus] - || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) - avahi? ( net-dns/avahi[autoipd] ) - gnutls? ( - nss? ( >=dev-libs/nss-3.11 ) - !nss? ( dev-libs/libgcrypt - net-libs/gnutls ) ) - !gnutls? ( >=dev-libs/nss-3.11 ) - dhclient? ( - dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) - !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - net-dialup/ppp - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.8 )" - -#PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.7.1-confchanges.patch" - - # bug #266982 - epatch "${FILESDIR}/${PN}-0.7.0-gentoo-dhclient.patch" - - # bug #267349 - epatch "${FILESDIR}/${PN}-0.7.1-bad-link.patch" - - # bug #262112 - EPATCH_SOURCE="${WORKDIR}/nm_0.7.1_patchset_${PATCH_VERSION}" - EPATCH_SUFFIX="patch" - epatch && eautoreconf - -} - -src_configure() { - ECONF="--disable-more-warnings - --localstatedir=/var - --with-distro=gentoo - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(use_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - else - ECONF="${ECONF} --with-dhcp-client=dhclient" - fi - else - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \ - || die "newins failed" - insinto /etc/udev/rules.d - newins callouts/77-nm-probe-modem-capabilities.rules 77-nm-probe-modem-capabilities.rules - rm -rf "${D}"/lib/udev/rules.d -} - -pkg_postinst() { - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." - elog "" - elog "To save system-wide settings as a user, that user needs to have the" - elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' -} diff --git a/net-misc/networkmanager/networkmanager-0.7.2.ebuild b/net-misc/networkmanager/networkmanager-0.7.2.ebuild deleted file mode 100644 index 9365be0a0c99..000000000000 --- a/net-misc/networkmanager/networkmanager-0.7.2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.2.ebuild,v 1.5 2010/01/22 19:19:21 ranger Exp $ - -EAPI="2" -inherit eutils -# autotools - -#PATCH_VERSION="1b" - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -MY_P=${MY_PN}-${PV} -#PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}" - -DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing" -# modemmanager" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=sys-apps/hal-0.5.10 - >=net-wireless/wireless-tools-28_pre9 - >=dev-libs/glib-2.16 - sys-auth/policykit - >=dev-libs/libnl-1.1 - >=net-wireless/wpa_supplicant-0.5.10[dbus] - || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) - avahi? ( net-dns/avahi[autoipd] ) - gnutls? ( - nss? ( >=dev-libs/nss-3.11 ) - !nss? ( dev-libs/libgcrypt - net-libs/gnutls ) ) - !gnutls? ( >=dev-libs/nss-3.11 ) - dhclient? ( - dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) - !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - net-dialup/ppp - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.8 )" - -#PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.7.1-confchanges.patch" - -} - -src_configure() { - ECONF="--disable-more-warnings - --localstatedir=/var - --with-distro=gentoo - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(use_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - else - ECONF="${ECONF} --with-dhcp-client=dhclient" - fi - else - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \ - || die "newins failed" - insinto /etc/udev/rules.d - newins callouts/77-nm-probe-modem-capabilities.rules 77-nm-probe-modem-capabilities.rules - rm -rf "${D}"/lib/udev/rules.d -} - -pkg_postinst() { - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." - elog "" - elog "To save system-wide settings as a user, that user needs to have the" - elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' -} |