Skip to content

Commit

Permalink
probes/rpmverifypackage: Don't use RPMTRANS_FLAG_NOPLUGINS
Browse files Browse the repository at this point in the history
./configure on rhel7 is not able to detect right rpm version, so
we will fallback solution everytime
  • Loading branch information
Zbynek Moravec committed Jun 22, 2016
1 parent 7b5578c commit 555369c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
5 changes: 0 additions & 5 deletions ac_probes/configure.ac.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,6 @@ PKG_CHECK_MODULES([rpm], [rpm >= 4.6],[
],[
AC_MSG_NOTICE([libprm is older than 4.6])
])
PKG_CHECK_MODULES([rpm], [rpm >= 4.12],[
AC_DEFINE([HAVE_RPM412], [1], [Define to 1 if rpm is newer than 4.12.])
],[
AC_MSG_NOTICE([libprm is older than 4.12])
])
echo
echo '* Checking for bz2 library (optional dependency of libopenscap)'
AC_CHECK_LIB([bz2], [BZ2_bzReadOpen],
Expand Down
5 changes: 0 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,6 @@ PKG_CHECK_MODULES([rpm], [rpm >= 4.6],[
],[
AC_MSG_NOTICE([libprm is older than 4.6])
])
PKG_CHECK_MODULES([rpm], [rpm >= 4.12],[
AC_DEFINE([HAVE_RPM412], [1], [Define to 1 if rpm is newer than 4.12.])
],[
AC_MSG_NOTICE([libprm is older than 4.12])
])
echo
echo '* Checking for bz2 library (optional dependency of libopenscap)'
AC_CHECK_LIB([bz2], [BZ2_bzReadOpen],
Expand Down
2 changes: 2 additions & 0 deletions src/OVAL/probes/unix/linux/rpm-helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ typedef void *rpmlogCallbackData;
void rpmErrorCb (rpmlogRec rec, rpmlogCallbackData data);
#endif

// todo: HAVE_RPM412 needs to be set by configure,
// although fallback solution should have same result
#ifdef HAVE_RPM412
#define DISABLE_PLUGINS(ts) rpmtsSetFlags(ts, RPMTRANS_FLAG_NOPLUGINS)
#else
Expand Down

0 comments on commit 555369c

Please sign in to comment.