| 1 |
commit: e425311072fd1d289fbaa27baa23e788c7fed72e |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 05:39:38 2012 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 12:50:20 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=e4253110 |
| 7 |
|
| 8 |
tests/revdeppaxtest/revdeptest.sh: update to work with new revdep-pax |
| 9 |
|
| 10 |
--- |
| 11 |
tests/revdeppaxtest/revdeptest.sh | 31 ++++++++++--------------------- |
| 12 |
1 files changed, 10 insertions(+), 21 deletions(-) |
| 13 |
|
| 14 |
diff --git a/tests/revdeppaxtest/revdeptest.sh b/tests/revdeppaxtest/revdeptest.sh |
| 15 |
index 2bbfb56..6512959 100755 |
| 16 |
--- a/tests/revdeppaxtest/revdeptest.sh |
| 17 |
+++ b/tests/revdeppaxtest/revdeptest.sh |
| 18 |
@@ -45,23 +45,16 @@ RM="/bin/rm -f" |
| 19 |
MKDIR="/bin/mkdir -p" |
| 20 |
RMDIR="/bin/rmdir" |
| 21 |
LDD="/usr/bin/ldd" |
| 22 |
-LDCONFIG="/sbin/ldconfig" |
| 23 |
-LDCONFIGD="/etc/ld.so.conf.d/revdeptest.conf" |
| 24 |
|
| 25 |
|
| 26 |
-# create a ld.so.conf.d/ file |
| 27 |
-cat << EOF > "${LDCONFIGD}" |
| 28 |
-${LIBSPATH} |
| 29 |
-EOF |
| 30 |
-${LDCONFIG} |
| 31 |
- |
| 32 |
-# create our /var/db/pkg/${CAT}/${PKG}/NEEDED |
| 33 |
+# create our /var/db/pkg/${CAT}/${PKG}/NEEDED.ELF.2 |
| 34 |
CAT="zzz" |
| 35 |
PKG="revdepbin-1" |
| 36 |
VARDBPKG="/var/db/pkg" |
| 37 |
${MKDIR} "${VARDBPKG}/${CAT}/${PKG}" |
| 38 |
-cat << EOF > "${VARDBPKG}/${CAT}/${PKG}/NEEDED" |
| 39 |
-${LIBSPATH}/${BINARY} ${SONAME} |
| 40 |
+cat << EOF > "${VARDBPKG}/${CAT}/${PKG}/NEEDED.ELF.2" |
| 41 |
+XYZ;${LIBSPATH}/${BINARY};;;${SONAME} |
| 42 |
+XYZ;${LIBSPATH}/${LIBRARY};${SONAME};; |
| 43 |
EOF |
| 44 |
|
| 45 |
if [ "${verbose}" = 0 ] ;then |
| 46 |
@@ -104,14 +97,14 @@ do |
| 47 |
$PAXCTLNG -m${lf} "${LIBSPATH}/${LIBRARY}" |
| 48 |
|
| 49 |
p=$($PAXCTLNG -v ${LIBSPATH}/${BINARY}) |
| 50 |
- p=$(echo $p | awk '{ print $3 }') |
| 51 |
+ p=$(echo $p | awk '{ print $4 }') |
| 52 |
if [ "${verbose}" != 0 ] ;then |
| 53 |
echo " BEFORE: " |
| 54 |
echo " Binary: $p" |
| 55 |
fi |
| 56 |
|
| 57 |
p=$($PAXCTLNG -v ${LIBSPATH}/${LIBRARY}) |
| 58 |
- p=$(echo $p | awk '{ print $3 }') |
| 59 |
+ p=$(echo $p | awk '{ print $4 }') |
| 60 |
if [ "${verbose}" != 0 ] ;then |
| 61 |
echo " Library: $p" |
| 62 |
fi |
| 63 |
@@ -119,14 +112,14 @@ do |
| 64 |
$REVDEPPAX -m -y -s ${SONAME} >/dev/null 2>&1 |
| 65 |
|
| 66 |
ba=$($PAXCTLNG -v ${LIBSPATH}/${BINARY}) |
| 67 |
- ba=$(echo $ba | awk '{ print $3 }') |
| 68 |
+ ba=$(echo $ba | awk '{ print $4 }') |
| 69 |
if [ "${verbose}" != 0 ] ;then |
| 70 |
echo " AFTER: " |
| 71 |
echo " Binary: $ba" |
| 72 |
fi |
| 73 |
|
| 74 |
p=$($PAXCTLNG -v ${LIBSPATH}/${LIBRARY}) |
| 75 |
- p=$(echo $p | awk '{ print $3 }') |
| 76 |
+ p=$(echo $p | awk '{ print $4 }') |
| 77 |
if [ "${verbose}" != 0 ] ;then |
| 78 |
echo " Library: $p" |
| 79 |
fi |
| 80 |
@@ -165,15 +158,11 @@ done |
| 81 |
# do test here |
| 82 |
# |
| 83 |
|
| 84 |
-# clean up our /var/db/pkg/${CAT}/${PKG}/NEEDED |
| 85 |
-${RM} ${VARDBPKG}/${CAT}/${PKG}/NEEDED |
| 86 |
+# clean up our /var/db/pkg/${CAT}/${PKG}/NEEDED.ELF.2 |
| 87 |
+${RM} ${VARDBPKG}/${CAT}/${PKG}/NEEDED.ELF.2 |
| 88 |
${RMDIR} ${VARDBPKG}/${CAT}/${PKG} |
| 89 |
${RMDIR} ${VARDBPKG}/${CAT} |
| 90 |
|
| 91 |
-# clean up our ld.so.conf.d/ file |
| 92 |
-${RM} ${LDCONFIGD} |
| 93 |
-${LDCONFIG} |
| 94 |
- |
| 95 |
if [ "${verbose}" = 0 ] ;then |
| 96 |
echo |
| 97 |
echo |
Archives