[arch-commits] Commit in networkmanager/repos (9 files)

Ionut Biru ibiru at archlinux.org
Thu Nov 10 19:42:03 UTC 2011


    Date: Thursday, November 10, 2011 @ 14:42:03
  Author: ibiru
Revision: 142490

db-move: moved networkmanager from [testing] to [extra] (i686)

Added:
  networkmanager/repos/extra-i686/NetworkManager.conf
    (from rev 142487, networkmanager/repos/testing-i686/NetworkManager.conf)
  networkmanager/repos/extra-i686/PKGBUILD
    (from rev 142487, networkmanager/repos/testing-i686/PKGBUILD)
  networkmanager/repos/extra-i686/disable_set_hostname.patch
    (from rev 142487, networkmanager/repos/testing-i686/disable_set_hostname.patch)
  networkmanager/repos/extra-i686/networkmanager.install
    (from rev 142487, networkmanager/repos/testing-i686/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/testing-i686/

----------------------------+
 NetworkManager.conf        |    4 -
 PKGBUILD                   |  124 +++++++++++++++++++++----------------------
 disable_set_hostname.patch |   38 ++++++-------
 networkmanager.install     |   18 +++---
 4 files changed, 93 insertions(+), 91 deletions(-)

Deleted: extra-i686/NetworkManager.conf
===================================================================
--- extra-i686/NetworkManager.conf	2011-11-10 19:42:01 UTC (rev 142489)
+++ extra-i686/NetworkManager.conf	2011-11-10 19:42:03 UTC (rev 142490)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile

Copied: networkmanager/repos/extra-i686/NetworkManager.conf (from rev 142487, networkmanager/repos/testing-i686/NetworkManager.conf)
===================================================================
--- extra-i686/NetworkManager.conf	                        (rev 0)
+++ extra-i686/NetworkManager.conf	2011-11-10 19:42:03 UTC (rev 142490)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-10 19:42:01 UTC (rev 142489)
+++ extra-i686/PKGBUILD	2011-11-10 19:42:03 UTC (rev 142490)
@@ -1,61 +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.1.95
-pkgrel=1
-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')
-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=('4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468'
-            '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 \
-    --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 142487, networkmanager/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-10 19:42:03 UTC (rev 142490)
@@ -0,0 +1,63 @@
+# $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=1
+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/"
+}

Deleted: extra-i686/disable_set_hostname.patch
===================================================================
--- extra-i686/disable_set_hostname.patch	2011-11-10 19:42:01 UTC (rev 142489)
+++ extra-i686/disable_set_hostname.patch	2011-11-10 19:42:03 UTC (rev 142490)
@@ -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 142487, networkmanager/repos/testing-i686/disable_set_hostname.patch)
===================================================================
--- extra-i686/disable_set_hostname.patch	                        (rev 0)
+++ extra-i686/disable_set_hostname.patch	2011-11-10 19:42:03 UTC (rev 142490)
@@ -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.
+ 	 */

Deleted: extra-i686/networkmanager.install
===================================================================
--- extra-i686/networkmanager.install	2011-11-10 19:42:01 UTC (rev 142489)
+++ extra-i686/networkmanager.install	2011-11-10 19:42:03 UTC (rev 142490)
@@ -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 142487, networkmanager/repos/testing-i686/networkmanager.install)
===================================================================
--- extra-i686/networkmanager.install	                        (rev 0)
+++ extra-i686/networkmanager.install	2011-11-10 19:42:03 UTC (rev 142490)
@@ -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