rpms/grafana
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Import from CS git

Browse Source
This commit is contained in:
eabdullin 2024-10-01 09:03:58 +00:00
parent 0ffff8a3fb
commit a7876b3541
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch
View File

@ -2,7 +2,7 @@ use pbkdf2 from OpenSSL if FIPS mode is enabled
This patch modifies the x/crypto/pbkdf2 function to use OpenSSL This patch modifies the x/crypto/pbkdf2 function to use OpenSSL
if FIPS mode is enabled. if FIPS mode is enabled.
DEFINEFUNC is from /usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h DEFINEFUNC is from /usr/lib/golang/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
diff --git a/vendor/golang.org/x/crypto/internal/boring/boring.go b/vendor/golang.org/x/crypto/internal/boring/boring.go diff --git a/vendor/golang.org/x/crypto/internal/boring/boring.go b/vendor/golang.org/x/crypto/internal/boring/boring.go
new file mode 100644 new file mode 100644
@ -112,7 +112,7 @@ index 0000000000..6dfdf10424
--- /dev/null --- /dev/null
+++ b/vendor/golang.org/x/crypto/internal/boring/openssl_pbkdf2.h +++ b/vendor/golang.org/x/crypto/internal/boring/openssl_pbkdf2.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#include "/usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h" +#include "/usr/lib/golang/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h"
+ +
+DEFINEFUNC(int, PKCS5_PBKDF2_HMAC, +DEFINEFUNC(int, PKCS5_PBKDF2_HMAC,
+ (const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, EVP_MD *digest, int keylen, unsigned char *out), + (const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, EVP_MD *digest, int keylen, unsigned char *out),

5
SPECS/grafana.spec
View File

@ -35,7 +35,7 @@ end}
Name: grafana Name: grafana
Version: 9.2.10 Version: 9.2.10
Release: 17%{?dist} Release: 18%{?dist}
Summary: Metrics dashboard and graph editor Summary: Metrics dashboard and graph editor
License: AGPLv3 License: AGPLv3
URL: https://grafana.org URL: https://grafana.org
@ -1021,6 +1021,9 @@ fi
%{_datadir}/selinux/*/grafana.pp %{_datadir}/selinux/*/grafana.pp
%changelog %changelog
* Mon Jul 22 2024 Lauren Chilton <lchilton@redhat.com> 9.2.10-18
- Resolves RHEL-47191
* Wed Jun 26 2024 Sam Feifer <sfeifer@redhat.com> 9.2.10-17 * Wed Jun 26 2024 Sam Feifer <sfeifer@redhat.com> 9.2.10-17
- Allow for mssql datasource in selinux policy - Allow for mssql datasource in selinux policy
- Resolves RHEL-43435 - Resolves RHEL-43435