public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/sslh] epel9: Add sysusers.d config file to allow rpm to create users/groups automatically
Date: Sun, 21 Jun 2026 02:51:57 GMT	[thread overview]
Message-ID: <178201031748.1.5498734771050578444.rpms-sslh-700e0a54d086@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/sslh
            Branch : epel9
            Commit : 700e0a54d0863d73db207b939f6c622aff8c217a
            Author : Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
            Date   : 2025-02-11T16:44:38+01:00
            Stats  : +12/-8 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/sslh/c/700e0a54d0863d73db207b939f6c622aff8c217a?branch=epel9

            Log:
            Add sysusers.d config file to allow rpm to create users/groups automatically

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

---
diff --git a/sslh.spec b/sslh.spec
index d989ebd..fc82e0d 100644
--- a/sslh.spec
+++ b/sslh.spec
@@ -9,7 +9,7 @@
 
 Name:    sslh
 Version: 1.21c
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Applicative protocol(SSL/SSH) multiplexer
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License: GPL-2.0-only
@@ -48,7 +48,6 @@ BuildRequires: psmisc
 BuildRequires: tcp_wrappers-devel
 %endif
 
-Requires(pre):    shadow-utils
 %{?systemd_requires}
 
 %description
@@ -69,6 +68,11 @@ comes from its original function to serve SSH and HTTPS on the same port.
 %prep
 %autosetup -n %{name}-%{gh_commit} -p1
 
+# Create a sysusers.d config file
+cat >sslh.sysusers.conf <<EOF
+u sslh - 'SSLH daemon' /dev/null -
+EOF
+
 %build
 ./genver.sh >version.h
 %if 0%{?rhel}
@@ -114,6 +118,8 @@ FreeBind=true
 WantedBy=sockets.target
 EOF
 
+install -m0644 -D sslh.sysusers.conf %{buildroot}%{_sysusersdir}/sslh.conf
+
 %check
 %if %{with_tests}
 # Use right ip6 localhost for Fedora
@@ -122,12 +128,6 @@ sed -i 's/ip6-localhost/localhost6/g' t
 make test
 %endif
 
-%pre
-getent group %{name} >/dev/null || groupadd -r %{name}
-getent passwd %{name} >/dev/null || \
-    useradd -r -g %{name} -d /dev/null -s /sbin/nologin \
-    -c "SSLH daemon" %{name}
-exit 0
 
 %post
 %systemd_post sslh.service
@@ -148,11 +148,15 @@ exit 0
 %{_unitdir}/%{name}.socket
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}.cfg
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/%{name}
+%{_sysusersdir}/sslh.conf
 
 
 
 
 %changelog
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.21c-12
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.21c-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

                 reply	other threads:[~2026-06-21  2:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178201031748.1.5498734771050578444.rpms-sslh-700e0a54d086@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox