New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

oscap-ssh - remote oval and xccdf evaluation #69

Merged
merged 21 commits into from Apr 30, 2015
Commits
Jump to file or symbol
Failed to load files and symbols.
+23 −0
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Install oscap-ssh when running `make install`

  • Loading branch information...
mpreisler committed Apr 18, 2015
commit cd946fee96e882c027eb913d25fa4b20a3c3ee42
View
@@ -462,6 +462,14 @@ AC_ARG_ENABLE([util-scap-as-rpm],
*) AC_MSG_ERROR([bad value ${enableval} for --enable-util-scap-as-rpm]) ;;
esac],[util_scap_as_rpm=yes])
AC_ARG_ENABLE([util-oscap-ssh],
[AC_HELP_STRING([--enable-util-oscap-ssh], [enable compilation of the oscap-ssh utility (default=yes)])],
[case "${enableval}" in
yes) util_oscap_ssh=yes ;;
no) util_oscap_ssh=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-util-oscap-ssh]) ;;
esac],[util_oscap_ssh=yes])
if test "$vgdebug" = "yes"; then
if test "$HAVE_VALGRIND" = "yes"; then
vgcheck="yes"
@@ -535,6 +543,7 @@ AM_CONDITIONAL([WANT_PROBES_SOLARIS], test "$probes_solaris" = yes)
AM_CONDITIONAL([WANT_SCE], test "$sce" = yes)
AM_CONDITIONAL([WANT_UTIL_OSCAP], test "$util_oscap" = yes)
AM_CONDITIONAL([WANT_UTIL_SCAP_AS_RPM], test "$util_scap_as_rpm" = yes)
AM_CONDITIONAL([WANT_UTIL_OSCAP_SSH], test "$util_oscap_ssh" = yes)
AM_CONDITIONAL([WANT_PYTHON], test "$python_bind" = yes)
AM_CONDITIONAL([WANT_PYTHON3], test "$python3_bind" = yes)
AM_CONDITIONAL([WANT_PERL], test "$perl_bind" = yes)
@@ -669,6 +678,7 @@ echo "OpenSCAP will be compiled with the following settings:"
echo
echo "oscap tool: $util_oscap"
echo "scap-as-rpm tool: $util_scap_as_rpm"
echo "oscap-ssh tool: $util_oscap_ssh"
echo "python2 bindings enabled: $python_bind"
echo "python3 bindings enabled: $python3_bind"
echo "perl bindings enabled: $perl_bind"
View
@@ -1179,6 +1179,14 @@ AC_ARG_ENABLE([util-scap-as-rpm],
*) AC_MSG_ERROR([bad value ${enableval} for --enable-util-scap-as-rpm]) ;;
esac],[util_scap_as_rpm=yes])
AC_ARG_ENABLE([util-oscap-ssh],
[AC_HELP_STRING([--enable-util-oscap-ssh], [enable compilation of the oscap-ssh utility (default=yes)])],
[case "${enableval}" in
yes) util_oscap_ssh=yes ;;
no) util_oscap_ssh=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-util-oscap-ssh]) ;;
esac],[util_oscap_ssh=yes])
if test "$vgdebug" = "yes"; then
if test "$HAVE_VALGRIND" = "yes"; then
vgcheck="yes"
@@ -1338,6 +1346,7 @@ AM_CONDITIONAL([WANT_PROBES_SOLARIS], test "$probes_solaris" = yes)
AM_CONDITIONAL([WANT_SCE], test "$sce" = yes)
AM_CONDITIONAL([WANT_UTIL_OSCAP], test "$util_oscap" = yes)
AM_CONDITIONAL([WANT_UTIL_SCAP_AS_RPM], test "$util_scap_as_rpm" = yes)
AM_CONDITIONAL([WANT_UTIL_OSCAP_SSH], test "$util_oscap_ssh" = yes)
AM_CONDITIONAL([WANT_PYTHON], test "$python_bind" = yes)
AM_CONDITIONAL([WANT_PYTHON3], test "$python3_bind" = yes)
AM_CONDITIONAL([WANT_PERL], test "$perl_bind" = yes)
@@ -1472,6 +1481,7 @@ echo "OpenSCAP will be compiled with the following settings:"
echo
echo "oscap tool: $util_oscap"
echo "scap-as-rpm tool: $util_scap_as_rpm"
echo "oscap-ssh tool: $util_oscap_ssh"
echo "python2 bindings enabled: $python_bind"
echo "python3 bindings enabled: $python3_bind"
echo "perl bindings enabled: $perl_bind"
View
@@ -40,5 +40,8 @@ if WANT_UTIL_SCAP_AS_RPM
bin_SCRIPTS += scap-as-rpm
man_MANS += scap-as-rpm.8
endif
if WANT_UTIL_OSCAP_SSH
bin_SCRIPTS += oscap-ssh
endif
EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS)
ProTip! Use n and p to navigate between commits in a pull request.