Merge 4.5 into master #2226
Merged
Merge 4.5 into master #2226
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added Amazon Linux 2023 SCA
…-linux-2023 Revert "Added Amazon Linux 2023 SCA"
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
… postinstall.sh) Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
…in-init.sh Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Fix error with deployment variables on upgrade in macOS packages
* Added Amazon Linux 2023 SCA * Fixed typo * Revert "Added Amazon Linux 2023 SCA" --------- Co-authored-by: David Correa Rodríguez <davidcorreafjb2001@gmail.com> Co-authored-by: Gonzalo Acuña <33964202+teddytpc1@users.noreply.github.com>
…the package Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
…c-directory-to4.4 Removed ossec.confre after install or upgrade
Fixed macOS post-install user and group check
Replace launchctl variables from macOS installation scripts
Renamed macOS Login Item
merge 4.4.3 into 4.4
…21-merge-4.4-into-4.5
Merge 4.4 into 4.5
… 17285-master-merge-4.5
jotacarma90
approved these changes
Jun 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR merges the latest changes in 4.5 into branch master.