[arch-commits] Commit in networkmanager/repos/testing-x86_64 (PKGBUILD PKGBUILD)
Jan Steffens
heftig at archlinux.org
Wed May 5 19:45:06 UTC 2021
Date: Wednesday, May 5, 2021 @ 19:45:05
Author: heftig
Revision: 414417
archrelease: copy trunk to testing-x86_64
Added:
networkmanager/repos/testing-x86_64/PKGBUILD
(from rev 414416, networkmanager/trunk/PKGBUILD)
Deleted:
networkmanager/repos/testing-x86_64/PKGBUILD
----------+
PKGBUILD | 310 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 156 insertions(+), 154 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-05 19:44:45 UTC (rev 414416)
+++ PKGBUILD 2021-05-05 19:45:05 UTC (rev 414417)
@@ -1,154 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: 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 nm-cloud-setup)
-pkgver=1.30.4
-pkgrel=2
-pkgdesc="Network connection manager and user applications"
-url="https://wiki.gnome.org/Projects/NetworkManager"
-arch=(x86_64)
-license=(GPL2 LGPL2.1)
-_pppver=2.4.9
-makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
- iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
- libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
- glib2-docs iwd dnsmasq openresolv libpsl audit meson)
-checkdepends=(libx11 python-dbus)
-_commit=a3e45da9f984d58e3b76d6ca064033541d819eca # tags/1.30.4^0
-source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd NetworkManager
- git describe --abbrev=10 | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
-}
-
-prepare() {
- cd NetworkManager
-}
-
-build() {
- local meson_args=(
- # system paths
- -D dbus_conf_dir=/usr/share/dbus-1/system.d
-
- # platform
- -D dist_version="$pkgver-$pkgrel"
- -D session_tracking_consolekit=false
- -D suspend_resume=systemd
- -D modify_system=true
- -D polkit_agent=true
- -D selinux=false
-
- # features
- -D iwd=true
- -D pppd_plugin_dir=/usr/lib/pppd/$_pppver
- -D teamdctl=true
- -D nm_cloud_setup=true
- -D bluez5_dun=true
- -D ebpf=true
-
- # configuration plugins
- -D config_plugins_default=keyfile
-
- # handlers for resolv.conf
- -D netconfig=no
- -D config_dns_rc_manager_default=symlink
-
- # dhcp clients
- -D dhcpcd=no
-
- # miscellaneous
- -D vapi=true
- -D docs=true
- -D more_asserts=no
- -D more_logging=false
- -D qt=false
- )
-
- arch-meson NetworkManager build "${meson_args[@]}"
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_networkmanager() {
- depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
- bluez-libs libpsl audit mobile-broadband-provider-info)
- optdepends=('dnsmasq: connection sharing'
- 'bluez: Bluetooth support'
- 'ppp: dialup connection support'
- 'modemmanager: cellular network support'
- 'iwd: wpa_supplicant alternative'
- 'dhclient: alternative DHCP client'
- 'openresolv: alternative resolv.conf manager'
- 'firewalld: Firewall support')
- backup=(etc/NetworkManager/NetworkManager.conf)
- groups=(gnome)
-
- DESTDIR="$pkgdir" meson install -C build
-
- # /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
-
- # packaged configuration
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
-[connectivity]
-uri=http://ping.archlinux.org/nm-check.txt
-END
-
- shopt -s globstar
-
- _pick libnm "$pkgdir"/usr/include/libnm
- _pick libnm "$pkgdir"/usr/lib/girepository-1.0/NM-*
- _pick libnm "$pkgdir"/usr/lib/libnm.*
- _pick libnm "$pkgdir"/usr/lib/pkgconfig/libnm.pc
- _pick libnm "$pkgdir"/usr/share/gir-1.0/NM-*
- _pick libnm "$pkgdir"/usr/share/gtk-doc/html/libnm
- _pick libnm "$pkgdir"/usr/share/vala/vapi/libnm.*
-
- _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup*
- _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup*
-
- # Restore empty dir
- mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d"
-}
-
-package_libnm() {
- pkgdesc="NetworkManager client library"
- depends=(glib2 nss util-linux-libs jansson systemd-libs)
- provides=(libnm.so)
-
- mv libnm/* "$pkgdir"
-}
-
-package_nm-cloud-setup() {
- pkgdesc="Automatically configure NetworkManager in cloud"
- depends=(networkmanager)
-
- mv nm-cloud-setup/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 414416, networkmanager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-05 19:45:05 UTC (rev 414417)
@@ -0,0 +1,156 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: 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 nm-cloud-setup)
+pkgver=1.30.4
+pkgrel=3
+pkgdesc="Network connection manager and user applications"
+url="https://wiki.gnome.org/Projects/NetworkManager"
+arch=(x86_64)
+license=(GPL2 LGPL2.1)
+_pppver=2.4.9
+makedepends=(intltool dhclient dhcpcd iptables gobject-introspection gtk-doc
+ "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl
+ systemd libmm-glib libnewt libndp libteam vala perl-yaml
+ python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq
+ openresolv libpsl audit meson)
+checkdepends=(libx11 python-dbus)
+_commit=a3e45da9f984d58e3b76d6ca064033541d819eca # tags/1.30.4^0
+source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd NetworkManager
+ git describe --abbrev=10 | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
+}
+
+prepare() {
+ cd NetworkManager
+
+ # https://bugs.archlinux.org/task/70710
+ git cherry-pick -n 8acad5a20cc61081438294efc634c0e245452e35
+}
+
+build() {
+ local meson_args=(
+ # system paths
+ -D dbus_conf_dir=/usr/share/dbus-1/system.d
+
+ # platform
+ -D dist_version="$pkgver-$pkgrel"
+ -D session_tracking_consolekit=false
+ -D suspend_resume=systemd
+ -D modify_system=true
+ -D polkit_agent=true
+ -D selinux=false
+
+ # features
+ -D iwd=true
+ -D pppd_plugin_dir=/usr/lib/pppd/$_pppver
+ -D teamdctl=true
+ -D nm_cloud_setup=true
+ -D bluez5_dun=true
+ -D ebpf=true
+
+ # configuration plugins
+ -D config_plugins_default=keyfile
+
+ # handlers for resolv.conf
+ -D netconfig=no
+ -D config_dns_rc_manager_default=symlink
+
+ # miscellaneous
+ -D vapi=true
+ -D docs=true
+ -D more_asserts=no
+ -D more_logging=false
+ -D qt=false
+ )
+
+ arch-meson NetworkManager build "${meson_args[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_networkmanager() {
+ depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
+ bluez-libs libpsl audit mobile-broadband-provider-info)
+ optdepends=('dnsmasq: connection sharing'
+ 'bluez: Bluetooth support'
+ 'ppp: dialup connection support'
+ 'modemmanager: cellular network support'
+ 'iwd: wpa_supplicant alternative'
+ 'dhclient: alternative DHCP client'
+ 'dhcpcd: alternative DHCP client'
+ 'openresolv: alternative resolv.conf manager'
+ 'firewalld: Firewall support')
+ backup=(etc/NetworkManager/NetworkManager.conf)
+ groups=(gnome)
+
+ DESTDIR="$pkgdir" meson install -C build
+
+ # /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
+
+ # packaged configuration
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
+[connectivity]
+uri=http://ping.archlinux.org/nm-check.txt
+END
+
+ shopt -s globstar
+
+ _pick libnm "$pkgdir"/usr/include/libnm
+ _pick libnm "$pkgdir"/usr/lib/girepository-1.0/NM-*
+ _pick libnm "$pkgdir"/usr/lib/libnm.*
+ _pick libnm "$pkgdir"/usr/lib/pkgconfig/libnm.pc
+ _pick libnm "$pkgdir"/usr/share/gir-1.0/NM-*
+ _pick libnm "$pkgdir"/usr/share/gtk-doc/html/libnm
+ _pick libnm "$pkgdir"/usr/share/vala/vapi/libnm.*
+
+ _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup*
+ _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup*
+
+ # Restore empty dir
+ mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d"
+}
+
+package_libnm() {
+ pkgdesc="NetworkManager client library"
+ depends=(glib2 nss util-linux-libs jansson systemd-libs)
+ provides=(libnm.so)
+
+ mv libnm/* "$pkgdir"
+}
+
+package_nm-cloud-setup() {
+ pkgdesc="Automatically configure NetworkManager in cloud"
+ depends=(networkmanager)
+
+ mv nm-cloud-setup/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list