Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.8.1 into 4.8.2 #2764

Merged
merged 43 commits into from
Jan 11, 2024
Merged

Merge 4.8.1 into 4.8.2 #2764

merged 43 commits into from
Jan 11, 2024

Conversation

MarcelKemp
Copy link
Member

Related issue
#2757

This PR aims to merge 4.8.1 into 4.8.2.

Dwordcito and others added 30 commits November 23, 2023 16:17
@Dwordcito
Add new libraries to the manager spec file.
b855574
@MiguelazoDS @Dwordcito
Adding flatccrt library to rpm SPECS
aa9a9e4
@Dwordcito
Remove cpe helper installation
ef65612
@Dwordcito
Remove libflatcc from specs files.
6c8bd2b
@jftuduri
Add indexer config to ossec.conf if missing
be4f235
@jftuduri
Revert "Add indexer config to ossec.conf if missing"
7f9a95c 
This reverts commit be4f235.
@Dwordcito
Merge branch '4.8.0' into dev-14153-vulndet-refactor
dc4219e
@jftuduri
Add indexer config to ossec.conf if missing, on upgrade
9ceb882
@tsarquis88 @jftuduri
Update old VD config when installing Wazuh manager
dded7ee 
Co-authored-by: Kevin Cardenas <kevin.cardenas@wazuh.com>
@tsarquis88 @jftuduri
Improve script by doing it more general
d370b7b
@tsarquis88 @jftuduri
Revert "Improve script by doing it more general"
220b931 
This reverts commit d0e0905.
@tsarquis88 @jftuduri
Rename variables to shorter names
a35d415
@tsarquis88 @jftuduri
Reuse script
9b5dc85
@tsarquis88 @jftuduri
Fix path
e01f47d
@jftuduri @tsarquis88
Add indexer config to ossec.conf if missing, on upgrade
40548b1 
Co-authored-by: Tomas <tsarquis88@gmail.com>
@Damian-Mangold
Merge pull request #2684 from wazuh/dev-2683-fix-upgrade-config-failure
7d4e737 
 Ensure <indexer> config is present in ossec.conf after upgrade via deb package
@Damian-Mangold
Merge pull request #2711 from wazuh/dev-2706-fix-rpm-upgrade-config-f…
8317813 
…ailure

 Ensure <indexer> config is present in ossec.conf after upgrade via rpm
@diegodfrf
Add flag --download-content to generate_debian_package.sh
1622614
@diegodfrf
Add var download_content to build.sh
838881e
@diegodfrf
Add var DOWNLOAD_CONTENT_ENABLED to rules
c55ec47
@diegodfrf
Add decompress to postinst
34c902d
@diegodfrf
Fix var DOWNLOAD_CONTENT
6339a60
@diegodfrf
Change owner queue/vd
63993b4
@diegodfrf
Add --download-content option to generate_rpm_package.sh
586ce07
@diegodfrf
Add --define _download_content_enabled in build.sh
5ac6297
@diegodfrf
Add download content in install.sh call
f27da25
@diegodfrf
Rename vd.tar.xz to vd_1.0.0_vd_4.8.0.tar.xz
1adb361
@diegodfrf
Update folder name vd_updater
e152a5e
@diegodfrf
Update _vdfilename
b05c2a4
@diegodfrf
Fix rm command
b4069cf
Dwordcito and others added 12 commits December 31, 2023 00:58
@Dwordcito
Merge pull request #2695 from wazuh/20747-add-content-databases
e5af547 
Add content database in RPM and DEB packages
@diegodfrf
Add xz dependency in RPM
3ee5b41
@diegodfrf
Add xz dependency in DEB
51ade35
@diegodfrf
Remove flag --download-content
401a0a9 
Always download content, it's mandatory
@Dwordcito
Merge pull request #2748 from wazuh/2747-remove-download-content-flag
9b36ddc 
Remove flag --download-content
@Dwordcito
Merge pull request #2742 from wazuh/dev-14153-vulndet-refactor
3d2371a 
Vulnerability detector refactor
@MarcelKemp
Update release date for 4.8.0
e5be556
@MarcelKemp
Merge pull request #2755 from wazuh/change/4.8.0-release-date
4f57ad1 
Update release date for 4.8.0
@Dwordcito
Merge pull request #2738 from wazuh/2731-add-xz-utils-as-requirement
40e6361 
Add xz utils as requirement
@pereyra-m
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
3ceafce
@MarcelKemp
Merge pull request #2759 from wazuh/merge-4.8.0-into-4.8.1
f57bbd9 
Merge 4.8.0 into 4.8.1
@MarcelKemp
Merge branch '4.8.1' into merge-4.8.1-into-4.8.2
f2634cc
@MarcelKemp MarcelKemp added the type/maintenance Maintenance issue label Jan 11, 2024
@MarcelKemp MarcelKemp self-assigned this Jan 11, 2024
@MarcelKemp MarcelKemp linked an issue Jan 11, 2024 that may be closed by this pull request
Post release tasks for 4.7.2 #2757
Closed
8 tasks
@MarcelKemp
Copy link
Member Author

Failing checks

Known issues

Same error as before:

pereyra-m
pereyra-m requested changes Jan 11, 2024
View reviewed changes
Copy link
Member

@pereyra-m pereyra-m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gj!

aix/SPECS/wazuh-agent-aix.spec Outdated Show resolved Hide resolved
debs/SPECS/wazuh-agent/debian/copyright Outdated Show resolved Hide resolved
debs/SPECS/wazuh-manager/debian/changelog Show resolved Hide resolved
debs/SPECS/wazuh-manager/debian/copyright Outdated Show resolved Hide resolved
rpms/SPECS/wazuh-agent.spec Outdated Show resolved Hide resolved
solaris/solaris10/pkginfo Outdated Show resolved Hide resolved
stack/dashboard/deb/debian/copyright Outdated Show resolved Hide resolved
stack/dashboard/rpm/wazuh-dashboard.spec Outdated Show resolved Hide resolved
stack/indexer/deb/debian/copyright Outdated Show resolved Hide resolved
stack/indexer/rpm/wazuh-indexer.spec Outdated Show resolved Hide resolved
This was referenced Jan 11, 2024
Closed
Closed
@MarcelKemp MarcelKemp merged commit 1ed5ef6 into 4.8.2 Jan 11, 2024
54 checks passed
@MarcelKemp MarcelKemp deleted the merge-4.8.1-into-4.8.2 branch January 11, 2024 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dwordcito Dwordcito Dwordcito approved these changes

@pereyra-m pereyra-m Awaiting requested review from pereyra-m

Assignees

@MarcelKemp MarcelKemp

Labels
type/maintenance Maintenance issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.7.2
8 participants
@MarcelKemp @Dwordcito @pereyra-m @MiguelazoDS @jftuduri @tsarquis88 @Damian-Mangold @diegodfrf