Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / lib32-libnm


Commits:
73749e92 by Jan Alexander Steffens (heftig) at 2024-02-24T23:20:11+01:00
Remove references to ebpf and bluez5_dun (match extra/networkmanager)

They're disabled by default.

- - - - -
6387f523 by Jan Alexander Steffens (heftig) at 2024-04-20T00:09:46+02:00
Use tag pinning

- - - - -
ff9bf63c by Jan Alexander Steffens (heftig) at 2024-04-20T00:13:31+02:00
drop workaround for fortification level

See: 
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/commit/af20d82a235c8d1100f0403041128dde11042d2b

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -20,7 +20,7 @@ pkgbase = lib32-libnm
        depends = lib32-util-linux
        depends = libnm
        provides = libnm.so
-       source = 
git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=e39f48a30a2ef7b445276a859bbd5255e4c5071d
-       b2sums = SKIP
+       source = 
git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#tag=1.46.0
+       b2sums = 
9285561e9c7ffb3e5d60ce60120d53e137c0ec2c36a373ee76befc3c93e54d191ff3187a287fbf05ab97bf8012ce72dd232a6756ebd0d59a5089c92b333a1bd2
 
 pkgname = lib32-libnm


=====================================
PKGBUILD
=====================================
@@ -33,16 +33,11 @@ makedepends=(
   meson
 )
 provides=(libnm.so)
-_commit=e39f48a30a2ef7b445276a859bbd5255e4c5071d  # tags/1.46.0^0
 source=(
-  
"git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit";
+  # Can't locate the public key (sf...@redhat.com, 
E472337703D0C46002928B5790617850A125DE59)
+  
"git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#tag=$pkgver";
 )
-b2sums=('SKIP')
-
-pkgver() {
-  cd NetworkManager
-  git describe --tags | sed 's/-dev/dev/;s/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g'
-}
+b2sums=('9285561e9c7ffb3e5d60ce60120d53e137c0ec2c36a373ee76befc3c93e54d191ff3187a287fbf05ab97bf8012ce72dd232a6756ebd0d59a5089c92b333a1bd2')
 
 prepare() {
   cd NetworkManager
@@ -67,9 +62,7 @@ build() {
     -D selinux=false
 
     # features
-    -D bluez5_dun=false
     -D concheck=false
-    -D ebpf=false
     -D iwd=false
     -D modem_manager=false
     -D nm_cloud_setup=false
@@ -97,10 +90,6 @@ build() {
     -D qt=false
   )
 
-  # NM uses malloc_usable_size in code copied from systemd
-  CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-  CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-
   arch-meson NetworkManager build "${meson_options[@]}"
   meson compile -C build
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libnm/-/compare/f56cba466a556b1a039202f25a21f3d4d976644c...ff9bf63cd392467d54a7bdfe304be8d7e8b5ac79

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-libnm/-/compare/f56cba466a556b1a039202f25a21f3d4d976644c...ff9bf63cd392467d54a7bdfe304be8d7e8b5ac79
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to