Skip to content

Commit 58e5249

Browse files
atomicturtleatomicturtle
authored
Merge pull request ossec#2209 from atomicturtle/version-01
Version 01
2 parents 341f92e + 23ff552 commit 58e5249

3 files changed

Lines changed: 74 additions & 67 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
language: [ 'cpp', 'python' ]
2525
include:
26-
- os: ubuntu-18.04
26+
- os: ubuntu-22.04
2727
DB: none
2828
OSSEC_TYPE: agent
2929
GEOIP: no
@@ -47,7 +47,7 @@ jobs:
4747
if [[ "${ZEROMQ}" == "yes" ]]; then ( sudo apt-get install libzmq3-dev libtool autoconf libczmq-dev ); fi
4848
if [[ "${OSSEC_TYPE}" == "winagent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
4949
if [[ "${OSSEC_TYPE}" == "server" ]]; then ( sudo apt-get install libsqlite3-dev sqlite3 ); fi
50-
if [[ "${OSSEC_TYPE}" == "test" ]]; then if [ `uname -m` = "aarch64"]; then (sudo apt-get install check libc6-dbg && wget -q http://ports.ubuntu.com/pool/main/v/valgrind/valgrind_3.15.0-1ubuntu9.1_arm64.deb && sudo dpkg -i valgrind_3.15.0-1ubuntu9.1_arm64.deb ) ; else ( sudo apt-get install check valgrind ); fi; fi
50+
if [[ "${OSSEC_TYPE}" == "test" ]]; then if [ `uname -m` = "aarch64" ]; then (sudo apt-get install check libc6-dbg && wget -q http://ports.ubuntu.com/pool/main/v/valgrind/valgrind_3.15.0-1ubuntu9.1_arm64.deb && sudo dpkg -i valgrind_3.15.0-1ubuntu9.1_arm64.deb ) ; else ( sudo apt-get install check valgrind ); fi; fi
5151
COMMAND="V=1 TARGET=${OSSEC_TYPE}" && if ! [[ "${DB}" = "none" ]]; then COMMAND="${COMMAND} DATABASE=${DB}"; fi && if [[ "${GEOIP}" = "yes" ]]; then COMMAND="${COMMAND} USE_GEOIP=1"; fi && if [[ "${PRELUDE}" = "yes" ]]; then COMMAND="${COMMAND} USE_PRELUDE=1"; fi && if [[ "${ZEROMQ}" = "yes" ]]; then COMMAND="${COMMAND} USE_ZEROMQ=1"; fi && if [[ "${OSSEC_TYPE}" = "test" ]]; then COMMAND="${COMMAND} USE_PCRE2_JIT=0"; fi && if [[ "${ARCH}" = "arm64" ]]; then ./build.sh; fi && ( cd src/ && make --warn-undefined-variables ${COMMAND} settings && make --warn-undefined-variables ${COMMAND} external -j && make --warn-undefined-variables ${COMMAND} -j ) && if ! [[ "${OSSEC_TYPE}" = "test" || "${OSSEC_TYPE}" = "winagent" ]]; then ( cd src/ && sudo make --warn-undefined-variables ${COMMAND} install ) fi
5252
if [[ "${OSSEC_TYPE}" == "test" ]]; then ( cd src/ && make --warn-undefined-variables test_valgrind ) fi
5353
if [[ "${RULES}" == "test" ]]; then ( cd src/ && sudo make V=1 TARGET=server test-rules ) fi

‎LICENSE‎

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,5 @@
1-
21
Copyright (C) 2003 - 2013 Trend Micro Inc. All rights reserved.
32

4-
OSSEC HIDS is a free software; you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License (version 2) as
6-
published by the FSF - Free Software Foundation.
7-
8-
In addition, certain source files in this program permit linking with the
9-
OpenSSL library (http://www.openssl.org), which otherwise wouldn't be allowed
10-
under the GPL. For purposes of identifying OpenSSL, most source files giving
11-
this permission limit it to versions of OpenSSL having a license identical to
12-
that listed in this file (see section "OpenSSL LICENSE" below). It is not
13-
necessary for the copyright years to match between this file and the OpenSSL
14-
version in question. However, note that because this file is an extension of
15-
the license statements of these source files, this file may not be changed
16-
except with permission from all copyright holders of source files in this
17-
program which reference this file.
18-
19-
Note that this license applies to the source code, as well as
20-
decoders, rules and any other data file included with OSSEC (unless
21-
otherwise specified).
22-
23-
For the purpose of this license, we consider an application to constitute a
24-
"derivative work" or a work based on this program if it does any of the
25-
following (list not exclusive):
26-
27-
* Integrates source code/data files from OSSEC.
28-
* Includes OSSEC copyrighted material.
29-
* Includes/integrates OSSEC into a proprietary executable installer.
30-
* Links to a library or executes a program that does any of the above.
31-
32-
This list is not exclusive, but just a clarification of our interpretation
33-
of derived works. These restrictions only apply if you actually redistribute
34-
OSSEC (or parts of it).
35-
36-
We don't consider these to be added restrictions on top of the GPL,
37-
but just a clarification of how we interpret "derived works" as it
38-
applies to OSSEC. This is similar to the way Linus Torvalds has
39-
announced his interpretation of how "derived works" applies to Linux kernel
40-
modules. Our interpretation refers only to OSSEC - we don't speak
41-
for any other GPL products.
42-
43-
* As a special exception, the copyright holders give
44-
* permission to link the code of portions of this program with the
45-
* OpenSSL library under certain conditions as described in each
46-
* individual source file, and distribute linked combinations
47-
* including the two.
48-
* You must obey the GNU General Public License in all respects
49-
* for all of the code used other than OpenSSL. If you modify
50-
* file(s) with this exception, you may extend this exception to your
51-
* version of the file(s), but you are not obligated to do so. If you
52-
* do not wish to do so, delete this exception statement from your
53-
* version. If you delete this exception statement from all source
54-
* files in the program, then also delete it here.
55-
56-
OSSEC HIDS is distributed in the hope that it will be useful, but WITHOUT
57-
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
58-
FITNESS FOR A PARTICULAR PURPOSE.
59-
See the GNU General Public License Version 2 below for more details.
60-
61-
-----------------------------------------------------------------------------
623

634
GNU GENERAL PUBLIC LICENSE
645
Version 2, June 1991
@@ -342,7 +283,67 @@ POSSIBILITY OF SUCH DAMAGES.
342283
END OF TERMS AND CONDITIONS
343284

344285

345-
-------------------------------------------------------------------------------
286+
287+
-----------------------------------------------------------------------------
288+
289+
OSSEC HIDS is a free software; you can redistribute it and/or modify
290+
it under the terms of the GNU General Public License (version 2) as
291+
published by the FSF - Free Software Foundation.
292+
293+
In addition, certain source files in this program permit linking with the
294+
OpenSSL library (http://www.openssl.org), which otherwise wouldn't be allowed
295+
under the GPL. For purposes of identifying OpenSSL, most source files giving
296+
this permission limit it to versions of OpenSSL having a license identical to
297+
that listed in this file (see section "OpenSSL LICENSE" below). It is not
298+
necessary for the copyright years to match between this file and the OpenSSL
299+
version in question. However, note that because this file is an extension of
300+
the license statements of these source files, this file may not be changed
301+
except with permission from all copyright holders of source files in this
302+
program which reference this file.
303+
304+
Note that this license applies to the source code, as well as
305+
decoders, rules and any other data file included with OSSEC (unless
306+
otherwise specified).
307+
308+
For the purpose of this license, we consider an application to constitute a
309+
"derivative work" or a work based on this program if it does any of the
310+
following (list not exclusive):
311+
312+
* Integrates source code/data files from OSSEC.
313+
* Includes OSSEC copyrighted material.
314+
* Includes/integrates OSSEC into a proprietary executable installer.
315+
* Links to a library or executes a program that does any of the above.
316+
317+
This list is not exclusive, but just a clarification of our interpretation
318+
of derived works. These restrictions only apply if you actually redistribute
319+
OSSEC (or parts of it).
320+
321+
We don't consider these to be added restrictions on top of the GPL,
322+
but just a clarification of how we interpret "derived works" as it
323+
applies to OSSEC. This is similar to the way Linus Torvalds has
324+
announced his interpretation of how "derived works" applies to Linux kernel
325+
modules. Our interpretation refers only to OSSEC - we don't speak
326+
for any other GPL products.
327+
328+
* As a special exception, the copyright holders give
329+
* permission to link the code of portions of this program with the
330+
* OpenSSL library under certain conditions as described in each
331+
* individual source file, and distribute linked combinations
332+
* including the two.
333+
* You must obey the GNU General Public License in all respects
334+
* for all of the code used other than OpenSSL. If you modify
335+
* file(s) with this exception, you may extend this exception to your
336+
* version of the file(s), but you are not obligated to do so. If you
337+
* do not wish to do so, delete this exception statement from your
338+
* version. If you delete this exception statement from all source
339+
* files in the program, then also delete it here.
340+
341+
OSSEC HIDS is distributed in the hope that it will be useful, but WITHOUT
342+
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
343+
FITNESS FOR A PARTICULAR PURPOSE.
344+
See the GNU General Public License Version 2 above for more details.
345+
346+
-----------------------------------------------------------------------------
346347

347348
OpenSSL License
348349
---------------

‎README.md‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
OSSEC v4.1.0
22

3+
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/ossec/ossec-hids)](https://github.com/ossec/ossec-hids/releases)
4+
[![GitHub license](https://img.shields.io/github/license/ossec/ossec-hids)](https://github.com/ossec/ossec-hids/blob/master/LICENSE)
5+
[![GitHub language count](https://img.shields.io/github/languages/count/ossec/ossec-hids)](https://github.com/ossec/ossec-hids)
6+
[![GitHub issues](https://img.shields.io/github/issues/ossec/ossec-hids)](https://github.com/ossec/ossec-hids/issues)
7+
38
# Information about OSSEC
49

510
OSSEC is a full platform to monitor and control your systems. It mixes together
@@ -17,16 +22,13 @@ The current stable releases are available on the ossec website.
1722
* Releases can be downloaded from: [Downloads](https://www.ossec.net/downloads/)
1823
* Release documentation is available at: [docs](https://www.ossec.net/docs/)
1924

20-
## ossec-maild and libcurl SMTP TLS ##
21-
22-
When built with `USE_CURL=yes`, failed SMTP sends log detailed libcurl errors in `ossec.log`: a TLS verification category line when certificate checks fail, `curl_easy_strerror` text, optional `CURLOPT_ERRORBUFFER` detail, `CURLINFO_SSL_VERIFYRESULT` (backend-specific), and `CURLINFO_OS_ERRNO` when set. See comments at the top of `src/os_maild/curlmail.c`.
2325

2426
## Development ##
2527

2628
The development version is hosted on GitHub and just a simple git clone away.
2729

28-
[![Build Status](https://travis-ci.org/ossec/ossec-hids.svg?branch=master)](https://travis-ci.org/ossec/ossec-hids)
29-
[![Coverity Scan Build Status](https://scan.coverity.com/projects/1847/badge.svg)](https://scan.coverity.com/projects/1847)
30+
[![Build Status](https://github.com/ossec/ossec-hids/actions/workflows/make-multi-platform.yml/badge.svg)](https://github.com/ossec/ossec-hids/actions/workflows/make-multi-platform.yml)
31+
[![CodeQL](https://github.com/ossec/ossec-hids/actions/workflows/codeql.yml/badge.svg)](https://github.com/ossec/ossec-hids/actions/workflows/codeql.yml)
3032

3133

3234
## Screenshots ##
@@ -60,4 +62,8 @@ Join us on Discord: https://discord.gg/BXzM75Xzq7
6062
(Dave Gamble)
6163
* [Atomicorp](https://www.atomicorp.com) hosting the annual OSSEC conference. Presentations for the 2019 conference can be found at https://www.atomicorp.com/ossec-con2019/
6264

65+
## License
66+
67+
OSSEC is licensed under the [GNU General Public License version 2 (GPLv2)](LICENSE).
68+
6369

0 commit comments

Comments
 (0)