Update version of rsyslog, socat, redis (#1989)

* Update version of rsyslog, socat, redis

* Fix date

SPECS/redis/CVE-2020-14147.patch

@@ -1,41 +0,0 @@
-diff --git a/deps/lua/src/lua_struct.c b/deps/lua/src/lua_struct.c
-index 4d5f027..c58c8e7 100644
---- a/deps/lua/src/lua_struct.c
-+++ b/deps/lua/src/lua_struct.c
-@@ -89,12 +89,14 @@ typedef struct Header {
- } Header;
- 
- 
--static int getnum (const char **fmt, int df) {
-+static int getnum (lua_State *L, const char **fmt, int df) {
-   if (!isdigit(**fmt))  /* no number? */
-     return df;  /* return default value */
-   else {
-     int a = 0;
-     do {
-+      if (a > (INT_MAX / 10) || a * 10 > (INT_MAX - (**fmt - '0')))
-+        luaL_error(L, "integral size overflow");
-       a = a*10 + *((*fmt)++) - '0';
-     } while (isdigit(**fmt));
-     return a;
-@@ -115,9 +117,9 @@ static size_t optsize (lua_State *L, char opt, const char **fmt) {
-     case 'f':  return sizeof(float);
-     case 'd':  return sizeof(double);
-     case 'x': return 1;
--    case 'c': return getnum(fmt, 1);
-+    case 'c': return getnum(L, fmt, 1);
-     case 'i': case 'I': {
--      int sz = getnum(fmt, sizeof(int));
-+      int sz = getnum(L, fmt, sizeof(int));
-       if (sz > MAXINTSIZE)
-         luaL_error(L, "integral size %d is larger than limit of %d",
-                        sz, MAXINTSIZE);
-@@ -150,7 +152,7 @@ static void controloptions (lua_State *L, int opt, const char **fmt,
-     case '>': h->endian = BIG; return;
-     case '<': h->endian = LITTLE; return;
-     case '!': {
--      int a = getnum(fmt, MAXALIGN);
-+      int a = getnum(L, fmt, MAXALIGN);
-       if (!isp2(a))
-         luaL_error(L, "alignment %d is not a power of 2", a);
-       h->align = a;

SPECS/redis/CVE-2021-3470.patch

@@ -1,14 +0,0 @@
-diff --git a/src/zmalloc.c b/src/zmalloc.c
-index dd655620ca69..972db79d7ab7 100644
---- a/src/zmalloc.c
-+++ b/src/zmalloc.c
-@@ -177,9 +177,6 @@ void *zrealloc(void *ptr, size_t size) {
- size_t zmalloc_size(void *ptr) {
-     void *realptr = (char*)ptr-PREFIX_SIZE;
-     size_t size = *((size_t*)realptr);
--    /* Assume at least that all the allocations are padded at sizeof(long) by
--     * the underlying allocator. */
--    if (size&(sizeof(long)-1)) size += sizeof(long)-(size&(sizeof(long)-1));
-     return size+PREFIX_SIZE;
- }
- size_t zmalloc_usable(void *ptr) {

SPECS/redis/disable_active_defrag_big_keys.patch

@@ -10,19 +10,21 @@ Reading through comments on the following, this appears to be a test issue and n
 https://github.com/redis/redis/issues/2126
 
 diff -ruN a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl
---- a/tests/unit/memefficiency.tcl	2021-03-03 09:39:16.028741917 -0800
-+++ b/tests/unit/memefficiency.tcl	2021-03-03 09:45:37.207401387 -0800
-@@ -87,6 +87,7 @@
-             }
-         } {}
- 
+--- a/tests/unit/memefficiency.tcl	2021-07-21 11:06:49.000000000 -0700
++++ b/tests/unit/memefficiency.tcl	2022-01-19 12:08:18.218560014 -0800
+@@ -158,6 +158,7 @@
+         r config set appendonly no
+         r config set key-load-delay 0
+
 +    if {0} {
          test "Active defrag big keys" {
              r flushdb
              r config resetstat
-@@ -210,4 +211,5 @@
+@@ -286,6 +287,7 @@
+             assert {$digest eq $newdigest}
              r save ;# saving an rdb iterates over all the data / pointers
          } {OK}
-     }
 +    }
- }
+
+         test "Active defrag big list" {
+             r flushdb

SPECS/redis/redis.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "redis-5.0.5.tar.gz": "2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375"
+  "redis-6.2.5.tar.gz": "4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae"
  }
 }

SPECS/redis/redis.spec

@@ -1,28 +1,24 @@
 Summary:        advanced key-value store
 Name:           redis
-Version:        5.0.5
-Release:        7%{?dist}
+Version:        6.2.5
+Release:        1%{?dist}
 License:        BSD
-URL:            https://redis.io/
-Group:          Applications/Databases
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Group:          Applications/Databases
+URL:            https://redis.io/
 Source0:        https://download.redis.io/releases/%{name}-%{version}.tar.gz
 Patch0:         redis-conf.patch
-Patch1:         CVE-2020-14147.patch
-Patch2:         disable_active_defrag_big_keys.patch
-# CVE-2021-21309 affects 32-bit executables only. Mariner always builds with -m64 and does not support 32-bit architectures.
-Patch3:         CVE-2021-21309.nopatch
-Patch4:         CVE-2021-3470.patch
-
+Patch1:         disable_active_defrag_big_keys.patch
 BuildRequires:  gcc
-BuildRequires:  systemd
 BuildRequires:  make
-BuildRequires:  which
+BuildRequires:  systemd
 BuildRequires:  tcl
 BuildRequires:  tcl-devel
+BuildRequires:  which
 Requires:       systemd
-Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
+Requires(pre):  %{_sbindir}/groupadd
+Requires(pre):  %{_sbindir}/useradd
 
 %description
 Redis is an in-memory data structure store, used as database, cache and message broker.
@@ -35,12 +31,12 @@ make %{?_smp_mflags}
 
 %install
 install -vdm 755 %{buildroot}
-make PREFIX=%{buildroot}/usr install
+make PREFIX=%{buildroot}%{_prefix} install
 install -D -m 0640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
-mkdir -p %{buildroot}/var/lib/redis
-mkdir -p %{buildroot}/var/log
-mkdir -p %{buildroot}/var/opt/%{name}/log
-ln -sfv /var/opt/%{name}/log %{buildroot}/var/log/%{name}
+mkdir -p %{buildroot}%{_sharedstatedir}/redis
+mkdir -p %{buildroot}%{_var}/log
+mkdir -p %{buildroot}%{_var}/opt/%{name}/log
+ln -sfv %{_var}/opt/%{name}/log %{buildroot}%{_var}/log/%{name}
 mkdir -p %{buildroot}/usr/lib/systemd/system
 cat << EOF >>  %{buildroot}/usr/lib/systemd/system/redis.service
 [Unit]
@@ -48,8 +44,8 @@ Description=Redis in-memory key-value database
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no
-ExecStop=/usr/bin/redis-cli shutdown
+ExecStart=%{_bindir}/redis-server %{_sysconfdir}/redis.conf --daemonize no
+ExecStop=%{_bindir}/redis-cli shutdown
 User=redis
 Group=redis
 
@@ -76,43 +72,59 @@ exit 0
 /sbin/ldconfig
 %systemd_postun_with_restart redis.service
 
-
 %files
 %defattr(-,root,root)
 %license COPYING
-%dir %attr(0750, redis, redis) /var/lib/redis
-%dir %attr(0750, redis, redis) /var/opt/%{name}/log
+%dir %attr(0750, redis, redis) %{_sharedstatedir}/redis
+%dir %attr(0750, redis, redis) %{_var}/opt/%{name}/log
 %attr(0750, redis, redis) %{_var}/log/%{name}
 %{_bindir}/*
 %{_libdir}/systemd/*
 %config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/redis.conf
 
 %changelog
+* Mon Jan 24 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 6.2.5-1
+- Update to version 6.2.5.
+- Modified patch to apply to new version.
+
 * Fri Apr 09 2021 Suresh Babu Chalamalasetty <schalam@microsoft.com> 5.0.5-7
 - Add patch for CVE-2021-3470
+
 * Thu Mar 11 2021 Mateusz Malisz <mamalisz@microsoft.com> 5.0.5-6
 - Add nopatch for CVE-2021-21309.
+
 * Wed Mar 03 2021 Andrew Phelps <anphel@microsoft.com> 5.0.5-5
 - Add patch to remove an unreliable test. License verified.
+
 * Fri Oct 23 2020 Henry Li <lihl@microsoft.com> 5.0.5-4
 - Add patch to resolve CVE-2020-14147
+
 * Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 5.0.5-3
 - Added %%license line automatically
+
 * Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 5.0.5-2
 - Initial CBL-Mariner import from Photon (license: Apache2).
+
 * Mon Jul 22 2019 Shreyas B. <shreyasb@vmware.com> 5.0.5-1
 - Updated to version 5.0.5.
+
 * Tue Sep 11 2018 Keerthana K <keerthanak@vmware.com> 4.0.11-1
 - Updated to version 4.0.11.
+
 * Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  3.2.8-5
 - Fixed the log file directory structure
+
 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.8-4
 - Remove shadow from requires and use explicit tools for post actions
+
 * Wed May 31 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-3
 - Fix DB persistence,log file,grace-ful shutdown issues
+
 * Tue May 16 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-2
 - Added systemd service unit
+
 * Wed Apr 5 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-1
 - Updating to latest version
+
 * Mon Oct 3 2016 Dheeraj Shetty <dheerajs@vmware.com> 3.2.4-1
 - initial version

SPECS/rsyslog/rsyslog.signatures.json

@@ -1,8 +1,8 @@
 {
  "Signatures": {
   "50-rsyslog-journald.conf": "c4c875396276951b491e799e9cdb5a090b2ca82a754967c7f310888373e51c40",
-  "rsyslog-8.37.0.tar.gz": "9e8125951375e5a37cd360a30e6b952edd69e691f7f3f56e52695cb71f894bfd",
-  "rsyslog-doc-8.37.0.tar.gz": "9ff5a6ecb93f2e4544b5d96a2ff9c47681a9946c02b351ec1f9363bd6eb688a7",
+  "rsyslog-8.2108.0.tar.gz": "4826c2b6d081a9c95f469fb0115be3f9512065297d3de00ec513758cdb30b1d9",
+  "rsyslog-doc-8.2108.0.tar.gz": "a0a994e8f6f470ba5c5b8e4e74261655543992f8a979edc0531f5535e7d89c52",
   "rsyslog.conf": "f2d5b52fb527306452cdebb4a5fe549d89136063a65cc06d862dcf55c3489baf",
   "rsyslog.service": "df62c9fa758079016e3b73f39d3b5952dce1e0c14a063c7a776b86eeba405153"
  }

SPECS/rsyslog/rsyslog.spec

@@ -1,7 +1,7 @@
 Summary:        Rocket-fast system for log processing
 Name:           rsyslog
-Version:        8.37.0
-Release:        8%{?dist}
+Version:        8.2108.0
+Release:        1%{?dist}
 License:        GPLv3+ AND ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -153,6 +153,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %doc %{_docdir}/%{name}/html
 
 %changelog
+* Mon Jan 24 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 8.2108.0-1
+- Update to version 8.2108.0.
+
 * Wed Jan 19 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.37.0-8
 - Added "Provides: syslog".
 

SPECS/socat/socat.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "socat-1.7.3.4.tar.gz": "d9ed2075abed7b3ec9730ed729b4c8e287c502181c806d4487020418a6e2fc36"
+  "socat-1.7.4.3.tar.gz": "d697245144731423ddbbceacabbd29447089ea223e9a439b28f9ff90d0dd216e"
  }
 }

SPECS/socat/socat.spec

@@ -1,13 +1,13 @@
-Summary:          Multipurpose relay (SOcket CAT)
-Name:             socat
-Version:          1.7.3.4
-Release:          3%{?dist}
-License:          GPL2
-URL:              http://www.dest-unreach.org/socat
-Group:            Applications/Internet
-Vendor:           Microsoft Corporation
-Distribution:     Mariner
-Source0:          http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
+Summary:        Multipurpose relay (SOcket CAT)
+Name:           socat
+Version:        1.7.4.3
+Release:        1%{?dist}
+License:        GPL2
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+Group:          Applications/Internet
+URL:            http://www.dest-unreach.org/socat
+Source0:        http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
 
 %description
 Socat is a command line based utility that establishes two bidirectional byte streams and transfers data between them. Because the streams can be constructed from a large set of different types of data sinks and sources (see address types), and because lots of address options may be applied to the streams, socat can be used for many different purposes.
@@ -36,25 +36,35 @@ make %{?_smp_mflags} test
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 24 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 1.7.4.3-1
+- Update to version 1.7.4.3.
+
 * Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.7.3.4-3
 - Removing the explicit %%clean stage.
 
 * Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.7.3.4-2
 - Added %%license line automatically
 
-*   Tue Mar 24 2020 Henry Beberman <henry.beberman@microsoft.com> 1.7.3.4-1
--   Switch to 1.7.3.4. Updated Source0 URL. License verified.
-*   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.0.b9-2
--   Initial CBL-Mariner import from Photon (license: Apache2).
-*   Wed Sep 19 2018 Srinidhi Rao <srinidhir@vmware.com> 2.0.0.b9-1
--   Upgrade to 2.0.0-b9
-*   Tue Sep 19 2017 Bo Gan <ganb@vmware.com> 1.7.3.2-4
--   Disable test 302
-*   Tue Sep 12 2017 Xiaolin Li <xiaolinl@vmware.com> 1.7.3.2-3
--   Fix make check issue.
-*   Tue May 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.3.2-2
--   Correct the GPL license version.
-*   Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.3.2-1
--   Update to version 1.7.3.2
-*   Wed Jan 11 2017 Xiaolin Li <xiaolinl@vmware.com>  1.7.3.1-1
--   Initial build.
+* Tue Mar 24 2020 Henry Beberman <henry.beberman@microsoft.com> 1.7.3.4-1
+- Switch to 1.7.3.4. Updated Source0 URL. License verified.
+
+* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.0.b9-2
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Wed Sep 19 2018 Srinidhi Rao <srinidhir@vmware.com> 2.0.0.b9-1
+- Upgrade to 2.0.0-b9
+
+* Tue Sep 19 2017 Bo Gan <ganb@vmware.com> 1.7.3.2-4
+- Disable test 302
+
+* Tue Sep 12 2017 Xiaolin Li <xiaolinl@vmware.com> 1.7.3.2-3
+- Fix make check issue.
+
+* Tue May 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.3.2-2
+- Correct the GPL license version.
+
+* Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.3.2-1
+- Update to version 1.7.3.2
+
+* Wed Jan 11 2017 Xiaolin Li <xiaolinl@vmware.com>  1.7.3.1-1
+- Initial build.

cgmanifest.json

@@ -25284,8 +25284,8 @@
         "type": "other",
         "other": {
           "name": "redis",
-          "version": "5.0.5",
-          "downloadUrl": "http://download.redis.io/releases/redis-5.0.5.tar.gz"
+          "version": "6.2.5",
+          "downloadUrl": "http://download.redis.io/releases/redis-6.2.5.tar.gz"
         }
       }
     },
@@ -25535,8 +25535,8 @@
         "type": "other",
         "other": {
           "name": "rsyslog",
-          "version": "8.37.0",
-          "downloadUrl": "http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.37.0.tar.gz"
+          "version": "8.2108.0",
+          "downloadUrl": "http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2108.0.tar.gz"
         }
       }
     },
@@ -27407,8 +27407,8 @@
         "type": "other",
         "other": {
           "name": "socat",
-          "version": "1.7.3.4",
-          "downloadUrl": "http://www.dest-unreach.org/socat/download/socat-1.7.3.4.tar.gz"
+          "version": "1.7.4.3",
+          "downloadUrl": "http://www.dest-unreach.org/socat/download/socat-1.7.4.3.tar.gz"
         }
       }
     },