Date: Tuesday, March 13, 2018 @ 20:59:08 Author: heftig Revision: 318877
archrelease: copy trunk to testing-x86_64 Added: networkmanager/repos/testing-x86_64/20-connectivity.conf (from rev 318876, networkmanager/trunk/20-connectivity.conf) networkmanager/repos/testing-x86_64/NetworkManager.conf (from rev 318876, networkmanager/trunk/NetworkManager.conf) networkmanager/repos/testing-x86_64/PKGBUILD (from rev 318876, networkmanager/trunk/PKGBUILD) Deleted: networkmanager/repos/testing-x86_64/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch networkmanager/repos/testing-x86_64/20-connectivity.conf networkmanager/repos/testing-x86_64/NetworkManager.conf networkmanager/repos/testing-x86_64/PKGBUILD ------------------------------------------------------+ 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch | 43 -- 20-connectivity.conf | 4 NetworkManager.conf | 4 PKGBUILD | 365 ++++++++--------- 4 files changed, 184 insertions(+), 232 deletions(-) Deleted: 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch =================================================================== --- 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch 2018-03-13 20:58:15 UTC (rev 318876) +++ 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch 2018-03-13 20:59:08 UTC (rev 318877) @@ -1,43 +0,0 @@ -From 0acfc3e775b7ea3fccefd48f90644ef85fd76b3b Mon Sep 17 00:00:00 2001 -Message-Id: <0acfc3e775b7ea3fccefd48f90644ef85fd76b3b.1515702272.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Thu, 11 Jan 2018 21:23:38 +0100 -Subject: [PATCH] nmp-netns: Mount /proc in the new namespace - -The /proc inherited from the parent namespace might be read-only. ---- - src/platform/nmp-netns.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c -index e31c881d6..7ec647241 100644 ---- a/src/platform/nmp-netns.c -+++ b/src/platform/nmp-netns.c -@@ -503,12 +503,24 @@ nmp_netns_new (void) - goto err_out; - } - -+ if (umount2 ("/proc", MNT_DETACH) != 0) { -+ errsv = errno; -+ _LOGE (NULL, "failed umount /proc: %s", g_strerror (errsv)); -+ goto err_out; -+ } -+ - if (mount ("sysfs", "/sys", "sysfs", 0, NULL) != 0) { - errsv = errno; - _LOGE (NULL, "failed mount /sys: %s", g_strerror (errsv)); - goto err_out; - } - -+ if (mount ("proc", "/proc", "proc", 0, NULL) != 0) { -+ errsv = errno; -+ _LOGE (NULL, "failed mount /proc: %s", g_strerror (errsv)); -+ goto err_out; -+ } -+ - self = _netns_new (&error); - if (!self) { - errsv = errno; --- -2.15.1 - Deleted: 20-connectivity.conf =================================================================== --- 20-connectivity.conf 2018-03-13 20:58:15 UTC (rev 318876) +++ 20-connectivity.conf 2018-03-13 20:59:08 UTC (rev 318877) @@ -1,2 +0,0 @@ -[connectivity] -uri=http://www.archlinux.org/check_network_status.txt Copied: networkmanager/repos/testing-x86_64/20-connectivity.conf (from rev 318876, networkmanager/trunk/20-connectivity.conf) =================================================================== --- 20-connectivity.conf (rev 0) +++ 20-connectivity.conf 2018-03-13 20:59:08 UTC (rev 318877) @@ -0,0 +1,2 @@ +[connectivity] +uri=http://www.archlinux.org/check_network_status.txt Deleted: NetworkManager.conf =================================================================== --- NetworkManager.conf 2018-03-13 20:58:15 UTC (rev 318876) +++ NetworkManager.conf 2018-03-13 20:59:08 UTC (rev 318877) @@ -1,2 +0,0 @@ -# Configuration file for NetworkManager. -# See "man 5 NetworkManager.conf" for details. Copied: networkmanager/repos/testing-x86_64/NetworkManager.conf (from rev 318876, networkmanager/trunk/NetworkManager.conf) =================================================================== --- NetworkManager.conf (rev 0) +++ NetworkManager.conf 2018-03-13 20:59:08 UTC (rev 318877) @@ -0,0 +1,2 @@ +# Configuration file for NetworkManager. +# See "man 5 NetworkManager.conf" for details. Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-13 20:58:15 UTC (rev 318876) +++ PKGBUILD 2018-03-13 20:59:08 UTC (rev 318877) @@ -1,185 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Maintainer: Jan de Groot <j...@archlinxu.org> -# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> -# Contributor: Tor Krill <t...@krill.nu> -# Contributor: Will Rea <sillywi...@gmail.com> -# Contributor: Valentine Sinitsyn <e_...@inbox.ru> - -pkgbase=networkmanager -pkgname=(networkmanager libnm libnm-glib) -pkgver=1.10.5dev+3+g5159c34ea -pkgrel=2 -pkgdesc="Network connection manager and user applications" -arch=(x86_64) -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 - libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs - glib2-docs dhcpcd) -checkdepends=(libx11 python-dbus) -_commit=5159c34ea8923bf0c17fd31e183c5803b72b97f3 # nm-1-10 -source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit" - 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch) -sha256sums=('SKIP' - '9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0') - -prepare() { - mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}} - - cd NetworkManager - - # Fix test_netns_general in our containers - patch -Np1 -i ../0001-nmp-netns-Mount-proc-in-the-new-namespace.patch - - NOCONFIGURE=1 ./autogen.sh -} - -pkgver() { - cd NetworkManager - git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g' -} - -build() { - cd NetworkManager - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - runstatedir=/run \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib \ - --disable-ifcfg-rh \ - --disable-ifcfg-suse \ - --disable-ifnet \ - --disable-ifupdown \ - --disable-lto \ - --disable-more-logging \ - --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=internal \ - --with-config-dns-rc-manager-default=symlink \ - --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 \ - --with-dhcpcd-supports-ipv6 \ - --with-dhcpcd=/usr/bin/dhcpcd \ - --with-dist-version="$pkgver-$pkgrel, Arch Linux" \ - --with-dnsmasq=/usr/bin/dnsmasq \ - --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ - --with-hostname-persist=default \ - --with-iptables=/usr/bin/iptables \ - --with-kernel-firmware-dir=/usr/lib/firmware \ - --with-libnm-glib \ - --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-wext \ - --without-consolekit \ - --without-libaudit \ - --without-more-asserts \ - --without-netconfig \ - --without-ofono \ - --without-selinux - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd NetworkManager - make -k check -} - -package_networkmanager() { - depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam curl - bluez-libs) - optdepends=('dnsmasq: connection sharing' - 'bluez: Bluetooth support' - 'ppp: dialup connection support' - 'modemmanager: cellular network support') - backup=('etc/NetworkManager/NetworkManager.conf') - groups=('gnome') - - cd NetworkManager - make DESTDIR="$pkgdir" install - - # packaged configuration - install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END -[connectivity] -uri=http://www.archlinux.org/check_network_status.txt -END - - # /etc/NetworkManager - install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d - install -dm700 "$pkgdir/etc/NetworkManager/system-connections" - install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END -# Configuration file for NetworkManager. -# See "man 5 NetworkManager.conf" for details. -END - -### Split libnm - - 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.pc 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 - -### Split libnm-glib - - cd ../libnm-glib - mv "$pkgdir"/usr/include/* usr/include - mv "$pkgdir"/usr/lib/girepository-1.0/* usr/lib/girepository-1.0 - mv "$pkgdir"/usr/lib/libnm-* usr/lib - mv "$pkgdir"/usr/lib/pkgconfig/* usr/lib/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0/* usr/share/gir-1.0 - mv "$pkgdir"/usr/share/gtk-doc/html/libnm-* usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/vala/vapi/* usr/share/vala/vapi - - rmdir -p --ignore-fail-on-non-empty \ - "$pkgdir"/usr/include \ - "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \ - "$pkgdir"/usr/share/{gir-1.0,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" -} Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 318876, networkmanager/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-13 20:59:08 UTC (rev 318877) @@ -0,0 +1,180 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Maintainer: Jan de Groot <j...@archlinxu.org> +# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> +# Contributor: Tor Krill <t...@krill.nu> +# Contributor: Will Rea <sillywi...@gmail.com> +# Contributor: Valentine Sinitsyn <e_...@inbox.ru> + +pkgbase=networkmanager +pkgname=(networkmanager libnm libnm-glib) +pkgver=1.10.6 +pkgrel=1 +pkgdesc="Network connection manager and user applications" +arch=(x86_64) +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 + libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs + glib2-docs dhcpcd) +checkdepends=(libx11 python-dbus) +_commit=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712 # tags/1.10.6^0 +source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit") +sha256sums=('SKIP') + +prepare() { + mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}} + + cd NetworkManager + NOCONFIGURE=1 ./autogen.sh +} + +pkgver() { + cd NetworkManager + git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g' +} + +build() { + cd NetworkManager + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + runstatedir=/run \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --disable-ifcfg-rh \ + --disable-ifcfg-suse \ + --disable-ifnet \ + --disable-ifupdown \ + --disable-lto \ + --disable-more-logging \ + --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=internal \ + --with-config-dns-rc-manager-default=symlink \ + --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 \ + --with-dhcpcd-supports-ipv6 \ + --with-dhcpcd=/usr/bin/dhcpcd \ + --with-dist-version="$pkgver-$pkgrel, Arch Linux" \ + --with-dnsmasq=/usr/bin/dnsmasq \ + --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ + --with-hostname-persist=default \ + --with-iptables=/usr/bin/iptables \ + --with-kernel-firmware-dir=/usr/lib/firmware \ + --with-libnm-glib \ + --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-wext \ + --without-consolekit \ + --without-libaudit \ + --without-more-asserts \ + --without-netconfig \ + --without-ofono \ + --without-selinux + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd NetworkManager + # netns tests fail in our containers + make -k check || : +} + +package_networkmanager() { + depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam curl + bluez-libs) + optdepends=('dnsmasq: connection sharing' + 'bluez: Bluetooth support' + 'ppp: dialup connection support' + 'modemmanager: cellular network support') + backup=('etc/NetworkManager/NetworkManager.conf') + groups=('gnome') + + cd NetworkManager + make DESTDIR="$pkgdir" install + + # packaged configuration + install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END +[connectivity] +uri=http://www.archlinux.org/check_network_status.txt +END + + # /etc/NetworkManager + install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d + install -dm700 "$pkgdir/etc/NetworkManager/system-connections" + install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END +# Configuration file for NetworkManager. +# See "man 5 NetworkManager.conf" for details. +END + +### Split libnm + + 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.pc 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 + +### Split libnm-glib + + cd ../libnm-glib + mv "$pkgdir"/usr/include/* usr/include + mv "$pkgdir"/usr/lib/girepository-1.0/* usr/lib/girepository-1.0 + mv "$pkgdir"/usr/lib/libnm-* usr/lib + mv "$pkgdir"/usr/lib/pkgconfig/* usr/lib/pkgconfig + mv "$pkgdir"/usr/share/gir-1.0/* usr/share/gir-1.0 + mv "$pkgdir"/usr/share/gtk-doc/html/libnm-* usr/share/gtk-doc/html + mv "$pkgdir"/usr/share/vala/vapi/* usr/share/vala/vapi + + rmdir -p --ignore-fail-on-non-empty \ + "$pkgdir"/usr/include \ + "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \ + "$pkgdir"/usr/share/{gir-1.0,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" +}