From 5eaca907f2afa6f1a3bfbbae5e7985401d7ff3ad Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Tue, 8 Dec 2015 13:13:47 +0100 Subject: [PATCH] redhat: exclude kpasswd from debuginfo processing While kpasswd was in the separate openafs-kpasswd package to avoid clashing with the krb5 executable, openafs-debuginfo still conflicted with krb5-debuginfo. Remove the x-bits from kpasswd in %install to make debuginfo processing ignore it, and add them back in the %files list. Make kapasswd a copy rather than a hard link to have it processed in the usual way. This is a 1.6-only change. On the master branch, this issue is fixed by commit 4e3ceaccd9dc2b6e6a20e938d82af1ebaa2c43c8 which however removes kpasswd altogether and is thus considered inapproriate for the stable release series. FIXES 131771 Change-Id: Icd940e3f5da133a98401c7a28ed6ee0c637bf602 Reviewed-on: http://gerrit.openafs.org/12128 Reviewed-by: Michael Meffie Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Tested-by: Stephan Wiesand Reviewed-by: Marcio Brito Barbosa Reviewed-by: Stephan Wiesand --- src/packaging/RedHat/openafs.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 1bf4b7ab2..1afcc4d12 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1062,8 +1062,11 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so* # any user in /usr/bin mv $RPM_BUILD_ROOT%{_prefix}/afs/bin/restorevol $RPM_BUILD_ROOT%{_bindir}/restorevol -# Link kpasswd to kapasswd -ln -f $RPM_BUILD_ROOT%{_bindir}/kpasswd $RPM_BUILD_ROOT%{_bindir}/kapasswd +# Copy kpasswd to kapasswd +cp -a $RPM_BUILD_ROOT%{_bindir}/kpasswd $RPM_BUILD_ROOT%{_bindir}/kapasswd + +# make kpasswd non-executable to exclude it from debuginfo processing +chmod 0644 $RPM_BUILD_ROOT%{_bindir}/kpasswd # Copy root.client config files install -m 755 src/packaging/RedHat/openafs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openafs @@ -1729,7 +1732,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %files kpasswd %defattr(-,root,root) -%{_bindir}/kpasswd +%attr(0755,root,root) %{_bindir}/kpasswd %{_bindir}/kpwvalid %if %{krb5support} -- 2.39.5