[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r964 - trunk/openvas-libraries
From: scm-commit () wald ! intevation ! org
Date: 2008-06-25 21:06:00
Message-ID: 20080625210600.139CE1422E () pyrosoma ! intevation ! org
[Download RAW message or body]
Author: jan
Date: 2008-06-25 23:05:59 +0200 (Wed, 25 Jun 2008)
New Revision: 964
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/INSTALL_README
trunk/openvas-libraries/configure
trunk/openvas-libraries/configure.in
trunk/openvas-libraries/libopenvas-config.pre.in
trunk/openvas-libraries/openvas-libraries.tmpl.in
Log:
Removing handling of "CIPHER" information because
the client-server communication is always encrypted.
* configure.in: Removed handling of "cipher_cflags"
and "use_cipher". This means the option --enable-cipher
is not available anymore.
* libopenvas-config.pre.in: Removed handling of CIPHER and
CIPHER_CFLAGS.
* openvas-libraries.tmpl.in: Removed handling of
USE_CIPHER and CIPHER_CFLAGS.
* INSTALL_README: only slightly improved. Now does
not mention anymore --enable-cipher option.
* configure: Updated.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2008-06-25 13:31:32 UTC (rev 963)
+++ trunk/openvas-libraries/ChangeLog 2008-06-25 21:05:59 UTC (rev 964)
@@ -1,3 +1,23 @@
+2008-06-25 Jan-Oliver Wagner <jan-oliver.wagner@intevation.de>
+
+ Removing handling of "CIPHER" information because
+ the client-server communication is always encrypted.
+
+ * configure.in: Removed handling of "cipher_cflags"
+ and "use_cipher". This means the option --enable-cipher
+ is not available anymore.
+
+ * libopenvas-config.pre.in: Removed handling of CIPHER and
+ CIPHER_CFLAGS.
+
+ * openvas-libraries.tmpl.in: Removed handling of
+ USE_CIPHER and CIPHER_CFLAGS.
+
+ * INSTALL_README: only slightly improved. Now does
+ not mention anymore --enable-cipher option.
+
+ * configure: Updated.
+
2008-06-20 Tim Brown <timb@nth-dimension.org.uk>
* libopenvas/hlst.c (sort_hlst): Avoid sorting an hlst if it has no
Modified: trunk/openvas-libraries/INSTALL_README
===================================================================
--- trunk/openvas-libraries/INSTALL_README 2008-06-25 13:31:32 UTC (rev 963)
+++ trunk/openvas-libraries/INSTALL_README 2008-06-25 21:05:59 UTC (rev 964)
@@ -1,8 +1,9 @@
$Id$
ATTENTION:
-These are old instructions from the Nessus age.
-Things might have changed.
+These are old instructions from the Nessus age, only
+slighlty updated for names and available features.
+More things might have changed.
However, the usual "./configure && make && make install" procedure
ist still valid.
@@ -32,22 +33,9 @@
1. configure options
All the configure options have been centralized the the
- 'configure' script of nessus-libraries.
-
- For instance, if you want to disable the cipher layer,
- then just type :
+ 'configure' script of openvas-libraries.
- ./configure --disable-cipher
-
- This will affect the build of the other packages, as
- the 'configure' options are then hardcoded in the
- nessus library.
-
The current configure options are :
-
- --enable-cipher[=NN] enables the compilation of the cipher
- layer with a special option: NN is the
- size of the keys (use this for US export.)
--disable-ptmx use this directive if you have problems
with the pseudo tty multiplexer; on
Modified: trunk/openvas-libraries/configure
===================================================================
--- trunk/openvas-libraries/configure 2008-06-25 13:31:32 UTC (rev 963)
+++ trunk/openvas-libraries/configure 2008-06-25 21:05:59 UTC (rev 964)
@@ -846,7 +846,6 @@
INSTALL
EXTRA
debug_cflags
-cipher_cflags
with_ws2_32
llib
version
@@ -1452,7 +1451,6 @@
--enable-debug-store Warn the user if a plugin has too many CVE/BID/XRefs
--enable-debug-ssl produce verbose output regarding SSL
--enable-debug set the compiler flags to -g
- --enable-cipher crypts the client - server communication
--enable-getoptlong force using/disbling the internal GNU getopt package
--enable-ptmx force using/disabling the /dev/ptmx multiplexer
--enable-openpty if present, use/disable openpty for creating ptys
@@ -1924,7 +1922,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-use_cipher=yes
GCC_NO_PIPE=no
# Check whether --enable-gccpipe was given.
@@ -4723,7 +4720,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4726 "configure"' > conftest.$ac_ext
+ echo '#line 4723 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5275,7 +5272,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5278: \"$ac_compile\") 1>&5; (eval $ac_compile) \
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo \
configure:5275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && \
test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the \
option if not recognized # So say no if there are warnings
if test -s out/conftest.err; then
@@ -7136,7 +7133,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7139 "configure"
+#line 7136 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7234,7 +7231,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7237 "configure"
+#line 7234 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8503,18 +8500,7 @@
-# Check whether --enable-cipher was given.
-if test "${enable_cipher+set}" = set; then
- enableval=$enable_cipher; if test x$enable_cipher = xno ; then
- use_cipher=no
- else
- use_cipher=yes
- fi
-fi
-
-
-
# Check whether --with-egd was given.
if test "${with_egd+set}" = set; then
withval=$with_egd;
@@ -14193,7 +14179,6 @@
-
ac_config_files="$ac_config_files openvas-libraries.tmpl libopenvas-config.pre \
include/libvers.h"
cat >confcache <<\_ACEOF
@@ -14886,7 +14871,6 @@
INSTALL!$INSTALL$ac_delim
EXTRA!$EXTRA$ac_delim
debug_cflags!$debug_cflags$ac_delim
-cipher_cflags!$cipher_cflags$ac_delim
with_ws2_32!$with_ws2_32$ac_delim
llib!$llib$ac_delim
version!$version$ac_delim
@@ -14903,7 +14887,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/openvas-libraries/configure.in
===================================================================
--- trunk/openvas-libraries/configure.in 2008-06-25 13:31:32 UTC (rev 963)
+++ trunk/openvas-libraries/configure.in 2008-06-25 21:05:59 UTC (rev 964)
@@ -51,7 +51,6 @@
AC_LANG_C
dnl Set some defaults, enable with keyword 'yes'
-use_cipher=yes
GCC_NO_PIPE=no
dnl some compiler option
@@ -131,14 +130,6 @@
-AC_ARG_ENABLE(cipher, [ --enable-cipher crypts the client - server communication],
- [if test x$enable_cipher = xno ; then
- use_cipher=no
- else
- use_cipher=yes
- fi])
-
-
AC_ARG_WITH(egd,
[ --with-egd=/path specifies the path to the EGD socket],
[
@@ -512,7 +503,6 @@
AC_SUBST(INSTALL)
AC_SUBST(EXTRA)
AC_SUBST(debug_cflags)
-AC_SUBST(cipher_cflags)
AC_SUBST(with_ws2_32)
AC_SUBST(llib)
AC_SUBST(version)
Modified: trunk/openvas-libraries/libopenvas-config.pre.in
===================================================================
--- trunk/openvas-libraries/libopenvas-config.pre.in 2008-06-25 13:31:32 UTC (rev \
963)
+++ trunk/openvas-libraries/libopenvas-config.pre.in 2008-06-25 21:05:59 UTC (rev \
964) @@ -31,8 +31,6 @@
LIBDIR=$PREFIX/lib
INCLUDEDIR=$PREFIX/include
VERSION=@version@
-CIPHER="%CIPHER_LDFLAGS%"
-CIPHER_CFLAGS="%CIPHER_CFLAGS%"
EXTRA="@EXTRA@ @llib@"
EGDPATH="@egdpath@"
@@ -62,10 +60,10 @@
;;
--libs)
- echo $Xn "-L$LIBDIR -lopenvas -lopenvas_hg $CIPHER $EXTRA $Xc"
+ echo $Xn "-L$LIBDIR -lopenvas -lopenvas_hg $EXTRA $Xc"
;;
--cflags)
- echo $Xn "$DEFS -I$INCLUDEDIR/openvas $CIPHER_CFLAGS $Xc"
+ echo $Xn "$DEFS -I$INCLUDEDIR/openvas $Xc"
;;
--egd)
echo $Xn "$EGDPATH" $Xc
Modified: trunk/openvas-libraries/openvas-libraries.tmpl.in
===================================================================
--- trunk/openvas-libraries/openvas-libraries.tmpl.in 2008-06-25 13:31:32 UTC (rev \
963)
+++ trunk/openvas-libraries/openvas-libraries.tmpl.in 2008-06-25 21:05:59 UTC (rev \
964) @@ -47,10 +47,8 @@
top_builddir = @PWDD@
include= -I. -I$(rootdir)/include -I$(includedir)
lib_dir=@libdir@
-USE_CIPHER=@cipher_cflags@
INSTALL=@INSTALL@
INSTALL_DIR=@INSTALL_DIR@
-CIPHER_CFLAGS=@cipher_cflags@
WS2_32=@with_ws2_32@
@@ -62,7 +60,7 @@
DEBUG_SSL = @debug_ssl@
# Some defines you may want to modify
-DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)
+DEFS=@DEFS@ $(DEBUG_SSL) $(DEBUG)
LDFLAGS=
# Your C compiler
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic