[arch-commits] Commit in networkmanager/trunk (3 files)

Jan Steffens heftig at archlinux.org
Wed Jan 25 23:25:43 UTC 2017


    Date: Wednesday, January 25, 2017 @ 23:25:43
  Author: heftig
Revision: 287483

1.6.0-1

Added:
  networkmanager/trunk/20-connectivity.conf
Modified:
  networkmanager/trunk/NetworkManager.conf
  networkmanager/trunk/PKGBUILD

----------------------+
 20-connectivity.conf |    2 
 NetworkManager.conf  |   10 ---
 PKGBUILD             |  155 +++++++++++++++++++++++++++++++------------------
 3 files changed, 104 insertions(+), 63 deletions(-)

Added: 20-connectivity.conf
===================================================================
--- 20-connectivity.conf	                        (rev 0)
+++ 20-connectivity.conf	2017-01-25 23:25:43 UTC (rev 287483)
@@ -0,0 +1,2 @@
+[connectivity]
+uri=http://pkgbuild.com/check_network_status.txt

Modified: NetworkManager.conf
===================================================================
--- NetworkManager.conf	2017-01-25 23:11:48 UTC (rev 287482)
+++ NetworkManager.conf	2017-01-25 23:25:43 UTC (rev 287483)
@@ -1,8 +1,2 @@
-[main]
-plugins=keyfile
-dns=default
-
-## HTTP-based connectivity check
-#[connectivity]
-#uri=http://nmcheck.gnome.org/check_network_status.txt
-#interval=100
+# Configuration file for NetworkManager.
+# See "man 5 NetworkManager.conf" for details.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-25 23:11:48 UTC (rev 287482)
+++ PKGBUILD	2017-01-25 23:25:43 UTC (rev 287483)
@@ -7,8 +7,8 @@
 # Contributor: Valentine Sinitsyn <e_val at inbox.ru>
 
 pkgbase=networkmanager
-pkgname=(networkmanager libnm-glib)
-pkgver=1.4.4
+pkgname=(networkmanager libnm libnm-glib)
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Network connection manager and user applications"
 arch=(i686 x86_64)
@@ -15,22 +15,22 @@
 license=(GPL2 LGPL2.1)
 url="https://wiki.gnome.org/Projects/NetworkManager"
 _pppver=2.4.7
-makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
-             "ppp=$_pppver" modemmanager dbus-glib iproute2 nss polkit
-             wpa_supplicant libsoup systemd libgudev libmm-glib rp-pppoe
-             libnewt libndp libteam vala perl-yaml python-gobject git)
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
+             dbus-glib iproute2 nss polkit wpa_supplicant libsoup systemd libgudev libmm-glib
+             libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
+             glib2-docs)
 checkdepends=(libx11 python-dbus)
-_commit=3c70a03cf5be420afaaf44f3a0bab5d00cc4e993  # tags/1.4.4^0
+_commit=2554a8736d41e1091fb69a796a126f818873449b  # tags/1.6.0^0
 source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
-        NetworkManager.conf)
+        NetworkManager.conf 20-connectivity.conf)
 sha256sums=('SKIP'
-            '67f112c1ac8ee3726eb229f5cd783de19f09cc252af49e157343d82b324b923f')
+            'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
+            '1961f50c8ed2668052bb543a29a11ccf8a5a1226473234a915aa139ceb32d472')
 
 prepare() {
+  mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
+
   cd NetworkManager
-
-  2to3 -w libnm src tools
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -44,30 +44,65 @@
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
+    runstatedir=/run \
     --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/networkmanager \
+    --libexecdir=/usr/lib/NetworkManager \
+    --disable-ifcfg-rh \
+    --disable-ifcfg-suse \
+    --disable-ifnet \
+    --disable-ifupdown \
+    --disable-lto \
+    --disable-more-warnings \
+    --disable-static \
+    --enable-bluez5-dun \
+    --enable-concheck \
+    --enable-config-plugin-ibft \
+    --enable-gtk-doc \
+    --enable-introspection \
+    --enable-json-validation \
+    --enable-ld-gc \
+    --enable-modify-system \
+    --enable-polkit \
+    --enable-polkit-agent \
+    --enable-teamdctl \
+    --enable-wifi \
+    --with-config-dhcp-default=dhclient \
+    --with-config-dns-rc-manager-default=resolvconf \
+    --with-config-logging-backend-default=journal \
+    --with-config-plugins-default=keyfile,ibft \
     --with-crypto=nss \
+    --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
     --with-dhclient=/usr/bin/dhclient \
-    --without-dhcpcd \
+    --with-dist-version="$pkgver-$pkgrel, Arch Linux" \
     --with-dnsmasq=/usr/bin/dnsmasq \
+    --with-dnssec-trigger=/usr/lib/dnssec-trigger \
+    --with-hostname-persist=default \
     --with-iptables=/usr/bin/iptables \
+    --with-kernel-firmware-dir=/usr/lib/firmware \
+    --with-libnm-glib \
+    --with-libsoup \
+    --with-modem-manager-1 \
+    --with-nmcli \
+    --with-nmtui \
+    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+    --with-pppd=/usr/bin/pppd \
+    --with-resolvconf=/usr/bin/resolvconf \
+    --with-session-tracking=systemd \
+    --with-suspend-resume=systemd \
+    --with-system-ca-path=/etc/ssl/certs \
+    --with-systemd-journal \
+    --with-systemd-logind \
     --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
+    --with-wext \
+    --without-consolekit \
+    --without-dhcpcd \
+    --without-libaudit \
+    --without-netconfig \
+    --without-ofono \
+    --without-selinux
 
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
   make
 }
@@ -78,13 +113,12 @@
 }
 
 package_networkmanager() {
-  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib
-           libnewt libndp libteam)
+  depends=(libnm iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam
+           bluez-libs)
   optdepends=('dnsmasq: connection sharing'
               'bluez: Bluetooth support'
               'openresolv: resolvconf support'
               'ppp: dialup connection support'
-              'rp-pppoe: ADSL support'
               'dhclient: External DHCP client'
               'modemmanager: cellular network support')
   backup=('etc/NetworkManager/NetworkManager.conf')
@@ -91,34 +125,45 @@
 
   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 -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+  install -Dm644 ../20-connectivity.conf \
+    "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf"
 
-  rm -r "$pkgdir/var/run"
-  rmdir -p --ignore-fail-on-non-empty \
-    "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0}
-}
+### Split libnm-glib
 
-package_libnm-glib() {
-  pkgdesc="NetworkManager library"
-  depends=(libgudev nss dbus-glib libutil-linux jansson)
+  cd ../libnm-glib
+  mv "$pkgdir"/usr/include/libnm-glib usr/include
+  mv "$pkgdir"/usr/lib/girepository-1.0/NMClient* usr/lib/girepository-1.0
+  mv "$pkgdir"/usr/lib/libnm-{glib,util}* usr/lib
+  mv "$pkgdir"/usr/lib/pkgconfig/libnm-{glib,util}* usr/lib/pkgconfig
+  mv "$pkgdir"/usr/share/gir-1.0/NMClient* usr/share/gir-1.0
+  mv "$pkgdir"/usr/share/gtk-doc/html/libnm-{glib,util} usr/share/gtk-doc/html
+  mv "$pkgdir"/usr/share/vala/vapi/libnm-{glib,util}* usr/share/vala/vapi
 
-  install -d "$pkgdir/usr/lib"
-  mv include "$pkgdir/usr"
-  mv pkgconfig "$pkgdir/usr/lib"
+### Split libnm
 
-  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
+  cd ../libnm
+  mv "$pkgdir"/usr/include/libnm usr/include
+  mv "$pkgdir"/usr/lib/girepository-1.0/NM* usr/lib/girepository-1.0
+  mv "$pkgdir"/usr/lib/libnm* usr/lib
+  mv "$pkgdir"/usr/lib/pkgconfig/libnm* usr/lib/pkgconfig
+  mv "$pkgdir"/usr/share/gir-1.0/NM* usr/share/gir-1.0
+  mv "$pkgdir"/usr/share/gtk-doc/html/libnm usr/share/gtk-doc/html
+  mv "$pkgdir"/usr/share/vala/vapi/libnm* usr/share/vala/vapi
+
+  rmdir -p --ignore-fail-on-non-empty "$pkgdir"/{run/NetworkManager,usr/share/vala/vapi}
 }
+
+package_libnm() {
+  pkgdesc="NetworkManager client library"
+  depends=(glib2 libgudev nss libutil-linux jansson)
+  mv libnm/* "$pkgdir"
+}
+
+package_libnm-glib() {
+  pkgdesc="NetworkManager client library (legacy)"
+  depends=(libnm dbus-glib)
+  mv libnm-glib/* "$pkgdir"
+}



More information about the arch-commits mailing list