diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 18:00:42 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 18:00:42 +0000 |
commit | 15322b5e4bfa3f93637cb32bf9d45e2b4791a6e7 (patch) | |
tree | f146159c9472fd011940a5ed051deb835bbabf7c /debian/patches/fix-reproducible-builds-rocksdb.patch | |
parent | Adding upstream version 1:10.11.6. (diff) | |
download | mariadb-15322b5e4bfa3f93637cb32bf9d45e2b4791a6e7.tar.xz mariadb-15322b5e4bfa3f93637cb32bf9d45e2b4791a6e7.zip |
Adding debian version 1:10.11.6-0+deb12u1.debian/1%10.11.6-0+deb12u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches/fix-reproducible-builds-rocksdb.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/fix-reproducible-builds-rocksdb.patch b/debian/patches/fix-reproducible-builds-rocksdb.patch new file mode 100644 index 00000000..1bc01252 --- /dev/null +++ b/debian/patches/fix-reproducible-builds-rocksdb.patch @@ -0,0 +1,26 @@ +Origin: https://github.com/facebook/rocksdb/commit/0a9a05ae12943b1529ef1eabbca5ce5a71c986bf +# Merged in RocksDB 6.19.3, but not updated into MariaDB yet +Bug: https://github.com/facebook/rocksdb/issues/7035 +Author: Otto Kekäläinen <otto@kekalainen.net> +Subject: Make RocksDB build reproducible + +The RocksDB binary included a string with the build timestamp: +> rocksdb_build_git_date:@2021-05-23·16:04:38@ + +As this changes from build to build, it makes the builds unreproducible. +Simply removing it solves the issue. + +This temporary fix can be removed when a proper fix already done in upstream +lands in MariaDB when the RocksDB submodule is updated to a newer release. + +--- a/storage/rocksdb/rocksdb/util/build_version.cc.in ++++ b/storage/rocksdb/rocksdb/util/build_version.cc.in +@@ -1,5 +1,5 @@ + // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + #include "build_version.h" +-const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@@GIT_SHA@@"; +-const char* rocksdb_build_git_date = "rocksdb_build_git_date:@@GIT_DATE_TIME@@"; +-const char* rocksdb_build_compile_date = __DATE__; ++const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:REDACTED"; ++const char* rocksdb_build_git_date = "rocksdb_build_git_date:REDACTED"; ++const char* rocksdb_build_compile_date = "REDACTED"; |