rpms / policycoreutils

Clone
Source Code
GIT

#42 Prepare for bin-sbin merge
Merged 21 days ago by plautrba. Opened a month ago by zbyszek.
rpms/ zbyszek/policycoreutils bin-sbin-merge  into  rawhide

file modified
+22 -2 
@@ -51,6 +51,17 @@ 
 

  Provides: /sbin/fixfiles
 

  Provides: /sbin/restorecon
 

  

+ %if "%{_sbindir}" == "%{_bindir}"
 

+ # Compat symlinks for Requires in other packages.
 

+ # We rely on filesystem to create the symlinks for us.
 

+ Requires: filesystem(unmerged-sbin-symlinks)
 

+ Provides: /usr/sbin/restorecon
 

+ Provides: /usr/sbin/fixfiles
 

+ Provides: /usr/sbin/setfiles
 

+ Provides: /usr/sbin/setsebool
 

+ Provides: /usr/sbin/semodule
 

+ %endif
 

+ 

  BuildRequires: gcc make
 

  BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
 

  BuildRequires: desktop-file-utils dbus-devel glib2-devel
 
@@ -137,8 +148,8 @@ 
 

  rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond
 

  

  rm -f %{buildroot}/usr/share/man/man8/open_init_pty.8
 

- rm -f %{buildroot}/usr/sbin/open_init_pty
 

- rm -f %{buildroot}/usr/sbin/run_init
 

+ rm -f %{buildroot}%{_sbindir}/open_init_pty
 

+ rm -f %{buildroot}%{_sbindir}/run_init
 

  rm -f %{buildroot}/usr/share/man/man8/run_init.8*
 

  rm -f %{buildroot}/etc/pam.d/run_init*
 

  
@@ -164,6 +175,13 @@ 
 

  Obsoletes:  policycoreutils-python <= 2.4-4
 

  BuildArch:  noarch
 

  

+ %if "%{_sbindir}" == "%{_bindir}"
 

+ # Compat symlinks for Requires in other packages.
 

+ # We rely on filesystem to create the symlinks for us.
 

+ Requires:       filesystem(unmerged-sbin-symlinks)
 

+ Provides:       /usr/sbin/semanage
 

+ %endif
 

+ 

  %description python-utils
 

  The policycoreutils-python-utils package contains the management tools use to manage
 

  an SELinux environment.
 
@@ -349,8 +367,10 @@ 
 

  %{_sbindir}/genhomedircon
 

  %{_sbindir}/setsebool
 

  %{_sbindir}/semodule
 

+ %if "%{_sbindir}" != "%{_bindir}"
 

  # symlink to %%{_bindir}/sestatus
 

  %{_sbindir}/sestatus
 

+ %endif
 

  %{_bindir}/secon
 

  %{_bindir}/semodule_expand
 

  %{_bindir}/semodule_link

https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin

  • do not hardcode "/usr/sbin", use the macro instead.
  • skip symlink if it'd point to itself.

This commit makes things compatible with the state before and after
the merge.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/1f0ec974c03945619a09cb5e71323d5d

rebased onto 08806a7
a month ago

rebased onto fd8e395
a month ago

rebased onto 3676849
a month ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/019cf7a9cac7472c9f506cb58a54ff52

rebased onto daa5acf
a month ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/828ba5b354e644b18f7beba945f9211f

rebased onto 2bead81
a month ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/7cdce3ba5383420db498e9342d6d4bc9

rebased onto 7ebfa73
a month ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/484c6e492aeb4162b2a1f0f1dd7851e9

 
::   semanage fcontext -l
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

:: [ 09:12:20 ] :: [  BEGIN   ] :: Running 'semanage fcontext -l >stdout'
:: [ 09:12:21 ] :: [   PASS   ] :: Command 'semanage fcontext -l >stdout' (Expected 0, got 0)
:: [ 09:12:21 ] :: [   PASS   ] :: File 'stdout' should contain 'SELinux fcontext' 
:: [ 09:12:21 ] :: [   PASS   ] :: File 'stdout' should contain 'SELinux Distribution fcontext Equivalence' 
:: [ 09:12:21 ] :: [   PASS   ] :: File 'stdout' should contain '/run/\.\* *all files *system_u:object_r:var_run_t:s0' 
:: [ 09:12:21 ] :: [   PASS   ] :: File 'stdout' should contain '/run *directory *system_u:object_r:var_run_t:s0' 
:: [ 09:12:21 ] :: [   PASS   ] :: File 'stdout' should contain '/home/\[\^/\]+/bin(/\.\*)? *all files *unconfined_u:object_r:home_bin_t:s0' 
:: [ 09:12:21 ] :: [   FAIL   ] :: File 'stdout' should contain '/run = /var/run' 
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::   Duration: 1s
::   Assertions: 6 good, 1 bad
::   RESULT: FAIL (semanage fcontext -l)

I don't think this failure is caused by the path changes. The tool executes correctly, but the output seems unexpected.

In Zuul: "Tests have failed". That explains everything ;)

Pull-Request has been closed by plautrba
24 days ago

Pull-Request has been reopened by plautrba
21 days ago

Pull-Request has been merged by plautrba
21 days ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/645d1de4cf264ec1aefad9b73140cf97
Metadata
None
No Tags
Changes Summary 1
+22 -2
file changed
policycoreutils.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.