From bbe27e9eb024b2eaaaf4fd94834f28feee1707f0 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Mon, 1 May 2017 17:00:42 +0000 Subject: [PATCH] Update systemd unit file (nfs removal, reload capability) --- Update-systemd-file.patch | 35 +++++++++++++++++++++++++++++++++++ gssproxy.spec | 9 ++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 Update-systemd-file.patch diff --git a/Update-systemd-file.patch b/Update-systemd-file.patch new file mode 100644 index 0000000..952dc96 --- /dev/null +++ b/Update-systemd-file.patch @@ -0,0 +1,35 @@ +From 88eccbb8ab00ee73c9f483d621e05cd57c41ceae Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Wed, 26 Apr 2017 21:02:47 -0400 +Subject: [PATCH] Update systemd file + +Add `reload` capability, and remove dependency on nfs-utils. + +Closes: #127 +Signed-off-by: Robbie Harwood +Reviewed-by: Simo Sorce +(cherry picked from commit c7e8b4066575508a91a38bb6a44694c8a171f0c5) +--- + proxy/systemd/gssproxy.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/proxy/systemd/gssproxy.service.in b/proxy/systemd/gssproxy.service.in +index dae39ee..f50f526 100644 +--- a/proxy/systemd/gssproxy.service.in ++++ b/proxy/systemd/gssproxy.service.in +@@ -3,7 +3,6 @@ Description=GSSAPI Proxy Daemon + # GSSPROXY will not be started until syslog is + After=syslog.target + Before=nfs-secure.service nfs-secure-server.service +-Requires=proc-fs-nfsd.mount + + [Service] + Environment=KRB5RCACHEDIR=/var/lib/gssproxy/rcache +@@ -12,6 +11,7 @@ ExecStart=@sbindir@/gssproxy -D + # consult systemd.service(5) for more details + Type=forking + PIDFile=@localstatedir@/run/gssproxy.pid ++ExecReload=/bin/kill -HUP $MAINPID + + [Install] + WantedBy=multi-user.target diff --git a/gssproxy.spec b/gssproxy.spec index eb384eb..238e306 100644 --- a/gssproxy.spec +++ b/gssproxy.spec @@ -1,6 +1,6 @@ Name: gssproxy Version: 0.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GSSAPI Proxy Group: System Environment/Libraries @@ -18,6 +18,7 @@ Patch0: Properly-renew-expired-credentials.patch Patch1: Change-impersonator-check-code.patch Patch2: Allow-connection-to-self-when-impersonator-set.patch Patch3: Remove-gpm_release_ctx-to-fix-double-unlock.patch +Patch4: Update-systemd-file.patch ### Dependencies ### Requires: krb5-libs >= 1.12.0 @@ -57,8 +58,7 @@ A proxy for GSSAPI credential handling %patch1 -p2 -b .Change-impersonator-check-code %patch2 -p2 -b .Allow-connection-to-self-when-impersonator-set %patch3 -p2 -b .Remove-gpm_release_ctx-to-fix-double-unlock - - +%patch4 -p2 -b .Update-systemd-file %build autoreconf -f -i @@ -114,6 +114,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart gssproxy.service %changelog +* Mon May 01 2017 Robbie Harwood - 0.7.0-5 +- Update systemd unit file (nfs removal, reload capability) + * Mon Apr 03 2017 Robbie Harwood - 0.7.0-4 - Backport fix for double unlock