#34 updpkg: nonsystemd/networkmanager 1.32.12-1.nonsystemd1
Opened 2 months ago by commodorecrunch. Modified 2 months ago
commodorecrunch/abslibre networkmanager  into  pull-requests

@@ -8,20 +8,20 @@ 

  

  pkgbase=networkmanager

  pkgname=(networkmanager libnm)

- pkgver=1.30.4

- pkgrel=3

+ pkgver=1.32.12

+ pkgrel=1

  pkgrel+=.nonsystemd1

  pkgdesc="Network connection manager and user applications"

  url="https://wiki.gnome.org/Projects/NetworkManager"

  arch=(x86_64 i686 armv7h)

- license=(GPL2 LGPL2.1)

+ license=(GPL)

  _pppver=2.4.9

  makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager

               iproute2 nss polkit wpa_supplicant curl elogind libmm-glib

               libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs

               glib2-docs dhcpcd iwd dnsmasq openresolv libpsl audit meson)

  checkdepends=(libx11 python-dbus)

- _commit=a3e45da9f984d58e3b76d6ca064033541d819eca  # tags/1.30.4^0

+ _commit=d90c03b1b8f3e6f5ff8fbc1cbc176f0a0dec6362  # tags/1.32.12^0

  source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"

          NetworkManager.{confd,initd} 10-openrc-status)

  sha256sums=('SKIP'
@@ -36,9 +36,6 @@ 

  

  prepare() {

    cd NetworkManager

- 

-   # https://bugs.archlinux.org/task/70710

-   git cherry-pick -n 8acad5a20cc61081438294efc634c0e245452e35

  }

  

  build() {
@@ -97,32 +94,35 @@ 

    provides=($pkgname-{elogind,openrc})

    replaces=($pkgname-{elogind,openrc})

    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://www.archlinux.org/check_network_status.txt

+ uri=http://ping.archlinux.org/nm-check.txt

  END

  

+   shopt -s globstar

+ 

  ### Split libnm

-   _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.*

  

    # Init script

    install -Dm755 ${srcdir}/NetworkManager.confd ${pkgdir}/etc/conf.d/NetworkManager
@@ -138,6 +138,7 @@ 

  

  package_libnm() {

    pkgdesc="NetworkManager client library"

+   license=(LGPL)

    depends=(glib2 nss libutil-linux jansson libelogind)

    mv libnm/* "$pkgdir"

  }

Metadata