all: initial support for freebsd
- Use `copy_file_range(2)` over `sendfile(2)` which has wider compatibility. - Special case pam on freebsd and document `configDirectory` incompatibility. - Disable jemalloc for FreeBSD by default as it is the system allocator. - Disable breakpad by default on FreeBSD as breakpad is not supported.
This commit is contained in:
parent
341a07d05b
commit
6742148cf4
8 changed files with 39 additions and 10 deletions
|
|
@ -44,8 +44,13 @@ boption(BUILD_TESTING "Build tests (dev)" OFF)
|
|||
boption(ASAN "ASAN (dev)" OFF) # note: better output with gcc than clang
|
||||
boption(FRAME_POINTERS "Keep Frame Pointers (dev)" ${ASAN})
|
||||
|
||||
boption(CRASH_REPORTER "Crash Handling" ON)
|
||||
boption(USE_JEMALLOC "Use jemalloc" ON)
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
boption(CRASH_REPORTER "Crash Handling" OFF)
|
||||
boption(USE_JEMALLOC "Use jemalloc" OFF)
|
||||
else()
|
||||
boption(CRASH_REPORTER "Crash Handling" ON)
|
||||
boption(USE_JEMALLOC "Use jemalloc" ON)
|
||||
endif()
|
||||
boption(SOCKETS "Unix Sockets" ON)
|
||||
boption(WAYLAND "Wayland" ON)
|
||||
boption(WAYLAND_WLR_LAYERSHELL " Wlroots Layer-Shell" ON REQUIRES WAYLAND)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ set shell id.
|
|||
|
||||
## Other Changes
|
||||
|
||||
- FreeBSD is now partially supported.
|
||||
- IPC operations filter available instances to the current display connection by default.
|
||||
|
||||
## Bug Fixes
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include <qtmetamacros.h>
|
||||
#include <qtypes.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/sendfile.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "instanceinfo.hpp"
|
||||
#include "logcat.hpp"
|
||||
|
|
@ -392,7 +392,7 @@ void ThreadLogging::initFs() {
|
|||
delete detailedFile;
|
||||
detailedFile = nullptr;
|
||||
} else {
|
||||
auto lock = flock {
|
||||
struct flock lock = {
|
||||
.l_type = F_WRLCK,
|
||||
.l_whence = SEEK_SET,
|
||||
.l_start = 0,
|
||||
|
|
@ -414,7 +414,7 @@ void ThreadLogging::initFs() {
|
|||
auto* oldFile = this->file;
|
||||
if (oldFile) {
|
||||
oldFile->seek(0);
|
||||
sendfile(file->handle(), oldFile->handle(), nullptr, oldFile->size());
|
||||
copy_file_range(oldFile->handle(), nullptr, file->handle(), nullptr, oldFile->size(), 0);
|
||||
}
|
||||
|
||||
this->file = file;
|
||||
|
|
@ -426,7 +426,14 @@ void ThreadLogging::initFs() {
|
|||
auto* oldFile = this->detailedFile;
|
||||
if (oldFile) {
|
||||
oldFile->seek(0);
|
||||
sendfile(detailedFile->handle(), oldFile->handle(), nullptr, oldFile->size());
|
||||
copy_file_range(
|
||||
oldFile->handle(),
|
||||
nullptr,
|
||||
detailedFile->handle(),
|
||||
nullptr,
|
||||
oldFile->size(),
|
||||
0
|
||||
);
|
||||
}
|
||||
|
||||
crash::CrashInfo::INSTANCE.logFd = detailedFile->handle();
|
||||
|
|
@ -889,7 +896,7 @@ bool LogReader::continueReading() {
|
|||
}
|
||||
|
||||
void LogFollower::FcntlWaitThread::run() {
|
||||
auto lock = flock {
|
||||
struct flock lock = {
|
||||
.l_type = F_RDLCK, // won't block other read locks when we take it
|
||||
.l_whence = SEEK_SET,
|
||||
.l_start = 0,
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ void QsPaths::createLock() {
|
|||
return;
|
||||
}
|
||||
|
||||
auto lock = flock {
|
||||
struct flock lock = {
|
||||
.l_type = F_WRLCK,
|
||||
.l_whence = SEEK_SET,
|
||||
.l_start = 0,
|
||||
|
|
@ -389,7 +389,7 @@ bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info, bool allowD
|
|||
auto file = QFile(QDir(path).filePath("instance.lock"));
|
||||
if (!file.open(QFile::ReadOnly)) return false;
|
||||
|
||||
auto lock = flock {
|
||||
struct flock lock = {
|
||||
.l_type = F_WRLCK,
|
||||
.l_whence = SEEK_SET,
|
||||
.l_start = 0,
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ bool QmlToolingSupport::lockTooling() {
|
|||
return false;
|
||||
}
|
||||
|
||||
auto lock = flock {
|
||||
struct flock lock = {
|
||||
.l_type = F_WRLCK,
|
||||
.l_whence = SEEK_SET, // NOLINT (fcntl.h??)
|
||||
.l_start = 0,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
#include <qsocketnotifier.h>
|
||||
#include <qstring.h>
|
||||
#include <qtmetamacros.h>
|
||||
#include <csignal>
|
||||
#include <sys/signal.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include "../../core/logcat.hpp"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,11 @@
|
|||
#include <qtclasshelpermacros.h>
|
||||
#include <qthread.h>
|
||||
#include <qtmetamacros.h>
|
||||
#ifdef __FreeBSD__
|
||||
#include <security/pam_types.h>
|
||||
#else
|
||||
#include <security/_pam_types.h>
|
||||
#endif
|
||||
#include <security/pam_appl.h>
|
||||
|
||||
#include "conversation.hpp"
|
||||
|
|
@ -35,6 +39,8 @@ class PamContext
|
|||
///
|
||||
/// The configuration directory is resolved relative to the current file if not an absolute path.
|
||||
///
|
||||
/// On FreeBSD this property is ignored as the pam configuration directory cannot be changed.
|
||||
///
|
||||
/// This property may not be set while @@active is true.
|
||||
Q_PROPERTY(QString configDirectory READ configDirectory WRITE setConfigDirectory NOTIFY configDirectoryChanged);
|
||||
/// The user to authenticate as. If unset the current user will be used.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,11 @@
|
|||
#include <qloggingcategory.h>
|
||||
#include <qstring.h>
|
||||
#include <sched.h>
|
||||
#ifdef __FreeBSD__
|
||||
#include <security/pam_types.h>
|
||||
#else
|
||||
#include <security/_pam_types.h>
|
||||
#endif
|
||||
#include <security/pam_appl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
|
@ -83,7 +87,11 @@ PamIpcExitCode PamSubprocess::exec(const char* configDir, const char* config, co
|
|||
logIf(this->log) << "Starting pam session for user \"" << user << "\" with config \"" << config
|
||||
<< "\" in dir \"" << configDir << "\"" << std::endl;
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
auto result = pam_start(config, user, &conv, &handle);
|
||||
#else
|
||||
auto result = pam_start_confdir(config, user, &conv, configDir, &handle);
|
||||
#endif
|
||||
|
||||
if (result != PAM_SUCCESS) {
|
||||
logIf(true) << "Unable to start pam conversation with error \"" << pam_strerror(handle, result)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue