This commit is contained in:
jslobodzian 2024-04-08 20:30:04 -04:00 коммит произвёл GitHub
Родитель b98be2bc9f
Коммит 290f6698c6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
12 изменённых файлов: 2 добавлений и 426 удалений

Просмотреть файл

@ -1,26 +0,0 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
ARG BASE_IMAGE
FROM $BASE_IMAGE
@INCLUDE_MAIN_RUN_INSTRUCTION@
RUN set -eux && \
redis-cli --version && \
redis-server --version && \
mkdir /data && \
chown redis:redis /data
VOLUME /data
WORKDIR /data
COPY redis-docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/redis-docker-entrypoint.sh
ENTRYPOINT ["/usr/local/bin/redis-docker-entrypoint.sh"]
EXPOSE 6379
CMD ["redis-server"]

Просмотреть файл

@ -1,26 +0,0 @@
#!/bin/bash
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
set -e
# first arg is `-f` or `--some-option`
# or first arg is `something.conf`
if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
set -- redis-server "$@"
fi
# allow the container to be started with `--user`
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
find . \! -user redis -exec chown redis '{}' +
exec setpriv --reuid=redis --regid=redis --init-groups --inh-caps=-all "$BASH_SOURCE" "$@"
fi
# set an appropriate umask (if one isn't set already)
# - https://github.com/docker-library/redis/issues/305
# - https://github.com/redis/redis/blob/bb875603fb7ff3f9d19aad906bd45d7db98d9a39/utils/systemd-redis_server.service#L37
um="$(umask)"
if [ "$um" = '0022' ]; then
umask 0077
fi
exec "$@"

Просмотреть файл

@ -1,3 +0,0 @@
redis
cronie
util-linux

4
LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md сгенерированный

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -1772,7 +1772,6 @@
"python-qrcode",
"python-rdflib",
"python-recommonmark",
"python-redis",
"python-requests-file",
"python-requests-ftp",
"python-requests-kerberos",
@ -2985,7 +2984,6 @@
"PyYAML",
"rapidjson",
"readline",
"redis",
"rng-tools",
"rpcbind",
"rpcsvc-proto",

Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"python-redis-3.5.3.tar.gz": "0e3ef04af57d17207c2f13a49641a63b98e0040a10756a8247e833468b5a8206"
}
}

Просмотреть файл

@ -1,156 +0,0 @@
%{!?python3_pkgversion: %global python3_pkgversion 3}
%{!?python3_version: %define python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
%{!?__python3: %global __python3 /usr/bin/python3}
%{!?py3_build: %define py3_build CFLAGS="%{optflags}" %{__python3} setup.py build}
%{!?py3_install: %define py3_install %{__python3} setup.py install --skip-build --root %{buildroot}}
%global upstream_name redis
Name: python-%{upstream_name}
Version: 3.5.3
Release: 2%{?dist}
Summary: Python interface to the Redis key-value store
License: MIT
URL: https://github.com/andymccurdy/redis-py
#Source0: https://github.com/andymccurdy/redis-py/archive/%{version}.tar.gz
Source0: https://github.com/andymccurdy/redis-py/archive/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: redis
%global _description\
This is a Python interface to the Redis key-value store.
%description %_description
%package -n python3-redis
Summary: Python 3 interface to the Redis key-value store
%{?python_provide:%python_provide python3-redis}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-py
BuildRequires: python3-pytest
BuildRequires: python3-mock
%description -n python3-redis
This is a Python 3 interface to the Redis key-value store.
%prep
%setup -qn redis-py-%{version}
rm -frv %{upstream_name}.egg-info
# This test passes locally but fails in koji...
rm tests/test_commands.py*
%build
%py3_build
%install
%py3_install
%check
redis-server &
%{__python3} -m pytest
kill %1
%files -n python3-redis
%doc CHANGES LICENSE README.rst
%{python3_sitelib}/%{upstream_name}
%{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info
%changelog
* Wed Dec 09 2020 Steve Laughman <steve.laughman@microsoft.com> - 3.5.3-2
- Initial CBL-Mariner import from Fedora 33 (license: MIT)
* Tue Sep 15 2020 Joel Capitao <jcapitao@redhat.com> - 3.5.3-1
- Update to 3.5.3
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-2
- Rebuilt for Python 3.9
* Mon Mar 16 2020 Clément Verna <cverna@fedoraproject.org> - 3.4.1-1
- Update to 3.4.1.
- Use pytest to run the unit tests.
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Oct 06 2019 Kevin Fenzi <kevin@scrye.com> - 3.3.8-1
- Update to 3.3.8.
* Sun Sep 08 2019 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-4
- Subpackage python2-redis has been removed
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-3
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Jun 22 2019 Kevin Fenzi <kevin@scrye.com> - 3.2.1-1
- Update to 3.2.1. Fixes bug #1670235
* Mon Feb 11 2019 Javier Peña <jpena@redhat.com> - 3.1.0-1
- Update to 3.1.0. Fixes bug #1670235
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 2.10.6-4
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Jan 27 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.10.6-2
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Sun Dec 17 2017 Kevin Fenzi <kevin@scrye.com> - 2.10.6-1
- Update to 2.10.6. Fixes bug #1482297
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.10.5-6
- Python 2 binary package renamed to python2-redis
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.10.5-3
- Rebuild for Python 3.6
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10.5-2
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Mon Apr 04 2016 Ralph Bean <rbean@redhat.com> - 2.10.5-1
- new version
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10.3-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Fri Jul 10 2015 Ralph Bean <rbean@redhat.com> - 2.10.3-3
- Remove test that fails erroneously in koji.
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Aug 21 2014 Christopher Meng <rpm@cicku.me> - 2.10.3-1
- Update to 2.10.3
* Tue Aug 12 2014 Christopher Meng <rpm@cicku.me> - 2.10.2-1
- Update to 2.10.2
* Thu Jun 19 2014 Christopher Meng <rpm@cicku.me> - 2.10.1-1
- Update to 2.10.1
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed May 28 2014 Kalev Lember <kalevlember@gmail.com> - 2.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
* Fri Feb 14 2014 Christopher Meng <rpm@cicku.me> - 2.9.1-1
- Update to 2.9.1
- Use generated egg instead of bundled egg
- Cleanup again
* Sat Jul 27 2013 Luke Macken <lmacken@redhat.com> - 2.7.6-1
- Update to 2.7.6
- Run the test suite
- Add a python3 subpackage
- Remove obsolete buildroot tag and cleanup
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Dec 27 2012 Silas Sewell <silas@sewell.org> - 2.7.2-1
- Update to 2.7.2
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sun Jul 24 2011 Silas Sewell <silas@sewell.org> - 2.4.9-1
- Update to 2.4.9
* Sun Mar 27 2011 Silas Sewell <silas@sewell.ch> - 2.2.4-1
- Update to 2.2.4
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Sep 04 2010 Silas Sewell <silas@sewell.ch> - 2.0.0-1
- Initial build

Просмотреть файл

@ -1,3 +0,0 @@
CVE-2022-3647 - patched in 6.2.9
Upstream: 0bf90d944313919eb8e63d3588bf63a367f020a3
Stable: d8102f5ff887e5e004a0cc2a86efd5ff7b3bbf12

Просмотреть файл

@ -1,22 +0,0 @@
diff -ru a/redis.conf b/redis.conf
--- a/redis.conf 2017-02-12 15:14:57.000000000 +0000
+++ b/redis.conf 2017-05-18 00:02:00.295531770 +0000
@@ -160,7 +160,7 @@
# Specify the log file name. Also the empty string can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+logfile "/var/log/redis/redis.log"
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
@@ -244,7 +244,7 @@
# The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
-dir ./
+dir /var/lib/redis
################################# REPLICATION #################################
Only in b: redis-conf.patch

Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"redis-7.2.4.tar.gz": "8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59"
}
}

Просмотреть файл

@ -1,156 +0,0 @@
Summary: advanced key-value store
Name: redis
Version: 7.2.4
Release: 1%{?dist}
License: BSD
Vendor: Microsoft Corporation
Distribution: Azure Linux
Group: Applications/Databases
URL: https://redis.io/
Source0: https://download.redis.io/releases/%{name}-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: make
BuildRequires: systemd
BuildRequires: tcl
BuildRequires: tcl-devel
BuildRequires: which
Requires: systemd
Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd
%description
Redis is an in-memory data structure store, used as database, cache and message broker.
%prep
%autosetup -p1
%build
make %{?_smp_mflags}
%install
install -vdm 755 %{buildroot}
make PREFIX=%{buildroot}%{_prefix} install
install -D -m 0640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
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]
Description=Redis in-memory key-value database
After=network.target
[Service]
ExecStart=%{_bindir}/redis-server %{_sysconfdir}/redis.conf --daemonize no
ExecStop=%{_bindir}/redis-cli shutdown
User=redis
Group=redis
[Install]
WantedBy=multi-user.target
EOF
%check
make check
%pre
getent group %{name} &> /dev/null || \
groupadd -r %{name} &> /dev/null
getent passwd %{name} &> /dev/null || \
useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
-c 'Redis Database Server' %{name} &> /dev/null
exit 0
%post
/sbin/ldconfig
%systemd_post redis.service
%postun
/sbin/ldconfig
%systemd_postun_with_restart redis.service
%files
%defattr(-,root,root)
%license COPYING
%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
* Tue Jan 23 2024 Sharath Srikanth Chellappa <sharathsr@microsoft.com> - 7.2.4-1
- Bump version to 7.2.4 for Mariner 3.0
- Removing disable_active_defrag_big_keys.patch since the fix has already released (5843a45d01f76c55288abe00c29931a2520fe521) by PR#8294
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 6.2.13-2
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
* Mon Sep 11 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.2.13-1
- Auto-upgrade to 6.2.13 - fix CVE-2022-24834
* Thu May 04 2023 Sumedh Sharma <sumsharma@microsoft.com> - 6.2.12-1
- Upgrade to 6.2.12 to fix CVE-2023-28856
* Mon Mar 13 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.2.11-1
- Auto-upgrade to 6.2.11 - to fix CVE-2022-36021, CVE-2023-25155
* Wed Feb 08 2023 Rachel Menge <rachelmenge@microsoft.com> - 6.2.9-1
- Bump version 6.2.9 for CVE-2022-35977 and CVE-2023-22458
* Fri Oct 28 2022 Cameron Baird <cameronbaird@microsoft.com> - 6.2.7-2
- Apply patch to address CVE-2022-3647
* Wed Jun 15 2022 Muhammad Falak <mwani@microsoft.com> - 6.2.7-1
- Bump version to 6.2.7 to address CVE-2022-24736
* Mon Feb 07 2022 Muhammad Falak <mwani@microsoft.com> - 6.2.6-1
- Bump version to 6.2.6 to fix ptest
* 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

Просмотреть файл

@ -23938,16 +23938,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "python-redis",
"version": "3.5.3",
"downloadUrl": "https://github.com/andymccurdy/redis-py/archive/python-redis-3.5.3.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -25428,16 +25418,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "redis",
"version": "7.2.4",
"downloadUrl": "https://download.redis.io/releases/redis-7.2.4.tar.gz"
}
}
},
{
"component": {
"type": "other",