[arch-commits] Commit in networkmanager/repos (18 files)
Jan Steffens
heftig at archlinux.org
Tue Mar 6 08:15:53 UTC 2012
Date: Tuesday, March 6, 2012 @ 03:15:52
Author: heftig
Revision: 152264
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
networkmanager/repos/extra-i686/NetworkManager.conf
(from rev 152262, networkmanager/trunk/NetworkManager.conf)
networkmanager/repos/extra-i686/PKGBUILD
(from rev 152262, networkmanager/trunk/PKGBUILD)
networkmanager/repos/extra-i686/disable_set_hostname.patch
(from rev 152262, networkmanager/trunk/disable_set_hostname.patch)
networkmanager/repos/extra-i686/dnsmasq-path.patch
(from rev 152262, networkmanager/trunk/dnsmasq-path.patch)
networkmanager/repos/extra-i686/networkmanager.install
(from rev 152262, networkmanager/trunk/networkmanager.install)
networkmanager/repos/extra-x86_64/NetworkManager.conf
(from rev 152262, networkmanager/trunk/NetworkManager.conf)
networkmanager/repos/extra-x86_64/PKGBUILD
(from rev 152262, networkmanager/trunk/PKGBUILD)
networkmanager/repos/extra-x86_64/disable_set_hostname.patch
(from rev 152262, networkmanager/trunk/disable_set_hostname.patch)
networkmanager/repos/extra-x86_64/dnsmasq-path.patch
(from rev 152262, networkmanager/trunk/dnsmasq-path.patch)
networkmanager/repos/extra-x86_64/networkmanager.install
(from rev 152262, networkmanager/trunk/networkmanager.install)
Deleted:
networkmanager/repos/extra-i686/NetworkManager.conf
networkmanager/repos/extra-i686/PKGBUILD
networkmanager/repos/extra-i686/disable_set_hostname.patch
networkmanager/repos/extra-i686/networkmanager.install
networkmanager/repos/extra-x86_64/NetworkManager.conf
networkmanager/repos/extra-x86_64/PKGBUILD
networkmanager/repos/extra-x86_64/disable_set_hostname.patch
networkmanager/repos/extra-x86_64/networkmanager.install
-----------------------------------------+
extra-i686/NetworkManager.conf | 4
extra-i686/PKGBUILD | 128 +++++++++++++++---------------
extra-i686/disable_set_hostname.patch | 38 ++++----
extra-i686/dnsmasq-path.patch | 30 +++++++
extra-i686/networkmanager.install | 18 ++--
extra-x86_64/NetworkManager.conf | 4
extra-x86_64/PKGBUILD | 128 +++++++++++++++---------------
extra-x86_64/disable_set_hostname.patch | 38 ++++----
extra-x86_64/dnsmasq-path.patch | 30 +++++++
extra-x86_64/networkmanager.install | 18 ++--
10 files changed, 250 insertions(+), 186 deletions(-)
Deleted: extra-i686/NetworkManager.conf
===================================================================
--- extra-i686/NetworkManager.conf 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-i686/NetworkManager.conf 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
Copied: networkmanager/repos/extra-i686/NetworkManager.conf (from rev 152262, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-i686/NetworkManager.conf (rev 0)
+++ extra-i686/NetworkManager.conf 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-i686/PKGBUILD 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contri-butor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgname=networkmanager
-pkgver=0.9.2.0
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
-optdepends=('modemmanager: for modem management service'
- 'dhclient: alternative DHCP/DHCPv6 client'
- 'iptables: Connection sharing'
- 'dnsmasq: Connection sharing'
- 'bluez: Bluetooth support'
- 'openresolv: openresolv support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
- NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf'
- '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-build() {
- cd "${srcdir}/NetworkManager-${pkgver}"
-
- patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --with-crypto=nss \
- --with-distro=arch \
- --with-dhclient=/usr/sbin/dhclient \
- --with-dhcpcd=/sbin/dhcpcd \
- --with-iptables=/usr/sbin/iptables \
- --with-systemdsystemunitdir=/lib/systemd/system \
- --with-resolvconf=/usr/sbin/resolvconf \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax
-
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
-
- rm -rf "${pkgdir}/var/run/"
-}
Copied: networkmanager/repos/extra-i686/PKGBUILD (from rev 152262, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contri-butor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgname=networkmanager
+pkgver=0.9.2.0
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+optdepends=('modemmanager: for modem management service'
+ 'dhclient: alternative DHCP/DHCPv6 client'
+ 'iptables: Connection sharing'
+ 'dnsmasq: Connection sharing'
+ 'bluez: Bluetooth support'
+ 'openresolv: openresolv support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
+ NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf'
+ '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+ '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+ '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
+
+build() {
+ cd "${srcdir}/NetworkManager-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
+ patch -Np1 -i "${srcdir}/dnsmasq-path.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/networkmanager \
+ --with-crypto=nss \
+ --with-distro=arch \
+ --with-dhclient=/usr/sbin/dhclient \
+ --with-dhcpcd=/sbin/dhcpcd \
+ --with-iptables=/usr/sbin/iptables \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --with-resolvconf=/usr/sbin/resolvconf \
+ --disable-static \
+ --enable-more-warnings=no \
+ --disable-wimax
+
+ make
+}
+
+package() {
+ cd "${srcdir}/NetworkManager-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
+
+ rm -rf "${pkgdir}/var/run/"
+}
Deleted: extra-i686/disable_set_hostname.patch
===================================================================
--- extra-i686/disable_set_hostname.patch 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-i686/disable_set_hostname.patch 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
Copied: networkmanager/repos/extra-i686/disable_set_hostname.patch (from rev 152262, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-i686/disable_set_hostname.patch (rev 0)
+++ extra-i686/disable_set_hostname.patch 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
++#if 0
+ /* Try automatically determined hostname from the best device's IP config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
++#endif
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
Copied: networkmanager/repos/extra-i686/dnsmasq-path.patch (from rev 152262, networkmanager/trunk/dnsmasq-path.patch)
===================================================================
--- extra-i686/dnsmasq-path.patch (rev 0)
+++ extra-i686/dnsmasq-path.patch 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,30 @@
+diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
+--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100
+@@ -52,8 +52,11 @@
+ find_dnsmasq (void)
+ {
+ static const char *paths[] = {
++ "/usr/local/bin/dnsmasq",
+ "/usr/local/sbin/dnsmasq",
++ "/usr/bin/dnsmasq",
+ "/usr/sbin/dnsmasq",
++ "/bin/dnsmasq",
+ "/sbin/dnsmasq",
+ NULL
+ };
+diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
+--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100
+@@ -170,8 +170,11 @@
+ nm_find_dnsmasq (void)
+ {
+ static const char *dnsmasq_binary_paths[] = {
++ "/usr/local/bin/dnsmasq",
+ "/usr/local/sbin/dnsmasq",
++ "/usr/bin/dnsmasq",
+ "/usr/sbin/dnsmasq",
++ "/bin/dnsmasq",
+ "/sbin/dnsmasq",
+ NULL
+ };
Deleted: extra-i686/networkmanager.install
===================================================================
--- extra-i686/networkmanager.install 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-i686/networkmanager.install 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,9 +0,0 @@
-post_upgrade() {
- (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- true
-}
Copied: networkmanager/repos/extra-i686/networkmanager.install (from rev 152262, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-i686/networkmanager.install (rev 0)
+++ extra-i686/networkmanager.install 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+ /etc/NetworkManager/nm-system-settings.conf has been replaced
+ by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+ any custom settings to the new config file.
+MSG
+ true
+}
Deleted: extra-x86_64/NetworkManager.conf
===================================================================
--- extra-x86_64/NetworkManager.conf 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-x86_64/NetworkManager.conf 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
Copied: networkmanager/repos/extra-x86_64/NetworkManager.conf (from rev 152262, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-x86_64/NetworkManager.conf (rev 0)
+++ extra-x86_64/NetworkManager.conf 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-x86_64/PKGBUILD 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contri-butor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgname=networkmanager
-pkgver=0.9.2.0
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
-optdepends=('modemmanager: for modem management service'
- 'dhclient: alternative DHCP/DHCPv6 client'
- 'iptables: Connection sharing'
- 'dnsmasq: Connection sharing'
- 'bluez: Bluetooth support'
- 'openresolv: openresolv support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
- NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf'
- '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-build() {
- cd "${srcdir}/NetworkManager-${pkgver}"
-
- patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --with-crypto=nss \
- --with-distro=arch \
- --with-dhclient=/usr/sbin/dhclient \
- --with-dhcpcd=/sbin/dhcpcd \
- --with-iptables=/usr/sbin/iptables \
- --with-systemdsystemunitdir=/lib/systemd/system \
- --with-resolvconf=/usr/sbin/resolvconf \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax
-
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
-
- rm -rf "${pkgdir}/var/run/"
-}
Copied: networkmanager/repos/extra-x86_64/PKGBUILD (from rev 152262, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contri-butor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgname=networkmanager
+pkgver=0.9.2.0
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/NetworkManager/"
+depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+optdepends=('modemmanager: for modem management service'
+ 'dhclient: alternative DHCP/DHCPv6 client'
+ 'iptables: Connection sharing'
+ 'dnsmasq: Connection sharing'
+ 'bluez: Bluetooth support'
+ 'openresolv: openresolv support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
+ NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf'
+ '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+ '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+ '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
+
+build() {
+ cd "${srcdir}/NetworkManager-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
+ patch -Np1 -i "${srcdir}/dnsmasq-path.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/networkmanager \
+ --with-crypto=nss \
+ --with-distro=arch \
+ --with-dhclient=/usr/sbin/dhclient \
+ --with-dhcpcd=/sbin/dhcpcd \
+ --with-iptables=/usr/sbin/iptables \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --with-resolvconf=/usr/sbin/resolvconf \
+ --disable-static \
+ --enable-more-warnings=no \
+ --disable-wimax
+
+ make
+}
+
+package() {
+ cd "${srcdir}/NetworkManager-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
+
+ rm -rf "${pkgdir}/var/run/"
+}
Deleted: extra-x86_64/disable_set_hostname.patch
===================================================================
--- extra-x86_64/disable_set_hostname.patch 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-x86_64/disable_set_hostname.patch 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
Copied: networkmanager/repos/extra-x86_64/disable_set_hostname.patch (from rev 152262, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-x86_64/disable_set_hostname.patch (rev 0)
+++ extra-x86_64/disable_set_hostname.patch 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
++#if 0
+ /* Try automatically determined hostname from the best device's IP config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
++#endif
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
Copied: networkmanager/repos/extra-x86_64/dnsmasq-path.patch (from rev 152262, networkmanager/trunk/dnsmasq-path.patch)
===================================================================
--- extra-x86_64/dnsmasq-path.patch (rev 0)
+++ extra-x86_64/dnsmasq-path.patch 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,30 @@
+diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
+--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100
+@@ -52,8 +52,11 @@
+ find_dnsmasq (void)
+ {
+ static const char *paths[] = {
++ "/usr/local/bin/dnsmasq",
+ "/usr/local/sbin/dnsmasq",
++ "/usr/bin/dnsmasq",
+ "/usr/sbin/dnsmasq",
++ "/bin/dnsmasq",
+ "/sbin/dnsmasq",
+ NULL
+ };
+diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
+--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100
+@@ -170,8 +170,11 @@
+ nm_find_dnsmasq (void)
+ {
+ static const char *dnsmasq_binary_paths[] = {
++ "/usr/local/bin/dnsmasq",
+ "/usr/local/sbin/dnsmasq",
++ "/usr/bin/dnsmasq",
+ "/usr/sbin/dnsmasq",
++ "/bin/dnsmasq",
+ "/sbin/dnsmasq",
+ NULL
+ };
Deleted: extra-x86_64/networkmanager.install
===================================================================
--- extra-x86_64/networkmanager.install 2012-03-06 08:15:46 UTC (rev 152263)
+++ extra-x86_64/networkmanager.install 2012-03-06 08:15:52 UTC (rev 152264)
@@ -1,9 +0,0 @@
-post_upgrade() {
- (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- true
-}
Copied: networkmanager/repos/extra-x86_64/networkmanager.install (from rev 152262, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-x86_64/networkmanager.install (rev 0)
+++ extra-x86_64/networkmanager.install 2012-03-06 08:15:52 UTC (rev 152264)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+ /etc/NetworkManager/nm-system-settings.conf has been replaced
+ by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+ any custom settings to the new config file.
+MSG
+ true
+}
More information about the arch-commits
mailing list