- Pakfire - lists.ipfire.org

[PATCH 1/2] macros: Add macro to automatically install all systemd sysusers files
by Stefan Schantl 02 Apr '23

02 Apr '23

This macros works very similar than the tmpfiles one but handles sysusers files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- macros/systemd.macro | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/macros/systemd.macro b/macros/systemd.macro index 9dc74ff0..1453db95 100644 --- a/macros/systemd.macro +++ b/macros/systemd.macro @@ -1,5 +1,6 @@ SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d +SYSTEMD_SYSUSERS_DIR = /usr/lib/sysusers.d MACRO_INSTALL_SYSTEMD_FILES for file in %{DIR_SOURCE}/systemd/*; do @@ -19,3 +20,12 @@ MACRO_INSTALL_SYSTEMD_TMPFILES done unset file end + +MACRO_INSTALL_SYSTEMD_SYSUSERS + for file in %{DIR_SOURCE}/*.sysusers; do + [ -e "${file}" ] || continue + mkdir -p %{BUILDROOT}/%{SYSTEMD_SYSUSERS_DIR} + cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_SYSUSERS_DIR}/$(basename ${file%*.sysusers}).conf + done + unset file +end -- 2.30.2

2 7

[PATCH] systemd.macro: Avoid declaring the directory for tmpfiles twice
by Stefan Schantl 02 Apr '23

02 Apr '23

We allready have declared this directory in the arch macro file, so there is no need in doing this again. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- macros/systemd.macro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/macros/systemd.macro b/macros/systemd.macro index 9dc74ff0..085fabbd 100644 --- a/macros/systemd.macro +++ b/macros/systemd.macro @@ -1,6 +1,3 @@ - -SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d - MACRO_INSTALL_SYSTEMD_FILES for file in %{DIR_SOURCE}/systemd/*; do [ -e "${file}" ] || continue @@ -14,8 +11,8 @@ end MACRO_INSTALL_SYSTEMD_TMPFILES for file in %{DIR_SOURCE}/*.tmpfiles; do [ -e "${file}" ] || continue - mkdir -p %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR} - cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}/$(basename ${file%*.tmpfiles}).conf + mkdir -p %{BUILDROOT}/%{tmpfilesdir} + cp -vf ${file} %{BUILDROOT}/%{tmpfilesdir}/$(basename ${file%*.tmpfiles}).conf done unset file end -- 2.30.2

1 0

[PATCH] macros: Introduce sysusersdir
by Stefan Schantl 29 Mar '23

29 Mar '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- macros/arch.macro | 1 + 1 file changed, 1 insertion(+) diff --git a/macros/arch.macro b/macros/arch.macro index 2c41a979..5597b589 100644 --- a/macros/arch.macro +++ b/macros/arch.macro @@ -18,6 +18,7 @@ infodir = %{datadir}/info mandir = %{datadir}/man firmwaredir = %{prefix}/lib/firmware unitdir = %{prefix}/lib/systemd/system +sysusersdir = %{prefix}/lib/sysusers.d tmpfilesdir = %{prefix}/lib/tmpfiles.d debugsourcedir = /usr/src/debug -- 2.30.2

1 0

[PATCH] meson: Avoid calling meson without setup is deprecated
by Stefan Schantl 29 Mar '23

29 Mar '23

Calling meson without setup as argument when configure a project is deprecated since a while by the meson developers. To avoid any problems in future adding this argument. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- macros/meson.macro | 1 + 1 file changed, 1 insertion(+) diff --git a/macros/meson.macro b/macros/meson.macro index 28c370fc..951bd737 100644 --- a/macros/meson.macro +++ b/macros/meson.macro @@ -10,6 +10,7 @@ build _smp_mesonflags = %{PARALLELISMFLAGS} meson = %{__meson} \ + setup \ --buildtype=plain \ --prefix=%{prefix} \ --libdir=%{libdir} \ -- 2.30.2

1 0

[PATCH] archive: sysusers: Fix walking through archive for sysusers files
by Stefan Schantl 28 Mar '23

28 Mar '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/libpakfire/archive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 34d1f986..019438f6 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -1247,7 +1247,7 @@ static int __pakfire_archive_filter_systemd_sysusers(struct pakfire* pakfire, struct archive* a, struct archive_entry* e, void* data) { const char* path = archive_entry_pathname(e); - if (!pakfire_path_match("/usr/lib/sysusers.d/*.conf", path)) + if (!pakfire_path_match("usr/lib/sysusers.d/*.conf", path)) return PAKFIRE_WALK_SKIP; return PAKFIRE_WALK_OK; @@ -1312,7 +1312,7 @@ ERROR: int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive) { pakfire_archive_walk(archive, - __pakfire_archive_filter_systemd_sysusers, __pakfire_archive_handle_systemd_sysusers, NULL); + __pakfire_archive_handle_systemd_sysusers, __pakfire_archive_filter_systemd_sysusers, NULL); return 0; } -- 2.30.2

1 0

[PATCH] Hardening: Declare content of /usr/lib/grub as firmware files
by Stefan Schantl 28 Mar '23

28 Mar '23

This folder contains the neccessary files, which are written to the MBR, dealing with EFI, or loading additional required grub modules unless the whole grub menu can be displayed or a selected OS will start up. Some of these files are 32bit ELF files or do not have SSP etc. So I would suggest to mark them as firmware files and therefore skip some of the hardening tests. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/libpakfire/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index 33e26fea..819587ef 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -1509,6 +1509,7 @@ static const struct pattern { { "*.pm", PAKFIRE_FILE_PERL }, { "*.pc", PAKFIRE_FILE_PKGCONFIG }, { "/usr/lib/firmware/*", PAKFIRE_FILE_FIRMWARE }, + { "/usr/lib/grub/*", PAKFIRE_FILE_FIRMWARE }, { "/usr/lib*/ld-*.so*", PAKFIRE_FILE_RUNTIME_LINKER }, { NULL }, }; -- 2.30.2

1 0

[PATCH] .gitignore: Ignore ~/tests/stub/root
by Peter Müller 28 Nov '22

28 Nov '22

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 930f569d..2444915b 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ /tests/libpakfire/snapshot /tests/libpakfire/string /tests/libpakfire/util +/tests/stub/root /tmp *.py[co] /*.tar.bz2 -- 2.34.1

1 0

[PATCH] jail.c: It should have been the other way round, Michael :-)
by Peter Müller 28 Nov '22

28 Nov '22

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/libpakfire/jail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c index 3e6f691d..775d780e 100644 --- a/src/libpakfire/jail.c +++ b/src/libpakfire/jail.c @@ -22,8 +22,8 @@ #include <linux/capability.h> #include <linux/fcntl.h> #include <linux/sched.h> -#include <linux/wait.h> #include <sys/wait.h> +#include <linux/wait.h> #include <sched.h> #include <signal.h> #include <stdlib.h> -- 2.34.1

1 0

[PATCH] configure.ac: Do not use AC_PROG_CC_STDC anymore
by Peter Müller 28 Nov '22

28 Nov '22

On Ubuntu 22.04 LTS, this resolves: > configure.ac:100: warning: The macro `AC_PROG_CC_STDC' is obsolete. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2289e7d9..ada66edd 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # # ############################################################################### -AC_PREREQ([2.64]) +AC_PREREQ([2.71]) AC_INIT([pakfire], [0.9.27], @@ -97,7 +97,7 @@ PKG_PROG_PKG_CONFIG m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) # C Compiler -AC_PROG_CC_STDC +AC_PROG_CC CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -Wall \ -- 2.34.1

1 0

[PATCH] configure.ac: Do not use AC_PROG_CC_STDC anymore
by Peter Müller 28 Nov '22

28 Nov '22

On Ubuntu 22.04 LTS, this resolves: > configure.ac:100: warning: The macro `AC_PROG_CC_STDC' is obsolete. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2289e7d9..ada66edd 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # # ############################################################################### -AC_PREREQ([2.64]) +AC_PREREQ([2.71]) AC_INIT([pakfire], [0.9.27], @@ -97,7 +97,7 @@ PKG_PROG_PKG_CONFIG m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) # C Compiler -AC_PROG_CC_STDC +AC_PROG_CC CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -Wall \ -- 2.34.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Pakfire