summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/kde/kde/build/akonadi-search2
-rw-r--r--source/kde/kde/build/akonadiconsole2
-rw-r--r--source/kde/kde/build/calligra2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/build/khelpcenter2
-rw-r--r--source/kde/kde/build/kile2
-rw-r--r--source/kde/kde/build/konsole2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/skanlite2
-rw-r--r--source/kde/kde/patch/konsole.patch3
-rw-r--r--source/kde/kde/patch/konsole/konsole_fix_toolbar.patch156
-rw-r--r--source/l/cryfs/041b5baea5a4efceff33df2f316646b47a1cd7c0.patch27
-rw-r--r--source/l/cryfs/27587ea1acec5f939a31217f1c43953378f18821.patch297
-rwxr-xr-xsource/l/cryfs/cryfs.SlackBuild10
-rwxr-xr-xsource/l/glib2/glib2.SlackBuild2
-rw-r--r--source/l/glib2/libglib2.csh2
16 files changed, 343 insertions, 172 deletions
diff --git a/source/kde/kde/build/akonadi-search b/source/kde/kde/build/akonadi-search
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/akonadi-search
+++ b/source/kde/kde/build/akonadi-search
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/akonadiconsole b/source/kde/kde/build/akonadiconsole
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/akonadiconsole
+++ b/source/kde/kde/build/akonadiconsole
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index f599e28b8..b4de39476 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-10
+11
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/khelpcenter b/source/kde/kde/build/khelpcenter
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/khelpcenter
+++ b/source/kde/kde/build/khelpcenter
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index f599e28b8..b4de39476 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-10
+11
diff --git a/source/kde/kde/build/konsole b/source/kde/kde/build/konsole
index 00750edc0..d00491fd7 100644
--- a/source/kde/kde/build/konsole
+++ b/source/kde/kde/build/konsole
@@ -1 +1 @@
-3
+1
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/skanlite b/source/kde/kde/build/skanlite
index 00750edc0..d00491fd7 100644
--- a/source/kde/kde/build/skanlite
+++ b/source/kde/kde/build/skanlite
@@ -1 +1 @@
-3
+1
diff --git a/source/kde/kde/patch/konsole.patch b/source/kde/kde/patch/konsole.patch
deleted file mode 100644
index 34dfbe26c..000000000
--- a/source/kde/kde/patch/konsole.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix KXmlGUI toolbars; and Konsole MainWindow size - https://invent.kde.org/utilities/konsole/-/merge_requests/457
-cat $CWD/patch/konsole/konsole_fix_toolbar.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch b/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch
deleted file mode 100644
index 6071db5e9..000000000
--- a/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- ./src/MainWindow.h.orig 2021-08-04 16:48:59.000000000 -0500
-+++ ./src/MainWindow.h 2021-08-19 19:24:14.000000000 -0500
-@@ -200,6 +200,7 @@
- bool _menuBarInitialVisibility;
- bool _menuBarInitialVisibilityApplied;
- bool _blurEnabled = false;
-+ bool _isSavedUiState = false;
- };
- }
-
---- ./src/MainWindow.cpp.orig 2021-08-04 16:48:59.000000000 -0500
-+++ ./src/MainWindow.cpp 2021-08-19 19:24:14.000000000 -0500
-@@ -11,12 +11,12 @@
- #include <QMouseEvent>
- #include <QMenu>
- #include <QMenuBar>
--#include <QStatusBar>
-
- // KDE
- #include <KAcceleratorManager>
- #include <KActionCollection>
- #include <KActionMenu>
-+#include <KCrash>
- #include <KIconUtils>
- #include <KShortcutsDialog>
- #include <KLocalizedString>
-@@ -56,6 +56,8 @@
- #include "terminalDisplay/TerminalDisplay.h"
- #include "widgets/ViewContainer.h"
-
-+#include <konsoledebug.h>
-+
- using namespace Konsole;
-
- MainWindow::MainWindow() :
-@@ -68,13 +70,22 @@
- _menuBarInitialVisibility(true),
- _menuBarInitialVisibilityApplied(false)
- {
-- if (!KonsoleSettings::saveGeometryOnExit()) {
-+ KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc"));
-+ KConfigGroup cg = konsoleConfig->group(QStringLiteral("MainWindow"));
-+ const bool isGroup = cg.exists();
-+ if (isGroup) {
-+ const QString stateConfig = cg.readEntry(QStringLiteral("State"));
-+
-+ // If "stateConfig" is empty then this is the very first run,
-+ // i.e. no konsolerc file in $HOME
-+ _isSavedUiState = !stateConfig.isEmpty();
-+ }
-+
-+ if (isGroup && !KonsoleSettings::saveGeometryOnExit()) {
- // If we are not using the global Konsole save geometry on exit,
- // remove all geometry data from [MainWindow] in Konsolerc, so KWin will
- // manage it directly
-- KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc"));
-- KConfigGroup group = konsoleConfig->group("MainWindow");
-- QMap<QString, QString> configEntries = group.entryMap();
-+ QMap<QString, QString> configEntries = cg.entryMap();
- QMapIterator<QString, QString> i(configEntries);
-
- while (i.hasNext()) {
-@@ -91,7 +102,7 @@
- || i.key().contains(QLatin1String(" YPosition"))
- #endif
- ) {
-- group.deleteEntry(i.key());
-+ cg.deleteEntry(i.key());
- }
- }
- }
-@@ -103,7 +114,7 @@
-
- // create view manager
- _viewManager = new ViewManager(this, actionCollection());
-- connect(_viewManager, &Konsole::ViewManager::empty, this, &Konsole::MainWindow::close);
-+ connect(_viewManager, &Konsole::ViewManager::empty, this, &QWidget::close);
- connect(_viewManager, &Konsole::ViewManager::activeViewChanged, this,
- &Konsole::MainWindow::activeViewChanged);
- connect(_viewManager, &Konsole::ViewManager::unplugController, this,
-@@ -129,8 +140,10 @@
- // in terminal applications
- KAcceleratorManager::setNoAccel(menuBar());
-
-- // create menus
-- createGUI();
-+ constexpr KXmlGuiWindow::StandardWindowOptions guiOpts = ToolBar | Keys | Save | Create;
-+ const QString xmlFile = componentName() + QLatin1String("ui.rc"); // Typically "konsoleui.rc"
-+ // The "Create" flag will make it call createGUI()
-+ setupGUI(guiOpts, xmlFile);
-
- // remember the original menu accelerators for later use
- rememberMenuAccelerators();
-@@ -146,11 +159,7 @@
- connect(KonsoleSettings::self(), &Konsole::KonsoleSettings::configChanged, this,
- &Konsole::MainWindow::applyKonsoleSettings);
-
--
-- // KXMLGui is making the status bar always visible, we need to fix in a proper way.
-- if (statusBar() != nullptr) {
-- statusBar()->installEventFilter(this);
-- }
-+ KCrash::initialize();
- }
-
- void MainWindow::updateUseTransparency()
-@@ -889,7 +898,15 @@
- #if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5,82,0)
- KWindowEffects::enableBlurBehind(winId(), blur);
- #else
-- KWindowEffects::enableBlurBehind(windowHandle(), blur);
-+ // Set the WA_NativeWindow attribute to force the creation of the QWindow.
-+ // Without this QWidget::windowHandle() returns 0.
-+ // See https://phabricator.kde.org/D23108
-+ setAttribute(Qt::WA_NativeWindow);
-+ if (QWindow *window = windowHandle()) {
-+ KWindowEffects::enableBlurBehind(window, blur);
-+ } else {
-+ qCWarning(KonsoleDebug) << "Blur effect couldn't be enabled.";
-+ }
- #endif
- }
- }
-@@ -935,9 +952,14 @@
- menuBar()->setVisible(_menuBarInitialVisibility);
- _toggleMenuBarAction->setChecked(_menuBarInitialVisibility);
- _menuBarInitialVisibilityApplied = true;
-- if (!KonsoleSettings::saveGeometryOnExit()) {
-- resize(sizeHint());
-- }
-+ }
-+
-+ if (!_isSavedUiState || !KonsoleSettings::saveGeometryOnExit()) {
-+ // Delay resizing to here, so that the other parts of the UI
-+ // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc)
-+ // have been created and TabbedViewContainer::sizeHint() returns
-+ // a usuable size.
-+ resize(sizeHint());
- }
-
- // Call parent method
-@@ -971,13 +993,7 @@
- default: ;
- }
- }
-- if (qobject_cast<QStatusBar*>(obj) != nullptr) {
-- switch(event->type()) {
-- case QEvent::Show: statusBar()->hide(); break;
-- default: return true;
-- }
-- return true;
-- }
-+
- return KXmlGuiWindow::eventFilter(obj, event);
- }
-
diff --git a/source/l/cryfs/041b5baea5a4efceff33df2f316646b47a1cd7c0.patch b/source/l/cryfs/041b5baea5a4efceff33df2f316646b47a1cd7c0.patch
new file mode 100644
index 000000000..22d8b3447
--- /dev/null
+++ b/source/l/cryfs/041b5baea5a4efceff33df2f316646b47a1cd7c0.patch
@@ -0,0 +1,27 @@
+From 041b5baea5a4efceff33df2f316646b47a1cd7c0 Mon Sep 17 00:00:00 2001
+From: Sam James <11667869+thesamesam@users.noreply.github.com>
+Date: Sat, 14 Aug 2021 17:29:24 +0100
+Subject: [PATCH] src/fspp/fuse/Fuse.h: add <memory.h> include for
+ std::shared_ptr (#395)
+
+Needed to fix build with Boost 1.77 (some indirect inclusion
+got lost).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/fspp/fuse/Fuse.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/fspp/fuse/Fuse.h b/src/fspp/fuse/Fuse.h
+index 2dd3c2d4d..3841e38a4 100644
+--- a/src/fspp/fuse/Fuse.h
++++ b/src/fspp/fuse/Fuse.h
+@@ -11,6 +11,7 @@
+ #include <boost/optional.hpp>
+ #include <cpp-utils/macros.h>
+ #include <atomic>
++#include <memory>
+ #include "stat_compatibility.h"
+ #include <fspp/fs_interface/Context.h>
+
+
diff --git a/source/l/cryfs/27587ea1acec5f939a31217f1c43953378f18821.patch b/source/l/cryfs/27587ea1acec5f939a31217f1c43953378f18821.patch
new file mode 100644
index 000000000..0d739b077
--- /dev/null
+++ b/source/l/cryfs/27587ea1acec5f939a31217f1c43953378f18821.patch
@@ -0,0 +1,297 @@
+From 27587ea1acec5f939a31217f1c43953378f18821 Mon Sep 17 00:00:00 2001
+From: Sebastian Messmer <messmer@cryfs.org>
+Date: Sat, 8 May 2021 14:44:27 -0700
+Subject: [PATCH] Fixed an issue when compiling with GCC 11, see
+ https://github.com/cryfs/cryfs/issues/389
+
+---
+ ChangeLog.txt | 5 ++
+ .../onblocks/datanodestore/DataNodeView.h | 8 +--
+ .../filesystem/fsblobstore/utils/DirEntry.cpp | 66 +++++++++----------
+ src/cryfs/localstate/LocalStateMetadata.cpp | 24 +++----
+ src/cryfs/localstate/LocalStateMetadata.h | 10 +--
+ 5 files changed, 59 insertions(+), 54 deletions(-)
+
+diff --git a/ChangeLog.txt b/ChangeLog.txt
+index f9776eb93..9d7a6708c 100644
+--- a/ChangeLog.txt
++++ b/ChangeLog.txt
+@@ -1,3 +1,8 @@
++Version 0.10.4 (unreleased)
++--------------
++Fixed bugs:
++* Fixed an issue when compiling with GCC 11, see https://github.com/cryfs/cryfs/issues/389
++
+ Version 0.10.3
+ ---------------
+ Fixed bugs:
+diff --git a/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
+index 256c28495..3799612e3 100644
+--- a/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
++++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
+@@ -67,7 +67,7 @@ class DataNodeView final {
+
+ static DataNodeView create(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
+ ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node");
+- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data));
++ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data));
+ ASSERT(serialized.size() == layout.blocksizeBytes(), "Wrong block size");
+ auto block = blockStore->create(serialized);
+ return DataNodeView(std::move(block));
+@@ -75,7 +75,7 @@ class DataNodeView final {
+
+ static DataNodeView initialize(cpputils::unique_ref<blockstore::Block> block, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
+ ASSERT(data.size() <= DataNodeLayout(block->size()).datasizeBytes(), "Data is too large for node");
+- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data));
++ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data));
+ ASSERT(serialized.size() == block->size(), "Block has wrong size");
+ block->write(serialized.data(), 0, serialized.size());
+ return DataNodeView(std::move(block));
+@@ -83,7 +83,7 @@ class DataNodeView final {
+
+ static DataNodeView overwrite(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, const blockstore::BlockId &blockId, cpputils::Data data) {
+ ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node");
+- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data));
++ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data));
+ auto block = blockStore->overwrite(blockId, std::move(serialized));
+ return DataNodeView(std::move(block));
+ }
+@@ -143,7 +143,7 @@ class DataNodeView final {
+ }
+
+ private:
+- static cpputils::Data _serialize(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
++ static cpputils::Data serialize_(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
+ cpputils::Data result(layout.blocksizeBytes());
+ cpputils::serialize<uint16_t>(result.dataOffset(layout.FORMAT_VERSION_OFFSET_BYTES), formatVersion);
+ cpputils::serialize<uint8_t>(result.dataOffset(layout.DEPTH_OFFSET_BYTES), depth);
+diff --git a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
+index 941148db9..70dd5a560 100644
+--- a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
++++ b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
+@@ -11,55 +11,55 @@ namespace cryfs {
+
+ namespace {
+ template<typename DataType>
+- size_t _serialize(void* dst, const DataType& obj) {
++ size_t serialize_(void* dst, const DataType& obj) {
+ cpputils::serialize<DataType>(dst, obj);
+ return sizeof(DataType);
+ }
+
+ template<typename DataType>
+- DataType _deserialize(const char** src) {
++ DataType deserialize_(const char** src) {
+ DataType result = cpputils::deserialize<DataType>(*src);
+ *src += sizeof(DataType);
+ return result;
+ }
+
+- constexpr size_t _serializedTimeValueSize() {
++ constexpr size_t serializedTimeValueSize_() {
+ return sizeof(uint64_t) + sizeof(uint32_t);
+ }
+
+- unsigned int _serializeTimeValue(uint8_t *dest, timespec value) {
++ unsigned int serializeTimeValue_(uint8_t *dest, timespec value) {
+ unsigned int offset = 0;
+- offset += _serialize<uint64_t>(dest + offset, value.tv_sec);
+- offset += _serialize<uint32_t>(dest + offset, value.tv_nsec);
+- ASSERT(offset == _serializedTimeValueSize(), "serialized to wrong size");
++ offset += serialize_<uint64_t>(dest + offset, value.tv_sec);
++ offset += serialize_<uint32_t>(dest + offset, value.tv_nsec);
++ ASSERT(offset == serializedTimeValueSize_(), "serialized to wrong size");
+ return offset;
+ }
+
+- timespec _deserializeTimeValue(const char **pos) {
++ timespec deserializeTimeValue_(const char **pos) {
+ timespec value{};
+- value.tv_sec = _deserialize<uint64_t>(pos);
+- value.tv_nsec = _deserialize<uint32_t>(pos);
++ value.tv_sec = deserialize_<uint64_t>(pos);
++ value.tv_nsec = deserialize_<uint32_t>(pos);
+ return value;
+ }
+
+- unsigned int _serializeString(uint8_t *dest, const string &value) {
++ unsigned int serializeString_(uint8_t *dest, const string &value) {
+ std::memcpy(dest, value.c_str(), value.size()+1);
+ return value.size() + 1;
+ }
+
+- string _deserializeString(const char **pos) {
++ string deserializeString_(const char **pos) {
+ size_t length = strlen(*pos);
+ string value(*pos, length);
+ *pos += length + 1;
+ return value;
+ }
+
+- unsigned int _serializeBlockId(uint8_t *dest, const BlockId &blockId) {
++ unsigned int serializeBlockId_(uint8_t *dest, const BlockId &blockId) {
+ blockId.ToBinary(dest);
+ return blockId.BINARY_LENGTH;
+ }
+
+- BlockId _deserializeBlockId(const char **pos) {
++ BlockId deserializeBlockId_(const char **pos) {
+ BlockId blockId = BlockId::FromBinary(*pos);
+ *pos += BlockId::BINARY_LENGTH;
+ return blockId;
+@@ -75,35 +75,35 @@ namespace cryfs {
+ _mode.hasDirFlag()) + ", " + std::to_string(_mode.hasSymlinkFlag()) + ", " + std::to_string(static_cast<uint8_t>(_type))
+ );
+ unsigned int offset = 0;
+- offset += _serialize<uint8_t>(dest + offset, static_cast<uint8_t>(_type));
+- offset += _serialize<uint32_t>(dest + offset, _mode.value());
+- offset += _serialize<uint32_t>(dest + offset, _uid.value());
+- offset += _serialize<uint32_t>(dest + offset, _gid.value());
+- offset += _serializeTimeValue(dest + offset, _lastAccessTime);
+- offset += _serializeTimeValue(dest + offset, _lastModificationTime);
+- offset += _serializeTimeValue(dest + offset, _lastMetadataChangeTime);
+- offset += _serializeString(dest + offset, _name);
+- offset += _serializeBlockId(dest + offset, _blockId);
++ offset += serialize_<uint8_t>(dest + offset, static_cast<uint8_t>(_type));
++ offset += serialize_<uint32_t>(dest + offset, _mode.value());
++ offset += serialize_<uint32_t>(dest + offset, _uid.value());
++ offset += serialize_<uint32_t>(dest + offset, _gid.value());
++ offset += serializeTimeValue_(dest + offset, _lastAccessTime);
++ offset += serializeTimeValue_(dest + offset, _lastModificationTime);
++ offset += serializeTimeValue_(dest + offset, _lastMetadataChangeTime);
++ offset += serializeString_(dest + offset, _name);
++ offset += serializeBlockId_(dest + offset, _blockId);
+ ASSERT(offset == serializedSize(), "Didn't write correct number of elements");
+ }
+
+ const char *DirEntry::deserializeAndAddToVector(const char *pos, vector<DirEntry> *result) {
+- fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(_deserialize<uint8_t>(&pos));
+- fspp::mode_t mode = fspp::mode_t(_deserialize<uint32_t>(&pos));
+- fspp::uid_t uid = fspp::uid_t(_deserialize<uint32_t>(&pos));
+- fspp::gid_t gid = fspp::gid_t(_deserialize<uint32_t>(&pos));
+- timespec lastAccessTime = _deserializeTimeValue(&pos);
+- timespec lastModificationTime = _deserializeTimeValue(&pos);
+- timespec lastMetadataChangeTime = _deserializeTimeValue(&pos);
+- string name = _deserializeString(&pos);
+- BlockId blockId = _deserializeBlockId(&pos);
++ fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(deserialize_<uint8_t>(&pos));
++ fspp::mode_t mode = fspp::mode_t(deserialize_<uint32_t>(&pos));
++ fspp::uid_t uid = fspp::uid_t(deserialize_<uint32_t>(&pos));
++ fspp::gid_t gid = fspp::gid_t(deserialize_<uint32_t>(&pos));
++ timespec lastAccessTime = deserializeTimeValue_(&pos);
++ timespec lastModificationTime = deserializeTimeValue_(&pos);
++ timespec lastMetadataChangeTime = deserializeTimeValue_(&pos);
++ string name = deserializeString_(&pos);
++ BlockId blockId = deserializeBlockId_(&pos);
+
+ result->emplace_back(type, name, blockId, mode, uid, gid, lastAccessTime, lastModificationTime, lastMetadataChangeTime);
+ return pos;
+ }
+
+ size_t DirEntry::serializedSize() const {
+- return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*_serializedTimeValueSize() + (
++ return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*serializedTimeValueSize_() + (
+ _name.size() + 1) + _blockId.BINARY_LENGTH;
+ }
+ }
+diff --git a/src/cryfs/localstate/LocalStateMetadata.cpp b/src/cryfs/localstate/LocalStateMetadata.cpp
+index 529a26129..dfa952a1a 100644
+--- a/src/cryfs/localstate/LocalStateMetadata.cpp
++++ b/src/cryfs/localstate/LocalStateMetadata.cpp
+@@ -30,10 +30,10 @@ LocalStateMetadata::LocalStateMetadata(uint32_t myClientId, Hash encryptionKeyHa
+
+ LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath, const Data& encryptionKey, bool allowReplacedFilesystem) {
+ auto metadataFile = statePath / "metadata";
+- auto loaded = _load(metadataFile);
++ auto loaded = load_(metadataFile);
+ if (loaded == none) {
+ // If it couldn't be loaded, generate a new client id.
+- return _generate(metadataFile, encryptionKey);
++ return generate_(metadataFile, encryptionKey);
+ }
+
+ if (!allowReplacedFilesystem && loaded->_encryptionKeyHash.digest != cpputils::hash::hash(encryptionKey, loaded->_encryptionKeyHash.salt).digest) {
+@@ -42,22 +42,22 @@ LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath,
+ return *loaded;
+ }
+
+-optional<LocalStateMetadata> LocalStateMetadata::_load(const bf::path &metadataFilePath) {
++optional<LocalStateMetadata> LocalStateMetadata::load_(const bf::path &metadataFilePath) {
+ ifstream file(metadataFilePath.string());
+ if (!file.good()) {
+ // State file doesn't exist
+ return none;
+ }
+- return _deserialize(file);
++ return deserialize_(file);
+ }
+
+-void LocalStateMetadata::_save(const bf::path &metadataFilePath) const {
++void LocalStateMetadata::save_(const bf::path &metadataFilePath) const {
+ ofstream file(metadataFilePath.string(), std::ios::trunc);
+- _serialize(file);
++ serialize_(file);
+ }
+
+ namespace {
+-uint32_t _generateClientId() {
++uint32_t generateClientId_() {
+ uint32_t result;
+ do {
+ result = cpputils::deserialize<uint32_t>(Random::PseudoRandom().getFixedSize<sizeof(uint32_t)>().data());
+@@ -82,8 +82,8 @@ optional<uint32_t> _tryLoadClientIdFromLegacyFile(const bf::path &metadataFilePa
+ #endif
+ }
+
+-LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePath, const Data& encryptionKey) {
+- uint32_t myClientId = _generateClientId();
++LocalStateMetadata LocalStateMetadata::generate_(const bf::path &metadataFilePath, const Data& encryptionKey) {
++ uint32_t myClientId = generateClientId_();
+ #ifndef CRYFS_NO_COMPATIBILITY
+ // In the old format, this was stored in a "myClientId" file. If that file exists, load it from there.
+ optional<uint32_t> legacy = _tryLoadClientIdFromLegacyFile(metadataFilePath);
+@@ -93,11 +93,11 @@ LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePat
+ #endif
+
+ LocalStateMetadata result(myClientId, cpputils::hash::hash(encryptionKey, cpputils::hash::generateSalt()));
+- result._save(metadataFilePath);
++ result.save_(metadataFilePath);
+ return result;
+ }
+
+-void LocalStateMetadata::_serialize(ostream& stream) const {
++void LocalStateMetadata::serialize_(ostream& stream) const {
+ ptree pt;
+ pt.put<uint32_t>("myClientId", myClientId());
+ pt.put<string>("encryptionKey.salt", _encryptionKeyHash.salt.ToString());
+@@ -106,7 +106,7 @@ void LocalStateMetadata::_serialize(ostream& stream) const {
+ write_json(stream, pt);
+ }
+
+-LocalStateMetadata LocalStateMetadata::_deserialize(istream& stream) {
++LocalStateMetadata LocalStateMetadata::deserialize_(istream& stream) {
+ try {
+ ptree pt;
+ read_json(stream, pt);
+diff --git a/src/cryfs/localstate/LocalStateMetadata.h b/src/cryfs/localstate/LocalStateMetadata.h
+index 8b0ffc662..c06b0f05b 100644
+--- a/src/cryfs/localstate/LocalStateMetadata.h
++++ b/src/cryfs/localstate/LocalStateMetadata.h
+@@ -20,11 +20,11 @@ class LocalStateMetadata final {
+ const uint32_t _myClientId;
+ const cpputils::hash::Hash _encryptionKeyHash;
+
+- static boost::optional<LocalStateMetadata> _load(const boost::filesystem::path &metadataFilePath);
+- static LocalStateMetadata _deserialize(std::istream& stream);
+- static LocalStateMetadata _generate(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey);
+- void _save(const boost::filesystem::path &metadataFilePath) const;
+- void _serialize(std::ostream& stream) const;
++ static boost::optional<LocalStateMetadata> load_(const boost::filesystem::path &metadataFilePath);
++ static LocalStateMetadata deserialize_(std::istream& stream);
++ static LocalStateMetadata generate_(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey);
++ void save_(const boost::filesystem::path &metadataFilePath) const;
++ void serialize_(std::ostream& stream) const;
+
+ LocalStateMetadata(uint32_t myClientId, cpputils::hash::Hash encryptionKey);
+ };
+
diff --git a/source/l/cryfs/cryfs.SlackBuild b/source/l/cryfs/cryfs.SlackBuild
index 9738ab4f0..e37b529b2 100755
--- a/source/l/cryfs/cryfs.SlackBuild
+++ b/source/l/cryfs/cryfs.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL
-# Copyright 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryfs
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -89,6 +89,12 @@ find . \
# Oddly, cryfs expects a static boost, so we'll need to hit it with the LART:
export LDFLAGS="$SLKLDFLAGS -lboost_thread -lboost_program_options -lboost_filesystem -lboost_chrono -lcryptopp -lfuse"
+# gcc11 fixes:
+zcat $CWD/27587ea1acec5f939a31217f1c43953378f18821.patch.gz | patch -p1 --verbose || exit 1
+
+# Boost 1.77.0 fix:
+zcat $CWD/041b5baea5a4efceff33df2f316646b47a1cd7c0.patch.gz | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
mkdir cmake-build
cd cmake-build
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index 3f04afb5a..6beafe56d 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glib2
VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/glib2/libglib2.csh b/source/l/glib2/libglib2.csh
index c598e193a..eb0ada61a 100644
--- a/source/l/glib2/libglib2.csh
+++ b/source/l/glib2/libglib2.csh
@@ -15,7 +15,7 @@
# in the locale encoding rather than in UTF-8.
# Determine if the locale is UTF-8:
-locale charmap 2> /dev/null | grep -q UTF-8
+locale charmap | grep -q UTF-8
if ($status == 0) then
setenv G_FILENAME_ENCODING "@locale"
endif
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-18 03:37:16 +0000