PR#19: -clients: provide ssh-agent.service (#1761817) - rpms/openssh

rpms / openssh

#19 -clients: provide ssh-agent.service (#1761817)

Closed 3 years ago by jjelen. Opened 3 years ago by rdieter.

rpms/ rdieter/openssh rawhide into rawhide

-clients: provide ssh-agent.service (#1761817)

Rex Dieter • 3 years ago

2c0dd4d

openssh.spec

file modified

+15 -2

		`@@ -51,14 +51,14 @@`

		`# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1`
		`%global openssh_ver 8.4p1`
		`- %global openssh_rel 5`
		`+ %global openssh_rel 6`
		`%global pam_ssh_agent_ver 0.10.4`
		`%global pam_ssh_agent_rel 1`

		`Summary: An open source implementation of SSH protocol version 2`
		`Name: openssh`
		`Version: %{openssh_ver}`
		`- Release: %{openssh_rel}%{?dist}.2`
		`+ Release: %{openssh_rel}%{?dist}`
		`URL: http://www.openssh.com/portable.html`
		`#URL1: https://github.com/jbeverly/pam_ssh_agent_auth/`
		`Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz`
		`@@ -75,6 +75,7 @@`
		`Source12: sshd-keygen@.service`
		`Source13: sshd-keygen`
		`Source15: sshd-keygen.target`
		`+ Source16: ssh-agent.service`

		`#https://bugzilla.mindrot.org/show_bug.cgi?id=2581`
		`Patch100: openssh-6.7p1-coverity.patch`
		`@@ -216,6 +217,7 @@`
		`BuildRequires: openssl-devel >= 0.9.8j`
		`BuildRequires: perl-podlators`
		`BuildRequires: systemd-devel`
		`+ BuildRequires: systemd-rpm-macros`
		`BuildRequires: gcc make`
		`BuildRequires: p11-kit-devel`
		`BuildRequires: libfido2-devel`
		`@@ -517,6 +519,7 @@`
		`install -m644 %{SOURCE11} $RPM_BUILD_ROOT/%{_unitdir}/sshd.service`
		`install -m644 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen@.service`
		`install -m644 %{SOURCE15} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen.target`
		`+ install -m644 %{SOURCE16} $RPM_BUILD_ROOT/%{_unitdir}/ssh-agent.service`
		`install -m744 %{SOURCE13} $RPM_BUILD_ROOT/%{_libexecdir}/openssh/sshd-keygen`
		`install -m755 contrib/ssh-copy-id $RPM_BUILD_ROOT%{_bindir}/`
		`install contrib/ssh-copy-id.1 $RPM_BUILD_ROOT%{_mandir}/man1/`
		`@@ -584,6 +587,12 @@`
		`%attr(2555,root,ssh_keys) %{_libexecdir}/openssh/ssh-keysign`
		`%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*`

		`+ %post clients`
		`+ %systemd_user_post ssh-agent.service`
		`+`
		`+ %preun clients`
		`+ %systemd_user_preun ssh-agent.service`
		`+`
		`%files clients`
		`%attr(0755,root,root) %{_bindir}/ssh`
		`%attr(0644,root,root) %{_mandir}/man1/ssh.1*`
		`@@ -607,6 +616,7 @@`
		`%attr(0644,root,root) %{_mandir}/man1/ssh-copy-id.1*`
		`%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8*`
		`%attr(0644,root,root) %{_mandir}/man8/ssh-sk-helper.8*`
		`+ %attr(0644,root,root) %{_unitdir}/ssh-agent.service`

		`%files server`
		`%dir %attr(0711,root,root) %{_datadir}/empty.sshd`
		`@@ -648,6 +658,9 @@`
		`%endif`

		`%changelog`
		`+ * Tue Mar 02 2021 Rex Dieter <rdieter@fedoraproject.org> - 8.4p1-6`
		`+ - -clients: provide ssh-agent.service (#1761817)`
		`+`
		`* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 8.4p1-5.2`
		`- Rebuilt for updated systemd-rpm-macros`
		`See https://pagure.io/fesco/issue/2583.`

ssh-agent.service

file added

+14

		`@@ -0,0 +1,14 @@`
		`+ # Requires SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"`
		`+ # set in environment, handled for example in plasma via`
		`+ # /etc/xdg/plasma-workspace/env/ssh-agent.sh`
		`+ [Unit]`
		`+ ConditionEnvironment=!SSH_AGENT_PID`
		`+ Description=OpenSSH key agent`
		`+ Documentation=man:ssh-agent(1) man:ssh-add(1) man:ssh(1)`
		`+`
		`+ [Service]`
		`+ Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket`
		`+ ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK`
		`+ PassEnvironment=SSH_AGENT_PID`
		`+ SuccessExitStatus=2`
		`+ Type=forking`

rdieter commented 3 years ago

Per feedback in
https://bugzilla.redhat.com/show_bug.cgi?id=1761817#c24

An initial implementation of adding a systemd user unit for ssh-agent

zuul commented 3 years ago

Build succeeded.

check-for-arches : SUCCESS in 1m 54s
rpm-scratch-build : SUCCESS in 9m 15s
rpm-scratch-build-s390x : SUCCESS in 27m 02s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 9m 21s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 10m 21s (non-voting)
rpm-scratch-build-armv7hl : SUCCESS in 14m 18s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 12m 16s (non-voting)
rpm-linter : SUCCESS in 4m 22s
rpm-rpminspect : FAILURE in 8m 27s (non-voting)
check-for-tests : SUCCESS in 1m 01s
rpm-install-test : SKIPPED
rpm-test : SUCCESS in 6m 22s

jjelen commented 3 years ago

Merged manually as 5f230a4 and built as openssh-8.5p1-1.fc35

Fedora 34 build will come shortly.

Pull-Request has been closed by jjelen

3 years ago

rdieter commented 3 years ago

Please let me know when update is submittted, we'll need to coordinate as ssh-agent.service is currently provided by another package (to avoid conflicts).
Thanks!

Edited 3 years ago by rdieter