From 83be651505cc9eb071cc2b3a0cd21a5a5f79e37edf02511de7bb42b139855add Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 6 Jun 2013 05:17:31 +0000 Subject: [PATCH] after discussion with kukuk, werner and lnussel, we decided that this is not the proper fix OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=194 --- coreutils-testsuite.changes | 17 ----------------- coreutils-testsuite.spec | 17 +++-------------- coreutils.changes | 17 ----------------- coreutils.spec | 17 +++-------------- su.pamd | 5 +---- 5 files changed, 7 insertions(+), 66 deletions(-) diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index 824b0a7..2fa1631 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 4 12:34:50 UTC 2013 - coolo@suse.com - -- change the buildrequire system to pkgconfig(systemd) to fix bootstrap - -------------------------------------------------------------------- -Tue Jun 4 11:18:29 UTC 2013 - werner@suse.de - -- Add systemd to build and use requires - -------------------------------------------------------------------- -Tue Jun 4 08:31:39 UTC 2013 - werner@suse.de - -- Make pam configuration for command su using the systemd login - manager for ordinary users as this allows to use all services - provided by systemd login manager - ------------------------------------------------------------------- Mon May 20 15:38:30 UTC 2013 - mail@bernhard-voelker.de diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec index d1f5bd0..9e792ec 100644 --- a/coreutils-testsuite.spec +++ b/coreutils-testsuite.spec @@ -16,15 +16,6 @@ # -################################################################# -################################################################# -### ! ! ! R E M I N D E R ! ! ! ### -################################################################# -### Please call "./pre_checkin.sh" prior to submitting. ### -### (This will regenerate coreutils-testsuite.spec) ### -################################################################# -################################################################# - Name: coreutils-testsuite Summary: GNU Core Utilities License: GPL-3.0+ @@ -68,14 +59,12 @@ Recommends: %{name}-lang = %version # Needed for su. BuildRequires: pam-devel -BuildRequires: pkgconfig(systemd) Requires: pam >= 1.1.1.90 -Requires: systemd # this will create a cycle, broken up randomly - coreutils is just # too core to have other prerequisites. -#Requires(post): permissions -Requires(post): %{install_info_prereq} +#PreReq: permissions +PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -236,7 +225,7 @@ echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 %install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz # may fail if permissions is not there, but there is no way around that -%set_permissions %{_bindir}/su.core || : +%set_permissions %{_bindir}/su.core %endif # ================================================ diff --git a/coreutils.changes b/coreutils.changes index 824b0a7..2fa1631 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 4 12:34:50 UTC 2013 - coolo@suse.com - -- change the buildrequire system to pkgconfig(systemd) to fix bootstrap - -------------------------------------------------------------------- -Tue Jun 4 11:18:29 UTC 2013 - werner@suse.de - -- Add systemd to build and use requires - -------------------------------------------------------------------- -Tue Jun 4 08:31:39 UTC 2013 - werner@suse.de - -- Make pam configuration for command su using the systemd login - manager for ordinary users as this allows to use all services - provided by systemd login manager - ------------------------------------------------------------------- Mon May 20 15:38:30 UTC 2013 - mail@bernhard-voelker.de diff --git a/coreutils.spec b/coreutils.spec index ad6c9cc..c8e802d 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -16,15 +16,6 @@ # -################################################################# -################################################################# -### ! ! ! R E M I N D E R ! ! ! ### -################################################################# -### Please call "./pre_checkin.sh" prior to submitting. ### -### (This will regenerate coreutils-testsuite.spec) ### -################################################################# -################################################################# - Name: coreutils Summary: GNU Core Utilities License: GPL-3.0+ @@ -68,14 +59,12 @@ Recommends: %{name}-lang = %version # Needed for su. BuildRequires: pam-devel -BuildRequires: pkgconfig(systemd) Requires: pam >= 1.1.1.90 -Requires: systemd # this will create a cycle, broken up randomly - coreutils is just # too core to have other prerequisites. -#Requires(post): permissions -Requires(post): %{install_info_prereq} +#PreReq: permissions +PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -236,7 +225,7 @@ echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 %install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz # may fail if permissions is not there, but there is no way around that -%set_permissions %{_bindir}/su.core || : +%set_permissions %{_bindir}/su.core %endif # ================================================ diff --git a/su.pamd b/su.pamd index 6ca92e4..88ddbaf 100644 --- a/su.pamd +++ b/su.pamd @@ -1,11 +1,8 @@ #%PAM-1.0 auth sufficient pam_rootok.so auth include common-auth -account sufficient pam_rootok.so +account sufficient pam_rootok.so account include common-account password include common-password session include common-session session optional pam_xauth.so -session [default=1 success=ignore] pam_succeed_if.so quiet uid > 999 -session required pam_loginuid.so -session required pam_systemd.so kill-exclude-users=0