[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ff01db62f9e6b632aac1360fdea78d342be4311

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ff01db62f9e6b632aac1360fdea78d342be4311

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 8678 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  5ff01db62f9e6b632aac1360fdea78d342be4311 (commit)
       via  da4f96f132f3eff10670f9c1a4b39eb865d74aa4 (commit)
       via  e4b39d703b5ce50ab062ae66b642b3318beb0cf8 (commit)
       via  2d448045f35850b678c20e2be7b7be30d4f72d59 (commit)
      from  4c4c991fad688791d28c8e6c6956dc7bfa99e42b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5ff01db62f9e6b632aac1360fdea78d342be4311
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon May 8 13:40:07 2023 +0000

    openssl: Make sure we perform a parallel build
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit da4f96f132f3eff10670f9c1a4b39eb865d74aa4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Mar 29 16:07:15 2023 +0200

    systemd: Use sysusers mechanism inside the jail
    
    Change the old user/group creation mechanism to use systemd's
    sysusers mechanism instead.
    
    This is a bit of a tricky part, because before systemd we do not have
    this binary. So at first we have to push the sysusers files to the jails
    sysusers directory and use the previous compiled and installed systemd-sysusers
    binary in order to create the groups/users which are part of systemd
    inside the jail.
    
    After that, everything works quite normal when modifying the files or
    direcotry owners.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e4b39d703b5ce50ab062ae66b642b3318beb0cf8
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Mar 29 16:05:17 2023 +0200

    systemd: Build manpages again
    
    This "optional" feature now has to be enabled.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 2d448045f35850b678c20e2be7b7be30d4f72d59
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Mar 28 19:35:05 2023 +0200

    systemd: Move some basic tools into own package
    
    The systemd-sysusers and systemd-tmpfiles tools
    are used by various services and the build system in order
    to install / build packages.
    
    Moving this tools into an own package allows us to early access
    them without requiremet to install the whole systemd package.
    
    Anyway the systemd package requires those tools to proper get
    installed and handle their own sysusers files.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 openssl/openssl.nm | 17 ++++------
 systemd/systemd.nm | 98 +++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 81 insertions(+), 34 deletions(-)

Difference in files:
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 58d932b1a..76d2dffc7 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 3.0.8
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Libraries
@@ -54,7 +54,7 @@ build
 		ssl_arch += enable-ec_nistp_64_gcc_128
 	end
 
-	build
+	configure = \
 		./Configure \
 			--prefix=%{prefix} \
 			--libdir=%{libdir} \
@@ -72,19 +72,16 @@ build
 			${CFLAGS} \
 			${LDFLAGS}
 
-		make all
+	test
+		make test
+	end
 
+	install
 		# Clean up the .pc files
 		for i in libcrypto.pc libssl.pc openssl.pc; do
 			sed -i '/^Libs.private:/{s/-L[^ ]* //;s/-Wl[^ ]* //}' $i
 		done
-	end
 
-	test
-		make test
-	end
-
-	install
 		make install DESTDIR=%{BUILDROOT}
 
 		# Remove dist config
@@ -102,8 +99,6 @@ packages
 
 		requires += ca-certificates
 
-		conflicts += %{name} < %{thisver}
-
 		files += %{libdir}/openssl %{libdir}/engines*
 	end
 
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index a01063828..db57e4142 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 253
-release    = 2
+release    = 5
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -77,7 +77,11 @@ build
 	configure_options = \
 		-Dsysvinit-path= \
 		-Dsysvrcnd-path= \
+		-Dnobody-user=nobody \
+		-Dnobody-group=nobody \
+		-Dfallback-hostname="localhost" \
 		-Dzlib=true \
+		-Dman=true \
 		-Dsmack=false \
 		-Dbacklight=false \
 		-Dfirstboot=false \
@@ -92,9 +96,26 @@ build
 		-Dtimedated=false \
 		-Dpolkit=false
 
-	prepare_cmds
-		%{create_groups}
-	end
+	# Assign group ids
+	configure_options += \
+		-Dadm-gid=4 \
+		-Dtty-gid=5 \
+		-Ddisk-gid=6 \
+		-Dlp-gid=7 \
+		-Dkmem-gid=9 \
+		-Dwheel-gid=10 \
+		-Dcdrom-gid=11 \
+		-Ddialout-gid=18 \
+		-Dutmp-gid=22 \
+		-Dtape-gid=33 \
+		-Dkvm-gid=36 \
+		-Dvideo-gid=39 \
+		-Daudio-gid=63 \
+		-Dusers-gid=100 \
+		-Dinput-gid=104 \
+		-Drender-gid=105 \
+		-Dsgx-gid=106 \
+		-Dsystemd-journal-gid=190
 
 	build
 		# Call meson and pass configure options.
@@ -116,6 +137,10 @@ build
 		# Install systemd.
 		%{meson_install}
 
+		# Use the installed files to create all users and groups
+		# in one shot.
+		%{create_groups}
+
 		# Create folder in log to store the journal.
 		mkdir -pv %{BUILDROOT}/var/log/journal
 
@@ -201,22 +226,17 @@ build
 end
 
 create_groups
-	# Create groups for udev.
-	getent group cdrom >/dev/null || groupadd -g 11 cdrom || :
-	getent group tape >/dev/null || groupadd -g 33 tape || :
-	getent group dialout >/dev/null || groupadd -g 18 dialout || :
-	getent group floppy >/dev/null || groupadd -g 19 floppy || :
-	getent group input >/dev/null || groupadd -r input || :
-	getent group utmp >/dev/null || groupadd -r -g 22 utmp || :
-
-	# Create group for journald.
-	getent group systemd-journal >/dev/null || /usr/sbin/groupadd -r systemd-journal
-end
+	# Create the sysusers folder in the jail.
+	mkdir -pv %{sysusersdir}
 
-quality-agent
-	whitelist_rpath
-		%{prefix}/lib/systemd
-	end
+	# Copy all sysusers files from BUILDROOT into the jail's sysusers directory.
+	install -v -m 644 %{BUILDROOT}%{sysusersdir}/*.conf %{sysusersdir}
+
+	# We do not have a libsystemd or systemd-sysusers binary, so
+	# call the installed one inside BUILDROOT to create all users and
+	# groups in one shot.
+	LD_LIBRARY_PATH="%{BUILDROOT}%{libdir}/systemd/" \
+		%{BUILDROOT}%{bindir}/systemd-sysusers
 end
 
 packages
@@ -227,6 +247,7 @@ packages
 			python3-cairo
 			python3-dbus
 			python3-gobject3
+			%{name}-basetools = %{thisver}
 			%{name}-libs = %{thisver}
 			util-linux >= 2.19
 		end
@@ -271,10 +292,6 @@ packages
 			/etc/vconsole.conf
 		end
 
-		script prein
-			%{create_groups}
-		end
-
 		script postin
 			# Reexec systemd daemon.
 			/usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
@@ -315,6 +332,38 @@ packages
 		end
 	end
 
+	package %{name}-basetools
+		summary = Basetools from the systemd package, like sysuses and tmpfiles.
+		description
+			This package contains some very basic tools from systemd like
+			systemd-sysusers and systemd-tmpfiles.
+
+			They mostly are required in a very early stage and shipping them
+			in an own package allows us to handle this properly.
+		end
+
+		provides
+			systemd-sysusers = %{thisver}
+			systemd-tmpfiles = %{thisver}
+		end
+
+		requires
+			%{name}-libs = %{thisver}
+		end
+
+		files
+			%{bindir}/%{name}-sysusers
+			%{bindir}/%{name}-tmpfiles
+			%{mandir}/man1/%{name}-sysusers*
+			%{mandir}/man1/%{name}-tmpfiles*
+
+			# Only ship the sysusers.d folder without
+			# any config files.
+			%{sysusersdir}
+			!%{sysusersdir}/*.conf
+		end
+	end
+
 	package %{name}-libs
 		template LIBS
 	
@@ -339,6 +388,9 @@ packages
 			systemd < %{thisver}
 		end
 
+		files += \
+			%{libdir}/%{name}
+
 		# Add myhostname to the hosts line of /etc/nsswitch.conf
 		script postin
 			if [ -f "/etc/nsswitch.conf" ]; then


hooks/post-receive
--
IPFire 3.x development tree