Attachment 224065 Details for Bug 248656 – rebase fix for 4.1.4

[patch] rebase fix for 4.1.4

wazuh-agent.4.1.4.diff (text/plain), 5.92 KB, created by Michael Muenz on 2021-04-12 19:22:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Muenz

Created: 2021-04-12 19:22:58 UTC

Size: 5.92 KB

patch

obsolete

>diff -ruN wazuh-agent.orig/Makefile wazuh-agent/Makefile
>--- wazuh-agent.orig/Makefile	2021-03-23 21:33:27.416216000 +0100
>+++ wazuh-agent/Makefile	2021-04-09 08:54:45.644831000 +0200
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	wazuh
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	4.1.3
>+DISTVERSION=	4.1.4
> CATEGORIES=	security
> MASTER_SITES=	https://packages.wazuh.com/deps/11/libraries/sources/
> PKGNAMESUFFIX=	-agent
>@@ -44,7 +44,8 @@
> 		/wodles/oscap /wodles/oscap/content
> 
> WAZUHMOD770=	/logs /queue/alerts /queue/fim /queue/fim/db /queue/ossec /etc /etc/shared \
>-		/.ssh /var/run /var/upgrade /var/wodles /var/incoming
>+		/.ssh /var/run /var/upgrade /var/wodles /var/incoming /queue/ossec/fim \
>+		/queue/ossec/fim/db
> 
> WAZUHPREFIX=	/var/ossec
> 
>diff -ruN wazuh-agent.orig/distinfo wazuh-agent/distinfo
>--- wazuh-agent.orig/distinfo	2021-03-23 21:34:05.085572000 +0100
>+++ wazuh-agent/distinfo	2021-04-09 08:56:01.057236000 +0200
>@@ -1,31 +1,31 @@
>-TIMESTAMP = 1616531645
>-SHA256 (wazuh-4.1.3/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1
>-SIZE (wazuh-4.1.3/cJSON.tar.gz) = 27863
>-SHA256 (wazuh-4.1.3/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c
>-SIZE (wazuh-4.1.3/libplist.tar.gz) = 1520623
>-SHA256 (wazuh-4.1.3/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66
>-SIZE (wazuh-4.1.3/curl.tar.gz) = 3692998
>-SHA256 (wazuh-4.1.3/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b
>-SIZE (wazuh-4.1.3/libdb.tar.gz) = 4283467
>-SHA256 (wazuh-4.1.3/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69
>-SIZE (wazuh-4.1.3/libffi.tar.gz) = 964576
>-SHA256 (wazuh-4.1.3/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a
>-SIZE (wazuh-4.1.3/libyaml.tar.gz) = 424656
>-SHA256 (wazuh-4.1.3/openssl.tar.gz) = a88f46d7dd7b1a88db1faa94943911bf24a0081f90fd1a28bbf06ad54eeab013
>-SIZE (wazuh-4.1.3/openssl.tar.gz) = 12936469
>-SHA256 (wazuh-4.1.3/procps.tar.gz) = 87336a7860f5116ac5c5222b6b0d5c892e202ce136947e4776037bb7670ce6e2
>-SIZE (wazuh-4.1.3/procps.tar.gz) = 55692
>-SHA256 (wazuh-4.1.3/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2
>-SIZE (wazuh-4.1.3/sqlite.tar.gz) = 1980218
>-SHA256 (wazuh-4.1.3/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01
>-SIZE (wazuh-4.1.3/zlib.tar.gz) = 643568
>-SHA256 (wazuh-4.1.3/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434
>-SIZE (wazuh-4.1.3/audit-userspace.tar.gz) = 1682820
>-SHA256 (wazuh-4.1.3/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2
>-SIZE (wazuh-4.1.3/msgpack.tar.gz) = 591294
>-SHA256 (wazuh-4.1.3/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd
>-SIZE (wazuh-4.1.3/bzip2.tar.gz) = 71277
>-SHA256 (wazuh-4.1.3/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa
>-SIZE (wazuh-4.1.3/libpcre2.tar.gz) = 1252173
>-SHA256 (wazuh-4.1.3/wazuh-wazuh-v4.1.3_GH0.tar.gz) = 146cc69b736aaa40d7ef392aea28b7d7e7d04b1acc2a52c86015a360257e6adf
>-SIZE (wazuh-4.1.3/wazuh-wazuh-v4.1.3_GH0.tar.gz) = 18382701
>+TIMESTAMP = 1617951361
>+SHA256 (wazuh-4.1.4/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1
>+SIZE (wazuh-4.1.4/cJSON.tar.gz) = 27863
>+SHA256 (wazuh-4.1.4/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c
>+SIZE (wazuh-4.1.4/libplist.tar.gz) = 1520623
>+SHA256 (wazuh-4.1.4/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66
>+SIZE (wazuh-4.1.4/curl.tar.gz) = 3692998
>+SHA256 (wazuh-4.1.4/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b
>+SIZE (wazuh-4.1.4/libdb.tar.gz) = 4283467
>+SHA256 (wazuh-4.1.4/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69
>+SIZE (wazuh-4.1.4/libffi.tar.gz) = 964576
>+SHA256 (wazuh-4.1.4/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a
>+SIZE (wazuh-4.1.4/libyaml.tar.gz) = 424656
>+SHA256 (wazuh-4.1.4/openssl.tar.gz) = a88f46d7dd7b1a88db1faa94943911bf24a0081f90fd1a28bbf06ad54eeab013
>+SIZE (wazuh-4.1.4/openssl.tar.gz) = 12936469
>+SHA256 (wazuh-4.1.4/procps.tar.gz) = 87336a7860f5116ac5c5222b6b0d5c892e202ce136947e4776037bb7670ce6e2
>+SIZE (wazuh-4.1.4/procps.tar.gz) = 55692
>+SHA256 (wazuh-4.1.4/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2
>+SIZE (wazuh-4.1.4/sqlite.tar.gz) = 1980218
>+SHA256 (wazuh-4.1.4/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01
>+SIZE (wazuh-4.1.4/zlib.tar.gz) = 643568
>+SHA256 (wazuh-4.1.4/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434
>+SIZE (wazuh-4.1.4/audit-userspace.tar.gz) = 1682820
>+SHA256 (wazuh-4.1.4/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2
>+SIZE (wazuh-4.1.4/msgpack.tar.gz) = 591294
>+SHA256 (wazuh-4.1.4/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd
>+SIZE (wazuh-4.1.4/bzip2.tar.gz) = 71277
>+SHA256 (wazuh-4.1.4/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa
>+SIZE (wazuh-4.1.4/libpcre2.tar.gz) = 1252173
>+SHA256 (wazuh-4.1.4/wazuh-wazuh-v4.1.4_GH0.tar.gz) = 15f8415a09f1e0d73570b22891a03fa2ec6e36d14ef435ded2c2b17a28870356
>+SIZE (wazuh-4.1.4/wazuh-wazuh-v4.1.4_GH0.tar.gz) = 18382143
>diff -ruN wazuh-agent.orig/pkg-plist wazuh-agent/pkg-plist
>--- wazuh-agent.orig/pkg-plist	2020-10-29 08:07:21.000000000 +0100
>+++ wazuh-agent/pkg-plist	2021-04-12 23:18:39.778222000 +0200
>@@ -83,6 +83,8 @@
> @dir(ossec,ossec,0750) /var/ossec/queue/diff
> @dir(ossec,ossec,0770) /var/ossec/queue/fim/db
> @dir(ossec,ossec,0770) /var/ossec/queue/fim
>+@dir(ossec,ossec,0770) /var/ossec/queue/ossec/fim/db
>+@dir(ossec,ossec,0770) /var/ossec/queue/ossec/fim
> @dir(ossec,ossec,0770) /var/ossec/queue/ossec
> @dir(ossec,ossec,0750) /var/ossec/queue/rids
> @dir(root,ossec,0750) /var/ossec/queue

Actions: View | Diff

Attachments on bug 248656: 217535 | 224065