!7 [sync] PR-6: fix file conflict by del /etc/pam.d/sudo and /etc/pam.d/sudo-i
From: @openeuler-sync-bot Reviewed-by: @ut-wanglujun Signed-off-by: @ut-wanglujun
This commit is contained in:
commit
f82d65b1c0
26
utsudo.spec
26
utsudo.spec
@ -3,7 +3,7 @@ ExcludeArch: i686
|
|||||||
Summary: The tudo respect sudo
|
Summary: The tudo respect sudo
|
||||||
Name: utsudo
|
Name: utsudo
|
||||||
Version: 0.0.1
|
Version: 0.0.1
|
||||||
Release: 0.02
|
Release: 0.03
|
||||||
License: ISC
|
License: ISC
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: https://www.sudo.ws/
|
URL: https://www.sudo.ws/
|
||||||
@ -16,6 +16,7 @@ Source3: utsudo.conf
|
|||||||
Requires: pam
|
Requires: pam
|
||||||
Requires: vim-minimal
|
Requires: vim-minimal
|
||||||
Requires(post): coreutils
|
Requires(post): coreutils
|
||||||
|
Requires: sudo
|
||||||
|
|
||||||
BuildRequires: sendmail
|
BuildRequires: sendmail
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -143,23 +144,6 @@ rm utsudo.lang utsudoers.lang
|
|||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
|
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
|
||||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/utsudo
|
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/utsudo
|
||||||
cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF
|
|
||||||
#%%PAM-1.0
|
|
||||||
auth include system-auth
|
|
||||||
account include system-auth
|
|
||||||
password include system-auth
|
|
||||||
session include system-auth
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF
|
|
||||||
#%%PAM-1.0
|
|
||||||
auth include sudo
|
|
||||||
account include sudo
|
|
||||||
password include sudo
|
|
||||||
session optional pam_keyinit.so force revoke
|
|
||||||
session include sudo
|
|
||||||
EOF
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -170,8 +154,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%attr(0640,root,root) %config(noreplace) /etc/utsudo.conf
|
%attr(0640,root,root) %config(noreplace) /etc/utsudo.conf
|
||||||
%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/utsudo-ldap.conf
|
%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/utsudo-ldap.conf
|
||||||
%attr(0750,root,root) %dir /etc/utsudoers.d/
|
%attr(0750,root,root) %dir /etc/utsudoers.d/
|
||||||
%config(noreplace) /etc/pam.d/sudo
|
|
||||||
%config(noreplace) /etc/pam.d/sudo-i
|
|
||||||
%attr(0644,root,root) %{_tmpfilesdir}/utsudo.conf
|
%attr(0644,root,root) %{_tmpfilesdir}/utsudo.conf
|
||||||
%attr(0644,root,root) /etc/dnf/protected.d/utsudo.conf
|
%attr(0644,root,root) /etc/dnf/protected.d/utsudo.conf
|
||||||
%dir /var/db/sudo
|
%dir /var/db/sudo
|
||||||
@ -196,6 +178,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/bin/chmod 0440 /etc/utsudoers || :
|
/bin/chmod 0440 /etc/utsudoers || :
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 04 2023 Lujun <wanglujun@uniontech.com> - 0.0.1-0.03
|
||||||
|
- Add Requires: sudo
|
||||||
|
- Del /etc/pam.d/sudo and /etc/pam.d/sudo-i fix file conflict.
|
||||||
|
|
||||||
* Sat Aug 19 2023 senlin <xiasenlin1@huawei.com> - 0.0.1-0.02
|
* Sat Aug 19 2023 senlin <xiasenlin1@huawei.com> - 0.0.1-0.02
|
||||||
- Replace command file with rpm to avoid the build-system being unable to recognize it
|
- Replace command file with rpm to avoid the build-system being unable to recognize it
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user