Skip to content

Commit

Permalink
Merge branch 'main' into hash-digest
Browse files Browse the repository at this point in the history
  • Loading branch information
jjnicola authored Apr 12, 2024
2 parents 6228f14 + a97c1e9 commit e53ff15
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 1 deletion.
80 changes: 80 additions & 0 deletions RELICENSE/GFoti.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
Thank you for your interest in the project openvas-scanner managed by Greenbone.
In order for you to make Contributions now or in the future to this
project, You agree to license your Contributions under the MIT-0 license (see below).
Please note that You remain the copyright owner, and anyone receives the right to
use your Contribution in proprietary and open source software without any
attribution.

..................

MIT No Attribution (MIT-0)

Copyright <YEAR> <COPYRIGHT HOLDER>

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

.........................

Please note that You remain the copyright owner, and anyone receives the
right to use your Contribution in proprietary and open source software
without attribution. However, we will include your name as a Contributor
in our CREDITS list as long as your Contribution is used in the project
openvas-scanner.

"Contribution" shall mean any original work of authorship, including any
modifications or additions to an existing work, that is submitted by you
to Greenbone for inclusion in the project openvas-scanner.

Greenbone requires that each Contribution you submit now or in the
future to comply with the following commitments documented in the
Developer Certificate of Origin (DCO) [https://developercertificate.org/]:

........

Developer Certificate of Origin

Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

.....
2 changes: 1 addition & 1 deletion nasl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}")
# line below is needed so it also works with no-undefined which is e.g. used by Mandriva
target_link_libraries (openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS}
target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS}
${LIBOPENVAS_MISC_LDFLAGS}
${GLIB_JSON_LDFLAGS}
${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m
Expand Down

0 comments on commit e53ff15

Please sign in to comment.