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

Jan Steffens heftig at archlinux.org
Fri Sep 11 20:23:09 UTC 2015


    Date: Friday, September 11, 2015 @ 22:23:08
  Author: heftig
Revision: 245816

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

Added:
  networkmanager/repos/extra-i686/0001-Add-Requires.private-glib-2.0.patch
    (from rev 245815, networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch)
  networkmanager/repos/extra-i686/NetworkManager.conf
    (from rev 245815, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/extra-i686/PKGBUILD
    (from rev 245815, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/extra-i686/disable_set_hostname.patch
    (from rev 245815, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/extra-i686/networkmanager.install
    (from rev 245815, networkmanager/trunk/networkmanager.install)
  networkmanager/repos/extra-x86_64/0001-Add-Requires.private-glib-2.0.patch
    (from rev 245815, networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch)
  networkmanager/repos/extra-x86_64/NetworkManager.conf
    (from rev 245815, networkmanager/trunk/NetworkManager.conf)
  networkmanager/repos/extra-x86_64/PKGBUILD
    (from rev 245815, networkmanager/trunk/PKGBUILD)
  networkmanager/repos/extra-x86_64/disable_set_hostname.patch
    (from rev 245815, networkmanager/trunk/disable_set_hostname.patch)
  networkmanager/repos/extra-x86_64/networkmanager.install
    (from rev 245815, 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

-------------------------------------------------------+
 /NetworkManager.conf                                  |   26 +
 /PKGBUILD                                             |  228 ++++++++++++++++
 /disable_set_hostname.patch                           |   38 ++
 /networkmanager.install                               |   18 +
 extra-i686/0001-Add-Requires.private-glib-2.0.patch   |   26 +
 extra-i686/NetworkManager.conf                        |   13 
 extra-i686/PKGBUILD                                   |  111 -------
 extra-i686/disable_set_hostname.patch                 |   19 -
 extra-i686/networkmanager.install                     |    9 
 extra-x86_64/0001-Add-Requires.private-glib-2.0.patch |   26 +
 extra-x86_64/NetworkManager.conf                      |   13 
 extra-x86_64/PKGBUILD                                 |  111 -------
 extra-x86_64/disable_set_hostname.patch               |   19 -
 extra-x86_64/networkmanager.install                   |    9 
 14 files changed, 362 insertions(+), 304 deletions(-)

Copied: networkmanager/repos/extra-i686/0001-Add-Requires.private-glib-2.0.patch (from rev 245815, networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch)
===================================================================
--- extra-i686/0001-Add-Requires.private-glib-2.0.patch	                        (rev 0)
+++ extra-i686/0001-Add-Requires.private-glib-2.0.patch	2015-09-11 20:23:08 UTC (rev 245816)
@@ -0,0 +1,26 @@
+From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Thu, 27 Aug 2015 11:13:40 -0500
+Subject: [PATCH] Add Requires.private: glib-2.0
+
+since commit 6f616d4c4b04d5478f60d0311317bc84c5459ea to nm-version.h
+a dependency to glib was added, but this wasn't reflected in pkg-config
+deps... until now.
+---
+ NetworkManager.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
+index 877c344..a0557ee 100644
+--- a/NetworkManager.pc.in
++++ b/NetworkManager.pc.in
+@@ -9,5 +9,6 @@ configdir=@sysconfdir@/NetworkManager
+ Name: NetworkManager
+ Description: System for maintaining active network connection
+ Requires:
++Requires.private: glib-2.0
+ Version: @VERSION@
+ Cflags: -I${includedir}/NetworkManager
+-- 
+1.9.3
+

Deleted: extra-i686/NetworkManager.conf
===================================================================
--- extra-i686/NetworkManager.conf	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-i686/NetworkManager.conf	2015-09-11 20:23:08 UTC (rev 245816)
@@ -1,13 +0,0 @@
-[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/extra-i686/NetworkManager.conf (from rev 245815, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-i686/NetworkManager.conf	                        (rev 0)
+++ extra-i686/NetworkManager.conf	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-i686/PKGBUILD	2015-09-11 20:23:08 UTC (rev 245816)
@@ -1,111 +0,0 @@
-# $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.6
-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)
-checkdepends=(libx11 python-gobject python-dbus)
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
-            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
-  cd NetworkManager-$pkgver
-  patch -Np1 -i ../disable_set_hostname.patch
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd NetworkManager-$pkgver
-  ./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
-
-  make
-}
-
-check() {
-  cd NetworkManager-$pkgver
-  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-$pkgver
-  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-$pkgver
-  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/extra-i686/PKGBUILD (from rev 245815, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-09-11 20:23:08 UTC (rev 245816)
@@ -0,0 +1,114 @@
+# $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.6
+pkgrel=2
+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)
+checkdepends=(libx11 python-gobject python-dbus)
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch
+        0001-Add-Requires.private-glib-2.0.patch)
+sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '96fa0ecd0dabf7ba48b0af4220165d5777ac41f2e4cafd9d5c7a8d072ce0c9d7')
+
+prepare() {
+  cd NetworkManager-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+  patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd NetworkManager-$pkgver
+  ./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
+
+  make
+}
+
+check() {
+  cd NetworkManager-$pkgver
+  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-$pkgver
+  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-$pkgver
+  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
+}

Deleted: extra-i686/disable_set_hostname.patch
===================================================================
--- extra-i686/disable_set_hostname.patch	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-i686/disable_set_hostname.patch	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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 245815, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-i686/disable_set_hostname.patch	                        (rev 0)
+++ extra-i686/disable_set_hostname.patch	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-i686/networkmanager.install	2015-09-11 20:23:08 UTC (rev 245816)
@@ -1,9 +0,0 @@
-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/extra-i686/networkmanager.install (from rev 245815, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-i686/networkmanager.install	                        (rev 0)
+++ extra-i686/networkmanager.install	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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/extra-x86_64/0001-Add-Requires.private-glib-2.0.patch (from rev 245815, networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch)
===================================================================
--- extra-x86_64/0001-Add-Requires.private-glib-2.0.patch	                        (rev 0)
+++ extra-x86_64/0001-Add-Requires.private-glib-2.0.patch	2015-09-11 20:23:08 UTC (rev 245816)
@@ -0,0 +1,26 @@
+From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Thu, 27 Aug 2015 11:13:40 -0500
+Subject: [PATCH] Add Requires.private: glib-2.0
+
+since commit 6f616d4c4b04d5478f60d0311317bc84c5459ea to nm-version.h
+a dependency to glib was added, but this wasn't reflected in pkg-config
+deps... until now.
+---
+ NetworkManager.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
+index 877c344..a0557ee 100644
+--- a/NetworkManager.pc.in
++++ b/NetworkManager.pc.in
+@@ -9,5 +9,6 @@ configdir=@sysconfdir@/NetworkManager
+ Name: NetworkManager
+ Description: System for maintaining active network connection
+ Requires:
++Requires.private: glib-2.0
+ Version: @VERSION@
+ Cflags: -I${includedir}/NetworkManager
+-- 
+1.9.3
+

Deleted: extra-x86_64/NetworkManager.conf
===================================================================
--- extra-x86_64/NetworkManager.conf	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-x86_64/NetworkManager.conf	2015-09-11 20:23:08 UTC (rev 245816)
@@ -1,13 +0,0 @@
-[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/extra-x86_64/NetworkManager.conf (from rev 245815, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-x86_64/NetworkManager.conf	                        (rev 0)
+++ extra-x86_64/NetworkManager.conf	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-x86_64/PKGBUILD	2015-09-11 20:23:08 UTC (rev 245816)
@@ -1,111 +0,0 @@
-# $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.6
-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)
-checkdepends=(libx11 python-gobject python-dbus)
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
-            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
-  cd NetworkManager-$pkgver
-  patch -Np1 -i ../disable_set_hostname.patch
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd NetworkManager-$pkgver
-  ./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
-
-  make
-}
-
-check() {
-  cd NetworkManager-$pkgver
-  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-$pkgver
-  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-$pkgver
-  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/extra-x86_64/PKGBUILD (from rev 245815, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-09-11 20:23:08 UTC (rev 245816)
@@ -0,0 +1,114 @@
+# $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.6
+pkgrel=2
+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)
+checkdepends=(libx11 python-gobject python-dbus)
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch
+        0001-Add-Requires.private-glib-2.0.patch)
+sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '96fa0ecd0dabf7ba48b0af4220165d5777ac41f2e4cafd9d5c7a8d072ce0c9d7')
+
+prepare() {
+  cd NetworkManager-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+  patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd NetworkManager-$pkgver
+  ./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
+
+  make
+}
+
+check() {
+  cd NetworkManager-$pkgver
+  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-$pkgver
+  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-$pkgver
+  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
+}

Deleted: extra-x86_64/disable_set_hostname.patch
===================================================================
--- extra-x86_64/disable_set_hostname.patch	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-x86_64/disable_set_hostname.patch	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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 245815, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-x86_64/disable_set_hostname.patch	                        (rev 0)
+++ extra-x86_64/disable_set_hostname.patch	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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-x86_64/networkmanager.install
===================================================================
--- extra-x86_64/networkmanager.install	2015-09-11 20:21:30 UTC (rev 245815)
+++ extra-x86_64/networkmanager.install	2015-09-11 20:23:08 UTC (rev 245816)
@@ -1,9 +0,0 @@
-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/extra-x86_64/networkmanager.install (from rev 245815, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-x86_64/networkmanager.install	                        (rev 0)
+++ extra-x86_64/networkmanager.install	2015-09-11 20:23:08 UTC (rev 245816)
@@ -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