[Openvas-commits] r3467 - trunk/openvas-plugins

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon May 25 15:10:19 CEST 2009


Author: mwiegand
Date: 2009-05-25 15:10:17 +0200 (Mon, 25 May 2009)
New Revision: 3467

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/configure
   trunk/openvas-plugins/configure.in
Log:
Implementing first step of Change Request #32: Discontinuing the tarball
releases of openvas-plugins (http://www.openvas.org/openvas-cr-32.html).

* configure.in: Added test to the configure environment to make sure
openvas-plugins will not install in case openvas-server >= 2.1.0 is
installed and notify the user that from openvas-server >= 2.1.0 on
openvas-plugins is not needed anymore.

* configure: Regenerated.


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-05-25 13:00:42 UTC (rev 3466)
+++ trunk/openvas-plugins/ChangeLog	2009-05-25 13:10:17 UTC (rev 3467)
@@ -1,3 +1,15 @@
+2009-05-25  Michael Wiegand <michael.wiegand at intevation.de>
+
+	Implementing first step of Change Request #32: Discontinuing the tarball
+	releases of openvas-plugins (http://www.openvas.org/openvas-cr-32.html).
+
+	* configure.in: Added test to the configure environment to make sure
+	openvas-plugins will not install in case openvas-server >= 2.1.0 is
+	installed and notify the user that from openvas-server >= 2.1.0 on
+	openvas-plugins is not needed anymore.
+
+	* configure: Regenerated.
+
 2009-05-24 Michael Meyer <mime at gmx.de>
 	* scripts/nsd_35029.nasl,
 	scripts/nsd_version.nasl,

Modified: trunk/openvas-plugins/configure
===================================================================
--- trunk/openvas-plugins/configure	2009-05-25 13:00:42 UTC (rev 3466)
+++ trunk/openvas-plugins/configure	2009-05-25 13:10:17 UTC (rev 3467)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1774 .
+# From configure.in Revision: 3014 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -1909,6 +1909,7 @@
 
 NEED_OPENVASLIBS_VERSION=1.0.0
 NEED_OPENVASD_VERSION=0.9.2
+INVALID_WITH_OPENVASD_VERSION=2.1.0
 
 
 
@@ -3667,7 +3668,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3670 "configure"' > conftest.$ac_ext
+  echo '#line 3671 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6285,11 +6286,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6288: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6289: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6292: \$? = $ac_status" >&5
+   echo "$as_me:6293: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6553,11 +6554,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6556: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6557: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6560: \$? = $ac_status" >&5
+   echo "$as_me:6561: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6657,11 +6658,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6660: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6661: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6664: \$? = $ac_status" >&5
+   echo "$as_me:6665: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8954,7 +8955,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8957 "configure"
+#line 8958 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9054,7 +9055,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9057 "configure"
+#line 9058 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11390,11 +11391,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11393: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11394: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11397: \$? = $ac_status" >&5
+   echo "$as_me:11398: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11494,11 +11495,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11497: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11498: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11501: \$? = $ac_status" >&5
+   echo "$as_me:11502: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13055,11 +13056,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13058: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13059: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13062: \$? = $ac_status" >&5
+   echo "$as_me:13063: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13159,11 +13160,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13162: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13163: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13166: \$? = $ac_status" >&5
+   echo "$as_me:13167: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15346,11 +15347,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15349: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15350: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15353: \$? = $ac_status" >&5
+   echo "$as_me:15354: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15614,11 +15615,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15617: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15618: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15621: \$? = $ac_status" >&5
+   echo "$as_me:15622: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15718,11 +15719,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15721: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15722: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15725: \$? = $ac_status" >&5
+   echo "$as_me:15726: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18982,6 +18983,12 @@
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
 REQ_OPENVASD_PATCH=`echo $NEED_OPENVASD_VERSION | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+INV_OPENVASD_MAJOR=`echo $INVALID_WITH_OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+INV_OPENVASD_MINOR=`echo $INVALID_WITH_OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+INV_OPENVASD_PATCH=`echo $INVALID_WITH_OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
 
 
 ok=no
@@ -19010,6 +19017,31 @@
    { (exit 1); exit 1; }; }
 fi
 
+ok=no
+if test "$OPENVASD_MAJOR" -lt "$INV_OPENVASD_MAJOR"; then
+  ok=yes
+else
+  if test "$OPENVASD_MAJOR" -eq "$INV_OPENVASD_MAJOR"; then
+    if test "$OPENVASD_MINOR" -lt "$INV_OPENVASD_MINOR"; then
+      ok=yes
+    else
+      if test "$OPENVASD_MINOR" -eq "$INV_OPENVASD_MINOR"; then
+        if test "$OPENVASD_PATCH" -lt "$INV_OPENVASD_PATCH"; then
+          ok=yes
+        fi
+      fi
+    fi
+  fi
+fi
+if test $ok = no; then
+{ { echo "$as_me:$LINENO: error: openvas-server $OPENVASD_VERSION is installed.
+openvas-plugins is no longer required for $INVALID_WITH_OPENVASD_VERSION and up.
+" >&5
+echo "$as_me: error: openvas-server $OPENVASD_VERSION is installed.
+openvas-plugins is no longer required for $INVALID_WITH_OPENVASD_VERSION and up.
+" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 test "x$prefix" = xNONE && prefix=/usr/local
 # Extract the first word of "cp", so it can be a program name with args.

Modified: trunk/openvas-plugins/configure.in
===================================================================
--- trunk/openvas-plugins/configure.in	2009-05-25 13:00:42 UTC (rev 3466)
+++ trunk/openvas-plugins/configure.in	2009-05-25 13:10:17 UTC (rev 3467)
@@ -27,6 +27,7 @@
 
 NEED_OPENVASLIBS_VERSION=1.0.0
 NEED_OPENVASD_VERSION=0.9.2
+INVALID_WITH_OPENVASD_VERSION=2.1.0
 
 dnl Set up the main lines of the config script
 AC_PREFIX_DEFAULT("/usr/local")
@@ -153,6 +154,12 @@
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
 REQ_OPENVASD_PATCH=`echo $NEED_OPENVASD_VERSION | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+INV_OPENVASD_MAJOR=`echo $INVALID_WITH_OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+INV_OPENVASD_MINOR=`echo $INVALID_WITH_OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+INV_OPENVASD_PATCH=`echo $INVALID_WITH_OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
 
 
 ok=no
@@ -178,6 +185,28 @@
 )
 fi
 
+ok=no
+if test "$OPENVASD_MAJOR" -lt "$INV_OPENVASD_MAJOR"; then
+  ok=yes
+else
+  if test "$OPENVASD_MAJOR" -eq "$INV_OPENVASD_MAJOR"; then
+    if test "$OPENVASD_MINOR" -lt "$INV_OPENVASD_MINOR"; then
+      ok=yes
+    else
+      if test "$OPENVASD_MINOR" -eq "$INV_OPENVASD_MINOR"; then
+        if test "$OPENVASD_PATCH" -lt "$INV_OPENVASD_PATCH"; then
+          ok=yes
+        fi
+      fi
+    fi
+  fi
+fi
+if test $ok = no; then
+AC_ERROR(
+openvas-server $OPENVASD_VERSION is installed.
+openvas-plugins is no longer required for $INVALID_WITH_OPENVASD_VERSION and up.
+)
+fi
 
 test "x$prefix" = xNONE && prefix=/usr/local
 AC_PATH_PROG(CP, cp)



More information about the Openvas-commits mailing list