New upstream version 1.56.0 upstream/1.56.0

5 files changed, 15 insertions, 72 deletions

diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh
index 38bcdaf6..e6fc01b9 100755
--- a/tools/create-exports-NetworkManager.sh
+++ b/tools/create-exports-NetworkManager.sh
@@ -18,14 +18,8 @@ _sort() {
 }
 
 call_nm() {
-    if [ -n "$from_meson" ]; then
-        "${NM:-nm}" "$1" |
-            sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
-    else
-        libtool=(${LIBTOOL:-libtool})
-        ${libtool[@]} --mode=execute "${NM:-nm}" "$1" |
-            sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
-    fi
+    "${NM:-nm}" -D "$1" |
+        sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
 }
 
 get_symbols_nm () {
@@ -42,9 +36,9 @@ EOF
 }
 
 get_symbols_missing() {
-    (for f in $(find ./src/core/settings/plugins/*/${libs} \
-                     ./src/core/devices/*/${libs} \
-                     ./src/core/ppp/${libs} -name '*.so' 2>/dev/null); do
+    (for f in $(find ./src/core/settings/plugins/*/ \
+                     ./src/core/devices/*/ \
+                     ./src/core/ppp/ -name '*.so' 2>/dev/null); do
         call_nm "$f" |
             sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|nmtst_\|c_siphash_\|c_list_\).*\)$/\2/p'
     done) |
@@ -61,14 +55,6 @@ do_update() {
     do_generate > ./src/core/NetworkManager.ver
 }
 
-if [ -f "build.ninja" ]; then
-    from_meson=1
-    libs=
-else
-    from_meson=
-    libs=.libs/
-fi
-
 SYMBOLS_MISSING="$(get_symbols_missing | pretty)"
 SYMBOLS_EXPLICIT="$(get_symbols_explicit | pretty)"
 
@@ -86,7 +72,7 @@ local:
 EOF
 }
 
-test -f ./src/core/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree"
+test -f ./src/core/libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree"
 
 case "$1" in
     --called-from-build)
@@ -105,4 +91,3 @@ case "$1" in
         do_generate
         ;;
 esac
-
diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh
index fe85d417..2560e3d1 100755
--- a/tools/meson-post-install.sh
+++ b/tools/meson-post-install.sh
@@ -7,7 +7,7 @@ nm_pkglibdir="$4"
 nm_pkgstatedir="$5"
 nm_mandir="$6"
 nm_sysconfdir="$7"
-enable_docs="$8"
+enable_man="$8"
 enable_ifcfg_rh="$9"
 enable_nm_cloud_setup="${10}"
 install_systemdunitdir="${11}"
@@ -40,7 +40,7 @@ done
 mkdir -p "${DESTDIR}${nm_pkgstatedir}"
 chmod 0700 "${DESTDIR}${nm_pkgstatedir}"
 
-if [ "$enable_docs" = 1 ]; then
+if [ "$enable_man" = 1 ]; then
 
     for alias in nmtui-connect nmtui-edit nmtui-hostname; do
         ln -fn "${DESTDIR}${nm_mandir}/man1/nmtui.1" "${DESTDIR}${nm_mandir}/man1/${alias}.1"
@@ -58,4 +58,3 @@ if [ "$enable_nm_cloud_setup" = 1 -a "$install_systemdunitdir" = 1 ]; then
     ln -sfn '../pre-up.d/90-nm-cloud-setup.sh' "${DESTDIR}${nm_pkglibdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh"
     ln -sfn 'no-wait.d/90-nm-cloud-setup.sh' "${DESTDIR}${nm_pkglibdir}/dispatcher.d/90-nm-cloud-setup.sh"
 fi
-
diff --git a/tools/nm-in-container b/tools/nm-in-container
index 365b8fcf..e4ee8b94 100755
--- a/tools/nm-in-container
+++ b/tools/nm-in-container
@@ -189,7 +189,7 @@ RUN dnf install -y \\
     --skip-broken \\
     \\
     /usr/bin/python \\
-    /usr/sbin/ausearch \\
+    audit \\
     ModemManager-devel \\
     ModemManager-glib-devel \\
     NetworkManager \\
@@ -227,11 +227,10 @@ RUN dnf install -y \\
     libnvme-devel \\
     libpsl-devel \\
     libselinux-devel \\
-    libtool \\
     libubsan \\
     libuuid-devel \\
     meson \\
-    mlocate \\
+    plocate \\
     mobile-broadband-provider-info-devel \\
     newt-devel \\
     nispor \\
@@ -267,7 +266,7 @@ RUN dnf install -y \\
     which \\
     \\
     'dbus*' \\
-    'openvswitch2*' \\
+    'openvswitch*' \\
     /usr/bin/pytest \\
     /usr/bin/debuginfo-install \\
     NetworkManager-openvpn \\
@@ -290,7 +289,6 @@ RUN dnf install -y \\
     git \\
     hostapd \\
     iproute-tc \\
-    ipsec-tools \\
     iputils \\
     iscsi-initiator-utils \\
     iw \\
@@ -322,7 +320,7 @@ RUN dnf install -y \\
     wireguard-tools \\
     wireshark-cli
 
-RUN dnf debuginfo-install --skip-broken NetworkManager \$(ldd /usr/sbin/NetworkManager | sed -n 's/.* => \\(.*\\) (0x[0-9A-Fa-f]*)$/\1/p' | xargs -n1 readlink -f) -y
+RUN dnf debuginfo-install --skip-unavailable --skip-broken NetworkManager \$(ldd /usr/sbin/NetworkManager | sed -n 's/.* => \\(.*\\) (0x[0-9A-Fa-f]*)$/\1/p' | xargs -n1 readlink -f) -y
 
 RUN dnf clean all
 
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 9f0a6531..fe61f14b 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -34,8 +34,6 @@ usage() {
     echo "        depending on a hard-coded list of tests that require it. This flag overwrites"
     echo "        the automatism to always launch a D-Bus session"
     echo "  --no-launch-dbus|-D: prevent launching a D-Bus session"
-    echo "  --no-libtool: when running with valgrind, the script tries automatically to"
-    echo "        use libtool as necessary. This disables libtool usage"
     echo "  --valgrind|-v: run under valgrind"
     echo "  --no-valgrind|-V: disable running under valgrind (overrides NMTST_USE_VALGRIND=1)"
     echo "  -d: set NMTST_DEBUG=d"
@@ -50,7 +48,6 @@ usage() {
     echo ""
     echo "  The following environment variables are honored:"
     echo "    NMTST_USE_VALGRIND=0|1: enable/disable valgrind"
-    echo "    NMTST_LIBTOOL=: libtool path (or disable)"
     echo "    NMTST_LAUNCH_DBUS=0|1: whether to lounch a D-Bus session"
     echo "    NMTST_SET_DEBUG=0|1: saet NMTST_DEBUG=d"
     echo ""
@@ -75,12 +72,6 @@ BUILDDIR=
 if [ "$CALLED_FROM_MAKE" == 1 ]; then
     BUILDDIR="$1"
     shift
-    if [ -n "$1" ]; then
-        NMTST_LIBTOOL=($1 --mode=execute);
-    else
-        NMTST_LIBTOOL=()
-    fi
-    shift
     NMTST_VALGRIND_ARG="$1"; shift
     if [[ "$NMTST_VALGRIND_ARG" == no ]]; then
         NMTST_VALGRIND_ARG=
@@ -130,14 +121,6 @@ else
         # by default, disable valgrind checks.
         NMTST_USE_VALGRIND=0
     fi
-
-    if [ -n "$NMTST_LIBTOOL" ] ; then
-        NMTST_LIBTOOL=("$NMTST_LIBTOOL" "--mode=execute")
-    elif [ -z "${NMTST_LIBTOOL+x}" -a -f "$SCRIPT_PATH/../libtool" ]; then
-        NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" "--mode=execute")
-    else
-        NMTST_LIBTOOL=()
-    fi
     TEST_ARGV=()
     unset TEST
     while test $# -gt 0; do
@@ -154,10 +137,6 @@ else
             NMTST_LAUNCH_DBUS=0
             shift
             ;;
-        "--no-libtool")
-            NMTST_LIBTOOL=()
-            shift
-            ;;
         "--valgrind"|-v)
             NMTST_USE_VALGRIND=1
             shift;
@@ -209,7 +188,6 @@ else
                 BUILDDIR="$(dirname "$BUILDDIR")"
                 [[ "$BUILDDIR" == / ]] && BUILDDIR=
                 [[ -z "$BUILDDIR" ]] && break
-                [[ -e "$BUILDDIR/src/libnm-client-impl/.libs/libnm.so" ]] && break
                 [[ -e "$BUILDDIR/src/libnm-client-impl/libnm.so" ]] && break
             done
         fi
@@ -257,11 +235,7 @@ fi
 if [[ -n "$BUILDDIR" ]]; then
     if [[ -d "$BUILDDIR/src/libnm-client-impl" ]]; then
         export GI_TYPELIB_PATH="$BUILDDIR/src/libnm-client-impl/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
-        if [[ -d "$BUILDDIR/src/libnm-client-impl/.libs" ]]; then
-            export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-        else
-            export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-        fi
+        export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
     fi
 fi
 
@@ -304,7 +278,6 @@ export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 export NM_TEST_UNDER_VALGRIND=1
 "${NMTST_DBUS_RUN_SESSION[@]}" \
-"${NMTST_LIBTOOL[@]}" \
 "$NMTST_VALGRIND" \
     --quiet \
     --error-exitcode=$VALGRIND_ERROR \
diff --git a/tools/test-sudo-wrapper.sh b/tools/test-sudo-wrapper.sh
index b375368e..a9019bc3 100755
--- a/tools/test-sudo-wrapper.sh
+++ b/tools/test-sudo-wrapper.sh
@@ -3,25 +3,13 @@
 CMD="$1"
 shift;
 
-# convert the libtool internal path
-resolve_cmd() {
-    local C="$1"
-
-    local C2="$(echo "$C" | sed 's#^\(.*/\)\.libs/lt-\([^/]\+\)$#\1\2#')"
-    if [[ "$C2" != "$C" && ! -x "$C2" ]]; then
-        # such a file does not exist... back to $C
-        C2="$C"
-    fi
-    echo "$C2"
-}
-
 if [[ $UID == 0 ]]; then
     # we are already root. Execute directly.
-    exec "$(resolve_cmd "$CMD")" "$@"
+    exec "$CMD" "$@"
 elif [[ "$NMTST_SUDO_NO_CALL_SELF" != "" ]]; then
     # when setting $NMTST_SUDO_NO_CALL_SELF, pass the (resolved) command
     # directly to sudo.
-    exec sudo "$(resolve_cmd "$CMD")" "$@"
+    exec sudo "$CMD" "$@"
 else
     # by default, call self again with sudo.
     exec sudo -E "$0" "$CMD" "$@"