Skip to content

Some fixes for GNU/Hurd #1555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
val-ms merged 3 commits into from
Aug 30, 2025
Merged

Some fixes for GNU/Hurd #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4cd76b
CMake: re-add support for GNU/Hurd
pinotree Aug 18, 2025
f95afb4
clamconf: run lsb_release on Hurd if available
pinotree Aug 18, 2025
39c80e3
clamd: use setrlimit() also when using GNU libc
pinotree Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ elseif(APPLE OR CMAKE_SYSTEM_NAME MATCHES "BSD")
set(C_BSD 1)
elseif(CMAKE_SYSTEM_NAME MATCHES "AIX")
set(AIX TRUE)
elseif(CMAKE_SYSTEM_NAME STREQUAL "GNU")
set(C_GNU_HURD 1)
endif()

# Git optionally used to add commit info into build to differentiate in bug reports.
Expand Down Expand Up @@ -196,7 +198,7 @@ else()
set(USING_CLANG OFF)
endif()

if(C_LINUX)
if(C_LINUX OR C_GNU_HURD)
if(CMAKE_COMPILER_IS_GNUCXX OR USING_CLANG)
# Set _GNU_SOURCE for O_LARGEFILE, O_CLOEXEC, O_DIRECTORY, O_NOFOLLOW, etc flags on older systems
# (pre POSIX.1-2008: glibc 2.11 and earlier). #4042
Expand Down
2 changes: 1 addition & 1 deletion clamconf/clamconf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static void print_platform(struct cli_environment *env)

printf("OS: " TARGET_OS_TYPE ", ARCH: " TARGET_ARCH_TYPE ", CPU: " TARGET_CPU_TYPE "\n");

#ifdef C_LINUX
#if defined(C_LINUX) || defined(C_GNU_HURD)
if (!access("/usr/bin/lsb_release", X_OK)) {
fputs("Full OS version: ", stdout);
fflush(stdout);
Expand Down
6 changes: 3 additions & 3 deletions clamd/clamd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include <syslog.h>
#endif

#ifdef C_LINUX
#if defined(C_LINUX) || defined(__GLIBC__)
#include <sys/resource.h>
#endif

Expand Down Expand Up @@ -150,7 +150,7 @@ int main(int argc, char **argv)
struct sigaction sa;
int dropPrivRet = 0;
#endif
#if defined(C_LINUX) || (defined(RLIMIT_DATA) && defined(C_BSD))
#if defined(C_LINUX) || defined(__GLIBC__) || (defined(RLIMIT_DATA) && defined(C_BSD))
struct rlimit rlim;
#endif
time_t currtime;
Expand Down Expand Up @@ -201,7 +201,7 @@ int main(int argc, char **argv)
}

if (optget(opts, "debug")->enabled) {
#if defined(C_LINUX)
#if defined(C_LINUX) || defined(__GLIBC__)
/* njh@bandsman.co.uk: create a dump if needed */
rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
if (setrlimit(RLIMIT_CORE, &rlim) < 0)
Expand Down
Loading