From 5701dffe63be33ea9d5823ec2a78f0d489c42f91 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 17 Nov 2011 15:39:00 +0100 Subject: [PATCH] xbps-src: [verify_rundeps] safer way to detect invalid SONAMEs. --- xbps-src/shutils/verify_rundeps.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/xbps-src/shutils/verify_rundeps.sh b/xbps-src/shutils/verify_rundeps.sh index d979b0946c0..b6083473804 100644 --- a/xbps-src/shutils/verify_rundeps.sh +++ b/xbps-src/shutils/verify_rundeps.sh @@ -101,23 +101,18 @@ verify_rundeps() # for f in ${verify_deps}; do unset j rdep _rdep rdepcnt - rdep="$(grep "$f" $maplib|awk '{print $2}')" - rdepcnt="$(grep "$f" $maplib|awk '{print $2}'|wc -l)" + rdep="$(grep "^${f}.*$" $maplib|awk '{print $2}')" + rdepcnt="$(grep "^${f}.*$" $maplib|awk '{print $2}'|wc -l)" if [ -z "$rdep" ]; then # Ignore libs by current pkg - for j in ${verify_deps}; do - [ "$j" != "$f" ] && continue - found=1 - break - done - if [ -n "$found" ]; then - echo " SONAME: $f <-> $pkgname (ignored)" - continue - else - # Bail out if maplib is not aware for this lib + soname=$(find ${DESTDIR} -type f -name "$f"); + if [ -z "$soname" ]; then echo " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!" broken=1 + else + echo " SONAME: $f <-> $pkgname (ignored)" fi + continue elif [ "$rdepcnt" -gt 1 ]; then unset j found # Check if shlib is provided by multiple pkgs.