Updated to 1.32

Continue to use iptables

1 files changed, 40 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 092c30a..b6fcd45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,27 +9,34 @@
 # # I maintain this because:
 # Arch version is not configured for openrc
 # Arch version uses git
+# Arch version uses nftables
+
+_offline=1
 
 _altname=NetworkManager
 pkgbase=networkmanager
 pkgname=(networkmanager libnm nm-cloud-setup)
-_basever=1.30
-pkgver=${_basever}.4
-pkgrel=3
+_basever=1.32
+pkgver=${_basever}.0
+pkgrel=1
 pkgdesc="Network connection manager and user applications"
 pkgdesc+=", modified for openrc"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch=(x86_64)
-license=(GPL2 LGPL2.1)
+license=(GPL)
 _pppver=2.4.9
 makedepends=(intltool dhclient dhcpcd iptables gobject-introspection gtk-doc
              "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl
-             libelogind libmm-glib libnewt libndp libteam vala perl-yaml
+             libelogind libmm-glib libnewt libndp libteam nftables vala perl-yaml
              python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq
              openresolv libpsl audit meson)
 checkdepends=(libx11 python-dbus)
 source=(https://download.gnome.org/sources/${_altname}/${_basever}/${_altname}-${pkgver}.tar.xz)
-b2sums=('c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde')
+b2sums=('26a0642b217cde3b2ec39312b671a4d6c78460299c566fb6ce1130457803f039f242bf38cf6ce98924847c076f3c7dfb8c366fe87c8902b97e7bd11986fdfed6')
+
+prepare() {
+  cd ${_altname}-${pkgver}
+}
 
 build() {
   local meson_args=(
@@ -76,9 +83,11 @@ build() {
 }
 
 # tests do not work in an offline build environment
-#check() {
-#  meson test -C build --print-errorlogs
-#}
+  if [ "${_modclang}" == "0" ]; then
+check() {
+  meson test -C build --print-errorlogs
+}
+  fi
 
 _pick() {
   local p="$1" f d; shift
@@ -94,6 +103,8 @@ 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'
+              'nftables: connection sharing'
+              'iptables: connection sharing'
               'bluez: Bluetooth support'
               'ppp: dialup connection support'
               'modemmanager: cellular network support'
@@ -101,45 +112,47 @@ package_networkmanager() {
               'dhclient: alternative DHCP client'
               'dhcpcd: alternative DHCP client'
               'openresolv: alternative resolv.conf manager'
-              'firewalld: Firewall support')
+              'firewalld: firewall support')
   backup=(etc/NetworkManager/NetworkManager.conf)
-  groups=(gnome)
 
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
+
+  cd "$pkgdir"
 
   # /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
+  install -d etc/NetworkManager/{conf,dnsmasq}.d
+  install -dm700 etc/NetworkManager/system-connections
+  install -m644 /dev/stdin 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
+  install -Dm644 /dev/stdin 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 libnm usr/include/libnm
+  _pick libnm usr/lib/girepository-1.0/NM-*
+  _pick libnm usr/lib/libnm.*
+  _pick libnm usr/lib/pkgconfig/libnm.pc
+  _pick libnm usr/share/gir-1.0/NM-*
+  _pick libnm usr/share/gtk-doc/html/libnm
+  _pick libnm 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*
+  _pick cloud usr/lib/**/*nm-cloud-setup*
+  _pick cloud usr/share/man/*/nm-cloud-setup*
 
   # Restore empty dir
-  mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d"
+  install -d usr/lib/NetworkManager/dispatcher.d/no-wait.d
 }
 
 package_libnm() {
   pkgdesc="NetworkManager client library"
+  license=(LGPL)
   depends=(glib2 nss util-linux-libs jansson libelogind)
   provides=(libnm.so)
 
@@ -150,5 +163,5 @@ package_nm-cloud-setup() {
   pkgdesc="Automatically configure NetworkManager in cloud"
   depends=(networkmanager)
 
-  mv nm-cloud-setup/* "$pkgdir"
+  mv cloud/* "$pkgdir"
 }