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

Jan Steffens heftig at nymeria.archlinux.org
Mon Sep 30 17:55:21 UTC 2013


    Date: Monday, September 30, 2013 @ 19:55:21
  Author: heftig
Revision: 195473

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  networkmanager/repos/testing-i686/
  networkmanager/repos/testing-i686/NetworkManager.conf
    (from rev 195472, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/testing-i686/PKGBUILD
    (from rev 195472, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/testing-i686/disable_set_hostname.patch
    (from rev 195472, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/testing-i686/networkmanager.install
    (from rev 195472, networkmanager/trunk/networkmanager.install)
  networkmanager/repos/testing-x86_64/
  networkmanager/repos/testing-x86_64/NetworkManager.conf
    (from rev 195472, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/testing-x86_64/PKGBUILD
    (from rev 195472, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/testing-x86_64/disable_set_hostname.patch
    (from rev 195472, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/testing-x86_64/networkmanager.install
    (from rev 195472, networkmanager/trunk/networkmanager.install)

-------------------------------------------+
 testing-i686/NetworkManager.conf          |    2 
 testing-i686/PKGBUILD                     |   74 ++++++++++++++++++++++++++++
 testing-i686/disable_set_hostname.patch   |   19 +++++++
 testing-i686/networkmanager.install       |    9 +++
 testing-x86_64/NetworkManager.conf        |    2 
 testing-x86_64/PKGBUILD                   |   74 ++++++++++++++++++++++++++++
 testing-x86_64/disable_set_hostname.patch |   19 +++++++
 testing-x86_64/networkmanager.install     |    9 +++
 8 files changed, 208 insertions(+)

Copied: networkmanager/repos/testing-i686/NetworkManager.conf (from rev 195472, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-i686/NetworkManager.conf	                        (rev 0)
+++ testing-i686/NetworkManager.conf	2013-09-30 17:55:21 UTC (rev 195473)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Copied: networkmanager/repos/testing-i686/PKGBUILD (from rev 195472, networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2013-09-30 17:55:21 UTC (rev 195473)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: 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
+_pkgname=NetworkManager
+pkgver=0.9.8.6
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/"
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+         libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
+optdepends=('dhclient: DHCPv6 support'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support'
+            'openresolv: resolvconf support'
+            'ppp: Dialup connection support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --sbindir=/usr/bin \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --with-dhcpcd=/usr/bin/dhcpcd \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}

Copied: networkmanager/repos/testing-i686/disable_set_hostname.patch (from rev 195472, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- testing-i686/disable_set_hostname.patch	                        (rev 0)
+++ testing-i686/disable_set_hostname.patch	2013-09-30 17:55:21 UTC (rev 195473)
@@ -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/testing-i686/networkmanager.install (from rev 195472, networkmanager/trunk/networkmanager.install)
===================================================================
--- testing-i686/networkmanager.install	                        (rev 0)
+++ testing-i686/networkmanager.install	2013-09-30 17:55:21 UTC (rev 195473)
@@ -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
+}

Copied: networkmanager/repos/testing-x86_64/NetworkManager.conf (from rev 195472, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-x86_64/NetworkManager.conf	                        (rev 0)
+++ testing-x86_64/NetworkManager.conf	2013-09-30 17:55:21 UTC (rev 195473)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 195472, networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2013-09-30 17:55:21 UTC (rev 195473)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: 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
+_pkgname=NetworkManager
+pkgver=0.9.8.6
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/"
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+         libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
+optdepends=('dhclient: DHCPv6 support'
+            'dnsmasq: Connection sharing'
+            'bluez: Bluetooth support'
+            'openresolv: resolvconf support'
+            'ppp: Dialup connection support')
+options=('!libtool')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369'
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+}
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/networkmanager \
+    --sbindir=/usr/bin \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --with-dhcpcd=/usr/bin/dhcpcd \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}

Copied: networkmanager/repos/testing-x86_64/disable_set_hostname.patch (from rev 195472, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- testing-x86_64/disable_set_hostname.patch	                        (rev 0)
+++ testing-x86_64/disable_set_hostname.patch	2013-09-30 17:55:21 UTC (rev 195473)
@@ -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/testing-x86_64/networkmanager.install (from rev 195472, networkmanager/trunk/networkmanager.install)
===================================================================
--- testing-x86_64/networkmanager.install	                        (rev 0)
+++ testing-x86_64/networkmanager.install	2013-09-30 17:55:21 UTC (rev 195473)
@@ -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