policycoreutils-2.4-20.fc23

- sepolicy: don't use dnf.rpm.miscutils.splitFilename (#1309868)
This commit is contained in:
Petr Lautrbach 2016-02-21 14:16:56 +01:00
parent 845968f6d0
commit 6671467806
2 changed files with 7 additions and 4 deletions

View File

@ -659863,7 +659863,7 @@ index 9b9a09a..b99b6d4 100755
return tlist
diff --git a/policycoreutils-2.4/sepolicy/sepolicy/generate.py b/policycoreutils-2.4/sepolicy/sepolicy/generate.py
index 6b53035..a06c6c4 100644
index 6b53035..f222bc3 100644
--- a/policycoreutils-2.4/sepolicy/sepolicy/generate.py
+++ b/policycoreutils-2.4/sepolicy/sepolicy/generate.py
@@ -1,4 +1,4 @@
@ -661069,7 +661069,7 @@ index 6b53035..a06c6c4 100644
- for bpkg in yb.rpmdb.searchNames([pkg.base_package_name]):
- for fname in bpkg.dirlist + bpkg.filelist + bpkg.ghostlist:
+ pkg_basename = dnf.rpm.miscutils.splitFilename(pkg.sourcerpm)[0]
+ pkg_basename = '-'.join(pkg.sourcerpm.split('-')[0:-2])
+ for bpkg in installed.filter(name=pkg_basename):
+ for fname in bpkg.files:
for b in self.DEFAULT_DIRS:

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.4
Release: 19%{?dist}
Release: 20%{?dist}
License: GPLv2
Group: System Environment/Base
# https://github.com/SELinuxProject/selinux/wiki/Releases
@ -18,7 +18,7 @@ Source2: policycoreutils_man_ru2.tar.bz2
Source3: system-config-selinux.png
Source4: sepolicy-icons.tgz
# use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/
# HEAD https://github.com/fedora-selinux/selinux/commit/ae664ad843397fa6f9c09e8c2edd62a23559fe19
# HEAD https://github.com/fedora-selinux/selinux/commit/84b2132f7671a03512faa81c19f6e9f8cd4e9023
Patch: policycoreutils-rhat.patch
Patch1: sepolgen-rhat.patch
Patch100: policycoreutils-fix-semanage-python3.patch
@ -404,6 +404,9 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service
%changelog
* Sun Feb 21 2016 Petr Lautrbach <plautrba@redhat.com> 2.4-20
- sepolicy: don't use dnf.rpm.miscutils.splitFilename (#1309868)
* Fri Feb 19 2016 Petr Lautrbach <plautrba@redhat.com> 2.4-19
- sepolgen: Fix spelling mistake in audit2allow (#129422)
- Improve newrole and secon man pages