commit 14062a093a847220aa9158a8901abc847b9630e7 Author: Tim Biermann <tbier@posteo.de> Date: Sat May 30 11:30:32 2020 +0000 networkmanager: 1.24.0 -> 1.24.2 diff --git a/networkmanager/.footprint b/networkmanager/.footprint index 127ef8ce4..59733946b 100644 --- a/networkmanager/.footprint +++ b/networkmanager/.footprint @@ -141,10 +141,10 @@ drwxr-xr-x root/root usr/include/libnm/ -rw-r--r-- root/root usr/include/libnm/nm-wimax-nsp.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/NetworkManager/ -drwxr-xr-x root/root usr/lib/NetworkManager/1.24.0/ --rwxr-xr-x root/root usr/lib/NetworkManager/1.24.0/libnm-device-plugin-adsl.so --rwxr-xr-x root/root usr/lib/NetworkManager/1.24.0/libnm-device-plugin-wifi.so --rwxr-xr-x root/root usr/lib/NetworkManager/1.24.0/libnm-settings-plugin-ifupdown.so +drwxr-xr-x root/root usr/lib/NetworkManager/1.24.2/ +-rwxr-xr-x root/root usr/lib/NetworkManager/1.24.2/libnm-device-plugin-adsl.so +-rwxr-xr-x root/root usr/lib/NetworkManager/1.24.2/libnm-device-plugin-wifi.so +-rwxr-xr-x root/root usr/lib/NetworkManager/1.24.2/libnm-settings-plugin-ifupdown.so drwxr-xr-x root/root usr/lib/NetworkManager/VPN/ drwxr-xr-x root/root usr/lib/NetworkManager/conf.d/ drwxr-xr-x root/root usr/lib/NetworkManager/dispatcher.d/ diff --git a/networkmanager/.signature b/networkmanager/.signature index fc3b45ab7..86e568031 100644 --- a/networkmanager/.signature +++ b/networkmanager/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3y/KgLStytQSjAy6zcCKfO6Qp/HxG8+c9W8b8CEqqxqLlSEGXzk/SKofbC+0wTMeo6Hw1VeI1V2bf/cj10fLOw4= -SHA256 (Pkgfile) = ed3b356e1c5e35cb819bfa3fb78ea5684ddc57c90f2acabd0ba9e6cf7f7c2b0c -SHA256 (.footprint) = ccb788dcf0c7425d99cb58dbe06376ffb21ae68c998e20a3baeb331012128eab -SHA256 (NetworkManager-1.24.0.tar.xz) = c342ce0da9967d28d280ecdcef0d0c0696744a5d0ee36cd891542e60a8230418 +RWSagIOpLGJF38taGgx8md0IXvtVg8KIECZBFPkSZVb4S9JXCypggcGwAplHNPbXyasij9L9AbMhQbxdRCXTTXyPw/GwLlwVKgo= +SHA256 (Pkgfile) = 9223abf23ff0287d867b74f550525cc426e4330416b2c56da7997b31f6ef4395 +SHA256 (.footprint) = b84379ceb75601afa4f66d7b47d28a1efddb188b5077245f4ec183c72e7c5a5c +SHA256 (NetworkManager-1.24.2.tar.xz) = 2cc6075c41354c3f3426a3f7664754c0264f47ccb80f815ce78550e02203ceb2 SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc SHA256 (NetworkManager.conf) = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21 SHA256 (polkit.conf) = 7410be567871e4dc8ef1e8204f80b7cfd0dd08abfa514408b7d549bdc70dbaba diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile index 18eff3acd..8e8f12f47 100644 --- a/networkmanager/Pkgfile +++ b/networkmanager/Pkgfile @@ -5,26 +5,21 @@ # Optional: ppp avahi bash-completion dbus libnl jansson libteam dnsmasq name=networkmanager -version=1.24.0 +version=1.24.2 release=1 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz networkmanager.rc NetworkManager.conf polkit.conf dhcp.conf - org.freedesktop.NetworkManager.rules -) + org.freedesktop.NetworkManager.rules) build() { - cd NetworkManager-$version - - sed '/initrd/d' -i src/meson.build - - mkdir build - cd build + sed '/initrd/d' -i NetworkManager-$version/src/meson.build CXXFLAGS+="-O2 -fPIC" \ - meson --prefix /usr \ + meson NetworkManager-$version build \ + --prefix /usr \ --sysconfdir /etc \ --localstatedir /var \ --libexecdir /usr/lib/networkmanager \ @@ -63,10 +58,9 @@ build() { -Dmore_logging=false \ -Dmore_asserts=0 \ -Dlibpsl=false \ - .. - ninja - DESTDIR=$PKG ninja install + ninja -C build + DESTDIR=$PKG ninja -C build install # Install config file install -Dm 644 $SRC/NetworkManager.conf $PKG/etc/NetworkManager/NetworkManager.conf @@ -82,6 +76,8 @@ build() { # install polkit rules install -Dm 644 $SRC/org.freedesktop.NetworkManager.rules $PKG/usr/share/polkit-1/rules.d/org.freedesktop.NetworkManager.rules - # Remove bash-completion config - rm -rf $PKG/usr/share/bash-completion + # cleanup + + rm -rf $PKG/usr/lib/firewalld + [ -e /usr/lib/pkgconfig/bash-completion.pc ] || rm -rf $PKG/usr/share/bash-completion }