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

Jan Steffens heftig at archlinux.org
Sat Oct 17 02:47:53 UTC 2015


    Date: Saturday, October 17, 2015 @ 04:47:53
  Author: heftig
Revision: 249453

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

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

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

Copied: networkmanager/repos/testing-i686/NetworkManager.conf (from rev 249452, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-i686/NetworkManager.conf	                        (rev 0)
+++ testing-i686/NetworkManager.conf	2015-10-17 02:47:53 UTC (rev 249453)
@@ -0,0 +1,13 @@
+[main]
+plugins=keyfile
+dhcp=dhclient
+dns=default
+
+## Set static hostname
+#[keyfile]
+#hostname=foobar
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100

Copied: networkmanager/repos/testing-i686/PKGBUILD (from rev 249452, networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-10-17 02:47:53 UTC (rev 249453)
@@ -0,0 +1,120 @@
+# $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>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
+pkgver=1.0.7
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_pppver=2.4.7
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver"
+             modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup
+             systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml
+             python2-gobject git)
+checkdepends=(libx11 python2-dbus)
+#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+_commit=ba46efd07777350be737dbdac9df9becb86e8f77
+source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('SKIP'
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+prepare() {
+  mkdir path
+  ln -s /usr/bin/python2 path/python
+
+  cd NetworkManager
+  patch -Np1 -i ../disable_set_hostname.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export PATH="$srcdir/path:$PATH"
+  cd NetworkManager
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --without-dhcpcd \
+    --with-dnsmasq=/usr/bin/dnsmasq \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-pppd=/usr/bin/pppd \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --with-pppoe=/usr/bin/pppoe \
+    --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc \
+    --enable-gtk-doc
+
+  make
+}
+
+check() {
+  export PATH="$srcdir/path:$PATH"
+  cd NetworkManager
+  make -k check
+}
+
+package_networkmanager() {
+  depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup
+           libmm-glib libnewt libndp libteam libgudev)
+  optdepends=('dnsmasq: connection sharing'
+              'bluez: Bluetooth support'
+              'openresolv: resolvconf support'
+              'ppp: dialup connection support'
+              'rp-pppoe: ADSL support'
+              'modemmanager: cellular network support')
+  install=networkmanager.install
+  backup=('etc/NetworkManager/NetworkManager.conf')
+
+  cd NetworkManager
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libnm uninstall
+  make DESTDIR="$pkgdir" -C libnm-glib uninstall
+  make DESTDIR="$pkgdir" -C libnm-util uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}
+
+package_libnm-glib() {
+  pkgdesc="NetworkManager library"
+  depends=(libgudev nss dbus-glib libutil-linux)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd NetworkManager
+  make DESTDIR="$pkgdir" -C libnm install
+  make DESTDIR="$pkgdir" -C libnm-util install
+  make DESTDIR="$pkgdir" -C libnm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}

Copied: networkmanager/repos/testing-i686/disable_set_hostname.patch (from rev 249452, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- testing-i686/disable_set_hostname.patch	                        (rev 0)
+++ testing-i686/disable_set_hostname.patch	2015-10-17 02:47:53 UTC (rev 249453)
@@ -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 249452, networkmanager/trunk/networkmanager.install)
===================================================================
--- testing-i686/networkmanager.install	                        (rev 0)
+++ testing-i686/networkmanager.install	2015-10-17 02:47:53 UTC (rev 249453)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp $2 0.8.3) < 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 249452, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-x86_64/NetworkManager.conf	                        (rev 0)
+++ testing-x86_64/NetworkManager.conf	2015-10-17 02:47:53 UTC (rev 249453)
@@ -0,0 +1,13 @@
+[main]
+plugins=keyfile
+dhcp=dhclient
+dns=default
+
+## Set static hostname
+#[keyfile]
+#hostname=foobar
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100

Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 249452, networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-10-17 02:47:53 UTC (rev 249453)
@@ -0,0 +1,120 @@
+# $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>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
+pkgver=1.0.7
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_pppver=2.4.7
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver"
+             modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup
+             systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml
+             python2-gobject git)
+checkdepends=(libx11 python2-dbus)
+#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+_commit=ba46efd07777350be737dbdac9df9becb86e8f77
+source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('SKIP'
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+
+prepare() {
+  mkdir path
+  ln -s /usr/bin/python2 path/python
+
+  cd NetworkManager
+  patch -Np1 -i ../disable_set_hostname.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export PATH="$srcdir/path:$PATH"
+  cd NetworkManager
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/networkmanager \
+    --with-crypto=nss \
+    --with-dhclient=/usr/bin/dhclient \
+    --without-dhcpcd \
+    --with-dnsmasq=/usr/bin/dnsmasq \
+    --with-iptables=/usr/bin/iptables \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-udev-dir=/usr/lib/udev \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-pppd=/usr/bin/pppd \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --with-pppoe=/usr/bin/pppoe \
+    --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-session-tracking=systemd \
+    --with-modem-manager-1 \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc \
+    --enable-gtk-doc
+
+  make
+}
+
+check() {
+  export PATH="$srcdir/path:$PATH"
+  cd NetworkManager
+  make -k check
+}
+
+package_networkmanager() {
+  depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup
+           libmm-glib libnewt libndp libteam libgudev)
+  optdepends=('dnsmasq: connection sharing'
+              'bluez: Bluetooth support'
+              'openresolv: resolvconf support'
+              'ppp: dialup connection support'
+              'rp-pppoe: ADSL support'
+              'modemmanager: cellular network support')
+  install=networkmanager.install
+  backup=('etc/NetworkManager/NetworkManager.conf')
+
+  cd NetworkManager
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libnm uninstall
+  make DESTDIR="$pkgdir" -C libnm-glib uninstall
+  make DESTDIR="$pkgdir" -C libnm-util uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+
+  # Some stuff to move is left over
+  mv "$pkgdir/usr/include" ..
+  mv "$pkgdir/usr/lib/pkgconfig" ..
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}
+
+package_libnm-glib() {
+  pkgdesc="NetworkManager library"
+  depends=(libgudev nss dbus-glib libutil-linux)
+
+  install -d "$pkgdir/usr/lib"
+  mv include "$pkgdir/usr"
+  mv pkgconfig "$pkgdir/usr/lib"
+
+  cd NetworkManager
+  make DESTDIR="$pkgdir" -C libnm install
+  make DESTDIR="$pkgdir" -C libnm-util install
+  make DESTDIR="$pkgdir" -C libnm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
+}

Copied: networkmanager/repos/testing-x86_64/disable_set_hostname.patch (from rev 249452, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- testing-x86_64/disable_set_hostname.patch	                        (rev 0)
+++ testing-x86_64/disable_set_hostname.patch	2015-10-17 02:47:53 UTC (rev 249453)
@@ -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 249452, networkmanager/trunk/networkmanager.install)
===================================================================
--- testing-x86_64/networkmanager.install	                        (rev 0)
+++ testing-x86_64/networkmanager.install	2015-10-17 02:47:53 UTC (rev 249453)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp $2 0.8.3) < 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