Author: jan
Date: 2007-11-06 15:02:33 +0100 (Tue, 06 Nov 2007)
New Revision: 534
Modified:
trunk/openvas-server/ChangeLog
trunk/openvas-server/configure
trunk/openvas-server/configure.in
trunk/openvas-server/include/corevers.h.in
trunk/openvas-server/openvasd-config.in
Log:
* openvasd-config.in: Added header.
* configure.in: Added header and fixed version setting as used
for openvas-config.
* include/corevers.h.in: Adapt parameter names according to changes
in configure.in
* configure: updated.
Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog 2007-11-06 12:13:03 UTC (rev 533)
+++ trunk/openvas-server/ChangeLog 2007-11-06 14:02:33 UTC (rev 534)
@@ -1,3 +1,15 @@
+2007-11-06 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
+ * openvasd-config.in: Added header.
+
+ * configure.in: Added header and fixed version setting as used
+ for openvas-config.
+
+ * include/corevers.h.in: Adapt parameter names according to changes
+ in configure.in
+
+ * configure: updated.
+
2007-11-05 Jan-Oliver Wagner <[EMAIL PROTECTED]>
* Makefile: Added creation of gnupg subdirectory under
sysconfdir/openvas.
Modified: trunk/openvas-server/configure
===================================================================
--- trunk/openvas-server/configure 2007-11-06 12:13:03 UTC (rev 533)
+++ trunk/openvas-server/configure 2007-11-06 14:02:33 UTC (rev 534)
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 444 .
+# From configure.in Revision: 445 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -688,11 +688,12 @@
OVSCFLAGS
NASLCFLAGS
CWALL
-OPENVAS_MAJOR
-OPENVAS_MINOR
-OPENVAS_PATCH
-OPENVAS_RC
-OPENVAS_DATE
+version
+OPENVASD_MAJOR
+OPENVASD_MINOR
+OPENVASD_PATCH
+OPENVASD_RC
+OPENVASD_DATE
OVS_COMPILER
OVS_OS_NAME
OVS_OS_VERSION
@@ -1765,13 +1766,14 @@
save_IFS="${IFS}"
IFS=.
-read OPENVAS_MAJOR OPENVAS_MINOR OPENVAS_PATCH OPENVAS_RC <VERSION
+read OPENVASD_MAJOR OPENVASD_MINOR OPENVASD_PATCH OPENVASD_RC <VERSION
IFS="${save_IFS}"
-OPENVAS_DATE=\"`date '+%b %d, %Y'`\"
-expr 0 + $OPENVAS_MAJOR + $OPENVAS_MINOR + $OPENVAS_PATCH + 0 >/dev/null ||
+OPENVASD_DATE=\"`date '+%b %d, %Y'`\"
+expr 0 + $OPENVASD_MAJOR + $OPENVASD_MINOR + $OPENVASD_PATCH + 0 >/dev/null ||
{ { echo "$as_me:$LINENO: error: *** Panic: Corrupt version file" >&5
echo "$as_me: error: *** Panic: Corrupt version file" >&2;}
{ (exit 1); exit 1; }; }
+version=$OPENVASD_MAJOR.$OPENVASD_MINOR.$OPENVASD_PATCH
test "x$prefix" != "xNONE" || prefix=/usr/local
@@ -12192,6 +12194,7 @@
+
ac_config_files="$ac_config_files openvas.tmpl include/corevers.h
openvas-adduser openvas-rmuser openvas-mkcert openvas-mkcert-client
openvasd-config"
cat >confcache <<\_ACEOF
@@ -12889,11 +12892,12 @@
OVSCFLAGS!$OVSCFLAGS$ac_delim
NASLCFLAGS!$NASLCFLAGS$ac_delim
CWALL!$CWALL$ac_delim
-OPENVAS_MAJOR!$OPENVAS_MAJOR$ac_delim
-OPENVAS_MINOR!$OPENVAS_MINOR$ac_delim
-OPENVAS_PATCH!$OPENVAS_PATCH$ac_delim
-OPENVAS_RC!$OPENVAS_RC$ac_delim
-OPENVAS_DATE!$OPENVAS_DATE$ac_delim
+version!$version$ac_delim
+OPENVASD_MAJOR!$OPENVASD_MAJOR$ac_delim
+OPENVASD_MINOR!$OPENVASD_MINOR$ac_delim
+OPENVASD_PATCH!$OPENVASD_PATCH$ac_delim
+OPENVASD_RC!$OPENVASD_RC$ac_delim
+OPENVASD_DATE!$OPENVASD_DATE$ac_delim
OVS_COMPILER!$OVS_COMPILER$ac_delim
OVS_OS_NAME!$OVS_OS_NAME$ac_delim
OVS_OS_VERSION!$OVS_OS_VERSION$ac_delim
@@ -12912,7 +12916,6 @@
resolv_lib!$resolv_lib$ac_delim
socket_lib!$socket_lib$ac_delim
nsl_lib!$nsl_lib$ac_delim
-ssl_lib!$ssl_lib$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12954,6 +12957,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+ssl_lib!$ssl_lib$ac_delim
pthread_lib!$pthread_lib$ac_delim
debug_flags!$debug_flags$ac_delim
man_openvas_1!$man_openvas_1$ac_delim
@@ -12972,7 +12976,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/openvas-server/configure.in
===================================================================
--- trunk/openvas-server/configure.in 2007-11-06 12:13:03 UTC (rev 533)
+++ trunk/openvas-server/configure.in 2007-11-06 14:02:33 UTC (rev 534)
@@ -49,11 +49,12 @@
dnl version stuff -- jordan
save_IFS="${IFS}"
IFS=.
-read OPENVAS_MAJOR OPENVAS_MINOR OPENVAS_PATCH OPENVAS_RC <VERSION
+read OPENVASD_MAJOR OPENVASD_MINOR OPENVASD_PATCH OPENVASD_RC <VERSION
IFS="${save_IFS}"
-OPENVAS_DATE=\"`date '+%b %d, %Y'`\"
-expr 0 + $OPENVAS_MAJOR + $OPENVAS_MINOR + $OPENVAS_PATCH + 0 >/dev/null ||
+OPENVASD_DATE=\"`date '+%b %d, %Y'`\"
+expr 0 + $OPENVASD_MAJOR + $OPENVASD_MINOR + $OPENVASD_PATCH + 0 >/dev/null ||
AC_MSG_ERROR([ *** Panic: Corrupt version file])
+version=$OPENVASD_MAJOR.$OPENVASD_MINOR.$OPENVASD_PATCH
test "x$prefix" != "xNONE" || prefix=/usr/local
@@ -727,11 +728,12 @@
AC_SUBST(OVSCFLAGS)
AC_SUBST(NASLCFLAGS)
AC_SUBST(CWALL)
-AC_SUBST(OPENVAS_MAJOR)
-AC_SUBST(OPENVAS_MINOR)
-AC_SUBST(OPENVAS_PATCH)
-AC_SUBST(OPENVAS_RC)
-AC_SUBST(OPENVAS_DATE)
+AC_SUBST(version)
+AC_SUBST(OPENVASD_MAJOR)
+AC_SUBST(OPENVASD_MINOR)
+AC_SUBST(OPENVASD_PATCH)
+AC_SUBST(OPENVASD_RC)
+AC_SUBST(OPENVASD_DATE)
AC_SUBST(OVS_COMPILER)
AC_SUBST(OVS_OS_NAME)
AC_SUBST(OVS_OS_VERSION)
Modified: trunk/openvas-server/include/corevers.h.in
===================================================================
--- trunk/openvas-server/include/corevers.h.in 2007-11-06 12:13:03 UTC (rev
533)
+++ trunk/openvas-server/include/corevers.h.in 2007-11-06 14:02:33 UTC (rev
534)
@@ -33,5 +33,5 @@
#define OVS_OS_VERSION "@OVS_OS_VERSION@"
#define PROGNAME "OpenVAS"
-#define OPENVAS_VERSION "@[EMAIL PROTECTED]@[EMAIL PROTECTED]@OPENVAS_PATCH@"
-#define OPENVAS_FULL_VERSION "@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@OPENVAS_RC@"
+#define OPENVAS_VERSION "@[EMAIL PROTECTED]@[EMAIL PROTECTED]@OPENVASD_PATCH@"
+#define OPENVAS_FULL_VERSION "@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@OPENVASD_RC@"
Modified: trunk/openvas-server/openvasd-config.in
===================================================================
--- trunk/openvas-server/openvasd-config.in 2007-11-06 12:13:03 UTC (rev
533)
+++ trunk/openvas-server/openvasd-config.in 2007-11-06 14:02:33 UTC (rev
534)
@@ -1,9 +1,32 @@
#!/bin/sh
+
+# OpenVAS
+# $Id$
+# Description: Configuration script for openvas-server
#
-# OpenVAS Server configuration script
+# Authors:
+# Renaud Deraison <[EMAIL PROTECTED]> (Original pre-fork development)
#
+# Copyright:
+# Based on work Copyright (C) 1998 - 2007 Tenable Network Security, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2,
+# as published by the Free Software Foundation
-
[EMAIL PROTECTED]@
INCLUDEDIR=$PREFIX/include
[EMAIL PROTECTED]@
@@ -45,4 +68,4 @@
shift
done
-echo
+echo
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
