Author: jan
Date: 2007-07-20 12:10:50 +0200 (Fri, 20 Jul 2007)
New Revision: 289

Added:
   trunk/openvas-libnasl/doc/openvas-nasl.1
Removed:
   trunk/openvas-libnasl/doc/nasl.1
Modified:
   trunk/openvas-libnasl/ChangeLog
   trunk/openvas-libnasl/MANIFEST
   trunk/openvas-libnasl/Makefile
   trunk/openvas-libnasl/doc/Makefile
   trunk/openvas-libnasl/nasl/Makefile
Log:
Resolve name conflicts with a Nessus installation.

* doc/Makefile: Changed docdir from libnasl to openvas-libnasl to
avoid conflict with parallel Nessus installation.

* doc/nasl.1: Renamed to openvas-nasl.1

* doc/openvas-nasl.1: New. Former nasl.1

* Makefile: Renamed install files due to renaming.

* MANIFEST: updated.

* nasl/Makefile: Renaming libnasl to libopenvasnasl and nasl to
openvas-nasl.


Modified: trunk/openvas-libnasl/ChangeLog
===================================================================
--- trunk/openvas-libnasl/ChangeLog     2007-07-20 08:37:48 UTC (rev 288)
+++ trunk/openvas-libnasl/ChangeLog     2007-07-20 10:10:50 UTC (rev 289)
@@ -1,3 +1,21 @@
+2007-07-20  Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
+       Resolve name conflicts with a Nessus installation.
+
+       * doc/Makefile: Changed docdir from libnasl to openvas-libnasl to
+       avoid conflict with parallel Nessus installation.
+
+       * doc/nasl.1: Renamed to openvas-nasl.1
+
+       * doc/openvas-nasl.1: New. Former nasl.1
+
+       * Makefile: Renamed install files due to renaming.
+
+       * MANIFEST: updated.
+
+       * nasl/Makefile: Renaming libnasl to libopenvasnasl and nasl to
+       openvas-nasl.
+
 2007-07-19  Jan-Oliver Wagner <[EMAIL PROTECTED]>
 
        * CHANGES: New. Describe changes for users.

Modified: trunk/openvas-libnasl/MANIFEST
===================================================================
--- trunk/openvas-libnasl/MANIFEST      2007-07-20 08:37:48 UTC (rev 288)
+++ trunk/openvas-libnasl/MANIFEST      2007-07-20 10:10:50 UTC (rev 289)
@@ -8,7 +8,7 @@
 COPYING
 doc/fixtex.pl
 doc/Makefile
-doc/nasl.1
+doc/openvas-nasl.1
 doc/nasl2_reference.lyx
 doc/nasl_guide.tex
 doc/nessus_org.pem

Modified: trunk/openvas-libnasl/Makefile
===================================================================
--- trunk/openvas-libnasl/Makefile      2007-07-20 08:37:48 UTC (rev 288)
+++ trunk/openvas-libnasl/Makefile      2007-07-20 10:10:50 UTC (rev 289)
@@ -39,7 +39,7 @@
        $(INSTALL) -c -m 0755 openvas-libnasl-config 
${bindir}/openvas-libnasl-config
        test -d ${mandir}/man1 || $(INSTALL_DIR) -m 755 ${mandir}/man1
        $(INSTALL) -c -m 0644 doc/openvas-libnasl-config.1 ${mandir}/man1
-       $(INSTALL) -c -m 0644 doc/nasl.1 ${mandir}/man1
+       $(INSTALL) -c -m 0644 doc/openvas-nasl.1 ${mandir}/man1
        $(INSTALL) -c -m 0644 doc/openvas-libnasl-config.1 ${mandir}/man1
        test -d ${localstatedir}/openvas || $(INSTALL_DIR) -m 755 
${localstatedir}/openvas
        $(INSTALL) -c -m 0644 doc/nessus_org.pem 
${localstatedir}/openvas/nessus_org.pem

Modified: trunk/openvas-libnasl/doc/Makefile
===================================================================
--- trunk/openvas-libnasl/doc/Makefile  2007-07-20 08:37:48 UTC (rev 288)
+++ trunk/openvas-libnasl/doc/Makefile  2007-07-20 10:10:50 UTC (rev 289)
@@ -1,5 +1,5 @@
 include ../nasl.tmpl
-docdir= ${datadir}/doc/libnasl
+docdir= ${datadir}/doc/openvas-libnasl
 
 all: nasl_guide.ps
 

Deleted: trunk/openvas-libnasl/doc/nasl.1
===================================================================
--- trunk/openvas-libnasl/doc/nasl.1    2007-07-20 08:37:48 UTC (rev 288)
+++ trunk/openvas-libnasl/doc/nasl.1    2007-07-20 10:10:50 UTC (rev 289)
@@ -1,68 +0,0 @@
-.TH NASL 1 "May 2006" "Nessus Project" "Nessus Attack Scripting Language"
-.SH NAME
-nasl \- Nessus Attack Scripting Language
-.SH SYNOPSIS
-.B nasl
-.I <[-vh] [-T tracefile] [-s] [-t target] [-sX] > files...
-.SH DESCRIPTION
-.BR nasl
-executes a set of NASL scripts against a given target host. It can 
-also be used to determine if a NASL script has any syntax errors by running
-it in parse (\fB-p\fR) or lint (\fB-L\fR) mode.
-
-
-.SH OPTIONS
-.TP
-.B \-T tracefile
-Makes nasl write verbosely what the script does in the file
-.I tracefile
-, ala 'set -x' under sh
-
-.TP
-.B \-t target
-Apply the NASL script to
-.I target
-which may be a single host (127.0.0.1), a whole subnet (192.168.1.0/24)
-or several subnets (192.168.1.0/24, 192.168.243.0/24)
-
-
-.TP
-.B \-s
-Sets the return value of safe_checks() to 1. (See the nessusd manual to know
-what the safe checks are)
-
-.TP
-.B \-D
-Only run the description part of the script.
- 
-.TP
-.B \-L
-.BI Lint 
-the script  (run extended checks).
-
-.TP
-.B \-X
-Run the script in 
-.BI authenticated
-mode. For more information see the nasl reference manual
-
-.TP
-.B \-h
-Show help
-.TP
-.B \-v
-Show the version of NASL.
-.SH SEE ALSO
-.BR The\ NASL2\ reference\ manual,
-.BR http://www.nessus.org/nasl2ref.pdf,
-.BR nessus (1),
-.BR nessusd (8).
-.SH HISTORY
-NASL comes from a private project called 'pkt_forge', which was written in 
late 1998 by Renaud Deraison and which was an interactive shell to forge and 
send raw IP packets (this pre-dates Perl's Net::RawIP by a couple of weeks). It 
was then extended to do a wide range of network-related operations and 
integrated into Nessus as 'NASL'. 
-
-The parser was completely hand-written and a pain to work with. In Mid-2002, 
Michel Arboi wrote a bison parser for NASL, and he and Renaud Deraison re-wrote 
NASL from scratch. Although the "new" NASL was nearly working as early as 
-August 2002, Michel's lazyness made us wait for early 2003 to have it working 
completely.
-
-.SH AUTHOR
-Most of the engine is (C) 2003 Michel Arboi, most of the built-in functions
-are (C) 2003 Renaud Deraison

Copied: trunk/openvas-libnasl/doc/openvas-nasl.1 (from rev 280, 
trunk/openvas-libnasl/doc/nasl.1)

Modified: trunk/openvas-libnasl/nasl/Makefile
===================================================================
--- trunk/openvas-libnasl/nasl/Makefile 2007-07-20 08:37:48 UTC (rev 288)
+++ trunk/openvas-libnasl/nasl/Makefile 2007-07-20 10:10:50 UTC (rev 289)
@@ -113,7 +113,7 @@
        nasl_debug.c
 
 COMPILE = $(LIBTOOL) $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
-all : cflags libnasl.la nasl
+all : cflags libopenvasnasl.la openvas-nasl
 
 .c.o:
        $(COMPILE) -c $<
@@ -121,20 +121,20 @@
        @echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags
        @chmod +x cflags
 
-nasl : cflags $(OBJS) nasl.c
-       $(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o nasl 
-DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
+openvas-nasl : cflags $(OBJS) nasl.c
+       $(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o openvas-nasl 
-DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
 
-libnasl.la : cflags $(OBJS)
-       $(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
+libopenvasnasl.la : cflags $(OBJS)
+       $(COMPILE) $(NESSUS_LIBS) -o libopenvasnasl.la $(LO_OBJS) -rpath 
${libdir} \
        -version-info ${PACKAGE_VERSION}
 
-install : libnasl.la nasl
+install : libopenvasnasl.la openvas-nasl
        test -d ${libdir} || $(INSTALL_DIR) -m 755 ${libdir}
        test -d ${bindir} || $(INSTALL_DIR) -m 755 ${bindir}
-       $(LIBTOOL) --mode install $(INSTALL) libnasl.la ${libdir}/libnasl.la
+       $(LIBTOOL) --mode install $(INSTALL) libopenvasnasl.la 
${libdir}/libopenvasnasl.la
        $(LIBTOOL) --finish ${libdir}
        test -d ${bindir} || $(INSTALL_DIR) -m 755 ${bindir}
-       $(INSTALL) nasl ${bindir}/
+       $(INSTALL) openvas-nasl ${bindir}/
 
 
 nasl_grammar.tab.o: nasl_grammar.tab.h nasl_grammar.tab.c nasl_tree.h

_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits

Reply via email to