[Openvas-commits] r170 - in trunk/openvas-libraries: . include
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Apr 12 01:40:51 CEST 2007
Author: jan
Date: 2007-04-12 01:40:47 +0200 (Thu, 12 Apr 2007)
New Revision: 170
Removed:
trunk/openvas-libraries/README.WINDOWS
trunk/openvas-libraries/include/config.w32
trunk/openvas-libraries/include/ntcompat.h
trunk/openvas-libraries/nessus.def
trunk/openvas-libraries/nmake.bat
trunk/openvas-libraries/nmake.w32
Modified:
trunk/openvas-libraries/include/includes.h
Log:
Removing various Windows related files.
Deleted: trunk/openvas-libraries/README.WINDOWS
===================================================================
--- trunk/openvas-libraries/README.WINDOWS 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/README.WINDOWS 2007-04-11 23:40:47 UTC (rev 170)
@@ -1,47 +0,0 @@
- Copyright (c) mjh-EDV Beratung, 1996-1999
- mjh-EDV Beratung - 63263 Neu-Isenburg - Rosenstrasse 12
- Tel +49 6102 328279 - Fax +49 6102 328278
- Email info at mjh.teddy-net.com
-
- Author: Jordan Hrycaj <jordan at mjh.teddy-net.com>
-
- $Id: README.WINDOWS,v 1.3 2000/11/26 15:28:46 jordan Exp $
-
- 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.
-
- -----------------------------------------------------------------
-
- To compile on windows nt/95 you must prepare the package on a unix
- machine like
-
- cd nessus-libraries
- ./configure
- make win32
-
- After that, you can copy the package to a windows box (perferrably
- you have Samba available, so you can use a shared drive.)
-
- On the windows box, as before goto the nessus-libraries directory
- and type
-
- nmake.bat distclean
- nmake.bat all
-
- and
-
- nmake.bat install
-
- or just "nmake" and see what happens. With a VC++5.0 or VC++6 M$
- compiler you should have no problems, compiling ths stuff.
-
---
-(jordan)
-
Deleted: trunk/openvas-libraries/include/config.w32
===================================================================
--- trunk/openvas-libraries/include/config.w32 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/include/config.w32 2007-04-11 23:40:47 UTC (rev 170)
@@ -1,55 +0,0 @@
-/*
- * Nessus
- * Copyright (C) 1998 Renaud Deraison
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#) Special/global config file for nt/win9x
- */
-
-#define ENABLE_CRYPTO_LAYER 1
-#define NO_HLST_EXTENSIONS 1
-#define NESSUSNT 1
-#define USE_AF_INET 1
-#define USE_GTK 1
-
-#define SERVER_TIMEOUT 800
-#define STDC_HEADERS 1
-#define HAVE_ASSERT_H 1
-#define HAVE__STAT 1
-#define HAVE__STRICMP
-#define HAVE__PUTENV
-#define HAVE_RAND 1
-#define HAVE_SELECT 1
-#define HAVE_TIMEVAL 1
-#define HAVE_LONG_FILE_NAMES 1
-
-#define HAVE_STRING_H 1
-#define HAVE_STAT_H 1
-#define HAVE_STRCHR 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE__ALLOCA 1
-#define SIZEOF_UNSIGNED_INT 4
-#define SIZEOF_UNSIGNED_LONG 4
-#define HAVE_FLOAT_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_ERRNO_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDIO_H 1
Modified: trunk/openvas-libraries/include/includes.h
===================================================================
--- trunk/openvas-libraries/include/includes.h 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/include/includes.h 2007-04-11 23:40:47 UTC (rev 170)
@@ -28,16 +28,7 @@
/*
* Nessus system includes
*/
-#ifdef _CYGWIN_
-#undef _WIN32
-#endif
-
-
-#ifdef _WIN32
-#include "config.w32"
-#else
#include "config.h"
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -247,7 +238,6 @@
#include <pcap.h>
-#include <ntcompat.h>
#include <libopenvas.h>
#include <nessus-devel.h>
Deleted: trunk/openvas-libraries/include/ntcompat.h
===================================================================
--- trunk/openvas-libraries/include/ntcompat.h 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/include/ntcompat.h 2007-04-11 23:40:47 UTC (rev 170)
@@ -1,141 +0,0 @@
-#ifndef NESSUS_NT_COMPAT__
-#define NESSUS_NT_COMPAT__
-/*
- * This file is subject to the GPL
- *
- * (c) 1998 Renaud Deraison <deraison at worldnet.fr>
- *
- * ntcompat.h : redefinition of several system calls to provide
- * NT compatibility to Nessus
- *
- */
-
-#ifdef NESSUSNT
-#include <windows.h>
-#endif
-
-
-/*
- * Thread management
- */
-
-typedef int(*thread_func_t)(void *);
-
-#ifdef USE_NT_THREADS
-typedef HANDLE nthread_t;
-#define EXIT(x) ExitThread(x)
-#define _EXIT(x) ExitThread(x)
-#define DO_EXIT(x) exit(x)
-#define TERMINATE_THREAD(x) TerminateThread(x,0)
-#endif /* US_NT_THREADS */
-
-#ifdef USE_FORK_THREADS
-typedef int nthread_t;
-#define EXIT(x) exit(x)
-#define _EXIT(x) _exit(x)
-#define DO_EXIT(x) exit(x)
-#define TERMINATE_THREAD(x) kill(x, SIGTERM)
-#endif /* USE_FORK_THREADS */
-
-#ifdef USE_PTHREADS
-/*
- * I hate pthreads
- */
-typedef struct {
- pthread_t thread;
- pthread_mutex_t mutex;
- int ready;
- } _nthread_t,*nthread_t;
-
-struct thread_args {
- void * arg;
- pthread_mutex_t * mutex;
- thread_func_t func;
- nthread_t thread;
- };
-#define EXIT(x) exit_pthread(x)
-#define _EXIT(x) EXIT(x)
-#define DO_EXIT(x) exit(x)
-
-#ifdef HAVE_PTHREAD_CANCEL
-#define TERMINATE_THREAD(x) {pthread_cancel(x->thread);pthread_detach(x->thread);}
-#else
-#warning "Your system lacks pthread_cancel() ! Using the pthreads is not recommanded"
-#define TERMINATE_THREAD(x)
-#endif /* HAVE_PTHREAD_CANCEL */
-#endif /* USE_PTHREADS */
-
-
-
-/*
- * External libraries management
- */
-#ifdef NESSUSNT
-typedef HMODULE ext_library_t;
-#define LOAD_FUNCTION(x,y) GetProcAddress(x,y)
-#define LOAD_LIBRARY(x) LoadLibrary(x)
-#define LIB_LAST_ERROR WSAGetLastError
-#define CLOSE_LIBRARY(x) FreeLibrary(x)
-#else
-typedef void * ext_library_t;
-#define LOAD_FUNCTION(x,y) dlsym(x,y)
-
-#ifdef RTLD_NOW
-#define LOAD_LIBRARY(x) dlopen(x,RTLD_NOW)
-#else
-#define LOAD_LIBRARY(x) dlopen(x, 1)
-#endif /* not defined(RTLD_NOW) */
-
-#define LIB_LAST_ERROR dlerror
-#define CLOSE_LIBRARY(x) dlclose(x)
-#endif /* defined(NESSUSNT) */
-
-
-/*
- * Misc. functions
- */
-#ifdef NESSUSNT
-#define getpid GetCurrentProcessId
-#define ioctl(x,y,z) ioctlsocket(x,y,z)
-#define signal(x,y)
-#define alarm(x)
-#define chmod(x,y)
-#define getopt(x,y,z) <*error*> unless you define optarg, as well
-typedef unsigned int u_int32_t;
-typedef unsigned short n_short;
-typedef unsigned short u_short;
-typedef unsigned short u_int16_t;
-typedef unsigned long n_time;
-#define ICMP_ECHO 8
-#define ICMP_ECHOREPLY 0
-#else
-#define closesocket(x) close (x)
-#endif /* defined(NESSUSNT) */
-
-#ifndef NESSUSNT
-#define print_error printf
-#endif
-
-
-
-#ifdef NESSUSNT
-#define DllExport __declspec (dllexport)
-#define DllImport __declspec (dllimport)
-#define PlugExport DllExport
-
-#ifdef EXPORTING
-#define ExtFunc DllExport
-#else
-#define ExtFunc DllImport
-#endif /* defined(EXPORTING) */
-
-#else /* !NESSUSNT */
-
-#define PlugExport
-#define DllExport
-#define DllImport
-#define ExtFunc
-
-#endif /* defined(NESSUSNT) */
-
-#endif /* defined(NESSUS_NT_COMPAT_H) */
Deleted: trunk/openvas-libraries/nessus.def
===================================================================
--- trunk/openvas-libraries/nessus.def 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/nessus.def 2007-04-11 23:40:47 UTC (rev 170)
@@ -1,105 +0,0 @@
-LIBRARY nessus.dll
-EXETYPE WINDOWS
-CODE PRELOAD MOVEABLE DISCARDABLE
-DATA PRELOAD MOVEABLE MULTIPLE
-
-EXPORTS
- arg_get @2
- arg_add_value @3
- arg_set_value @4
- arg_set_type @5
- arg_get_value @6
- arg_get_length @7
- arg_get_type @8
- arg_dup @9
- arg_dump @10
- arg_free @11
- arg_free_all @12
- ftp_log_in @13
- ftp_get_pasv_address @14
- is_cgi_installed @15
- open_sock_opt_hn @16
- open_sock_tcp_hn @17
- open_sock_tcp @18
- open_sock_udp @19
- open_sock_option @20
- recv_line @21
- socket_close @22
- auth_printf @23
- auth_send @24
- auth_gets @25
- nessus_lib_version @26
- plug_set_family @27
- plug_set_dep @28
- plug_set_timeout @29
- plug_get_family @30
- plug_set_launch @31
- plug_get_launch @32
- plug_set_name @33
- plug_set_summary @34
- plug_set_description @35
- plug_set_copyright @36
- plug_set_category @37
- plug_set_attacklevel @38
- plug_add_host @39
- host_add_port_proto @40
- host_add_port @41
- host_add_port_udp @42
- port_in_ports @43
- host_get_port_state_proto @44
- host_get_port_state @45
- host_get_port_state_udp @46
- plug_get_hostname @47
- plug_get_host_ip @48
- proto_post_hole @49
- post_hole @50
- post_hole_udp @51
- post_info @52
- post_info_udp @53
- proto_post_info @54
- get_preference @57
- add_plugin_preference @58
- get_plugin_preference @59
- plug_set_key @60
- scanner_add_port @61
- plug_get_key @62
- plug_get_host_open_port @63
- nn_resolve @64
- qsort_compar @66
- getpts @67
- emalloc @68
- estrdup @69
- efree @70
- estrlen @71
- getopt @74
- getopt_long @75
- getopt_long_only @76
- get_optarg @77
- get_opterr @78
- get_optind @79
- get_optopt @80
- inc_optind @81
- append_argv @82
- destroy_argv @83
- harg_create @84
- harg_dup @85
- harg_close @86
- harg_close_all @87
- harg_add @88
- harg_add_default @89
- harg_remove @90
- harg_set_tvalue @91
- harg_set_type @92
- harg_set_id @93
- harg_get_tvalue @94
- harg_get_type @95
- harg_get_id @96
- harg_get_size @97
- harg_inx_key @98
- harg_dump @99
- harg_walk_init @100
- harg_walk_next @101
- harg_walk_stop @102
- harg_do @103
- nessuslib_version @104
- banner_diff @105
Deleted: trunk/openvas-libraries/nmake.bat
===================================================================
--- trunk/openvas-libraries/nmake.bat 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/nmake.bat 2007-04-11 23:40:47 UTC (rev 170)
@@ -1,2 +0,0 @@
-nmake.exe /nologo /f nmake.w32 %1 %2 %3 %4 %5 %6 %7 %8 %9
-
Deleted: trunk/openvas-libraries/nmake.w32
===================================================================
--- trunk/openvas-libraries/nmake.w32 2007-03-29 20:08:45 UTC (rev 169)
+++ trunk/openvas-libraries/nmake.w32 2007-04-11 23:40:47 UTC (rev 170)
@@ -1,126 +0,0 @@
-#!nmake /f
-#
-# Makefile for the Microsoft compiler/linker
-# creates the peks.dll and peks.lib target
-#
-
-!include <ntwin32.mak>
-
-INSTALL_TARGET = C:\Nessus
-
-PEKS = libpeks
-GMP = $(PEKS)\gmp3
-ZLIB = $(PEKS)\zlib113
-LNES = libnessus
-
-CC = cl.exe
-DEFS = -I$(PEKS) -I$(LNES) -Iinclude
-CFLAGS = -nologo -Ox -I. $(DEFS)
-
-LD = link.exe
-LDFLAGS = -map -out:nessus.dll -def:nessus.def
-
-OBJ = arglists.obj ftp_funcs.obj \
- network.obj plugutils.obj \
- resolve.obj scanners_utils.obj \
- system.obj ptycall.obj \
- getopt.obj getopt1.obj \
- harglists.obj hlst.obj \
- www_funcs.obj diff.obj
-
-# ------------------------------------------------------
-# default rules
-# ------------------------------------------------------
-
-all: $(PEKS)\version.h $(PEKS)\peks.lib nessus.lib
-
-{$(LNES)\}.c.obj::
- $(CC) $(cvarsdll) $(CFLAGS) -c $<
-
-$(PEKS)\version.h:
- @echo .
- @echo -------------------------------------------
- @echo You probably forgot to prepare this package
- @echo on a Unix machine unsing "make win32"
- @echo -------------------------------------------
- @echo .
- aborting ...
-
-# ------------------------------------------------------
-# install peks stuff
-# ------------------------------------------------------
-
-install: install-bin install-doc
-
-install-bin: nessus.lib
- cd $(PEKS)
- nmake.bat install
- cd ..
-#
- copy nessus.lib $(INSTALL_TARGET)\lib
- copy nessus.dll $(INSTALL_TARGET)\bin
-#
- -mkdir $(INSTALL_TARGET)\include\nessus
- copy include\libnessus.h $(INSTALL_TARGET)\include\nessus
- copy include\harglists.h $(INSTALL_TARGET)\include\nessus
- copy include\libvers.h $(INSTALL_TARGET)\include\nessus
- copy include\getopt.h $(INSTALL_TARGET)\include\nessus
- copy include\*.w32 $(INSTALL_TARGET)\include\nessus
-
-install-doc:
- -mkdir $(INSTALL_TARGET)\doc\nessus
- -mkdir $(INSTALL_TARGET)\doc\nessus\lib
- copy VERSION $(INSTALL_TARGET)\doc\nessus\lib
- copy README.WINDOWS $(INSTALL_TARGET)\doc\nessus\lib
- copy nessus.map $(INSTALL_TARGET)\doc\nessus\lib
- copy $(LNES)\Copying $(INSTALL_TARGET)\doc\nessus\lib
-
-# ------------------------------------------------------
-# built peks stuff
-# ------------------------------------------------------
-
-nessus.lib: include\peks\common-stuff.w32 nessus.dll
-
-nessus.dll: $(OBJ) nessus.def
- $(LD) @<<
- $(dlllflags)
- $(LDFLAGS)
- $(OBJ)
- $(PEKS)\peks.lib
- $(ZLIB)\zlib.lib
- $(GMP)\mpz.lib
- $(guilibsdll)
-<<
-
-# ------------------------------------------------------
-# built libs in subdirectories
-# ------------------------------------------------------
-
-$(PEKS)\peks.lib: $(PEKS)\nmake.bat
- cd $(PEKS)
- nmake.bat
- cd ..
-
-include\peks\common-stuff.w32:
- -mkdir include\peks
- copy $(PEKS)\common-stuff.w32 include\peks
-
-# ------------------------------------------------------
-# clean up
-# ------------------------------------------------------
-
-distclean clean::
- -del nessus.map
- -del nessus.exp
- -del *.obj
- -del include\peks\*.w32
-
-distclean::
- -del nessus.dll
- -del nessus.lib
- -rmdir include\peks
-
-distclean clean::
- cd $(PEKS)
- nmake.bat $@
- cd ..
More information about the Openvas-commits
mailing list